rhodes 2.4.1 → 3.0.0.beta.1

data/lib/framework/rhodes.rb

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

data/lib/framework/rhoframework.rb

@@ -1,14 +1,34 @@
+if defined?( RHO_WP7 )
+    RHO_RB_EXT = '.rb'
+    RHO_ERB_EXT = '_erb' + RHO_RB_EXT
+    RHO_APPS_DIR = 'apps/'
+elsif defined?( RHODES_EMULATOR )
+    RHO_RB_EXT = '.rb'
+    RHO_ERB_EXT = '.erb'
+    RHO_APPS_DIR = ''
+    RHO_EMULATOR_DIR = 'rhosimulator'    
+    module Kernel   
+	    def eval_compiled_file(fname, bind)
+	        require 'erb'
+	        
+	        puts "eval_compiled_file : #{fname}"
+	        strFile = IO.read(fname)
+	        code = ERB.new(strFile).src
+	        
+		    eval(code, bind)
+	    end
+    end
+else
+    RHO_RB_EXT = '.iseq'
+    RHO_ERB_EXT = '_erb' + RHO_RB_EXT
+    RHO_APPS_DIR = 'apps/'
+end
+
 module Rho
   def self.file_exist?(fname)
       return File.exist_injar?(fname) if defined? RHO_ME
 
-	  if defined? RHO_WP7
-	     if fname.end_with?('_erb.iseq')
-			fname = fname[0,fname.length-9] + '_erb.rb'
-		 elsif fname.end_with?('.iseq')
-			fname = fname[0,fname.length-5] + '.rb'
-		 end
-	  end
+	  return __rho_exist_in_resources(fname) if defined? RHO_WP7
 	              
       File.exist?(fname)
   end
@@ -29,10 +49,6 @@ module Kernel
 	end
 
 	def eval_compiled_file(fname, bind)
-		if fname.end_with?('_erb.iseq')
-			fname = fname[0,fname.length-9] + '_erb.rb'
-		end
-
 	    code = IO.read(fname)
 		eval(code, bind)
 	end
@@ -71,6 +87,10 @@ begin
     require 'rho/render'
     
     require 'rho'
+
+if defined?( RHODES_EMULATOR )
+    require 'debugger'
+end
 	
     puts 'RHO loaded'
     RHO_FRAMEWORK = Rho::RHO.new

data/lib/framework/rholang/localization_simplified.rb

@@ -10,12 +10,12 @@ module LocalizationSimplified
   # substitute all daynames and monthnames with localized names
   # from RUtils plugin
   def self.localize_strftime(date='%d.%m.%Y', time='')
-    date.gsub!('%%', @@ignore)
+    #date.gsub!('%%', @@ignore)
     date.gsub!('%a', LocalizationSimplified::DateHelper::AbbrDaynames[time.wday])
     date.gsub!('%A', LocalizationSimplified::DateHelper::Daynames[time.wday])
     date.gsub!('%b', LocalizationSimplified::DateHelper::AbbrMonthnames[time.mon])
     date.gsub!('%B', LocalizationSimplified::DateHelper::Monthnames[time.mon])
-    date.gsub!(@@ignore, '%%')
+    #date.gsub!(@@ignore, '%%')
   end
   
   def self.get_cur_locale
@@ -30,17 +30,21 @@ module LocalizationSimplified
         @@cur_locale = curLocale
 
         unless check_exist
-            file = File.join( __rhoGetCurrentDir(), "lib", file)
+if defined?( RHODES_EMULATOR )        
+            file = File.join( __rhoGetRhodesDir(), 'lib/framework', file)
+else
+            file = File.join( __rhoGetCurrentDir(), 'lib', file)            
+end            
             puts "file: #{file}"
         end
       
-        if curCountry && curCountry.length() > 0 && Rho::file_exist?(file + curLocale + '_' + curCountry + '.iseq') 
+        if curCountry && curCountry.length() > 0 && Rho::file_exist?(file + curLocale + '_' + curCountry + RHO_RB_EXT) 
             require file + curLocale + '_' + curCountry
-        elsif Rho::file_exist?(file + curLocale + '.iseq')
+        elsif Rho::file_exist?(file + curLocale + RHO_RB_EXT)
             require file + curLocale
         else    
             puts 'Could not find resources for locale: ' + curLocale.to_s + ";file: #{file}"if curLocale != 'en'
-            if curLocale != 'en' && Rho::file_exist?(file + 'en.iseq')
+            if curLocale != 'en' && Rho::file_exist?(file + 'en' + RHO_RB_EXT)
                 puts 'Load english resources.'
                 require file + 'en'
             end    

data/lib/framework/rhom/rhom_object_factory.rb

@@ -667,7 +667,7 @@ module Rhom
                                   #new_obj.vars.merge!( { attrName.to_sym()=>attrVal } ) if attrVal
                                   
                                   if attribs && attribs != '*'    
-                                     next unless attribs.include? (attrName)
+                                     next unless attribs.include? attrName
                                   end
                                   
 								  new_obj.vars[attrName.to_sym()] = attrVal if attrVal
@@ -935,7 +935,7 @@ module Rhom
                                     new_item = {'object'=>object_id }
                                     item_attribs.each do |item|
                                        if attribs && attribs != '*'    
-                                         next unless attribs.include? (item['attrib'])
+                                         next unless attribs.include? item['attrib']
                                        end
                                        
                                        new_item[item['attrib']] = item['value']
@@ -1738,7 +1738,7 @@ module Rhom
         end #unless
         #modelname = classname.split(/(?=[A-Z])/).map{|w| w.downcase}.join("_")
         #puts "classname: #{classname}; modelname: #{modelname}"
-        #require "#{classname}/#{modelname}" if File.exists? File.join(Rho::RhoFSConnector.get_base_app_path,'app',classname,"#{modelname}.iseq")
+        #require "#{classname}/#{modelname}" if File.exists? File.join(Rho::RhoFSConnector.get_base_app_path,'app',classname,"#{modelname}" + RHO_RB_EXT)
       #end
     end #init_object
   end # RhomObjectFactory

data/lib/framework/version.rb

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

data/lib/rhodes.rb

@@ -1,6 +1,6 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '2.4.1'
+    VERSION = '3.0.0'
   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="31"
-    android:versionName="2.4.1">
+    android:versionCode="32"
+    android:versionName="3.0.0">
     
     <uses-sdk android:minSdkVersion="4" />
     

data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesApplication.h

@@ -1,19 +1,43 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
 #include <jni.h>
-/* Header for class com_rhomobile_rhodes_RhodesApplication */
+/* Header for class com_rhomobile_rhodes_NativeApplication */
 
-#ifndef _Included_com_rhomobile_rhodes_RhodesApplication
-#define _Included_com_rhomobile_rhodes_RhodesApplication
+#ifndef _Included_com_rhomobile_rhodes_NativeApplication
+#define _Included_com_rhomobile_rhodes_NativeApplication
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     com_rhomobile_rhodes_RhodesApplication
- * Method:    setStartParameters
- * Signature: (Ljava/lang/String;)V
+ * Class:     com_rhomobile_rhodes_NativeApplication
+ * Method:    createRhodesApp
+ * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesApplication_setStartParameters
-  (JNIEnv *, jclass, jstring);
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesApplication_createRhodesApp
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     com_rhomobile_rhodes_NativeApplication
+ * Method:    startRhodesApp
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesApplication_startRhodesApp
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     com_rhomobile_rhodes_NativeApplication
+ * Method:    stopRhodesApp
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesApplication_stopRhodesApp
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     com_rhomobile_rhodes_NativeApplication
+ * Method:    canStartApp
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_com_rhomobile_rhodes_RhodesApplication_canStartApp
+  (JNIEnv *, jclass, jstring, jstring);
 
 #ifdef __cplusplus
 }

data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesService.h

@@ -8,7 +8,7 @@
 extern "C" {
 #endif
 #undef com_rhomobile_rhodes_RhodesService_DEBUG
-#define com_rhomobile_rhodes_RhodesService_DEBUG 0L
+#define com_rhomobile_rhodes_RhodesService_DEBUG 1L
 #undef com_rhomobile_rhodes_RhodesService_DOWNLOAD_PACKAGE_ID
 #define com_rhomobile_rhodes_RhodesService_DOWNLOAD_PACKAGE_ID 1L
 /*
@@ -19,22 +19,6 @@ extern "C" {
 JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_initClassLoader
   (JNIEnv *, jobject, jobject);
 
-/*
- * Class:     com_rhomobile_rhodes_RhodesService
- * Method:    createRhodesApp
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_createRhodesApp
-  (JNIEnv *, jobject);
-
-/*
- * Class:     com_rhomobile_rhodes_RhodesService
- * Method:    startRhodesApp
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_startRhodesApp
-  (JNIEnv *, jobject);
-
 /*
  * Class:     com_rhomobile_rhodes_RhodesService
  * Method:    doSyncAllSources
@@ -141,11 +125,19 @@ JNIEXPORT jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_isOnStartPage
 
 /*
  * Class:     com_rhomobile_rhodes_RhodesService
- * Method:    canStartApp
- * Signature: (Ljava/lang/String;Ljava/lang/String;)Z
+ * Method:    isEnableTitle
+ * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_canStartApp
-  (JNIEnv *, jclass, jstring, jstring);
+JNIEXPORT jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_isTitleEnabled
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     com_rhomobile_rhodes_RhodesService
+ * Method:    isEnableTitle
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_isEnableTitle
+  (JNIEnv *, jclass);
 
 /*
  * Class:     com_rhomobile_rhodes_RhodesService
@@ -155,6 +147,14 @@ JNIEXPORT jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_canStartApp
 JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_setPushRegistrationId
   (JNIEnv *, jobject, jstring);
 
+/*
+ * Class:     com_rhomobile_rhodes_RhodesService
+ * Method:    getPushRegistrationId
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_getPushRegistrationId
+  (JNIEnv *, jobject);
+
 /*
  * Class:     com_rhomobile_rhodes_RhodesService
  * Method:    callPushCallback

data/platform/android/Rhodes/jni/src/rhocryptimpl.cpp

@@ -26,6 +26,7 @@ CRhoCryptImpl::CRhoCryptImpl() : m_obj(0), m_dataOut(0)
 
     m_obj = env->NewObject(cls, midConstructor);
     env->NewGlobalRef(m_obj);
+    env->DeleteLocalRef(m_obj);
 
     m_dataOut = (unsigned char*)malloc(1024); //sqlite page size
 }

data/platform/android/Rhodes/jni/src/rhodes.cpp

@@ -481,8 +481,8 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_nativeInitPath
     g_apk_path = rho_cast<std::string>(env, apk_path);
 }
 
-RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_createRhodesApp
-  (JNIEnv *env, jobject)
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesApplication_createRhodesApp
+  (JNIEnv *env, jclass)
 {
     jclass clsRE = getJNIClass(RHODES_JAVA_CLASS_RUNTIME_EXCEPTION);
     if (!clsRE)
@@ -538,14 +538,14 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_createRhodesApp
     rho_rhodesapp_create(szRootPath);
 }
 
-RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_startRhodesApp
-  (JNIEnv *env, jobject obj)
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesApplication_startRhodesApp
+  (JNIEnv *, jclass)
 {
     rho_rhodesapp_start();
 }
 
-RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_stopRhodesApp
-  (JNIEnv *, jobject)
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesApplication_stopRhodesApp
+  (JNIEnv *, jclass)
 {
     rho_rhodesapp_destroy();
 }
@@ -637,8 +637,8 @@ RHO_GLOBAL jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_isOnStartPag
 }
 
 
-RHO_GLOBAL jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_isEnableTitle
-  (JNIEnv *, jclass, jstring cmdLine, jstring sep)
+RHO_GLOBAL jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_isTitleEnabled
+  (JNIEnv *, jclass)
 {
     bool value = true;
     const char* svalue = get_app_build_config_item("android_title");
@@ -648,7 +648,7 @@ RHO_GLOBAL jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_isEnableTitl
     return (jboolean)value;
 }
 
-RHO_GLOBAL jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_canStartApp
+RHO_GLOBAL jboolean JNICALL Java_com_rhomobile_rhodes_RhodesApplication_canStartApp
   (JNIEnv *, jclass, jstring cmdLine, jstring sep)
 {
     std::string const &strCmdLine = rho_cast<std::string>(cmdLine);
@@ -699,7 +699,19 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_setPushRegistrat
   (JNIEnv *env, jobject, jstring jId)
 {
     std::string id = rho_cast<std::string>(env, jId);
+    rho::sync::CClientRegister* pClientRegister = rho::sync::CClientRegister::getInstance();
+    if(pClientRegister && (pClientRegister->getDevicePin().compare(id) != 0))
+    {
+        rho::sync::CClientRegister::Destroy();
+    }
     rho::sync::CClientRegister::Create(id.c_str());
+    RHOCONF().setString("push_pin", id.c_str(), true);
+}
+
+RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_getPushRegistrationId
+  (JNIEnv * env, jobject)
+{
+    return rho_cast<jhstring>(RHOCONF().getString("push_pin").c_str()).release();
 }
 
 RHO_GLOBAL jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_callPushCallback

data/platform/android/Rhodes/jni/src/sslimpl.cpp

@@ -89,6 +89,7 @@ void* SSLImpl::createStorage()
     JNIEnv *env = jnienv();
     jobject obj = env->NewObject(cls, midConstructor);
     env->NewGlobalRef(obj);
+    env->DeleteLocalRef(obj);
     return obj;
 }
 

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

@@ -3,6 +3,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;
@@ -96,12 +97,12 @@ public class BaseActivity extends Activity implements ServiceConnection {
 		}
 	}
 	
-	public RhodesApplication getRhodesApplication() {
-		Application app = super.getApplication();
-		if (DEBUG)
-			Log.d(TAG, "getApplication: " + app);
-		return (RhodesApplication)app;
-	}
+//	public NativeApplication getRhodesApplication() {
+//		Application app = super.getApplication();
+//		if (DEBUG)
+//			Log.d(TAG, "getApplication: " + app);
+//		return (NativeApplication)app;
+//	}
 
 	@Override
 	public void onServiceConnected(ComponentName name, IBinder service) {

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

@@ -1,5 +1,7 @@
 package com.rhomobile.rhodes;
 
+import com.rhomobile.rhodes.alert.StatusNotification;
+
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -13,6 +15,10 @@ public class PushReceiver extends BroadcastReceiver {
 	
 	private static final String REG_ID = "registration_id";
 	
+	private static final String NOTIFICATION_NONE = "none";
+    private static final String NOTIFICATION_BACKGROUND = "background";
+    private static final String NOTIFICATION_ALWAYS = "always";
+	
 	public static final String INTENT_SOURCE = PushReceiver.class.getName();
 	
 	private static final String INTENT_PREFIX = PushReceiver.class.getPackage().getName();
@@ -54,7 +60,19 @@ public class PushReceiver extends BroadcastReceiver {
 		serviceIntent.putExtra(RhodesService.INTENT_SOURCE, INTENT_SOURCE);
 		serviceIntent.putExtra(INTENT_TYPE, INTENT_TYPE_MESSAGE);
 		serviceIntent.putExtra(INTENT_EXTRAS, extras);
-		context.startService(serviceIntent);
+		String alert = extras.getString("alert");
+		String from = extras.getString("from");
+
+        boolean statusNotification = false;
+		if (Push.PUSH_NOTIFICATIONS.equals(NOTIFICATION_ALWAYS))
+		    statusNotification = true;
+		else if (Push.PUSH_NOTIFICATIONS.equals(NOTIFICATION_BACKGROUND))
+		    statusNotification = !RhodesService.isRhodesActivityStarted();
+		
+		if (statusNotification)
+			StatusNotification.simpleNotification(TAG, INTENT_TYPE_MESSAGE, context, serviceIntent, "PUSH message from: " + from, alert);
+		else
+			context.startService(serviceIntent);
 	}
 	
 	@Override