check ruby is started

rhomobile · Jun 11, 2013 · 00d228a · 00d228a
1 parent 278abe5
commit 00d228a
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 27 deletions.
diff --git a/ext/rhoconnect-client/ext/shared/sync/SyncEngine.cpp b/ext/rhoconnect-client/ext/shared/sync/SyncEngine.cpp
@@ -581,16 +581,17 @@ void CSyncEngine::applyChangedValues(db::CDBAdapter& db)
 
 void CSyncEngine::loadAllSources()
 {
-#ifndef RHO_NO_RUBY    
-    if (isNoThreadedMode())
-        RhoAppAdapter.loadAllSyncSources();
-    else
+    if (rho_ruby_is_started())
     {
-        NetResponse resp = getNet().pushData( getNet().resolveUrl("/system/loadallsyncsources"), "", null );
-    }
-#else
-    RhoAppAdapter.loadAllSyncSources();
-#endif
+        if (isNoThreadedMode())
+            RhoAppAdapter.loadAllSyncSources();
+        else
+        {
+            NetResponse resp = getNet().pushData( getNet().resolveUrl("/system/loadallsyncsources"), "", null );
+        }
+    }else
+        RhoAppAdapter.loadAllSyncSources();
+
     m_sources.removeAllElements();
 
     Vector<String> arPartNames = db::CDBAdapter::getDBAllPartitionNames();
@@ -712,16 +713,17 @@ void CSyncEngine::processServerSources(String strSources)
 {
     if ( strSources.length() > 0 )
     {
- #ifndef RHO_NO_RUBY       
-        if (isNoThreadedMode())
-            RhoAppAdapter.loadServerSources(strSources);
-        else
+        if (rho_ruby_is_started())
         {
-            NetResponse resp = getNet().pushData( getNet().resolveUrl("/system/loadserversources"), strSources, null );
-        }
-#else
-        RhoAppAdapter.loadServerSources(strSources);
-#endif
+            if (isNoThreadedMode())
+                RhoAppAdapter.loadServerSources(strSources);
+            else
+            {
+                NetResponse resp = getNet().pushData( getNet().resolveUrl("/system/loadserversources"), strSources, null );
+            }
+        }else
+            RhoAppAdapter.loadServerSources(strSources);
+
         loadAllSources();
 
         rho_db_init_attr_manager();
@@ -1081,16 +1083,18 @@ void CSyncEngine::login(String name, String password, const CSyncNotification& o
         String strOldUser = RHOCONF().getString("rho_sync_user");
         if ( name.compare(strOldUser) != 0 )
         {
-#ifndef RHO_NO_RUBY            
-            if (isNoThreadedMode())
-                RhoAppAdapter.resetDBOnSyncUserChanged();
-            else
+            if ( !RhoAppAdapter.callCallbackOnSyncUserChanged())
             {
-                NetResponse resp = getNet().pushData( getNet().resolveUrl("/system/resetDBOnSyncUserChanged"), "", null );
-           }
-#else
-          RhoAppAdapter.resetDBOnSyncUserChanged();  
-#endif            
+                if (rho_ruby_is_started())
+                {
+                    if (isNoThreadedMode())
+                        RhoAppAdapter.resetDBOnSyncUserChanged();
+                    else
+                    {
+                        NetResponse resp = getNet().pushData( getNet().resolveUrl("/system/resetDBOnSyncUserChanged"), "", null );
+                    }
+                }
+            }
         }
     }
     RHOCONF().setString("rho_sync_user", name, true);

diff --git a/platform/shared/RhoConnectClient/RhoConnectClient.cpp b/platform/shared/RhoConnectClient/RhoConnectClient.cpp
@@ -1588,6 +1588,11 @@ namespace rho {
 	{
 		rho_connectclient_database_full_reset(false);
 	}	
+
+    /*static*/ bool  _CRhoAppAdapter::callCallbackOnSyncUserChanged()
+    {
+        return false; 
+    }
 }
 
 extern "C"