rhodes 3.0.0 → 3.0.1.beta.2

data/lib/extensions/rhoxml/rexml/encodings/CP-1252.rb

@@ -0,0 +1,103 @@
+#
+# This class was contributed by Mikko Tiihonen mikko DOT tiihonen AT hut DOT fi
+#
+module REXML
+  module Encoding
+    register( "CP-1252" ) do |o|
+      class << o
+        alias encode encode_cp1252
+      alias decode decode_cp1252
+      end
+    end
+
+    # Convert from UTF-8
+    def encode_cp1252(content)
+      array_utf8 = content.unpack('U*')
+      array_enc = []
+      array_utf8.each do |num|
+        case num
+          # shortcut first bunch basic characters
+        when 0..0xFF; array_enc << num
+          # characters added compared to iso-8859-1
+        when 0x20AC; array_enc << 0x80 # 0xe2 0x82 0xac
+        when 0x201A; array_enc << 0x82 # 0xe2 0x82 0x9a
+        when 0x0192; array_enc << 0x83 # 0xc6 0x92
+        when 0x201E; array_enc << 0x84 # 0xe2 0x82 0x9e
+        when 0x2026; array_enc << 0x85 # 0xe2 0x80 0xa6
+        when 0x2020; array_enc << 0x86 # 0xe2 0x80 0xa0
+        when 0x2021; array_enc << 0x87 # 0xe2 0x80 0xa1
+        when 0x02C6; array_enc << 0x88 # 0xcb 0x86
+        when 0x2030; array_enc << 0x89 # 0xe2 0x80 0xb0
+        when 0x0160; array_enc << 0x8A # 0xc5 0xa0
+        when 0x2039; array_enc << 0x8B # 0xe2 0x80 0xb9
+        when 0x0152; array_enc << 0x8C # 0xc5 0x92
+        when 0x017D; array_enc << 0x8E # 0xc5 0xbd
+        when 0x2018; array_enc << 0x91 # 0xe2 0x80 0x98
+        when 0x2019; array_enc << 0x92 # 0xe2 0x80 0x99
+        when 0x201C; array_enc << 0x93 # 0xe2 0x80 0x9c
+        when 0x201D; array_enc << 0x94 # 0xe2 0x80 0x9d
+        when 0x2022; array_enc << 0x95 # 0xe2 0x80 0xa2
+        when 0x2013; array_enc << 0x96 # 0xe2 0x80 0x93
+        when 0x2014; array_enc << 0x97 # 0xe2 0x80 0x94
+        when 0x02DC; array_enc << 0x98 # 0xcb 0x9c
+        when 0x2122; array_enc << 0x99 # 0xe2 0x84 0xa2
+        when 0x0161; array_enc << 0x9A # 0xc5 0xa1
+        when 0x203A; array_enc << 0x9B # 0xe2 0x80 0xba
+        when 0x0152; array_enc << 0x9C # 0xc5 0x93
+        when 0x017E; array_enc << 0x9E # 0xc5 0xbe
+        when 0x0178; array_enc << 0x9F # 0xc5 0xb8
+        else
+          # all remaining basic characters can be used directly
+          if num <= 0xFF
+            array_enc << num
+          else
+            # Numeric entity (&#nnnn;); shard by  Stefan Scholl
+            array_enc.concat "&\##{num};".unpack('C*')
+          end
+        end
+      end
+      array_enc.pack('C*')
+    end
+    
+    # Convert to UTF-8
+    def decode_cp1252(str)
+      array_latin9 = str.unpack('C*')
+      array_enc = []
+      array_latin9.each do |num|
+        case num
+          # characters that added compared to iso-8859-1
+        when 0x80; array_enc << 0x20AC # 0xe2 0x82 0xac
+        when 0x82; array_enc << 0x201A # 0xe2 0x82 0x9a
+        when 0x83; array_enc << 0x0192 # 0xc6 0x92
+        when 0x84; array_enc << 0x201E # 0xe2 0x82 0x9e
+        when 0x85; array_enc << 0x2026 # 0xe2 0x80 0xa6
+        when 0x86; array_enc << 0x2020 # 0xe2 0x80 0xa0
+        when 0x87; array_enc << 0x2021 # 0xe2 0x80 0xa1
+        when 0x88; array_enc << 0x02C6 # 0xcb 0x86
+        when 0x89; array_enc << 0x2030 # 0xe2 0x80 0xb0
+        when 0x8A; array_enc << 0x0160 # 0xc5 0xa0
+        when 0x8B; array_enc << 0x2039 # 0xe2 0x80 0xb9
+        when 0x8C; array_enc << 0x0152 # 0xc5 0x92
+        when 0x8E; array_enc << 0x017D # 0xc5 0xbd
+        when 0x91; array_enc << 0x2018 # 0xe2 0x80 0x98
+        when 0x92; array_enc << 0x2019 # 0xe2 0x80 0x99
+        when 0x93; array_enc << 0x201C # 0xe2 0x80 0x9c
+        when 0x94; array_enc << 0x201D # 0xe2 0x80 0x9d
+        when 0x95; array_enc << 0x2022 # 0xe2 0x80 0xa2
+        when 0x96; array_enc << 0x2013 # 0xe2 0x80 0x93
+        when 0x97; array_enc << 0x2014 # 0xe2 0x80 0x94
+        when 0x98; array_enc << 0x02DC # 0xcb 0x9c
+        when 0x99; array_enc << 0x2122 # 0xe2 0x84 0xa2
+        when 0x9A; array_enc << 0x0161 # 0xc5 0xa1
+        when 0x9B; array_enc << 0x203A # 0xe2 0x80 0xba
+        when 0x9C; array_enc << 0x0152 # 0xc5 0x93
+        when 0x9E; array_enc << 0x017E # 0xc5 0xbe
+        when 0x9F; array_enc << 0x0178 # 0xc5 0xb8
+        else
+          array_enc << num
+        end
+      end
+      array_enc.pack('U*')
+    end
+  end
+end

data/lib/extensions/rhoxml/rexml/encodings/ISO-8859-1.rb

@@ -0,0 +1,7 @@
+require 'rexml/encodings/US-ASCII'
+
+module REXML
+  module Encoding
+    register("ISO-8859-1", &encoding_method("US-ASCII"))
+  end
+end

data/lib/framework/dateME.rb

@@ -2,6 +2,9 @@ require 'date/format'
 
 class Time
 
+  def getlocal() localtime end
+  def to_time() getlocal end
+
   def __makeTwoDigit(num)
     str = num.to_s
     if str.length < 2
@@ -101,7 +104,27 @@ class Date
     ((@m_date-x._get_date()).to_i)/(60*60*24)
   end
 
+  def + (x)
+    Date.new( @m_date + x*(60*60*24) )
+  end
+
+  # Get the week day of this date.  Sunday is day-of-week 0;
+  # Saturday is day-of-week 6.
   def wday() @m_date.wday end
+  
+  # Get the commercial day of the week of this date.  Monday is
+  # commercial day-of-week 1; Sunday is commercial day-of-week 7.
+  def cwday() 
+    _wday = @m_date.wday
+    return 7 if _wday == 0
+    
+    return _wday
+  end
+
+  # Get the commercial week of the year of this date.
+  # TODO: cweek()
+  #def cweek() 0 end
+  
   def mon() @m_date.mon end
   def year() @m_date.year end
   def mday() @m_date.mday end
@@ -121,6 +144,9 @@ class Date
   end
 
   private_class_method :now
+
+  def to_time() Time.local(year(), mon(), mday()) end
+  def to_date() self end
   
 end
 

data/lib/framework/rho/render.rb

@@ -26,16 +26,28 @@ module Rho
     end
 
     def self.renderfile(filename, req = {}, res = {})
-      res = ""
+      begin
+          res = ""
 
-      if filename.end_with?(RHO_ERB_EXT)
-        res = (RhoController.new).inst_render_index(filename, req, res)
-      else
-        res = IO.read(filename)
-      end
-      RhoController.start_objectnotify()
-      RhoController.start_geoview_notification()
-      res
+          if filename.end_with?(RHO_ERB_EXT)
+            res = (RhoController.new).inst_render_index(filename, req, res)
+          else
+            res = IO.read(filename)
+          end
+          RhoController.start_objectnotify()
+          RhoController.start_geoview_notification()
+          res
+      rescue Exception => exception
+        if defined? RHO_WP7
+          #For some reason rho_serve get another exception, so report original one here                
+          if exception
+            trace_msg = exception.backtrace.join("\n")
+            puts "renderfile error: #{exception}\n #{trace_msg}"
+          end  
+        end
+        
+        raise
+      end    
     end
 
     def inst_render_index(filename, req, res)

data/lib/framework/rho/rho.rb

@@ -16,6 +16,18 @@ module Rho
     System::get_property('platform') == 'APPLE' || System::get_property('platform') == 'ANDROID' || is_bb6
   end
 
+  def self.close_database(arg_partition=nil)
+    if arg_partition
+        puts "Close database for partition: #{arg_partition}"    
+        ::Rho::RHO.get_db_partitions()[arg_partition].close
+    else
+        ::Rho::RHO.get_db_partitions().each do |partition, db|
+            puts "Close database for partition: #{partition}"
+            db.close
+        end
+    end    
+  end
+    
   class RHO
     APPLICATIONS = {}
     APPNAME = 'app'

data/lib/framework/rho/rhoevent_bb.rb

@@ -11,6 +11,9 @@ module Rho
       elsif args.first == :all
 
         if args.length > 1
+          args[1][:start_date] = args[1][:start_date].to_time unless args[1][:start_date].nil?
+          args[1][:end_date] = args[1][:end_date].to_time unless args[1][:end_date].nil?
+        
           records = Calendar::findCalendarEvents(pb, args[1])
         else
           records = Calendar::getallCalendarEvents(pb)

data/lib/framework/rho/rhoevent_c.rb

@@ -12,6 +12,9 @@ module Rho
           end
         end
 
+        params['start_date'] = params['start_date'].to_time unless params['start_date'].nil?
+        params['end_date'] = params['end_date'].to_time unless params['end_date'].nil?
+        
         params['start_date'] = MIN_TIME if params['start_date'].nil? or params['start_date'] < MIN_TIME
         params['end_date'] = MAX_TIME if params['end_date'].nil? or params['end_date'] > MAX_TIME
         

data/lib/framework/rhodes.rb

@@ -1,6 +1,6 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '3.0.0'
+    VERSION = '3.0.1'
   end
   unless defined? Rhodes::DBVERSION
     DBVERSION = '2.2.0'

data/lib/framework/rhom/rhom_db_adapter.rb

@@ -32,15 +32,15 @@ class RhomDbAdapter
   end
 
   # closes the database if and only if it is open
-  #def close
-  #  if @database
-  #    @database.close
-  #    @database = nil
-  #  else
-  #    return false
-  #  end
-  #  return true
-  #end   
+  def close
+    if @database
+      @database.close
+      @database = nil
+    else
+      return false
+    end
+    return true
+  end   
 
   def is_ui_waitfordb
       @database.is_ui_waitfordb

data/lib/framework/rhosystem.rb

@@ -35,6 +35,23 @@ module Alert
 	end
 end
 
+module NavBar
+	def self.create( arg )
+		#TODO: create
+	end
+	
+	def self.remove( )
+		#TODO: remove
+	end
+
+	def self.started( )
+		#TODO: started
+		
+		false
+	end
+	
+end
+
 module Rho
 
 class RhoConf

data/lib/framework/stringio.rb

@@ -0,0 +1,18 @@
+# ****************************************************************************
+#
+# Copyright (c) Microsoft Corporation. 
+#
+# This source code is subject to terms and conditions of the Apache License, Version 2.0. A 
+# copy of the license can be found in the License.html file at the root of this distribution. If 
+# you cannot locate the  Apache License, Version 2.0, please send an email to 
+# ironruby@microsoft.com. By using this source code in any fashion, you are agreeing to be bound 
+# by the terms of the Apache License, Version 2.0.
+#
+# You must not remove this notice, or any other, from this software.
+#
+#
+# ****************************************************************************
+
+if defined?( RHO_WP7 )
+	load_assembly 'IronRuby.Libraries', 'IronRuby.StandardLibrary.StringIO'
+end

data/lib/framework/version.rb

@@ -1,6 +1,6 @@
 module RhodesFramework
   unless defined? RhodesFramework::VERSION
-    VERSION = '3.0.0'
+    VERSION = '3.0.1'
   end
   unless defined? RhodesFramework::DBVERSION
     DBVERSION = '2.2.2'

data/lib/rhodes.rb

@@ -1,6 +1,6 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '3.0.0'
+    VERSION = '3.0.1'
   end
   unless defined? Rhodes::DBVERSION
     DBVERSION = '2.2.0'

data/platform/android/Rhodes/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.rhomobile.rhodes"
     android:installLocation="auto"
-    android:versionCode="32"
-    android:versionName="3.0.0">
+    android:versionCode="33"
+    android:versionName="3.0.1">
     
     <uses-sdk android:minSdkVersion="4" />
     

data/platform/android/Rhodes/res/xml/filter_nfc.xml

@@ -4,10 +4,6 @@
         <tech>android.nfc.tech.MifareClassic</tech>
     </tech-list>
     <tech-list>
-        <tech>android.nfc.tech.MifareUltralight</tech>
-    </tech-list>
-    <tech-list>
-        <tech>android.nfc.tech.MifareClassic</tech>
-        <tech>android.nfc.tech.MifareUltralight</tech>
+        <tech>android.nfc.tech.Ndef</tech>
     </tech-list>
 </resources>

data/platform/android/Rhodes/src/com/rhomobile/rhodes/BaseActivity.java

@@ -1,9 +1,7 @@
 package com.rhomobile.rhodes;
 
 import android.app.Activity;
-import android.app.Application;
 import android.content.ComponentName;
-//import android.content.Context;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;

data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushReceiver.java

@@ -51,12 +51,16 @@ public class PushReceiver extends BroadcastReceiver {
 	private void handleMessage(Context context, Intent intent) {
 		Bundle extras = intent.getExtras();
 
-		if (DEBUG) {
-		    Log.d(TAG, "Message: " + extras.toString());
-		    for (String key: extras.keySet()) {
-		        Log.d(TAG, key + ": " + extras.get(key).toString());
-		    }
-		}
+        if (DEBUG) {
+            if (extras != null) {
+                Log.d(TAG, "Message: " + extras.toString());
+                for (String key: extras.keySet()) {
+                    Log.d(TAG, key + ": " + extras.get(key).toString());
+                }
+            } else {
+                Log.d(TAG, "Message: <empty>");
+            }
+        }
 
 		Intent serviceIntent = new Intent(context, RhodesService.class);
 		serviceIntent.putExtra(RhodesService.INTENT_SOURCE, INTENT_SOURCE);

data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoCryptImpl.java

@@ -10,9 +10,8 @@ import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 import java.nio.ByteBuffer;
 
-//import android.util.Base64;
+import android.content.Context;
 import android.content.SharedPreferences;
-import android.app.Activity;
 import com.rhomobile.rhodes.Logger;
 
 public class RhoCryptImpl 
@@ -24,10 +23,10 @@ public class RhoCryptImpl
 	final String m_strPrefName = "rho_internal_data";
 	Cipher m_encryptCipher, m_decryptCipher;
 	final int m_nKeyLenBit = 128;  // 192 and 256 bits may not be available
-	
-	private void readKeyFromStorage()
-	{
-    	SharedPreferences settings = RhodesActivity.getInstance().getSharedPreferences( m_strPrefName, Activity.MODE_PRIVATE);
+
+    private void readKeyFromStorage()
+    {
+        SharedPreferences settings = RhodesService.getInstance().getSharedPreferences( m_strPrefName, Context.MODE_PRIVATE);
     	String strOldKey = settings.getString(m_strDBPartition, "");
     	if ( strOldKey != null && strOldKey.length() > 0 )
     	{
@@ -46,7 +45,7 @@ public class RhoCryptImpl
 
 	private void writeKeyToStorage()
 	{
-		SharedPreferences settings = RhodesActivity.getInstance().getSharedPreferences(m_strPrefName, Activity.MODE_PRIVATE);		
+		SharedPreferences settings = RhodesService.getInstance().getSharedPreferences(m_strPrefName, Context.MODE_PRIVATE);		
     	SharedPreferences.Editor editor = settings.edit();
     	String strKey = Base64.encodeToString(m_dbKeyData, false);//, Base64.DEFAULT);
     	editor.putString(m_strDBPartition, strKey );
@@ -70,8 +69,10 @@ public class RhoCryptImpl
 	
 	private void initContext(String szPartition)throws Exception
 	{
-	    if ( m_dbKeyData != null )
+	    if ( m_dbKeyData != null ) {
+	        Logger.T(TAG, "RhoCrypt context already initialized, partition: " + szPartition);
 	        return;
+	    }
 
 	    initKey(szPartition);
 	    
@@ -89,6 +90,8 @@ public class RhoCryptImpl
 		m_decryptCipher = Cipher.getInstance("AES/CBC/NoPadding");  
 		m_decryptCipher.init(Cipher.DECRYPT_MODE, skeySpec, paramSpec);
 		
+        Logger.T(TAG, "RhoCrypt context initialized for partition: " + szPartition);
+
 	}
 	
 	private static void reportFail(String name, Exception e) 
@@ -103,8 +106,12 @@ public class RhoCryptImpl
 	    	initContext(szPartition);
 
             dataOut.rewind();
-	    	m_encryptCipher.doFinal(dataIn, dataOut);
-	    	
+
+            if (m_encryptCipher == null)
+                throw new NullPointerException("m_encryptCipher == null");
+
+            m_encryptCipher.doFinal(dataIn, dataOut);
+
 	    	return true;
     	}catch(Exception exc)
     	{
@@ -115,17 +122,21 @@ public class RhoCryptImpl
     
     public boolean db_decrypt( String szPartition, ByteBuffer dataIn, ByteBuffer dataOut )
     {
-    	try
-    	{
-	    	initContext(szPartition);
-
+        try
+        {
+            initContext(szPartition);
+            
             dataOut.rewind();
-	    	m_decryptCipher.doFinal(dataIn, dataOut);
-	    	
-	    	return true;
+
+            if (m_decryptCipher == null)
+                throw new NullPointerException("m_decryptCipher == null");
+
+            m_decryptCipher.doFinal(dataIn, dataOut);
+
+            return true;
 		}catch(Exception exc)
 		{
-			reportFail("db_encrypt", exc);
+			reportFail("db_decrypt", exc);
 			return false;
 		}
     }