rhodes 1.5.5 → 2.0.0.beta1

data/lib/framework/rhom/rhom_source.rb

@@ -4,27 +4,30 @@ require 'rhom/rhom_object'
 module Rhom
   class RhomSource
     include ::Rhom::RhomObject
-    attr_accessor :source_url
     attr_reader   :source_id, :name, :last_updated, :last_inserted_size, 
                   :last_deleted_size, :last_sync_duration,
-                  :last_sync_success, :distinct_objects, :backend_refresh_time
+                  :last_sync_success, :distinct_objects, :backend_refresh_time,
+                  :partition, :schema, :schema_version
                   
     def initialize(args,count=0)
       # setup the name
       # TODO: should really store this in the database
-      Rho::RhoConfig::sources.each do |key,value|
-        if value['source_id'].to_i == args['source_id'].to_i
-          @name = key
-        end
-      end
+      #Rho::RhoConfig::sources.each do |key,value|
+      #  if value['source_id'].to_i == args['source_id'].to_i
+      #    @name = key
+      #  end
+      #end
+      @name = args['name']
       @source_id = args['source_id'].to_i
-      @source_url = args['source_url']
       @last_updated = Time.at(args['last_updated'].to_i)
       @last_inserted_size = args['last_inserted_size'].to_i
       @last_deleted_size = args['last_deleted_size'].to_i
       @last_sync_duration = args['last_sync_duration'].to_i
       @last_sync_success = args['last_sync_success'].to_i == 1 ? true : false
       @backend_refresh_time = Time.at(args['backend_refresh_time'].to_i)
+      @partition =  args['partition']
+      @schema =  args['schema']
+      @schema_version =  args['schema_version']
       
       #VERY SLOW OPERATION!
       #@distinct_objects = ::Rhom::RhomDbAdapter::select_from_table(
@@ -35,7 +38,7 @@ module Rhom
     end
     
     def distinct_objects
-        ::Rhom::RhomDbAdapter::select_from_table(
+        ::Rho::RHO.get_src_db(@name).select_from_table(
             'object_values',
             'object',
             {"source_id"=>@source_id},
@@ -51,13 +54,13 @@ module Rhom
       def find(*args)
         list = []
         if args.first == :all
-          results = ::Rhom::RhomDbAdapter::select_from_table('sources', '*')
+          results = ::Rho::RHO.get_src_db().select_from_table('sources', '*')
           
           results.each do |result|
             list << RhomSource.new(result)
           end
         else
-          result = ::Rhom::RhomDbAdapter::select_from_table('sources', '*', 
+          result = ::Rho::RHO.get_src_db().select_from_table('sources', '*', 
                                                             {"source_id" => strip_braces(args.first)}).first
           puts 'result: ' + result.inspect
           list << RhomSource.new(result)
@@ -70,12 +73,22 @@ module Rhom
         list
       end
       
-      def update_attributes(params=nil)
-        if params
-          ::Rhom::RhomDbAdapter::update_into_table('sources', {"source_url"=>params['source_url']},
-                                                   {"source_id"=>strip_braces(params['source_id'])})
+      def find_all_ashash
+        ar = find(:all)  
+        res = {}
+        ar.each do |src|
+            res[src.name] = src
         end
+        
+        res
       end
+      
+      #def update_attributes(params=nil)
+      #  if params
+      #    ::Rhom::RhomDbAdapter::update_into_table('sources', {"source_url"=>params['source_url']},
+      #                                             {"source_id"=>strip_braces(params['source_id'])})
+      #  end
+      #end
     end
   end
 end

data/lib/framework/version.rb

@@ -1,8 +1,8 @@
 module RhodesFramework
   unless defined? RhodesFramework::VERSION
-    VERSION = '1.5.5'
+    VERSION = '2.0.0'
   end
   unless defined? RhodesFramework::DBVERSION
-    DBVERSION = '1.5.5'
+    DBVERSION = '2.0.0'
   end
 end

data/lib/rhodes.rb

@@ -1,9 +1,9 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '1.5.5'
+    VERSION = '2.0.0'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '1.5.5'
+    DBVERSION = '2.0.1'
   end
   
 end

data/platform/android/Rhodes/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.rhomobile.rhodes"
-      android:versionCode="24"
-      android:versionName="1.5.5">
+      android:versionCode="20"
+      android:versionName="2.0.0">
     <uses-sdk android:minSdkVersion="3" />
     <application android:icon="@drawable/icon"
           android:multiprocess="true"

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

@@ -11,53 +11,48 @@ public final class R {
     public static final class attr {
     }
     public static final class drawable {
-        public static final int back=0x7f020000;
-        public static final int exit=0x7f020001;
-        public static final int home=0x7f020002;
-        public static final int icon=0x7f020003;
-        public static final int info=0x7f020004;
-        public static final int marker=0x7f020005;
-        public static final int next=0x7f020006;
-        public static final int options=0x7f020007;
-        public static final int refresh=0x7f020008;
-        public static final int sync=0x7f020009;
+        public static final int alert_alert=0x7f020000;
+        public static final int alert_info=0x7f020001;
+        public static final int alert_question=0x7f020002;
+        public static final int back=0x7f020003;
+        public static final int camera=0x7f020004;
+        public static final int exit=0x7f020005;
+        public static final int home=0x7f020006;
+        public static final int icon=0x7f020007;
+        public static final int info=0x7f020008;
+        public static final int marker=0x7f020009;
+        public static final int next=0x7f02000a;
+        public static final int options=0x7f02000b;
+        public static final int refresh=0x7f02000c;
+        public static final int sync=0x7f02000d;
     }
     public static final class id {
-        public static final int LinearLayout01=0x7f060004;
-        public static final int about=0x7f06001f;
-        public static final int buttonLayout=0x7f06000a;
-        public static final int cancelButton=0x7f060006;
-        public static final int datePicker=0x7f060002;
-        public static final int datetime=0x7f060001;
-        public static final int excludeClasses=0x7f060010;
-        public static final int exit=0x7f060020;
-        public static final int filesList=0x7f06000c;
-        public static final int includeClasses=0x7f06000f;
-        public static final int logcontent=0x7f060014;
-        public static final int loglevel=0x7f06000e;
-        public static final int logoptions=0x7f060022;
-        public static final int logoptsCloseButton=0x7f060012;
-        public static final int logoptsSaveButton=0x7f060011;
-        public static final int logview=0x7f060021;
-        public static final int logviewClearButton=0x7f060016;
-        public static final int logviewCloseButton=0x7f060018;
-        public static final int logviewRefreshButton=0x7f060015;
-        public static final int logviewSendButton=0x7f060017;
-        public static final int lookIn=0x7f060009;
-        public static final int navigation_back=0x7f06001b;
-        public static final int navigation_forward=0x7f06001a;
-        public static final int navigation_home=0x7f060019;
-        public static final int okButton=0x7f060005;
-        public static final int options=0x7f06001e;
-        public static final int preview=0x7f06000b;
-        public static final int refresh=0x7f06001c;
-        public static final int scrollview=0x7f060013;
+        public static final int LinearLayout01=0x7f060005;
+        public static final int buttonLayout=0x7f06000b;
+        public static final int cameraButton=0x7f060001;
+        public static final int cancelButton=0x7f060007;
+        public static final int datePicker=0x7f060003;
+        public static final int datetime=0x7f060002;
+        public static final int excludeClasses=0x7f060011;
+        public static final int filesList=0x7f06000d;
+        public static final int includeClasses=0x7f060010;
+        public static final int logcontent=0x7f060015;
+        public static final int loglevel=0x7f06000f;
+        public static final int logoptsCloseButton=0x7f060013;
+        public static final int logoptsSaveButton=0x7f060012;
+        public static final int logviewClearButton=0x7f060017;
+        public static final int logviewCloseButton=0x7f060019;
+        public static final int logviewRefreshButton=0x7f060016;
+        public static final int logviewSendButton=0x7f060018;
+        public static final int lookIn=0x7f06000a;
+        public static final int okButton=0x7f060006;
+        public static final int preview=0x7f06000c;
+        public static final int scrollview=0x7f060014;
         public static final int surface=0x7f060000;
-        public static final int sync=0x7f06001d;
-        public static final int text=0x7f060007;
-        public static final int text1=0x7f06000d;
-        public static final int timePicker=0x7f060003;
-        public static final int widget28=0x7f060008;
+        public static final int text=0x7f060008;
+        public static final int text1=0x7f06000e;
+        public static final int timePicker=0x7f060004;
+        public static final int widget28=0x7f060009;
     }
     public static final class layout {
         public static final int camera=0x7f030000;

data/platform/android/Rhodes/jni/include/JNIRhodes.h

@@ -13,7 +13,7 @@
 #include <logging/RhoLogConf.h>
 #include <logging/RhoLog.h>
 
-#include "gapikey.h"
+#include <genconfig.h>
 
 JavaVM *jvm();
 void store_thr_jnienv(JNIEnv *env);

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

@@ -1,26 +1,29 @@
-RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_INTEGER, "java/lang/Integer")
+RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_ALERT, "com/rhomobile/rhodes/alert/Alert")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_BOOLEAN, "java/lang/Boolean")
-RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_STRING, "java/lang/String")
-RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_ITERATOR, "java/util/Iterator")
-RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_SET, "java/util/Set")
-RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_MAP, "java/util/Map")
-RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_HASHMAP, "java/util/HashMap")
-RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_VECTOR, "java/util/Vector")
-RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_INET4ADDRESS, "java/net/Inet4Address")
-RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_FILEDESCRIPTOR, "java/io/FileDescriptor")
-RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_RHODES, "com/rhomobile/rhodes/Rhodes")
-RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_WEB_VIEW, "com/rhomobile/rhodes/WebView")
-RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_GEO_LOCATION, "com/rhomobile/rhodes/geolocation/GeoLocation")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_CAMERA, "com/rhomobile/rhodes/camera/Camera")
-RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_DATE_TIME_PICKER, "com/rhomobile/rhodes/datetime/DateTimePicker")
-RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_PHONEBOOK, "com/rhomobile/rhodes/phonebook/Phonebook")
+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")
-RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_ALERT, "com/rhomobile/rhodes/alert/Alert")
-RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_RINGTONE_MANAGER, "com/rhomobile/rhodes/RingtoneManager")
-RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_NATIVEBAR, "com/rhomobile/rhodes/NativeBar")
-#ifdef GOOGLE_API_KEY
+RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_DATE_TIME_PICKER, "com/rhomobile/rhodes/datetime/DateTimePicker")
+RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_DOUBLE, "java/lang/Double")
+RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_FILEDESCRIPTOR, "java/io/FileDescriptor")
+RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_FLOAT, "java/lang/Float")
+RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_GEO_LOCATION, "com/rhomobile/rhodes/geolocation/GeoLocation")
+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_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
-RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_SSLIMPL, "com/rhomobile/rhodes/socket/SSLImpl")
+#endif // RHO_GOOGLE_API_KEY
+RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_NATIVEBAR, "com/rhomobile/rhodes/NativeBar")
+RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_PHONEBOOK, "com/rhomobile/rhodes/phonebook/Phonebook")
+RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_RHODES, "com/rhomobile/rhodes/Rhodes")
 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_SET, "java/util/Set")
+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")
+RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_WEB_VIEW, "com/rhomobile/rhodes/WebView")

data/platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_RhoMenu.h

@@ -0,0 +1,61 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class com_rhomobile_rhodes_RhoMenu */
+
+#ifndef _Included_com_rhomobile_rhodes_RhoMenu
+#define _Included_com_rhomobile_rhodes_RhoMenu
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     com_rhomobile_rhodes_RhoMenu
+ * Method:    allocMenu
+ * Signature: ()J
+ */
+JNIEXPORT jlong JNICALL Java_com_rhomobile_rhodes_RhoMenu_allocMenu
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     com_rhomobile_rhodes_RhoMenu
+ * Method:    deallocMenu
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhoMenu_deallocMenu
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     com_rhomobile_rhodes_RhoMenu
+ * Method:    getMenuSize
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_com_rhomobile_rhodes_RhoMenu_getMenuSize
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     com_rhomobile_rhodes_RhoMenu
+ * Method:    getMenuItemLabel
+ * Signature: (JI)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_RhoMenu_getMenuItemLabel
+  (JNIEnv *, jobject, jlong, jint);
+
+/*
+ * Class:     com_rhomobile_rhodes_RhoMenu
+ * Method:    getMenuItemType
+ * Signature: (JI)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_RhoMenu_getMenuItemType
+  (JNIEnv *, jobject, jlong, jint);
+
+/*
+ * Class:     com_rhomobile_rhodes_RhoMenu
+ * Method:    getMenuItemUrl
+ * Signature: (JI)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_RhoMenu_getMenuItemUrl
+  (JNIEnv *, jobject, jlong, jint);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

data/platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_Rhodes.h

@@ -85,6 +85,22 @@ JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_Rhodes_getAppBackUrl
 JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_Rhodes_normalizeUrl
   (JNIEnv *, jobject, jstring);
 
+/*
+ * Class:     com_rhomobile_rhodes_Rhodes
+ * Method:    loadUrl
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_Rhodes_loadUrl
+  (JNIEnv *, jclass, jstring);
+
+/*
+ * Class:     com_rhomobile_rhodes_Rhodes
+ * Method:    navigateBack
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_Rhodes_navigateBack
+  (JNIEnv *, jclass);
+
 /*
  * Class:     com_rhomobile_rhodes_Rhodes
  * Method:    doRequest

data/platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_alert_Alert.h

@@ -0,0 +1,21 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class com_rhomobile_rhodes_alert_Alert */
+
+#ifndef _Included_com_rhomobile_rhodes_alert_Alert
+#define _Included_com_rhomobile_rhodes_alert_Alert
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     com_rhomobile_rhodes_alert_Alert
+ * Method:    doCallback
+ * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String)V
+ */
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_alert_Alert_doCallback
+  (JNIEnv *, jclass, jstring, jstring, jstring);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

data/platform/android/Rhodes/jni/include/sslimpl.h

@@ -15,7 +15,7 @@ public:
     void* createStorage();
     void freeStorage(void *ptr);
 
-    CURLcode connect(int sockfd, int nonblocking, int *done, void *storage);
+    CURLcode connect(int sockfd, int nonblocking, int *done, int ssl_verify_peer, void *storage);
     void shutdown(void *storage);
     ssize_t send(const void *mem, size_t len, void *storage);
     ssize_t recv(char *buf, size_t size, int *wouldblock, void *storage);

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

@@ -1,19 +1,46 @@
 #include "JNIRhodes.h"
 
+#include <jni/com_rhomobile_rhodes_alert_Alert.h>
+
+#include <common/rhoparams.h>
+#include <common/RhodesApp.h>
+
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "Alert"
 
-RHO_GLOBAL void alert_show_popup(char* message)
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_alert_Alert_doCallback
+  (JNIEnv *env, jclass, jstring url, jstring id, jstring title)
+{
+    rho_rhodesapp_callPopupCallback(rho_cast<std::string>(env, url).c_str(),
+        rho_cast<std::string>(env, id).c_str(), rho_cast<std::string>(env, title).c_str());
+}
+
+RHO_GLOBAL void alert_show_popup(rho_param *p)
 {
     JNIEnv *env = jnienv();
     jclass cls = getJNIClass(RHODES_JAVA_CLASS_ALERT);
     if (!cls) return;
-    jmethodID mid = getJNIClassStaticMethod(env, cls, "showPopup", "(Ljava/lang/String;)V");
+    jmethodID mid = getJNIClassStaticMethod(env, cls, "showPopup", "(Ljava/lang/Object;)V");
     if (!mid) return;
 
-    jstring msgObj = rho_cast<jstring>(message);
-    env->CallStaticVoidMethod(cls, mid, msgObj);
-    env->DeleteLocalRef(msgObj);
+    if (p->type != RHO_PARAM_STRING && p->type != RHO_PARAM_HASH) {
+        RAWLOG_ERROR("show_popup: wrong input parameter (expect String or Hash)");
+        return;
+    }
+
+    jobject paramsObj = RhoValueConverter(env).createObject(p);
+    env->CallStaticVoidMethod(cls, mid, paramsObj);
+    env->DeleteLocalRef(paramsObj);
+}
+
+RHO_GLOBAL void alert_hide_popup()
+{
+    JNIEnv *env = jnienv();
+    jclass cls = getJNIClass(RHODES_JAVA_CLASS_ALERT);
+    if (!cls) return;
+    jmethodID mid = getJNIClassStaticMethod(env, cls, "hidePopup", "()V");
+    if (!mid) return;
+    env->CallStaticVoidMethod(cls, mid);
 }
 
 RHO_GLOBAL void alert_vibrate(void *arg)