rhodes 2.2.6 → 2.3.0.beta.1

data/lib/framework/rhom/rhom_source.rb

@@ -51,16 +51,24 @@ module Rhom
     
     class << self
       include ::Rhom::RhomObject
+      
+      def load_all_sources
+        Rho::RHO.load_all_sources()
+      end
+       
       def find(*args)
         if args.first == :all || args.first == :first
           list = []
         
-          results = ::Rho::RHO.get_src_db().select_from_table('sources', '*')
-          
-          results.each do |result|
-            list << RhomSource.new(result)
+          ::Rho::RHO.get_db_partitions.each_value do |db|
+              results = db.select_from_table('sources', '*')
+
+              results.each do |result|
+                list << RhomSource.new(result)
+              end
           end
           
+          
           if args.first == :first
             return list.length > 0 ? list[0] : nil
           end 
@@ -68,9 +76,16 @@ module Rhom
           list
           
         else 
-          result = ::Rho::RHO.get_src_db().select_from_table('sources', '*', 
-                                                            {"source_id" => strip_braces(args.first)}).first
-          RhomSource.new(result)
+        
+          ::Rho::RHO.get_db_partitions.each_value do |db|
+              result = ::Rho::RHO.get_src_db().select_from_table('sources', '*', 
+                                                                {"source_id" => strip_braces(args.first)})
+              next unless result && result.length() > 0 
+              
+              return RhomSource.new(result.first)
+          end    
+          
+          return nil
         end
         
       end

data/lib/framework/version.rb

@@ -1,6 +1,6 @@
 module RhodesFramework
   unless defined? RhodesFramework::VERSION
-    VERSION = '2.2.6'
+    VERSION = '2.3.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.2.6'
+    VERSION = '2.3.0'
   end
   unless defined? Rhodes::DBVERSION
     DBVERSION = '2.2.0'

data/platform/android/Rhodes/AndroidManifest.xml

@@ -1,30 +1,93 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.rhomobile.rhodes"
-      android:installLocation="auto"
-      android:versionCode="27"
-      android:versionName="2.2.6">
-    <uses-sdk android:minSdkVersion="3" />
-    <application android:icon="@drawable/icon"
-          android:multiprocess="true"
-          android:allowTaskReparenting="true"
-          android:debuggable="true"
-          finishOnTaskLaunch="true"
-          android:label="@string/app_name">
-        <activity android:name="com.rhomobile.rhodes.Rhodes"
-              android:label="@string/app_name"
-              android:configChanges="keyboardHidden|orientation">
+    package="com.rhomobile.rhodes"
+    android:installLocation="auto"
+    android:versionCode="28"
+    android:versionName="2.3.0">
+    
+    <uses-sdk android:minSdkVersion="4" />
+    
+    <application
+        android:name="com.rhomobile.rhodes.RhodesApplication"
+        android:icon="@drawable/icon"
+        android:label="@string/app_name"
+        android:debuggable="true">
+        
+        <!-- Main activity -->
+        <activity
+            android:name="com.rhomobile.rhodes.RhodesActivity"
+            android:label="@string/app_name"
+            android:configChanges="orientation|keyboardHidden">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.rhomobile.rhodes.camera.FileList" />
-        <activity android:name="com.rhomobile.rhodes.camera.ImageCapture" android:screenOrientation="landscape" />
-        <activity android:name="com.rhomobile.rhodes.signature.ImageCapture" />
-        <activity android:name="com.rhomobile.rhodes.datetime.DateTimePickerScreen" />
-        <activity android:name="com.rhomobile.rhodes.mapview.MapView" />
-        <activity android:name="com.rhomobile.rhodes.bluetooth.RhoBluetoothDeviceListActivity" />
+        
+        <activity
+            android:name="com.rhomobile.rhodes.camera.FileList" />
+        
+        <activity
+            android:name="com.rhomobile.rhodes.camera.ImageCapture"
+            android:screenOrientation="landscape" />
+        
+        <activity
+            android:name="com.rhomobile.rhodes.signature.ImageCapture" />
+        
+        <activity
+            android:name="com.rhomobile.rhodes.datetime.DateTimePickerScreen" />
+        
+        <activity
+            android:name="com.rhomobile.rhodes.mapview.MapView" />
+        
+        <activity
+            android:name="com.rhomobile.rhodes.mapview.GoogleMapView" />
+        
+        <activity
+            android:name="com.rhomobile.rhodes.bluetooth.RhoBluetoothDeviceListActivity" />
+        
+        <receiver
+            android:name="com.rhomobile.rhodes.PushReceiver"
+            android:permission="com.google.android.c2dm.permission.SEND">
+            <!-- Receive the actual message -->
+            <intent-filter>
+                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+                <category android:name="com.rhomobile.rhodes" />
+            </intent-filter>
+            <!-- Receive the registration id -->
+            <intent-filter>
+                <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
+                <category android:name="com.rhomobile.rhodes" />
+            </intent-filter>
+        </receiver>
+        
+        <service
+            android:name="com.rhomobile.rhodes.RhodesService" />
+        
         <uses-library android:name="com.google.android.maps" />
+        
     </application>
+    
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
+    <uses-permission android:name="android.permission.CALL_PHONE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.READ_CALENDAR" />
+    <uses-permission android:name="android.permission.WRITE_CALENDAR" />
+    <permission android:name="com.rhomobile.rhodes.permission.C2D_MESSAGE" android:protectionLevel="signature" />
+    <uses-permission android:name="com.rhomobile.rhodes.permission.C2D_MESSAGE" />
+    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+    
 </manifest> 

data/platform/android/Rhodes/gen/com/rhomobile/rhodes/R.java

@@ -35,6 +35,7 @@ public final class R {
     }
     public static final class id {
         public static final int LinearLayout01=0x7f07000a;
+        public static final int appIcon=0x7f070023;
         public static final int buttonLayout=0x7f070010;
         public static final int button_scan=0x7f070004;
         public static final int cameraButton=0x7f070006;
@@ -57,6 +58,8 @@ public final class R {
         public static final int okButton=0x7f07000b;
         public static final int paired_devices=0x7f070001;
         public static final int preview=0x7f070011;
+        public static final int progress_bar=0x7f070026;
+        public static final int progress_text=0x7f070024;
         public static final int scrollview=0x7f070019;
         public static final int sig_cancelButton=0x7f070020;
         public static final int sig_clearButton=0x7f070021;
@@ -66,6 +69,7 @@ public final class R {
         public static final int text=0x7f07000d;
         public static final int text1=0x7f070013;
         public static final int timePicker=0x7f070009;
+        public static final int title=0x7f070025;
         public static final int title_new_devices=0x7f070002;
         public static final int title_paired_devices=0x7f070000;
         public static final int widget28=0x7f07000e;
@@ -81,6 +85,7 @@ public final class R {
         public static final int logoptions=0x7f030007;
         public static final int logview=0x7f030008;
         public static final int signature=0x7f030009;
+        public static final int status_bar_ongoing_event_progress_bar=0x7f03000a;
     }
     public static final class menu {
         public static final int options=0x7f060000;

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

@@ -5,6 +5,7 @@
 #include <net/INetRequest.h>
 #include <net/ssl.h>
 #include <common/IRhoThreadImpl.h>
+#include <common/IRhoCrypt.h>
 
 namespace rho
 {
@@ -17,6 +18,7 @@ public:
     net::INetRequest *createNetRequest();
     IRhoThreadImpl *createThreadImpl();
     net::ISSL *createSSLEngine();
+    IRhoCrypt* createRhoCrypt();
 };
 
 } // namespace common

data/platform/android/Rhodes/jni/include/rhodes/details/rhojava.inc

@@ -1,8 +1,8 @@
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_ALERT, "com/rhomobile/rhodes/alert/Alert")
+RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_BITMAP, "android/graphics/Bitmap")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_BOOLEAN, "java/lang/Boolean")
+RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_BUFFEREDREADER, "java/io/BufferedReader")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_CAMERA, "com/rhomobile/rhodes/camera/Camera")
-RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_SIGNATURE, "com/rhomobile/rhodes/signature/Signature")
-RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_RHOBLUETOOTHMANAGER, "com/rhomobile/rhodes/bluetooth/RhoBluetoothManager")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_CAPABILITIES, "com/rhomobile/rhodes/Capabilities")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_CONTACT, "com/rhomobile/rhodes/phonebook/Contact")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_CONTACT_FIELD, "com/rhomobile/rhodes/phonebook/ContactField")
@@ -18,21 +18,25 @@ RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_HASHMAP, "java/util/HashMap")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_INET4ADDRESS, "java/net/Inet4Address")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_INTEGER, "java/lang/Integer")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_INPUTSTREAMREADER, "java/io/InputStreamReader")
-RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_BUFFEREDREADER, "java/io/BufferedReader")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_ITERATOR, "java/util/Iterator")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_MAP, "java/util/Map")
-#ifdef RHO_GOOGLE_API_KEY
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_MAPVIEW, "com/rhomobile/rhodes/mapview/MapView")
-#endif // RHO_GOOGLE_API_KEY
+#ifdef RHO_GOOGLE_API_KEY
+RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_GOOGLEMAPVIEW, "com/rhomobile/rhodes/mapview/GoogleMapView")
+#endif
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_NATIVEBAR, "com/rhomobile/rhodes/NativeBar")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_NAVBAR, "com/rhomobile/rhodes/NavBar")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_PHONEBOOK, "com/rhomobile/rhodes/phonebook/Phonebook")
+RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_RHOBLUETOOTHMANAGER, "com/rhomobile/rhodes/bluetooth/RhoBluetoothManager")
+RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_RHOCRYPTIMPL, "com/rhomobile/rhodes/RhoCryptImpl")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_RHODES_SERVICE, "com/rhomobile/rhodes/RhodesService")
+RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_RHODES_ACTIVITY, "com/rhomobile/rhodes/RhodesActivity")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_RHOFILEAPI, "com/rhomobile/rhodes/file/RhoFileApi")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_RHOSOCKADDR, "com/rhomobile/rhodes/socket/RhoSockAddr")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_RINGTONE_MANAGER, "com/rhomobile/rhodes/RingtoneManager")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_RUNTIME_EXCEPTION, "java/lang/RuntimeException")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_SET, "java/util/Set")
+RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_SIGNATURE, "com/rhomobile/rhodes/signature/Signature")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_SSLIMPL, "com/rhomobile/rhodes/socket/SSLImpl")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_STRING, "java/lang/String")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_VECTOR, "java/util/Vector")

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

@@ -0,0 +1,53 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class com_rhomobile_rhodes_RhodesAppOptions */
+
+#ifndef _Included_com_rhomobile_rhodes_RhodesAppOptions
+#define _Included_com_rhomobile_rhodes_RhodesAppOptions
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     com_rhomobile_rhodes_RhodesAppOptions
+ * Method:    getOptionsUrl
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_RhodesAppOptions_getOptionsUrl
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     com_rhomobile_rhodes_RhodesAppOptions
+ * Method:    getStartUrl
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_RhodesAppOptions_getStartUrl
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     com_rhomobile_rhodes_RhodesAppOptions
+ * Method:    getCurrentUrl
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_RhodesAppOptions_getCurrentUrl
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     com_rhomobile_rhodes_RhodesAppOptions
+ * Method:    getAppBackUrl
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_RhodesAppOptions_getAppBackUrl
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     com_rhomobile_rhodes_RhodesAppOptions
+ * Method:    getBlobPath
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_RhodesAppOptions_getBlobPath
+  (JNIEnv *, jclass);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

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

@@ -7,12 +7,10 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#undef com_rhomobile_rhodes_RhodesService_RHO_SPLASH_VIEW
-#define com_rhomobile_rhodes_RhodesService_RHO_SPLASH_VIEW 1L
-#undef com_rhomobile_rhodes_RhodesService_RHO_MAIN_VIEW
-#define com_rhomobile_rhodes_RhodesService_RHO_MAIN_VIEW 2L
-#undef com_rhomobile_rhodes_RhodesService_RHO_TOOLBAR_VIEW
-#define com_rhomobile_rhodes_RhodesService_RHO_TOOLBAR_VIEW 3L
+#undef com_rhomobile_rhodes_RhodesService_DEBUG
+#define com_rhomobile_rhodes_RhodesService_DEBUG 0L
+#undef com_rhomobile_rhodes_RhodesService_DOWNLOAD_PACKAGE_ID
+#define com_rhomobile_rhodes_RhodesService_DOWNLOAD_PACKAGE_ID 1L
 /*
  * Class:     com_rhomobile_rhodes_RhodesService
  * Method:    initClassLoader
@@ -55,75 +53,67 @@ JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_doSyncSource
 
 /*
  * Class:     com_rhomobile_rhodes_RhodesService
- * Method:    getOptionsUrl
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_getOptionsUrl
-  (JNIEnv *, jobject);
-
-/*
- * Class:     com_rhomobile_rhodes_RhodesService
- * Method:    getStartUrl
- * Signature: ()Ljava/lang/String;
+ * Method:    normalizeUrl
+ * Signature: (Ljava/lang/String;)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_getStartUrl
-  (JNIEnv *, jobject);
+JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_normalizeUrl
+  (JNIEnv *, jobject, jstring);
 
 /*
  * Class:     com_rhomobile_rhodes_RhodesService
- * Method:    getCurrentUrl
- * Signature: ()Ljava/lang/String;
+ * Method:    doRequest
+ * Signature: (Ljava/lang/String;)V
  */
-JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_getCurrentUrl
-  (JNIEnv *, jobject);
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_doRequest
+  (JNIEnv *, jobject, jstring);
 
 /*
  * Class:     com_rhomobile_rhodes_RhodesService
- * Method:    getAppBackUrl
- * Signature: ()Ljava/lang/String;
+ * Method:    loadUrl
+ * Signature: (Ljava/lang/String;)V
  */
-JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_getAppBackUrl
-  (JNIEnv *, jobject);
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_loadUrl
+  (JNIEnv *, jclass, jstring);
 
 /*
  * Class:     com_rhomobile_rhodes_RhodesService
- * Method:    getBlobPath
- * Signature: ()Ljava/lang/String;
+ * Method:    navigateBack
+ * Signature: ()V
  */
-JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_getBlobPath
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_navigateBack
   (JNIEnv *, jclass);
 
 /*
  * Class:     com_rhomobile_rhodes_RhodesService
- * Method:    normalizeUrl
- * Signature: (Ljava/lang/String;)Ljava/lang/String;
+ * Method:    nativeInitPath
+ * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
  */
-JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_normalizeUrl
-  (JNIEnv *, jobject, jstring);
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_nativeInitPath
+  (JNIEnv *, jobject, jstring, jstring, jstring);
 
 /*
  * Class:     com_rhomobile_rhodes_RhodesService
- * Method:    loadUrl
- * Signature: (Ljava/lang/String;)V
+ * Method:    onScreenOrientationChanged
+ * Signature: (III)V
  */
-JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_loadUrl
-  (JNIEnv *, jclass, jstring);
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_onScreenOrientationChanged
+  (JNIEnv *, jclass, jint, jint, jint);
 
 /*
  * Class:     com_rhomobile_rhodes_RhodesService
- * Method:    navigateBack
+ * Method:    callUiCreatedCallback
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_navigateBack
-  (JNIEnv *, jclass);
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_callUiCreatedCallback
+  (JNIEnv *, jobject);
 
 /*
  * Class:     com_rhomobile_rhodes_RhodesService
- * Method:    doRequest
- * Signature: (Ljava/lang/String;)V
+ * Method:    callUiDestroyedCallback
+ * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_doRequest
-  (JNIEnv *, jobject, jstring);
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_callUiDestroyedCallback
+  (JNIEnv *, jobject);
 
 /*
  * Class:     com_rhomobile_rhodes_RhodesService
@@ -135,27 +125,27 @@ JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_callActivationCal
 
 /*
  * Class:     com_rhomobile_rhodes_RhodesService
- * Method:    makeLink
- * Signature: (Ljava/lang/String;Ljava/lang/String;)V
+ * Method:    getBuildConfig
+ * Signature: (Ljava/lang/String;)Ljava/lang/String;
  */
-JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_makeLink
-  (JNIEnv *, jclass, jstring, jstring);
+JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_getBuildConfig
+  (JNIEnv *, jclass, jstring);
 
 /*
  * Class:     com_rhomobile_rhodes_RhodesService
- * Method:    onScreenOrientationChanged
- * Signature: (III)V
+ * Method:    isOnStartPage
+ * Signature: ()Z
  */
-JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_onScreenOrientationChanged
-  (JNIEnv *, jclass, jint, jint, jint);
+JNIEXPORT jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_isOnStartPage
+  (JNIEnv *, jclass);
 
 /*
  * Class:     com_rhomobile_rhodes_RhodesService
- * Method:    nativeInitPath
- * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+ * Method:    canStartApp
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)Z
  */
-JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_nativeInitPath
-  (JNIEnv *, jobject, jstring, jstring, jstring);
+JNIEXPORT jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_canStartApp
+  (JNIEnv *, jclass, jstring, jstring);
 
 /*
  * Class:     com_rhomobile_rhodes_RhodesService

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

@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_rhomobile_rhodes_SplashScreen_DEBUG
+#define com_rhomobile_rhodes_SplashScreen_DEBUG 0L
 /*
  * Class:     com_rhomobile_rhodes_SplashScreen
  * Method:    nativeStart
@@ -23,6 +25,14 @@ JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_SplashScreen_nativeStart
 JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_SplashScreen_nativeHide
   (JNIEnv *, jobject);
 
+/*
+ * Class:     com_rhomobile_rhodes_SplashScreen
+ * Method:    howLongWaitMs
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_com_rhomobile_rhodes_SplashScreen_howLongWaitMs
+  (JNIEnv *, jobject);
+
 #ifdef __cplusplus
 }
 #endif

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

@@ -0,0 +1,93 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class com_rhomobile_rhodes_mapview_MapView */
+
+#ifndef _Included_com_rhomobile_rhodes_mapview_MapView
+#define _Included_com_rhomobile_rhodes_mapview_MapView
+#ifdef __cplusplus
+extern "C" {
+#endif
+#undef com_rhomobile_rhodes_mapview_MapView_DEBUG
+#define com_rhomobile_rhodes_mapview_MapView_DEBUG 0L
+#undef com_rhomobile_rhodes_mapview_MapView_ZOOM_ANIMATION_ENABLED
+#define com_rhomobile_rhodes_mapview_MapView_ZOOM_ANIMATION_ENABLED 1L
+#undef com_rhomobile_rhodes_mapview_MapView_ZOOM_RESOLUTION
+#define com_rhomobile_rhodes_mapview_MapView_ZOOM_RESOLUTION 50L
+#undef com_rhomobile_rhodes_mapview_MapView_ENABLE_MULTI_TOUCH
+#define com_rhomobile_rhodes_mapview_MapView_ENABLE_MULTI_TOUCH 0L
+/*
+ * Class:     com_rhomobile_rhodes_mapview_MapView
+ * Method:    setSize
+ * Signature: (Lcom/rhomobile/rhodes/mapview/MapView;JII)V
+ */
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_mapview_MapView_setSize
+  (JNIEnv *, jobject, jobject, jlong, jint, jint);
+
+/*
+ * Class:     com_rhomobile_rhodes_mapview_MapView
+ * Method:    setPinImage
+ * Signature: (JLandroid/graphics/Bitmap;)V
+ */
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_mapview_MapView_setPinImage
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     com_rhomobile_rhodes_mapview_MapView
+ * Method:    minZoom
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_com_rhomobile_rhodes_mapview_MapView_minZoom
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     com_rhomobile_rhodes_mapview_MapView
+ * Method:    maxZoom
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_com_rhomobile_rhodes_mapview_MapView_maxZoom
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     com_rhomobile_rhodes_mapview_MapView
+ * Method:    zoom
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_com_rhomobile_rhodes_mapview_MapView_zoom
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     com_rhomobile_rhodes_mapview_MapView
+ * Method:    setZoom
+ * Signature: (JI)V
+ */
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_mapview_MapView_setZoom
+  (JNIEnv *, jobject, jlong, jint);
+
+/*
+ * Class:     com_rhomobile_rhodes_mapview_MapView
+ * Method:    move
+ * Signature: (JII)V
+ */
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_mapview_MapView_move
+  (JNIEnv *, jobject, jlong, jint, jint);
+
+/*
+ * Class:     com_rhomobile_rhodes_mapview_MapView
+ * Method:    paint
+ * Signature: (JLandroid/graphics/Canvas;)V
+ */
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_mapview_MapView_paint
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     com_rhomobile_rhodes_mapview_MapView
+ * Method:    destroy
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_mapview_MapView_destroy
+  (JNIEnv *, jobject, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

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

@@ -0,0 +1,38 @@
+#ifndef RHO_CRYPT_IMPL_36483A0BE5E44ef3B39915D41C54319B
+#define RHO_CRYPT_IMPL_36483A0BE5E44ef3B39915D41C54319B
+
+#include <jni.h>
+#include "common/IRhoCrypt.h"
+#include "logging/RhoLog.h"
+
+namespace rho {
+namespace common{
+
+class CRhoCryptImpl : public IRhoCrypt
+{
+    DEFINE_LOGCLASS;
+public:
+    CRhoCryptImpl();
+    ~CRhoCryptImpl();
+
+    virtual int db_decrypt( const char* szPartition, int size, unsigned char* data );
+    virtual int db_encrypt( const char* szPartition, int size, unsigned char* data, unsigned char* dataOut );
+    virtual int set_db_CryptKey( const char* szPartition, const char* szKey, bool bPersistent );
+
+private:
+    jclass cls;
+    jmethodID midConstructor;
+    jmethodID midDBDecrypt;
+    jmethodID midDBEncrypt;
+    jmethodID midSetDBCryptKey;
+
+    jobject m_obj;
+
+    unsigned char* m_dataOut;
+};
+
+}
+}
+
+#endif // RHO_CRYPT_IMPL_36483A0BE5E44ef3B39915D41C54319B
+