rhodes 2.3.0 → 2.3.1.beta.1

data/doc/synchronization.txt

@@ -150,8 +150,13 @@ These parameters are included in all notifications.
 #### "error"
 * `@params["error_code"]` - HTTP response code of the RhoSync server error: 401, 500, 404, etc.
 * `@params["error_message"]` - Response body (if any)
-* `@params["error_type"]` - Type of RhoSync adapter error (if exists): "login-error", "query-error", "create-error", "update-error", "delete-error", "logoff-error"
-* `@params["create_error"]` - Array of hashes each containing an "object" (that failed to create) and a corresponding "error_message".
+* `@params["server_errors"]` - Hash of Type objects of RhoSync adapter error (if exists): "login-error", "query-error", "create-error", "update-error", "delete-error", "logoff-error"
+
+For "login-error", "query-error", "logoff-error": Type object is hash contains 'message'  from server: @params["server_errors"]["query-error"]['message']
+
+For "create-error", "update-error", "delete-error": Type object is hash each containing an "object" as a key (that failed to create) and a corresponding "message": @params["server_errors"]["create-error"][object]['message']
+
+**NOTE: "create-error" has to be handled in sync callback. Otherwise sync will stop on this model. To fix create errors you should call Model.on_sync_create_error or SyncEngine.on_sync_create_error**
 
 #### "ok"
 * `@params["total_count"]` - Total number of records that exist for this RhoSync source.
@@ -166,6 +171,21 @@ This status returns for bulk-sync models that use [`FixedSchema`](/rhom#fixed-sc
 
 **NOTE: In this scenario the sync callback should notify the user with a wait screen and start the bulk sync process.**
 
+### Server create-error processing on client
+"create-error" has to be handled in sync callback. Otherwise sync will stop on this model. To fix create errors you should call Model.on_sync_create_error or SyncEngine.on_sync_create_error:
+
+	:::ruby
+	SyncEngine.on_sync_create_error( src_name, objects, action )
+	Model.on_sync_create_error( objects, action )
+
+* objects - One or more error objects
+* action - May be :delete or :recreate. :delete just remove object from client, :recreate will push this object to server again at next sync.
+
+For example:
+	:::ruby
+    SyncEngine.on_sync_create_error( @params['source_name'], 
+        @params['server_errors']['create-error'].keys(), :delete)
+    
 ### Notification Example
 Here is a simple example of a sync notification method that uses some of the parameters described above:
 
@@ -181,6 +201,13 @@ Here is a simple example of a sync notification method that uses some of the par
 	    WebView.navigate Rho::RhoConfig.start_path
 	
 	  elsif status == "error"
+	  
+        if @params['server_errors'] && 
+           @params['server_errors']['create-error']
+            SyncEngine.on_sync_create_error( @params['source_name'], 
+                @params['server_errors']['create-error'].keys(), :delete)
+        end
+	  
 	    err_code = @params['error_code'].to_i
 	    rho_error = Rho::RhoError.new(err_code)
    
@@ -427,6 +454,16 @@ Clears the sync notification for a given source id.
 
 	:::ruby
 	SyncEngine.clear_notification(Product.get_source_id)
+	
+### `on_sync_create_error( src_name, objects, action )`
+"create-error" has to be handled in sync callback. Otherwise sync will stop on this model. To fix create errors you should call Model.on_sync_create_error or SyncEngine.on_sync_create_error.
+
+	:::ruby
+    SyncEngine.on_sync_create_error( @params['source_name'], 
+        @params['server_errors']['create-error'].keys(), :delete)
+    
+* objects - One or more error objects
+* action - May be :delete or :recreate. :delete just remove object from client, :recreate will push this object to server again at next sync.
 
 ### `set_pollinterval(interval)`
 Update the `SyncEngine` poll interval. Setting this to 0 will disable polling-based sync.  However, you may still use [push-based-sync](/rhosync/push).

data/doc/ui.txt

@@ -536,6 +536,7 @@ Each tabbar item defined in the above sample defines following tab elements:
 * :selected_color => 0xFFFF00 - Optional parameter for change selected color of this tabs (if you use it on Android - you should defined it for all tabs! and also define :background_color for TabBar!)
 * :disabled => true - Optional parameter for disable this tab
 * :web_bkg_color = > int hex value (like HTML color) - background color for tab (use when your app bkg is not white for remove blink during switch tabs)
+* :use_current_view_for_tab => true - Optional argument which tells rhodes to smooth transfer WebView from current view into this Tab and make this Tab active. Defaults to false. Only one Tab can have this parameter!
 
 
 Behind the scenes, Rho::RhoApplication will detect the @tabs array in its initialize method and build the native bar through the following function:

data/installer/README.html

@@ -65,7 +65,7 @@ html, body {
 
 	<h3>Building Your Rhodes Application</h3>
 	
-	<p>To build your Rhodes application, please see the <a href="http://wiki.rhomobile.com/index.php/Tutorial">Rhodes Tutorial</a>.</p>
+	<p>To build your Rhodes application, please see the <a href="http://docs.rhomobile.com/rhodes/tutorial">Rhodes Tutorial</a>.</p>
 
 	<h3>More Info</h3>
 	

data/lib/build/jake.rb

@@ -139,6 +139,8 @@ class Jake
     ensure
       server.shutdown
     end
+    
+    $failed.to_i
   end
 
   def self.before_run_spec()
@@ -244,6 +246,7 @@ class Jake
                     Process.kill( 9, f.pid ) 
                 end    
             else
+                retval += line
                 puts "RET: " + line
                 $stdout.flush
             end    

data/lib/framework/rho/render.rb

@@ -163,6 +163,8 @@ module Rho
         data[sym.to_s] = self.instance_variable_get sym
       end
 
+      data["self"] = self
+      
       prepared = bind(data,metadata[action])
       
       translate(prepared,action)

data/lib/framework/rho/rho.rb

@@ -714,17 +714,20 @@ module Rho
             end
             
           else
-            if !source['source_id']
-                source['source_id'] = start_id
-                Rho::RhoConfig::sources[name]['source_id'] = start_id
-                
-                start_id += 1
-            end
           
-            db.insert_into_table('sources',
-                {"source_id"=>source['source_id'],"name"=>name, "sync_priority"=>sync_priority, "sync_type"=>sync_type, "partition"=>partition,
-                "schema_version"=>source['schema_version'], 'associations'=>associations, 'blob_attribs'=>blob_attribs })
-                
+            #puts "Rho::RhoConfig.use_bulk_model :  #{Rho::RhoConfig.use_bulk_model}"
+            if Rho::RhoConfig.use_bulk_model.to_s != 'true' && Rho::RhoConfig.use_bulk_model.to_s != '1'
+                if !source['source_id']
+                    source['source_id'] = start_id
+                    Rho::RhoConfig::sources[name]['source_id'] = start_id
+                    
+                    start_id += 1
+                end
+              
+                db.insert_into_table('sources',
+                    {"source_id"=>source['source_id'],"name"=>name, "sync_priority"=>sync_priority, "sync_type"=>sync_type, "partition"=>partition,
+                    "schema_version"=>source['schema_version'], 'associations'=>associations, 'blob_attribs'=>blob_attribs })
+            end                
           end
           
         end
@@ -1139,6 +1142,10 @@ module SyncEngine
         Rho::RhoConfig.rho_sync_user        
     end
     
+    def self.on_sync_create_error( src_name, objects, action )
+        Object.const_get(src_name).on_sync_create_error(objects, action)
+    end
+    
     def self.search(args)
         searchParams = ""
 

data/lib/framework/rho/rhoapplication.rb

@@ -28,9 +28,11 @@ module Rho
       		Rho::RhoMessages.get_message('sync_menu') => :sync, Rho::RhoMessages.get_message('options_menu') => :options, Rho::RhoMessages.get_message('log_menu') => :log, :separator => nil, Rho::RhoMessages.get_message('close_menu') => :close }
   	  end
 
-      if @tabs
+      if @vtabs != nil
+        @@native_bar_data = {:type => :vtabbar, :data => @vtabs}
+      elsif @tabs != nil
         @@native_bar_data = {:type => :tabbar, :data => @tabs}
-      elsif @@toolbar
+      elsif @@toolbar != nil
         @@native_bar_data = {:type => :toolbar, :data => @@toolbar}
       else
         @@native_bar_data = nil #{:type => :nobar}
@@ -44,7 +46,15 @@ module Rho
     def init_nativebar
       return unless @@native_bar_data
       
-      if @@native_bar_data[:type] == :tabbar
+      if @@native_bar_data[:type] == :vtabbar
+        tabs = @@native_bar_data[:data]
+        # normalize the list
+        tabs.map! { |tab| tab[:refresh] = false unless tab[:refresh]; tab }
+        puts "Initializing application with vertical tabs: #{tabs.inspect}"
+        NativeTabbar.create_vertical(tabs)
+        #NativeTabbar.create(tabs)
+        NativeTabbar.switch_tab(0)
+      elsif @@native_bar_data[:type] == :tabbar
         tabs = @@native_bar_data[:data]
         # normalize the list
         tabs.map! { |tab| tab[:refresh] = false unless tab[:refresh]; tab }

data/lib/framework/rho/rhoevent_bb.rb

@@ -27,6 +27,7 @@ module Rho
 
     def self.create!(properties)
       pb = Calendar::openCalendar
+      return_event = nil
       unless pb.nil?
         record = Calendar::createEvent(pb)
         if record.nil?
@@ -41,10 +42,11 @@ module Rho
             end
             Calendar::setEventValue(record,key,value)
           end
-          Calendar::addEvent(pb,record)
+          return_event = Calendar::addEvent(pb,record)
         end
         Calendar::closeCalendar(pb)
       end
+      return return_event
     end
 
     def self.destroy(recordId)

data/lib/framework/rho/rhoevent_c.rb

@@ -35,7 +35,10 @@ module Rho
 
     def self.create!(event)
       event['id'] = nil #indicate that event should be created
-      Rho::Calendar.save(event)
+      event['reminder'] = event['reminder'].to_i if event['reminder'] != nil
+      new_id = Rho::Calendar.save(event)
+      event['id'] = new_id
+      return event
     end
 
     def self.destroy(id)

data/lib/framework/rhodes.rb

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

data/lib/framework/rhom/rhom.rb

@@ -44,6 +44,9 @@ module Rhom
       def database_client_reset(reset_local_models=true)
         puts "database_client_reset : reset_local_models=#{reset_local_models}"      
         
+		#load all partitions
+		Rho::RHO.load_all_sources
+
         old_interval = SyncEngine.set_pollinterval(0)
         SyncEngine.stop_sync
         
@@ -70,6 +73,9 @@ module Rhom
       def database_local_reset()
         puts "database_local_reset"
         
+		#load all partitions
+		Rho::RHO.load_all_sources
+
         ::Rho::RHO.get_db_partitions().each do |partition, db|
         
             next if partition != 'local'        
@@ -84,6 +90,10 @@ module Rhom
       
       def database_full_reset(reset_client_info=false, reset_local_models=true)
         puts "database_full_reset : reset_client_info=#{reset_client_info}, reset_local_models=#{reset_local_models}"
+
+		#load all partitions
+		Rho::RHO.load_all_sources
+
         old_interval = SyncEngine.set_pollinterval(0)
         SyncEngine.stop_sync
         

data/lib/framework/rhom/rhom_object_factory.rb

@@ -1088,6 +1088,51 @@ module Rhom
                 def clear_notification
                   SyncEngine.clear_notification(get_source_id.to_i)
                 end
+
+                def on_sync_create_error( objects, action )
+                    raise ArgumentError, 'on_create_error action should be :delete or :recreate' unless action == :delete || action == :recreate
+                    return  unless is_sync_source()
+                    
+                    ar_objs = objects.is_a?(Array) ? objects : [objects]
+                    puts "ar_objs : #{ar_objs}"
+                    tableName = is_schema_source() ? get_schema_table_name : 'object_values'
+                    nSrcID = get_source_id()
+                    
+                    db = ::Rho::RHO.get_src_db(get_source_name)                            
+                    db.start_transaction
+
+                    begin
+                        ar_objs.each do |obj|
+                            if action == :recreate
+                                deletes =  db.select_from_table('changed_values', 'object', {"update_type"=>'delete', "object"=>obj, "source_id"=>nSrcID })
+                                unless ( deletes && deletes.length() > 0 )
+                                
+                                    db.delete_from_table('changed_values', {'object'=>obj, "source_id"=>nSrcID})
+
+                                    db.insert_into_table('changed_values', 
+                                        {'update_type'=>'create', 'attrib'=>'object', "source_id"=>nSrcID, "object"=>obj} )
+
+                                    next                                        
+                                end
+                            end
+                            
+                            db.delete_from_table('changed_values', {'object'=>obj, "source_id"=>nSrcID})
+                            if is_schema_source()                                
+                                db.delete_from_table(tableName, {'object'=>obj } )
+                            else
+                                db.delete_from_table(tableName, {'object'=>obj, "source_id"=>nSrcID} )
+                            end
+                        end
+                        
+                        db.commit
+                    rescue Exception => e
+                        puts 'on_create_error Exception: ' + e.inspect
+                        db.rollback
+
+                        raise    
+                    end    
+
+                end
                 
                 # deletes all records matching conditions (optionally nil)
                 def delete_all(*args)

data/lib/framework/rhom/rhom_source.rb

@@ -79,7 +79,7 @@ module Rhom
         
           ::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)})
+                                                                {"name" => args.first})
               next unless result && result.length() > 0 
               
               return RhomSource.new(result.first)

data/lib/framework/version.rb

@@ -1,6 +1,6 @@
 module RhodesFramework
   unless defined? RhodesFramework::VERSION
-    VERSION = '2.3.0'
+    VERSION = '2.3.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 = '2.3.0'
+    VERSION = '2.3.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="28"
-    android:versionName="2.3.0">
+    android:versionCode="29"
+    android:versionName="2.3.1">
     
     <uses-sdk android:minSdkVersion="4" />
     

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

@@ -15,7 +15,7 @@ namespace common
 class CRhoClassFactory : public IRhoClassFactory
 {
 public:
-    net::INetRequest *createNetRequest();
+    net::INetRequestImpl* createNetRequestImpl();
     IRhoThreadImpl *createThreadImpl();
     net::ISSL *createSSLEngine();
     IRhoCrypt* createRhoCrypt();

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

@@ -10,7 +10,7 @@ namespace rho
 namespace common
 {
 
-net::INetRequest *CRhoClassFactory::createNetRequest()
+net::INetRequestImpl* CRhoClassFactory::createNetRequestImpl()
 {
     return new net::CURLNetRequest();
 }

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

@@ -9,19 +9,12 @@
 
 extern "C" void rho_webview_navigate(const char* url, int index);
 
-namespace rho
+static rho::common::CRhoClassFactory g_oRhoClassFactory;
+rho::common::IRhoClassFactory* rho_get_RhoClassFactory()
 {
-namespace common
-{
-
-IRhoClassFactory* rho_impl_createClassFactory()
-{
-    return new CRhoClassFactory();
+    return &g_oRhoClassFactory;
 }
 
-} // namespace common
-} // namespace rho
-
 RHO_GLOBAL void rho_map_location(char* query)
 {
     rho::String url = "http://maps.google.com/?";
@@ -69,7 +62,12 @@ RHO_GLOBAL void rho_net_impl_network_indicator(int enable)
 
 RHO_GLOBAL int rho_net_ping_network(const char* szHost)
 {
-    return 0;
+    JNIEnv *env = jnienv();
+    jclass cls = getJNIClass(RHODES_JAVA_CLASS_RHODES_SERVICE);
+    if (!cls) return 0;
+    jmethodID mid = getJNIClassStaticMethod(env, cls, "pingHost", "(Ljava/lang/String;)Z");
+    if (!mid) return 0;
+	return (int)env->CallStaticBooleanMethod(cls, mid, rho_cast<jhstring>(szHost).get());
 }
 
 RHO_GLOBAL void *rho_nativethread_start()

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

@@ -384,24 +384,32 @@ RHO_GLOBAL VALUE event_fetch_by_id(const char *id)
     return rEvent;
 }
 
-RHO_GLOBAL void event_save(VALUE rEvent)
+static std::string return_string;
+
+RHO_GLOBAL const char* event_save(VALUE rEvent)
 {
     JNIEnv *env = jnienv();
     jclass cls = getJNIClass(RHODES_JAVA_CLASS_EVENT_STORE);
-    if (!cls) return;
+    if (!cls) return NULL;
     jmethodID mid = getJNIClassStaticMethod(env, cls, "save", "(Lcom/rhomobile/rhodes/event/Event;)Ljava/lang/String;");
-    if (!mid) return;
+    if (!mid) return NULL;
 
     jobject jEvent = event_cast<jobject>(rEvent);
-    jstring jError = (jstring)env->CallStaticObjectMethod(cls, mid, jEvent);
+    jstring new_id = (jstring)env->CallStaticObjectMethod(cls, mid, jEvent);
     env->DeleteLocalRef(jEvent);
 
-    if (jError)
-    {
-        std::string error = rho_cast<std::string>(env, jError);
-        env->DeleteLocalRef(jError);
-        rb_raise(rb_eRuntimeError, "Event save failed: %s", error.c_str());
+    //if (jError)
+    //{
+    //    std::string error = rho_cast<std::string>(env, jError);
+    //   env->DeleteLocalRef(jError);
+    //    rb_raise(rb_eRuntimeError, "Event save failed: %s", error.c_str());
+    //}
+    if (new_id) {
+        return_string = rho_cast<std::string>(env, new_id);
+        env->DeleteLocalRef(new_id);
+        return return_string.c_str();
     }
+    return NULL;
 }
 
 RHO_GLOBAL void event_delete(const char *id)

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

@@ -100,8 +100,9 @@ public:
     void setPinImage(JNIEnv *env, jobject bitmap);
     void setPinCalloutImage(JNIEnv *env, jobject bitmap);
     void setPinCalloutLinkImage(JNIEnv *env, jobject bitmap);
-
-    rho_param *params() const {return m_params;}
+    void setESRILogoImage(JNIEnv *env, jobject bitmap);
+ 
+	rho_param *params() const {return m_params;}
 
     void setMapView(IMapView *mv);
     IMapView *mapView() const {return m_mapview;}
@@ -122,6 +123,7 @@ private:
     std::auto_ptr<IDrawingImage> m_pin_image;
     std::auto_ptr<IDrawingImage> m_pin_calloutimage;
     std::auto_ptr<IDrawingImage> m_pin_calloutlinkimage;
+    std::auto_ptr<IDrawingImage> m_esriLogo_image;
 };
 
 AndroidImage::AndroidImage(jobject bitmap)
@@ -269,6 +271,7 @@ void AndroidMapDevice::setMapView(IMapView *mv)
 
         mv->setPinCalloutImage(m_pin_calloutimage.get(), pin_info1);
         mv->setPinCalloutLinkImage(m_pin_calloutlinkimage.get(), pin_info1);
+		mv->setESRILogoImage(m_esriLogo_image.get());
 
     }
     RHO_MAP_TRACE("AndroidMapDevice: setMapView: finish");
@@ -324,6 +327,17 @@ void AndroidMapDevice::setPinCalloutLinkImage(JNIEnv *env, jobject bitmap)
     RHO_MAP_TRACE("AndroidMapDevice: setPinCalloutLinkImage: finish");
 }
 
+void AndroidMapDevice::setESRILogoImage(JNIEnv *env, jobject bitmap) {
+    RHO_MAP_TRACE("AndroidMapDevice: setESRILogoImage: start");
+    m_esriLogo_image.reset(new AndroidImage(bitmap));
+    IMapView *mv = mapView();
+    if (mv) {
+        mv->setESRILogoImage(m_esriLogo_image.get());
+    }
+    RHO_MAP_TRACE("AndroidMapDevice: setESRILogoImage: finish");
+}
+
+
 
 IDrawingImage *AndroidMapDevice::createImage(String const &path, bool useAlpha)
 {
@@ -485,6 +499,15 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_mapview_MapView_setPinCalloutL
     RHO_MAP_TRACE("Java_com_rhomobile_rhodes_mapview_MapView_setPinCalloutLinkImage: finish");
 }
 
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_mapview_MapView_setESRILogoImage
+  (JNIEnv *env, jobject, jlong nativeDevice, jobject bitmap)
+{
+    RHO_MAP_TRACE("Java_com_rhomobile_rhodes_mapview_MapView_setESRILogoImage: start");
+    rhomap::AndroidMapDevice *d = device(env, nativeDevice);
+    d->setESRILogoImage(env, bitmap);
+    RHO_MAP_TRACE("Java_com_rhomobile_rhodes_mapview_MapView_setESRILogoImage: finish");
+}
+
 
 RHO_GLOBAL jint JNICALL Java_com_rhomobile_rhodes_mapview_MapView_minZoom
   (JNIEnv *env, jobject, jlong nativeDevice)
@@ -719,7 +742,9 @@ RHO_GLOBAL void mapview_create(rho_param *p)
                 eng_p = value;
         }
 	if (eng_p && eng_p->type == RHO_PARAM_STRING) {
-	   engine = eng_p->v.string;
+           if ((eng_p->v.string != NULL) && (eng_p->v.string[0] != 0)) {
+	      engine = eng_p->v.string;
+           }
 	}
     }
     if (strcasecmp(engine, "Google") == 0) {
@@ -730,7 +755,12 @@ RHO_GLOBAL void mapview_create(rho_param *p)
         google_mapview_create(p);
     }
     else {
-        s_mapdevice = new rhomap::AndroidMapDevice(p);
+		if (rho_map_check_param(p)) {
+			s_mapdevice = new rhomap::AndroidMapDevice(p);
+		}
+		else {
+		        RAWLOG_ERROR("MapView.create: wrong input parameters ! (parameters not validated !)");
+		}
     }
 }
 

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

@@ -608,7 +608,7 @@ 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::Create(new rho::common::CRhoClassFactory, id.c_str());
+    rho::sync::CClientRegister::Create(id.c_str());
 }
 
 RHO_GLOBAL jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_callPushCallback

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

@@ -38,6 +38,7 @@ public final class AndroidR {
         public static final int marker=R.drawable.marker;
         public static final int callout=R.drawable.callout;
         public static final int callout_link=R.drawable.callout_link;
+        public static final int esri=R.drawable.esri;
         public static final int next=R.drawable.next;
         public static final int options=R.drawable.options;
         public static final int refresh=R.drawable.refresh;

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

@@ -17,6 +17,8 @@ public class BaseActivity extends Activity implements ServiceConnection {
 	
 	private static final boolean DEBUG = false;
 	
+	public static final String INTENT_SOURCE = BaseActivity.class.getName();
+	
 	protected RhodesService mRhodesService;
 	private boolean mBoundToService;
 
@@ -25,6 +27,7 @@ public class BaseActivity extends Activity implements ServiceConnection {
 		super.onCreate(savedInstanceState);
 		
 		Intent intent = new Intent(this, RhodesService.class);
+		intent.putExtra(RhodesService.INTENT_SOURCE, INTENT_SOURCE);
 		ComponentName serviceName = startService(intent);
 		if (serviceName == null)
 			throw new RuntimeException("Can not start Rhodes service");

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

@@ -85,13 +85,16 @@ public class RhodesActivity extends BaseActivity {
 		mHandler.post(mSetup);
 		
 		sInstance = this;
-
+		
+		notifyUiCreated();
+	}
+	
+	private void notifyUiCreated() {
 		RhodesService r = RhodesService.getInstance();
-		if ( r != null )
-		{
+		if ( r != null ) {
 			r.callUiCreatedCallback();
-		}else
-		{
+		}
+		else {
 			mHandler.post(new Runnable() {
 				public void run() {
 					RhodesService r = RhodesService.getInstance();