rhodes 3.4.2 → 3.5.1.12

data/lib/framework/rho/rhoapplication.rb

@@ -210,20 +210,42 @@ module Rho
       
     end
 
+    @@current_controller = nil
+    def self.current_controller()
+        @@current_controller        
+    end
+    def self.set_current_controller(ctrl)
+        @@current_controller = ctrl
+    end
+    
     def serve(req,res)
       req[:modelpath] = self.class.get_model_path req['application'], req['model']
       controller_class = req['model']+'Controller'
       undercase = controller_class.split(/(?=[A-Z])/).map{|w| w.downcase}.join("_")
 	  undercase.slice!(0) if undercase.start_with?('_')
 	  #TODO: WP7 - for some reason it added _ at the start
-	  	
+
+      is_found = false  	  	
+      
       if Rho::file_exist?(  req[:modelpath]+ undercase +RHO_RB_EXT )
         require req['model'] + '/' + undercase #req[:modelpath]+ undercase
-      else
+        
+        is_found = true
+      elsif defined?( RHODES_EMULATOR )
+        begin
+            require req['model'] + '/' + undercase #req[:modelpath]+ undercase
+            is_found = true
+        rescue Exception => exc
+        end
+        
+      end
+      
+      unless is_found
         require req['model'] + '/controller' #req[:modelpath]+'controller'
       end
       
-      res['request-body'] = (Object.const_get(req['model']+'Controller').new).send :serve, self, @rhom, req, res
+      @@current_controller = (Object.const_get(req['model']+'Controller').new) 
+      res['request-body'] = @@current_controller.send :serve, self, @rhom, req, res
     end
 
   end # RhoApplication

data/lib/framework/rho/rhocontact.rb

@@ -28,6 +28,19 @@ require 'bsearch'
 
 module Rho
 	class RhoContact
+
+            AUTHORIZATION_STATUS_NOT_DETERMINED = 'Not Determined'            
+            AUTHORIZATION_STATUS_RESTRICTED = 'Restricted'            
+            AUTHORIZATION_STATUS_DENIED = 'Denied'            
+            AUTHORIZATION_STATUS_AUTHORIZED = 'Authorized'            
+
+            def self.get_authorization_status
+                    result = AUTHORIZATION_STATUS_AUTHORIZED
+                    if System::get_property('platform') == "ANDROID" or System::get_property('platform') == "APPLE"
+                        result = Phonebook::get_authorization_status()
+                    end
+                    result
+            end
 		class << self
             def open_phonebook()
                 return Phonebook::openPhonebook

data/lib/framework/rho/rhoevent.rb

@@ -35,6 +35,21 @@ end
 
 module Rho
 	module RhoEvent
+
+            AUTHORIZATION_STATUS_NOT_DETERMINED = 'Not Determined'            
+            AUTHORIZATION_STATUS_RESTRICTED = 'Restricted'            
+            AUTHORIZATION_STATUS_DENIED = 'Denied'            
+            AUTHORIZATION_STATUS_AUTHORIZED = 'Authorized'            
+
+            def self.get_authorization_status
+                    result = AUTHORIZATION_STATUS_AUTHORIZED
+                    if System::get_property('platform') == "ANDROID" or System::get_property('platform') == "APPLE"
+                        result = Rho::Calendar.calendar_get_authorization_status()
+                    end
+                    result
+            end
+
+
     MIN_TIME = Time.utc(1900, 'jan', 1, 0, 0, 0)
     MAX_TIME = Time.utc(2100, 'dec', 31, 23, 59, 59)
     

data/lib/framework/rho/rhonativeviewmanager.rb

@@ -55,7 +55,7 @@ class NativeView
   end
 
  
-  # destory this native view
+  # destroy this native view
   def destroy
      RhodesNativeViewManager.destroy_native_view(@nv_id)		
   end
@@ -75,8 +75,8 @@ class NativeViewManager
   # make and return NativeView object
   # view_type - string with registered native view type
   # tab_index - tab index where native view will opened, can be OPEN_IN_MODAL_FULL_SCREEN_WINDOW
-  # params - HASH or another ruby type wich will be transferred to native view with call create()
-  # this function execute NativeView fabric porvided in native code and link native NativeView 
+  # params - HASH or another ruby type which will be transferred to native view with call create()
+  # this function execute NativeView fabric provided in native code and link native NativeView 
   # object received from fabric to Ruby NativeView object returned by this function
   def self.create_native_view(view_type, tab_index, params = nil)
       id = RhodesNativeViewManager.create_native_view(view_type, tab_index, params) 

data/lib/framework/rhodes.rb

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

data/lib/framework/rhom/rhom.rb

@@ -243,6 +243,11 @@ module Rhom
             searchParams, args[:sync_changes] ? args[:sync_changes] : false, args[:progress_step] ? args[:progress_step] : -1,
             args[:callback], callbackParams )
         end
+	  
+		def have_local_changes
+			res = ::Rho::RHO.get_user_db().execute_sql("SELECT object FROM changed_values WHERE sent<=1 LIMIT 1 OFFSET 0")
+			return res.length > 0
+		end
       
     end #class methods
   end # Rhom

data/lib/framework/rhomotoapi.rb

@@ -24,7 +24,8 @@
 # http://rhomobile.com
 #------------------------------------------------------------------------
 
-if Object.const_defined?('RhoElementsExt')
+if (((System.get_property('platform') != 'ANDROID') and Object.const_defined?('RhoElementsExt')) or
+   ((System.get_property('platform') == 'ANDROID') and System.get_property('is_motorola_device')))
 
 =begin
 if System.get_property('platform') != 'ANDROID'

data/lib/framework/version.rb

@@ -1,6 +1,6 @@
 module RhodesFramework
   unless defined? RhodesFramework::VERSION
-    VERSION = '3.4.0'
+    VERSION = '3.5.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 = '3.4.0'
+    VERSION = '3.5.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="39"
-    android:versionName="3.4.0">
+    android:versionCode="40"
+    android:versionName="3.5.0">
     
     <uses-sdk android:minSdkVersion="8" />
     
@@ -97,7 +97,7 @@
                 <category android:name="com.rhomobile.rhodes" />
             </intent-filter>
         </receiver>
-        
+		
         <service
             android:name="com.rhomobile.rhodes.RhodesService" />
         
@@ -113,5 +113,6 @@
     <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" />
+	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     
 </manifest> 

data/platform/android/Rhodes/AndroidManifest.xml.erb

@@ -41,20 +41,20 @@
     <activity android:name='com.rhomobile.rhodes.RhodesActivity'
               android:label='@string/app_name'
               android:launchMode='singleTask'
-              android:configChanges='orientation|screenSize|smallestScreenSize'
+              android:configChanges='orientation|screenSize|smallestScreenSize|keyboard|keyboardHidden'
               android:screenOrientation='<%= @screenOrientation %>'>
       <% @rhodesActivityIntentFilters.each do |filter| %>
         <%= makeIntentFilter(filter) %>
       <% end %>
 
     </activity>
-    <activity android:name='com.rhomobile.rhodes.alert.PopupActivity' android:theme='@style/PopupTheme' android:configChanges='orientation' android:screenOrientation='<%= @screenOrientation %>'/>
+    <activity android:name='com.rhomobile.rhodes.alert.PopupActivity' android:windowSoftInputMode='stateAlwaysHidden' android:theme='@style/PopupTheme' android:configChanges='orientation' android:screenOrientation='<%= @screenOrientation %>'/>
     <activity android:name='com.rhomobile.rhodes.camera.FileList' android:configChanges='orientation' android:screenOrientation='<%= @screenOrientation %>'/>
-    <activity android:name='com.rhomobile.rhodes.camera.ImageCapture' android:screenOrientation='landscape'/>
-    <activity android:name='com.rhomobile.rhodes.signature.ImageCapture' android:configChanges='orientation' android:screenOrientation='<%= @screenOrientation %>'/>
-    <activity android:name='com.rhomobile.rhodes.datetime.DateTimePickerScreen' android:configChanges='orientation' android:screenOrientation='<%= @screenOrientation %>'/>
-    <activity android:name='com.rhomobile.rhodes.mapview.MapView' android:configChanges='orientation' android:screenOrientation='<%= @screenOrientation %>'/>
-    <activity android:name='com.rhomobile.rhodes.mapview.GoogleMapView' android:configChanges='orientation' android:screenOrientation='<%= @screenOrientation %>'/>
+    <activity android:name='com.rhomobile.rhodes.camera.ImageCapture' android:windowSoftInputMode='stateAlwaysHidden' android:screenOrientation='landscape'/>
+    <activity android:name='com.rhomobile.rhodes.signature.ImageCapture' android:windowSoftInputMode='stateAlwaysHidden' android:configChanges='orientation' android:screenOrientation='<%= @screenOrientation %>'/>
+    <activity android:name='com.rhomobile.rhodes.datetime.DateTimePickerScreen' android:windowSoftInputMode='stateAlwaysHidden' android:configChanges='orientation' android:screenOrientation='<%= @screenOrientation %>'/>
+    <activity android:name='com.rhomobile.rhodes.mapview.MapView' android:windowSoftInputMode='stateAlwaysHidden' android:configChanges='orientation' android:screenOrientation='<%= @screenOrientation %>'/>
+    <activity android:name='com.rhomobile.rhodes.mapview.GoogleMapView' android:windowSoftInputMode='stateAlwaysHidden' android:configChanges='orientation' android:screenOrientation='<%= @screenOrientation %>'/>
     <activity android:name='com.rhomobile.rhodes.bluetooth.RhoBluetoothDeviceListActivity' android:configChanges='orientation' android:screenOrientation='<%= @screenOrientation %>'/>
     <service android:name='com.rhomobile.rhodes.RhodesService'/>
 

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

@@ -34,6 +34,7 @@
 
 #include <common/RhoDefs.h>
 #include <common/RhoStd.h>
+#include <common/RhodesApp.h>
 #include <logging/RhoLogConf.h>
 #include <logging/RhoLog.h>
 
@@ -97,6 +98,27 @@ public:
     virtual String collect();
 };
 
+class AndroidNetworkStatusMonitor : public INetworkStatusMonitor
+{
+private:
+    INetworkStatusReceiver* m_pNetworkStatusReceiver;
+public:
+    AndroidNetworkStatusMonitor() : m_pNetworkStatusReceiver(0) {}
+    virtual ~AndroidNetworkStatusMonitor() {}
+    virtual void setPollInterval(int interval) {}
+    virtual void setNetworkStatusReceiver(INetworkStatusReceiver* receiver) { m_pNetworkStatusReceiver = receiver; }
+
+    void notifyReceiver(enNetworkStatus status)
+    {
+		RAWLOG_ERROR("enter notifyReceiver");
+        if ( m_pNetworkStatusReceiver != 0 )
+        {
+			RAWLOG_ERROR("calling onNetworkStatusChanged");
+            m_pNetworkStatusReceiver->onNetworkStatusChanged(status);
+        }
+    }
+};
+
 
 
 } // namespace common

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

@@ -161,15 +161,7 @@ JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_getPushRegistr
  * Signature: (Ljava/lang/String;)Z
  */
 JNIEXPORT jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_callPushCallback
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     com_rhomobile_rhodes_RhodesService
- * Method:    callPushCallback
- * Signature: (Ljava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_callPushCallbackWithJsonBody
-  (JNIEnv *, jobject, jstring, jstring);
+  (JNIEnv *, jobject, jstring, jstring, jstring);
 
 #ifdef __cplusplus
 }

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

@@ -231,6 +231,8 @@ RHO_GLOBAL void rho_sys_bring_to_front()
 
 RHO_GLOBAL void rho_sys_report_app_started()
 {
+    RHODESAPP().initPushClients();
+
     JNIEnv *env = jnienv();
     jclass cls = getJNIClass(RHODES_JAVA_CLASS_RHODES_SERVICE);
     if (!cls) return;

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

@@ -104,3 +104,8 @@ RHO_GLOBAL VALUE get_camera_info(const char* camera_type) {
     
     return hash;
 }
+
+RHO_GLOBAL void save_image_to_device_gallery(const char* image_path, rho_param* options_hash) {
+	
+}
+

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

@@ -30,6 +30,8 @@
 #include <ruby.h>
 #include <ruby/ext/calendar/event.h>
 
+#include "app_build_capabilities.h"
+
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "EventJNI"
 
@@ -559,3 +561,11 @@ RHO_GLOBAL void event_delete(const char *id)
         rb_raise(rb_eRuntimeError, "Event delete failed: %s", error.c_str());
     }
 }
+
+RHO_GLOBAL const char* calendar_get_authorization_status() {
+#ifdef APP_BUILD_CAPABILITY_CALENDAR
+	return "Authorized";
+#else
+	return "Restricted";
+#endif
+}

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

@@ -74,6 +74,16 @@ RHO_GLOBAL double rho_geo_longitude()
     return env->CallStaticDoubleMethod(cls, mid);
 }
 
+RHO_GLOBAL double rho_geo_altitude()
+{
+    JNIEnv *env = jnienv();
+    static jclass cls = getJNIClass(RHODES_JAVA_CLASS_GEO_LOCATION);
+    if (!cls) return 0;
+    static jmethodID mid = getJNIClassStaticMethod(env, cls, "getAltitude", "()D");
+    if (!mid) return 0;
+    return env->CallStaticDoubleMethod(cls, mid);
+}
+
 RHO_GLOBAL float rho_geo_accuracy()
 {
     JNIEnv *env = jnienv();

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

@@ -42,7 +42,7 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_Logger_E
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_Logger_W
   (JNIEnv *env, jclass, jstring tag, jstring msg)
 {
-    RAWLOGC_ERROR(rho_cast<std::string>(env, tag).c_str(), rho_cast<std::string>(env, msg).c_str());
+    RAWLOGC_WARNING(rho_cast<std::string>(env, tag).c_str(), rho_cast<std::string>(env, msg).c_str());
 }
 
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_Logger_I
@@ -54,7 +54,9 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_Logger_I
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_Logger_D
   (JNIEnv *env, jclass, jstring tag, jstring msg)
 {
+#ifdef _DEBUG
     RAWLOGC_INFO(rho_cast<std::string>(env, tag).c_str(), rho_cast<std::string>(env, msg).c_str());
+#endif
 }
 
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_Logger_T

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

@@ -30,6 +30,9 @@
 #include <android/log.h>
 #include <logging/RhoLogConf.h>
 
+#include "app_build_capabilities.h"
+
+
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "PhonebookJNI"
 
@@ -400,3 +403,11 @@ RHO_GLOBAL int deleteRecord(void* pb, void* record)
     return 1;
 }
 
+RHO_GLOBAL const char* phonebook_get_authorization_status() {
+#ifdef APP_BUILD_CAPABILITY_PIM
+	return "Authorized";
+#else
+	return "Restricted";
+#endif
+}
+

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

@@ -197,7 +197,7 @@ std::string rho_cast_helper<std::string, jstring>::operator()(JNIEnv *env, jstri
 
 jhstring rho_cast_helper<jhstring, char const *>::operator()(JNIEnv *env, char const *s)
 {
-    return jhstring(env->NewStringUTF(s));
+    return jhstring(s ? env->NewStringUTF(s) : (jstring)0);
 }
 
 jclass RhoMapConvertor::clsString;

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

@@ -44,6 +44,8 @@
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "RhodesAppJNI"
 
+static rho::common::CAutoPtr<rho::common::AndroidNetworkStatusMonitor> s_network_status_monitor(new rho::common::AndroidNetworkStatusMonitor());
+
 
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_makeLink
   (JNIEnv *env, jclass, jstring src, jstring dst)
@@ -107,6 +109,7 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesApplication_createRhodes
 {
     // Start Rhodes application
     rho_rhodesapp_create(rho_native_rhopath());
+	RHODESAPP().setNetworkStatusMonitor(s_network_status_monitor);
 }
 
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesApplication_startRhodesApp
@@ -124,7 +127,7 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesApplication_stopRhodesAp
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_doSyncAllSources
   (JNIEnv *, jobject, jboolean show_status_popup)
 {
-    rho_sync_doSyncAllSources(show_status_popup, "");
+    rho_sync_doSyncAllSources(show_status_popup, "", 0);
 }
 
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_doSyncSource
@@ -235,10 +238,14 @@ RHO_GLOBAL jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_isOnStartPag
 
 
 RHO_GLOBAL jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_isMotorolaLicencePassed
-(JNIEnv *env, jclass)
+(JNIEnv *env, jclass, jstring jLicense, jstring jCompany, jstring jAppName)
 {
-    bool res = (rho_can_app_started_with_current_licence() == 1);
-    return (jboolean)res;
+    int res = rho_can_app_started_with_current_licence(
+                    jLicense ? rho_cast<std::string>(env, jLicense).c_str() : 0,
+                    jCompany ? rho_cast<std::string>(env, jCompany).c_str() : 0,
+                    jAppName ? rho_cast<std::string>(env, jAppName).c_str() : 0);
+
+    return (jboolean)(res == 1);
 }
 
 
@@ -303,35 +310,23 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_callActivationCa
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_setPushRegistrationId
   (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);
+    std::string deviceId = rho_cast<std::string>(env, jId);
+    rho::sync::CClientRegister::Create(deviceId);
 }
 
 RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_getPushRegistrationId
   (JNIEnv * env, jobject)
 {
-    return rho_cast<jhstring>(RHOCONF().getString("push_pin").c_str()).release();
+    return rho_cast<jhstring>(env, rho::sync::CClientRegister::Get()->getDevicePin()).release();
 }
 
 RHO_GLOBAL jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_callPushCallback
-  (JNIEnv *env, jobject, jstring jData)
+  (JNIEnv *env, jobject, jstring jType, jstring jJson, jstring jData)
 {
-    return (jboolean)rho_rhodesapp_callPushCallback(
-                    rho_cast<std::string>(env, jData).c_str());
-}
-
-RHO_GLOBAL jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_callPushCallbackWithJsonBody
-  (JNIEnv *env, jobject, jstring jUrl, jstring jData)
-{
-    return (jboolean)rho_rhodesapp_callPushCallbackWithJsonBody(
-                    rho_cast<std::string>(env, jUrl).c_str(),
-                    rho_cast<std::string>(env, jData).c_str());
+    std::string strType = jType ? rho_cast<std::string>(env, jType) : "";
+    std::string strJson = jJson ? rho_cast<std::string>(env, jJson) : "";
+    std::string strData = jData ? rho_cast<std::string>(env, jData) : "";
+    return (jboolean)RHODESAPP().callPushCallback(strType, strJson, strData);
 }
 
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_resetHttpLogging
@@ -343,7 +338,12 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_resetHttpLogging
     //RAWLOG_ERROR("$$$$$$$$$$$ RESET HTTP LOGGING 2 $$$$$$$$$$$$$");
 }
 
-
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_resetFileLogging
+(JNIEnv *env, jobject, jstring jId)
+{
+    std::string path = rho_cast<std::string>(env, jId);
+    LOGCONF().setLogFilePath(path);
+}
 
 RHO_GLOBAL char *rho_timezone()
 {
@@ -373,3 +373,19 @@ RHO_GLOBAL void rho_conf_show_log()
     env->CallStaticVoidMethod(cls, mid);
 }
 
+	RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_notifyNetworkStatusChanged(JNIEnv *env, jobject, int status)
+	{
+		RAWLOG_ERROR("nativeNotify");
+		rho::common::enNetworkStatus s = rho::common::networkStatusUnknown;
+		switch(status)
+		{
+			case 1:
+				s = rho::common::networkStatusConnected;
+				break;
+			case 2:
+				s = rho::common::networkStatusDisconnected;
+				break;
+		}
+		
+		s_network_status_monitor->notifyReceiver(s);
+	}