rhodes 2.0.2 → 2.0.3

data/platform/shared/rubyJVM/src/com/rho/sync/SyncNotify.java

@@ -21,6 +21,8 @@ public class SyncNotify {
         String m_strUrl, m_strParams;
         boolean m_bRemoveAfterFire;
         
+        SyncNotification(){m_bRemoveAfterFire = false;}
+        
         SyncNotification(String strUrl, String strParams, boolean bRemoveAfterFire)
         { m_strUrl = strUrl; m_strParams = strParams; m_bRemoveAfterFire = bRemoveAfterFire; }
     };
@@ -40,6 +42,7 @@ public class SyncNotify {
     Hashtable/*<int,SyncNotification>*/ m_mapSyncNotifications = new Hashtable();
     SyncNotification m_pSearchNotification;
     SyncNotification m_bulkSyncNotify;
+    SyncNotification m_emptyNotify = new SyncNotification();
     
     Mutex m_mxSyncNotifications = new Mutex();
     ISyncStatusListener m_syncStatusListener = null;
@@ -253,9 +256,10 @@ public class SyncNotify {
     {
         SyncSource src = (SyncSource)sources.elementAt(nSrc);
 
-        fireSyncNotification( src, true, src.m_nErrCode, "");
         if ( getSync().getState() == SyncEngine.esStop )
-    		fireAllSyncNotifications(true, src.m_nErrCode, "", sources );
+    		fireAllSyncNotifications(true, src.m_nErrCode, src.m_strError, sources, nSrc  );
+        else
+            fireSyncNotification( src, true, src.m_nErrCode, "");
 
         cleanCreateObjectErrors();
     }
@@ -346,14 +350,6 @@ public class SyncNotify {
     	}
     }
 
-	void fireAllSyncNotifications( boolean bFinish, int nErrCode, String strMessage, Vector/*Ptr<CSyncSource*>&*/ sources )
-	{
-	    for( int i = 0; i < sources.size(); i++ )
-	    {
-	    	doFireSyncNotification( (SyncSource)sources.elementAt(i), bFinish, nErrCode, strMessage );
-	    }
-	}
-
 	void fireBulkSyncNotification( boolean bFinish, String status, String partition, int nErrCode )
 	{
 		if ( getSync().getState() == SyncEngine.esExit )
@@ -414,7 +410,41 @@ public class SyncNotify {
 		}
     	
 	}
-	
+
+	void fireAllSyncNotifications( boolean bFinish, int nErrCode, String strError, Vector/*Ptr<CSyncSource*>&*/ sources, int nCurSrc )
+	{
+	    synchronized(m_mxSyncNotifications)
+	    {
+	        if ( nCurSrc >= 0 )
+	        {
+	        	SyncSource src = (SyncSource)sources.elementAt(nCurSrc);
+	            SyncNotification pSN = getSyncNotifyBySrc(src);    
+	            if ( pSN != null )
+	            {
+	            	src.m_strError = strError;
+	            	src.m_nErrCode = nErrCode;
+	            	
+	            	fireSyncNotification( src, bFinish, nErrCode, "" );
+	                return;
+	            }
+	        }
+
+	        //find any source with notify
+	        for( int i = 0; i < (int)sources.size(); i++ )
+	        {
+	        	SyncSource src = (SyncSource)sources.elementAt(i);
+	            SyncNotification pSN = getSyncNotifyBySrc(src);    
+	            if ( pSN != null )
+	            {
+	            	src.m_strError = strError;
+	            	src.m_nErrCode = nErrCode;
+	            	fireSyncNotification( src, bFinish, nErrCode, "" );
+	                break;
+	            }
+	        }
+	    }
+	}
+
 	void fireSyncNotification( SyncSource src, boolean bFinish, int nErrCode, String strMessage )
 	{
 		if ( getSync().getState() == SyncEngine.esExit )
@@ -431,10 +461,24 @@ public class SyncNotify {
 			}
 		}
 		
-		doFireSyncNotification(src, bFinish, nErrCode, strMessage );
+		doFireSyncNotification(src, bFinish, nErrCode, "" );
 	}
 	
-	void doFireSyncNotification( SyncSource src, boolean bFinish, int nErrCode, String strMessage )
+	SyncNotification getSyncNotifyBySrc(SyncSource src)
+	{
+	    SyncNotification pSN = null;
+		if ( src.isSearch() )
+			pSN = m_pSearchNotification;
+		else
+			pSN = (SyncNotification)m_mapSyncNotifications.get(src.getID());
+	    
+		if ( pSN == null )//&& !getSync().isNoThreadedMode() )
+	        return null;
+
+	    return pSN != null ? pSN : m_emptyNotify;
+	}
+	
+	void doFireSyncNotification( SyncSource src, boolean bFinish, int nErrCode, String strError )
 	{
 		if ( src == null || getSync().isStoppedByUser() )
 			return; //TODO: implement all sources callback
@@ -444,12 +488,7 @@ public class SyncNotify {
 		    boolean bRemoveAfterFire = bFinish;
 		    {
 		    	synchronized(m_mxSyncNotifications){
-			        SyncNotification sn = null;
-					if ( src.isSearch() )
-						sn = m_pSearchNotification;
-					else
-						sn = (SyncNotification)m_mapSyncNotifications.get(src.getID());
-			        
+			        SyncNotification sn = getSyncNotifyBySrc(src);
 			        if ( sn == null )
 			            return;
 			
@@ -474,7 +513,11 @@ public class SyncNotify {
 				        	
 				        	strBody += "error";				        	
 						    strBody += "&error_code=" + nErrCode;
-					        strBody += "&error_message=" + URI.urlEncode(src.m_strError);
+						    
+						    if ( strError != null && strError.length() > 0 )
+						    	strBody += "&error_message=" + URI.urlEncode(strError);
+						    else
+						    	strBody += "&error_message=" + URI.urlEncode(src.m_strError);
 				        }
 			        }
 			        else

data/platform/shared/rubyJVM/src/com/rho/sync/SyncSource.java

@@ -77,7 +77,7 @@ class SyncSource
     boolean m_bGetAtLeastOnePage = false;
     int m_nErrCode = RhoRuby.ERR_NONE;
     String m_strError = "";
-    public boolean m_bIsSearch = false;
+    boolean m_bIsSearch = false;
     
 	//String m_strPushBody = "";
     Vector/*Ptr<CSyncBlob*>*/ m_arSyncBlobs = new Vector();
@@ -139,7 +139,7 @@ class SyncSource
         m_bGetAtLeastOnePage = false;
 
         m_nErrCode = RhoRuby.ERR_NONE;
-        m_bIsSearch = false;
+        m_bIsSearch = m_syncEngine.getState() == SyncEngine.esSearch;
         m_bSchemaSource = db.isTableExist(m_strName);
     }
 	
@@ -158,7 +158,7 @@ class SyncSource
         m_bGetAtLeastOnePage = false;
 
         m_nErrCode = RhoRuby.ERR_NONE;
-        m_bIsSearch = false;
+        m_bIsSearch = m_syncEngine.getState() == SyncEngine.esSearch;
 
         IDBResult res = db.executeSQL("SELECT token,associations from sources WHERE source_id=?", m_nID);
         if ( !res.isEnd() )
@@ -203,7 +203,7 @@ class SyncSource
     	getNotify().fireSyncNotification(null, false, RhoRuby.ERR_NONE, RhoRuby.getMessageText("syncronizing") + getName() + "...");
 		
 	    TimeInterval startTime = TimeInterval.getCurrentTime();
-	    m_bIsSearch = false;
+	    //m_bIsSearch = false;
 	    
 	    try{
 	        if ( isEmptyToken() )

data/platform/shared/rubyJVM/src/com/rho/sync/SyncThread.java

@@ -133,7 +133,6 @@ public class SyncThread extends RhoThread
 	{
 	    m_oSyncEngine.exitSync();
 	    stop(SYNC_WAIT_BEFOREKILL_SECONDS);
-	    LOG.INFO( "Sync engine thread shutdown" );
 		
 	    if ( ClientRegister.getInstance() != null )
 	    	ClientRegister.getInstance().Destroy();
@@ -246,6 +245,8 @@ public class SyncThread extends RhoThread
 	        	}
 	        }
 		}
+		
+		LOG.INFO("Sync engine thread shutdown");		
 	}
 	
 	boolean isNoCommands()
@@ -670,9 +671,18 @@ public class SyncThread extends RhoThread
 							getSyncEngine().setSyncServer(syncserver);
 							
 						    if ( syncserver != null && syncserver.length() > 0 )
+						    {
 						        SyncThread.getInstance().start(SyncThread.epLow);
+						    	if ( ClientRegister.getInstance() != null )
+						    		ClientRegister.getInstance().startUp();	    	
+						    }
 						    else
-						        SyncThread.getInstance().stop(SYNC_WAIT_BEFOREKILL_SECONDS);
+						    {
+						    	//DO NOT STOP thread. because they cannot be restarted
+						        //SyncThread.getInstance().stop(SYNC_WAIT_BEFOREKILL_SECONDS);
+						    	//if ( ClientRegister.getInstance() != null )
+						    	//	ClientRegister.getInstance().stop(SYNC_WAIT_BEFOREKILL_SECONDS);
+						    }
 							
 						}catch(Exception e)
 						{

data/platform/shared/rubyJVM/src/com/xruby/runtime/lang/RhoSupport.java

@@ -2,6 +2,7 @@ package com.xruby.runtime.lang;
 
 import com.rho.IRhoRubyHelper;
 import com.rho.RhoClassFactory;
+import com.rho.RhoConf;
 import com.rho.RhoEmptyLogger;
 import com.rho.RhoLogger;
 import com.rho.RhodesApp;
@@ -181,12 +182,12 @@ public class RhoSupport {
         required_file = required_file.replace('\\', '.');
         required_file = StringMe.replaceAll(required_file,"-", "minus");
         
-        int nDot = required_file.lastIndexOf('.');
+        /*int nDot = required_file.lastIndexOf('.');
         if (nDot>0)
         {
         	String fName = required_file.substring(nDot+1);
         	required_file = required_file.substring(0, nDot+1) + fName.toLowerCase();
-        }
+        }*/
         
         required_file += ".main";
         return getAppName() + "." + required_file;
@@ -259,7 +260,12 @@ public class RhoSupport {
         }
         
         if ( strValue == null || strValue.length() == 0 )
-        	return RubyConstant.QNIL;
+        {
+        	if ( RhoConf.getInstance().isExist(name) )
+        		strValue = RhoConf.getInstance().getString(name);
+        	else
+        		return RubyConstant.QNIL;
+        }
         
         return ObjectFactory.createString(strValue);
     }

data/platform/shared/sync/ClientRegister.cpp

@@ -41,8 +41,7 @@ CClientRegister::CClientRegister(common::IRhoClassFactory* factory,const char* d
 
     delete factory;
 
-    if ( RHOCONF().getString("syncserver").length() > 0 )
-    	start(epLow);
+    startUp();
 }
 
 CClientRegister::~CClientRegister()
@@ -53,10 +52,19 @@ CClientRegister::~CClientRegister()
     m_pInstance = null;
 }
 
+void CClientRegister::startUp() 
+{	
+    if ( RHOCONF().getString("syncserver").length() > 0 )
+    {
+    	start(epLow);
+        stopWait();
+    }
+}
+
 void CClientRegister::run() 
 {	
     LOG(INFO)+"ClientRegister start";
-	while(!isStopped()) 
+	while(!isStopping()) 
 	{
         if ( CSyncThread::getInstance() != null )
 		{

data/platform/shared/sync/ClientRegister.h

@@ -37,6 +37,7 @@ public:
 
     String getRegisterBody(const String& strClientID);
 
+    void startUp();
 private:
 	CClientRegister(common::IRhoClassFactory* factory,const char* device_pin);
     ~CClientRegister();

data/platform/shared/sync/SyncEngine.cpp

@@ -37,11 +37,12 @@ void CSyncEngine::initProtocol()
     m_SyncProtocol = new CSyncProtocol_3();
 }
 
-void CSyncEngine::prepareSync(ESyncState eState)
+void CSyncEngine::prepareSync(ESyncState eState, const CSourceID* oSrcID)
 {
     setState(eState);
     m_bStopByUser = false;
     m_nErrCode = RhoRuby.ERR_NONE;
+    m_strError = "";
 
     loadAllSources();
 
@@ -59,20 +60,26 @@ void CSyncEngine::prepareSync(ESyncState eState)
     }else
         m_nErrCode = RhoRuby.ERR_CLIENTISNOTLOGGEDIN;
 
-    if ( m_sources.size() > 0 )
-    {
-        CSyncSource& src = *m_sources.elementAt(getStartSource());
-        src.m_nErrCode = m_nErrCode;
-        getNotify().fireSyncNotification(&src, true, src.m_nErrCode, "");
+    CSyncSource* src = null;
+    if ( oSrcID != null )
+    	src = findSource(*oSrcID);
+    
+	if ( src != null )
+	{
+        src->m_nErrCode = m_nErrCode;
+        src->m_strError = m_strError;
+        getNotify().fireSyncNotification(src, true, src->m_nErrCode, "");
     }else
-        getNotify().fireSyncNotification(null, true, m_nErrCode, "");
+    {
+        getNotify().fireAllSyncNotifications(true, m_nErrCode, m_strError, m_sources, getStartSource());
+    }
 
     stopSync();
 }
 
 void CSyncEngine::doSyncAllSources()
 {
-    prepareSync(esSyncAllSources);
+    prepareSync(esSyncAllSources, null);
 
     if ( isContinueSync() )
     {
@@ -104,7 +111,7 @@ void CSyncEngine::doSyncAllSources()
 
 void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams, String strAction, boolean bSearchSyncChanges, int nProgressStep)
 {
-    prepareSync(esSearch);
+    prepareSync(esSearch, null);
     if ( !isContinueSync() )
     {
         if ( getState() != esExit )
@@ -125,7 +132,6 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
         }
     }
 
-    int nErrCode = 0;
     while( isContinueSync() )
     {
         int nSearchCount = 0;
@@ -153,7 +159,8 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
         if ( !resp.isOK() )
         {
             stopSync();
-            nErrCode = RhoRuby.getErrorFromResponse(resp);
+            m_nErrCode = RhoRuby.getErrorFromResponse(resp);
+            m_strError = resp.getCharData();
             continue;
         }
 
@@ -177,7 +184,8 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
                 LOG(ERROR) + "Sync server send search data with incompatible version. Client version: " + convertToStringA(getProtocol().getVersion()) +
                     "; Server response version: " + convertToStringA(nVersion);
                 stopSync();
-                nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE;
+                m_nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE;
+                m_strError = resp.getCharData();
                 continue;
             }
 
@@ -185,7 +193,8 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
             {
                 LOG(ERROR) + "Sync server send search data without source name.";
                 stopSync();
-                nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE;
+                m_nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE;
+                m_strError = resp.getCharData();
                 continue;
             }
 
@@ -195,12 +204,12 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
             {
                 LOG(ERROR) + "Sync server send search data for unknown source name:" + strSrcName;
                 stopSync();
-                nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE;
+                m_nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE;
+                m_strError = resp.getCharData();
                 continue;
             }
 
             oSrcArr.reset(0);
-            pSrc->m_bIsSearch = true;
             pSrc->setProgressStep(nProgressStep);
             pSrc->processServerResponse_ver3(oSrcArr);
 
@@ -211,20 +220,7 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
             break;
     }  
 
-    if ( isContinueSync() )
-    {
-        CSyncSource& src = *m_sources.elementAt(getStartSource());
-        src.m_bIsSearch = true;
-
-    	getNotify().fireSyncNotification(&src, true, RhoRuby.ERR_NONE, RhoRuby.getMessageText("sync_completed"));
-    }
-    else if ( nErrCode != 0 )
-    {
-        CSyncSource& src = *m_sources.elementAt(getStartSource());
-        src.m_nErrCode = nErrCode;
-        src.m_bIsSearch = true;
-        getNotify().fireSyncNotification(&src, true, src.m_nErrCode, "");
-    }
+    getNotify().fireAllSyncNotifications(true, m_nErrCode, m_strError, m_sources, getStartSource());
 
     //update db info
     CTimeInterval endTime = CTimeInterval::getCurrentTime();
@@ -250,7 +246,7 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
 
 void CSyncEngine::doSyncSource(const CSourceID& oSrcID)
 {
-    prepareSync(esSyncSource);
+    prepareSync(esSyncSource, &oSrcID);
 
     if ( isContinueSync() )
     {
@@ -358,6 +354,9 @@ String CSyncEngine::loadClientID()
             else
                 getUserDB().executeSQL("INSERT INTO client_info (client_id) values (?)", clientID);
 
+            if ( CClientRegister::getInstance() != null )
+                CClientRegister::getInstance()->startUp();
+
         }else if ( bResetClient )
         {
     	    if ( !resetClientIDByNet(clientID) )
@@ -413,7 +412,10 @@ boolean CSyncEngine::resetClientIDByNet(const String& strClientID)//throws Excep
         //"}}]}"); 
 
     if ( !resp.isOK() )
+    {
         m_nErrCode = RhoRuby.getErrorFromResponse(resp);
+        m_strError = resp.getCharData();
+    }
     /*else
     {
         processServerSources(resp.getCharData());
@@ -459,6 +461,7 @@ String CSyncEngine::requestClientIDByNet()
         m_nErrCode = RhoRuby.getErrorFromResponse(resp);
         if ( m_nErrCode == RhoRuby.ERR_NONE )
             m_nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE;
+        m_strError = resp.getCharData();
     }
 
     return "";
@@ -675,13 +678,13 @@ void CSyncEngine::login(String name, String password, String callback)
     else
         getUserDB().executeSQL("INSERT INTO client_info (session) values (?)", strSession);
 
-
-    if ( CClientRegister::getInstance() != null )
-        CClientRegister::getInstance()->stopWait();
-
     getNotify().callLoginCallback(callback, RhoRuby.ERR_NONE, "" );
 	
     PROF_STOP("Login");
+
+    if ( CClientRegister::getInstance() != null )
+        CClientRegister::getInstance()->startUp();
+
 	//}catch(Exception exc)
 	//{
 	//	LOG.ERROR("Login failed.", exc);
@@ -715,7 +718,7 @@ void CSyncEngine::logout()
     getUserDB().executeSQL( "UPDATE client_info SET session=NULL" );
     m_strSession = "";
 
-    loadAllSources();
+    //loadAllSources();
 }
 	
 void CSyncEngine::setSyncServer(char* syncserver)