rhodes 2.0.2 → 2.0.3

data/platform/shared/common/RhodesApp.h

@@ -41,7 +41,7 @@ private:
     int m_currentTabIndex;
     String m_currentUrls[5];
 
-    String m_strAppBackUrl;
+    String m_strAppBackUrl, m_strAppBackUrlOrig;
     Vector<ICallbackObject*> m_arCallbackObjects;
     rubyext::CGeoLocation m_oGeoLocation;
     CSplashScreen m_oSplashScreen;

data/platform/shared/common/ThreadQueue.cpp

@@ -49,7 +49,7 @@ void CThreadQueue::run()
 	LOG(INFO) + "Starting main routine...";
 
 	int nLastPollInterval = getLastPollInterval();
-	while( !isStopped() )
+	while( !isStopping() )
 	{
         unsigned int nWait = m_nPollInterval > 0 ? m_nPollInterval : QUEUE_POLL_INTERVAL_INFINITE;
 
@@ -62,16 +62,18 @@ void CThreadQueue::run()
                 nWait = nWait2;
         }
 
-        if ( nWait >= 0 && !isStopped() && isNoCommands() )
+        if ( nWait >= 0 && !isStopping() && isNoCommands() )
 		{
             LOG(INFO) + "ThreadQueue blocked for " + nWait + " seconds...";
             wait(nWait);
         }
         nLastPollInterval = 0;
 
-        if ( !isStopped() )
+        if ( !isStopping() )
     		processCommands();
 	}
+
+    LOG(INFO) + "Thread shutdown";
 }
 
 boolean CThreadQueue::isNoCommands()
@@ -87,7 +89,7 @@ boolean CThreadQueue::isNoCommands()
 
 void CThreadQueue::processCommands()//throws Exception
 {
-	while(!isStopped() && !isNoCommands())
+	while(!isStopping() && !isNoCommands())
 	{
 		common::CAutoPtr<CQueueCommand> pCmd = null;
     	{

data/platform/shared/rubyJVM/src/com/rho/IRhoRubyHelper.java

@@ -29,4 +29,6 @@ public interface IRhoRubyHelper {
 	public void wakeUpGeoLocation();
 	
 	public NetResponse postUrl(String url, String body);
+	public void navigateUrl(String url);
+	public void navigateBack();
 }

data/platform/shared/rubyJVM/src/com/rho/RhoThread.java

@@ -6,16 +6,24 @@ public class RhoThread extends Thread
 		new RhoLogger("RhoThread");
 	
 	public final static int epNormal = 0, epHigh = 1, epLow = 2;
+    static final int TS_NONE = 0;
+    static final int TS_WAIT = 1;
+    static final int TS_STOPPING = 2;
+    //static final int TS_RUNNING = 4;
+
+    int m_nState;
+	
 	private Object m_syncObj = new Object();
-	boolean m_isInWaitState;
-	protected boolean m_bStop = false;
 	
     public RhoThread(RhoClassFactory factory)
     {
-    	m_isInWaitState = false;
+    	m_nState = TS_NONE;
     }
 
     public Object getSyncObject(){ return m_syncObj; }
+    public boolean isStopping(){return (m_nState&TS_STOPPING) != 0;}
+    public boolean isWaiting(){return (m_nState&TS_WAIT) != 0;}
+    //public boolean isRunning(){return (m_nState&TS_RUNNING) != 0;}
     
     public void start(int ePriority)
     {
@@ -35,7 +43,7 @@ public class RhoThread extends Thread
     
     public void stop(int nTimeoutToKill)
     { 
-    	m_bStop = true;
+    	m_nState |= TS_STOPPING;
     	stopWait();
     	
 		try{
@@ -51,21 +59,23 @@ public class RhoThread extends Thread
 			
 		}catch(Exception e){
 			LOG.ERROR("stop failed", e);
+		}finally
+		{
+			m_nState &= ~TS_STOPPING;
 		}
-    	
     }
     
     public void wait(int nTimeout)
     {
 		synchronized (m_syncObj) {
 			try{
-				m_isInWaitState = true;
+				m_nState |= TS_WAIT;
 				m_syncObj.wait(nTimeout*1000);
 			}catch(Exception e)
 			{
 				LOG.ERROR("wait failed", e);
 			}finally{
-				m_isInWaitState = false;
+				m_nState &= ~TS_WAIT;
 			}
 		}
     	
@@ -74,7 +84,7 @@ public class RhoThread extends Thread
     public void stopWait()
     {
 		synchronized (m_syncObj) {
-	    	if ( m_isInWaitState )
+	    	if ( isWaiting() )
 	    		m_syncObj.notifyAll();
     	}    	
     }

data/platform/shared/rubyJVM/src/com/rho/RhodesApp.java

@@ -13,7 +13,8 @@ public class RhodesApp
 	static RhodesApp m_pInstance;
 	
     private String m_strRhoRootPath, m_strBlobsDirPath, m_strDBDirPath;
-	private String m_strHomeUrl;
+	private String m_strStartUrl, m_strHomeUrl;
+	private String m_strAppBackUrl = "", m_strAppBackUrlOrig = "";
 	
     Vector/*<unsigned long>*/ m_arCallbackObjects = new Vector();
     private SplashScreen m_oSplashScreen = new SplashScreen();
@@ -27,6 +28,8 @@ public class RhodesApp
     int m_currentTabIndex = 0;
     String[] m_currentUrls = new String[5];
     
+    String getAppBackUrl(){return m_strAppBackUrl;}
+
     public static RhodesApp Create(String strRootPath)
     {
         if ( m_pInstance != null ) 
@@ -236,5 +239,70 @@ public class RhodesApp
     	{
     		LOG.ERROR("Save current location failed.", exc);
     	}
-	}    
+	}
+    
+    String getStartUrl()
+    {
+        m_strStartUrl = canonicalizeRhoUrl( RHOCONF().getString("start_path") );
+        return m_strStartUrl;
+    }
+    
+    void navigateToUrl(String url)throws Exception
+    {
+    	IRhoRubyHelper helper = RhoClassFactory.createRhoRubyHelper();
+    	helper.navigateUrl(url);
+    }
+    
+    public void loadUrl(String url)throws Exception
+    {
+        boolean callback = false;
+        if (url.startsWith("callback:") )
+        {
+            callback = true;
+            url = url.substring(9);
+        }
+        url = canonicalizeRhoUrl(url);
+        if (callback)
+        {
+            getNet().pushData( url,  "rho_callback=1", null );
+        }
+        else
+            navigateToUrl(url);
+    }
+    
+    public void setAppBackUrl(String url)
+    {
+        if ( url != null && url.length() > 0 )
+        {
+            m_strAppBackUrlOrig = url;
+            m_strAppBackUrl = canonicalizeRhoUrl(url);
+        }
+        else
+        {
+            m_strAppBackUrlOrig = "";
+            m_strAppBackUrl = "";
+        }
+    }
+    
+    public boolean isCloseBack()
+    {
+    	return m_strAppBackUrlOrig.equalsIgnoreCase("close");
+    }
+    
+    public void navigateBack()
+    {
+    	try{
+	        if ( m_strAppBackUrlOrig.length() > 0 )
+	            loadUrl(m_strAppBackUrlOrig);
+	        else if ( !getCurrentUrl(0).equalsIgnoreCase(getStartUrl()) )
+	        {
+	        	IRhoRubyHelper helper = RhoClassFactory.createRhoRubyHelper();
+	        	helper.navigateBack();
+	        }
+    	}catch(Exception exc)
+    	{
+    		LOG.ERROR("Navigate back failed.", exc);
+    	}
+    }
+    
 }

data/platform/shared/rubyJVM/src/com/rho/ThreadQueue.java

@@ -0,0 +1,143 @@
+package com.rho;
+
+import j2me.util.LinkedList;
+
+public abstract class ThreadQueue extends RhoThread
+{
+	private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
+		new RhoLogger("ThreadQueue");
+	
+	public static void setLogCategory(String category)
+	{
+		LOG.setLogCategory(category);
+	}
+	
+	public static final int QUEUE_POLL_INTERVAL_SECONDS  = 300;
+	public static final int QUEUE_POLL_INTERVAL_INFINITE  = Integer.MAX_VALUE/1000;
+	public static final int QUEUE_STARTUP_INTERVAL_SECONDS  = 10;
+
+    public interface IQueueCommand
+    {
+        public abstract boolean equals(IQueueCommand cmd);
+        public abstract String toString();
+    };
+
+    RhoClassFactory m_ptrFactory;
+	int           m_nPollInterval;
+   	Mutex m_mxStackCommands = new Mutex();
+   	LinkedList	  m_stackCommands = new LinkedList();
+
+    boolean m_bNoThreaded;
+
+    int  getPollInterval(){ return m_nPollInterval;}
+
+    boolean isNoThreadedMode(){ return m_bNoThreaded; }
+    void setNonThreadedMode(boolean b){m_bNoThreaded = b;}
+
+    public RhoClassFactory getFactory(){ return m_ptrFactory; }
+
+    int getLastPollInterval(){ return 0;}
+    public abstract void processCommand(IQueueCommand pCmd);
+    boolean isSkipDuplicateCmd() { return false; }
+
+    public ThreadQueue(RhoClassFactory factory)
+    {
+        super(factory);
+        
+        m_nPollInterval = QUEUE_POLL_INTERVAL_SECONDS;
+        m_bNoThreaded = false;
+
+        m_ptrFactory = factory;
+    }
+
+    public void addQueueCommand(IQueueCommand pCmd)
+    { 
+        LOG.INFO("addCommand: " + pCmd.toString() );
+    	synchronized(m_mxStackCommands)
+    	{
+		    boolean bExist = false;
+            if ( isSkipDuplicateCmd() )
+            {
+		        for ( int i = 0; i < (int)m_stackCommands.size(); i++ )
+		        {
+		        	if ( m_stackCommands.get(i).equals(pCmd) )
+		        	{
+				        bExist = true;
+				        break;
+			        }
+		        }
+            }
+
+		    if ( !bExist )
+    		    m_stackCommands.add(pCmd);
+	    }
+
+        if ( isNoThreadedMode()  )
+            processCommands();
+        else
+	        stopWait(); 
+    }
+
+    public void run()
+    {
+	    LOG.INFO("Starting main routine...");
+
+	    int nLastPollInterval = getLastPollInterval();
+	    while( !isStopping() )
+	    {
+            int nWait = m_nPollInterval > 0 ? m_nPollInterval : QUEUE_POLL_INTERVAL_INFINITE;
+
+            if ( m_nPollInterval > 0 && nLastPollInterval > 0 )
+            {
+                int nWait2 = m_nPollInterval - nLastPollInterval;
+                if ( nWait2 <= 0 )
+                    nWait = QUEUE_STARTUP_INTERVAL_SECONDS;
+                else
+                    nWait = nWait2;
+            }
+
+            if ( nWait >= 0 && !isStopping() && isNoCommands() )
+		    {
+                LOG.INFO("ThreadQueue blocked for " + nWait + " seconds...");
+                wait(nWait);
+            }
+            nLastPollInterval = 0;
+
+            if ( !isStopping() )
+    		    processCommands();
+	    }
+	    
+	    LOG.INFO("Thread shutdown");	    
+    }
+
+    boolean isNoCommands()
+    {
+	    boolean bEmpty = false;
+	    synchronized(m_mxStackCommands)
+        {		
+		    bEmpty = m_stackCommands.isEmpty();
+	    }
+
+	    return bEmpty;
+    }
+
+    void processCommands()//throws Exception
+    {
+	    while(!isStopping() && !isNoCommands())
+	    {
+		    IQueueCommand pCmd = null;
+		    synchronized(m_mxStackCommands)
+		    {
+    		    pCmd = (IQueueCommand)m_stackCommands.removeFirst();
+    	    }
+    		
+		    processCommand(pCmd);
+	    }
+    }
+
+    public void setPollInterval(int nInterval)
+    { 
+        m_nPollInterval = nInterval; 
+        stopWait();
+    }
+}

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

@@ -55,23 +55,34 @@ public class ClientRegister extends RhoThread
 		m_NetRequest = RhoClassFactory.createNetRequest();
 		m_nPollInterval = POLL_INTERVAL_SECONDS;
 		
-		if ( RhoConf.getInstance().getString("syncserver").length() > 0 )
-			start(epLow);	
+		startUp();
 	}
 	
 	public static ClientRegister getInstance(){ return m_pInstance; }
 	
+	public void startUp() 
+	{	
+		if ( RhoConf.getInstance().getString("syncserver").length() > 0 )
+		{
+			start(epLow);	
+	        stopWait();
+	    }
+	}
+	
     public void run() 
     {
     	LOG.INFO("ClientRegister start");    	
-    	while(!m_bStop) 
+    	while(!isStopping()) 
     	{
     		try
     		{
     			if ( SyncThread.getInstance() != null )
     			{
 	    			if ( doRegister(SyncThread.getSyncEngine()) )
-	    				break;
+	    			{
+	    				m_nPollInterval = POLL_INTERVAL_INFINITE;
+	    				//break;
+	    			}
     			}
     			
     		}catch(Exception exc)
@@ -83,7 +94,6 @@ public class ClientRegister extends RhoThread
 			wait(m_nPollInterval);
 		}
         LOG.INFO( "ClientRegister thread shutdown" );
-    	
     }
 
     public String getRegisterBody(String strClientID)throws Exception

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

@@ -79,6 +79,7 @@ public class SyncEngine implements NetRequest.IRhoSession
     int m_nSyncPageSize = 2000;
     boolean m_bNoThreaded = false;
     int m_nErrCode = RhoRuby.ERR_NONE;
+    String m_strError = "";
     
     void setState(int eState){ m_syncState = eState; }
     int getState(){ return m_syncState; }
@@ -123,11 +124,12 @@ public class SyncEngine implements NetRequest.IRhoSession
 		m_NetRequest = RhoClassFactory.createNetRequest();
     }
     
-    void prepareSync(int eState)throws Exception
+    void prepareSync(int eState, SourceID oSrcID)throws Exception
     {
         setState(eState);
         m_bStopByUser = false;
         m_nErrCode = RhoRuby.ERR_NONE;
+        m_strError = "";
         
         loadAllSources();
 
@@ -145,15 +147,20 @@ public class SyncEngine implements NetRequest.IRhoSession
         }else
             m_nErrCode = RhoRuby.ERR_CLIENTISNOTLOGGEDIN;
         
-    	if ( m_sources.size() > 0 )
-        {		    	
-	    	SyncSource src = (SyncSource)m_sources.elementAt(getStartSource());
-	    	src.m_nErrCode = m_nErrCode;
-	    	
-	    	getNotify().fireSyncNotification(src, true, src.m_nErrCode, "");
+        SyncSource 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();
     }
     
@@ -161,7 +168,7 @@ public class SyncEngine implements NetRequest.IRhoSession
     {
 	    try
 	    {
-	        prepareSync(esSyncAllSources);
+	        prepareSync(esSyncAllSources, null);
 	
 	        if ( isContinueSync() )
 	        {
@@ -198,7 +205,7 @@ public class SyncEngine implements NetRequest.IRhoSession
     {
 	    try
 	    {
-		    prepareSync(esSearch);
+		    prepareSync(esSearch, null);
 		    if ( !isContinueSync() )
 		    {
 		        if ( getState() != esExit )
@@ -219,7 +226,6 @@ public class SyncEngine implements NetRequest.IRhoSession
 		        }
 		    }
 		
-		    int nErrCode = 0;
 		    while( isContinueSync() )
 		    {
 		        int nSearchCount = 0;
@@ -247,7 +253,8 @@ public class SyncEngine implements NetRequest.IRhoSession
 		        if ( !resp.isOK() )
 		        {
 		            stopSync();
-		            nErrCode = RhoRuby.getErrorFromResponse(resp);
+		            m_nErrCode = RhoRuby.getErrorFromResponse(resp);
+		            m_strError = resp.getCharData();
 		            continue;
 		        }
 		
@@ -271,7 +278,8 @@ public class SyncEngine implements NetRequest.IRhoSession
 		                LOG.ERROR( "Sync server send search data with incompatible version. Client version: " + getProtocol().getVersion() +
 		                    "; Server response version: " + nVersion );
 		                stopSync();
-		                nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE;
+		                m_nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE;
+		                m_strError = resp.getCharData();
 		                continue;
 		            }
 		
@@ -279,7 +287,8 @@ public class SyncEngine implements NetRequest.IRhoSession
 		            {
 		                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;
 		            }
 		
@@ -289,12 +298,12 @@ public class SyncEngine implements NetRequest.IRhoSession
 		            {
 		                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);
 		
@@ -305,20 +314,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 		            break;
 		    }  
 		
-		    if ( isContinueSync() )
-		    {
-		        SyncSource src = (SyncSource)m_sources.elementAt(getStartSource());
-		        src.m_bIsSearch = true;
-		
-		    	getNotify().fireSyncNotification(src, true, RhoRuby.ERR_NONE, RhoRuby.getMessageText("sync_completed"));
-		    }
-		    else if ( nErrCode != 0 )
-		    {
-		        SyncSource src = (SyncSource)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
 		    TimeInterval endTime = TimeInterval.getCurrentTime();
@@ -358,7 +354,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 
 	    try
 	    {
-	        prepareSync(esSyncSource);
+	        prepareSync(esSyncSource, oSrcID);
 	
 	        if ( isContinueSync() )
 	        {
@@ -473,6 +469,10 @@ public class SyncEngine implements NetRequest.IRhoSession
 	            	getUserDB().executeSQL("UPDATE client_info SET client_id=?", clientID);
 	            else
 	            	getUserDB().executeSQL("INSERT INTO client_info (client_id) values (?)", clientID);
+	            
+		    	if ( ClientRegister.getInstance() != null )
+		    		ClientRegister.getInstance().startUp();	    	
+	            
 		    }else if ( bResetClient )
 		    {
 		    	if ( !resetClientIDByNet(clientID) )
@@ -512,7 +512,10 @@ public class SyncEngine implements NetRequest.IRhoSession
 */	    				
 	    
 	    if ( !resp.isOK() )
+	    {
 	    	m_nErrCode = RhoRuby.getErrorFromResponse(resp);
+	    	m_strError = resp.getCharData();
+	    }
 	    /*else
     	{
     		processServerSources(resp.getCharData());
@@ -545,7 +548,10 @@ public class SyncEngine implements NetRequest.IRhoSession
 	    {
 	    	m_nErrCode = RhoRuby.getErrorFromResponse(resp);
 	    	if ( m_nErrCode == RhoRuby.ERR_NONE )
+	    	{
 	    		m_nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE;
+	    		m_strError = resp.getCharData();
+	    	}
 	    }
 	
 	    return "";
@@ -778,11 +784,11 @@ public class SyncEngine implements NetRequest.IRhoSession
 		    else
 		    	getUserDB().executeSQL("INSERT INTO client_info (session) values (?)", strSession);
 		
-		    if ( ClientRegister.getInstance() != null )
-		    	ClientRegister.getInstance().stopWait();
-		    
 	    	getNotify().callLoginCallback(callback, RhoRuby.ERR_NONE, "" );
 		    
+	    	if ( ClientRegister.getInstance() != null )
+	    		ClientRegister.getInstance().startUp();	    	
+	    	
 		}catch(Exception exc)
 		{
 			LOG.ERROR("Login failed.", exc);
@@ -817,7 +823,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 		getUserDB().executeSQL( "UPDATE client_info SET session = NULL");
 	    m_strSession = "";
 	
-	    loadAllSources();
+	    //loadAllSources();
 	}
 	
 	public void setSyncServer(String url)throws Exception