rhodes 3.4.2 → 3.5.1.12

data/platform/bb/RubyVM/src/com/rho/net/NetRequest.java

@@ -318,8 +318,9 @@ public class NetRequest
 	static String szMultipartContType = 
 	    "multipart/form-data; boundary=----------A6174410D6AD474183FDE48F5662FCC5";
 
-	void processMultipartItems( Vector/*Ptr<CMultipartItem*>&*/ arItems )throws Exception
+	int processMultipartItems( Vector/*Ptr<CMultipartItem*>&*/ arItems )throws Exception
 	{
+		int nSize = 0;
 	    for( int i = 0; i < (int)arItems.size(); i++ )
 	    {
 	        MultipartItem oItem = (MultipartItem)arItems.elementAt(i); 
@@ -373,8 +374,13 @@ public class NetRequest
 	            oItem.m_strDataPrefix += "Content-Length: " + nContentSize + "\r\n";
 
 	        oItem.m_strDataPrefix += "\r\n";
+	        
+	        nSize += oItem.m_strDataPrefix.length() + nContentSize;
 	    }
 
+	    nSize += szMultipartPostfix.length();
+
+	    return nSize;
 	}
 	
     public NetResponse pushMultipartData(String strUrl, Vector/*Ptr<CMultipartItem*>&*/ arItems, IRhoSession oSession, Hashtable/*<String,String>**/ headers)throws Exception
@@ -402,7 +408,8 @@ public class NetRequest
 				m_connection.setRequestMethod(IHttpConnection.POST);
 				
 				//PUSH specific
-				processMultipartItems( arItems );
+				int nContentSize = processMultipartItems( arItems );
+				m_connection.setRequestProperty("content-length", Integer.toString(nContentSize) );
 				os = m_connection.openOutputStream();
 		        //write all items
 		        for( int i = 0; i < (int)arItems.size(); i++ )

data/platform/bb/RubyVM/src/com/rho/net/RhoConnection.java

@@ -371,7 +371,14 @@ public class RhoConnection implements IHttpConnection {
 	public InputStream openInputStream() throws IOException {
 		LOG.TRACE("openInputStream");
 		processRequest();
-		return responseData;
+		
+		if ( responseData != null )
+			return responseData;
+		
+		if ( m_isDispatchCall )
+			return null;
+		
+		throw new IOException("Not found: " + url_external);
 	}
 
 	public DataOutputStream openDataOutputStream() throws IOException {
@@ -508,12 +515,9 @@ public class RhoConnection implements IHttpConnection {
 
 	protected boolean httpGetIndexFile(){
 		String strIndex = null;
-		String slash = "";
-		if ( uri.getPath()!=null && uri.getPath().length() > 0 )
-			slash = uri.getPath().charAt(uri.getPath().length()-1) == '/' ? "" : "/";
 		
 		for( int i = 0; i < m_arIndexes.length; i++ ){
-			String name = uri.getPath() + slash + m_arIndexes[i];
+			String name = FilePath.join( URI.urlDecode(uri.getPath()), m_arIndexes[i] );
 			String nameClass = name;
 			if ( nameClass.endsWith(".iseq"))
 				nameClass = nameClass.substring(0, nameClass.length()-5);
@@ -558,7 +562,7 @@ public class RhoConnection implements IHttpConnection {
 	
 	protected boolean httpServeFile(String strContType)throws IOException
 	{
-		String strPath = uri.getPath();
+		String strPath = URI.urlDecode(uri.getPath());
 		//if ( !strPath.startsWith("/apps") )
 		//	strPath = "/apps" + strPath; 
 
@@ -638,19 +642,20 @@ public class RhoConnection implements IHttpConnection {
 	
 	protected boolean httpGetFile(String strContType)throws IOException
 	{
-		if ( !isDbFilesPath(uri.getPath()) && !isKnownExtension(uri.getPath()) && strContType.length() == 0 )
+		String strPath = URI.urlDecode(uri.getPath());
+		if ( !isDbFilesPath(strPath) && !isKnownExtension(strPath) && strContType.length() == 0 )
 		{
-			String strTemp = FilePath.join(uri.getPath(), "/");
+			String strTemp = FilePath.join(strPath, "/");
 	
 			if( RhoSupport.findClass(strTemp + "controller") != null )
 				return false;
 
-			int nPos = findIndex(uri.getPath());
+			int nPos = findIndex(strPath);
 			if ( nPos >= 0 )
 			{
-				String url = uri.getPath();// + (nPos == 0 ? ".iseq" : "");
+				String url = strPath;// + (nPos == 0 ? ".iseq" : "");
 				Properties reqHash = new Properties();
-				this.doDispatch(reqHash, url);
+				doDispatch(reqHash, url);
 			//	RubyValue res = RhoRuby.processIndexRequest(url);//erb-compiled should load from class
 				//processResponse(res);
 				

data/platform/bb/RubyVM/src/com/rho/sync/ClientRegister.java

@@ -63,7 +63,7 @@ public class ClientRegister extends RhoThread
 	
 	public void startUp() 
 	{	
-		if ( RhoConf.getInstance().getString("syncserver").length() > 0 )
+		if ( com.rho.Capabilities.ENABLE_PUSH && RhoConf.getInstance().getString("syncserver").length() > 0 )
 		{
 			start(epLow);	
 	        stopWait();
@@ -102,7 +102,8 @@ public class ClientRegister extends RhoThread
 		int port = RhoConf.getInstance().getInt("push_port");
 
         return SyncThread.getSyncEngine().getProtocol().getClientRegisterBody( strClientID, m_strDevicePin, 
-            port > 0 ? port : DEFAULT_PUSH_PORT, m_sysInfo.getPlatform());
+            port > 0 ? port : DEFAULT_PUSH_PORT, m_sysInfo.getPlatform(),
+            isPushServiceEnabled() ? "bis" : "" );
     }
     
     private boolean doRegister(	SyncEngine oSync )throws Exception
@@ -147,5 +148,26 @@ public class ClientRegister extends RhoThread
 		}
 		
 		return false;
-    }    
+    }
+    
+    public static boolean isMDSPushEnabled()
+    {
+    	if ( !RhoConf.getInstance().isExist("push_options") )
+    		return true;
+    	
+    	String strOptions = RhoConf.getInstance().getString("push_options");
+    	
+    	return strOptions.indexOf("mds") >= 0;
+    }
+
+    public static boolean isPushServiceEnabled()
+    {
+    	if ( !RhoConf.getInstance().isExist("push_options") )
+    		return false;
+    	
+    	String strOptions = RhoConf.getInstance().getString("push_options");
+    	
+    	return strOptions.indexOf("push_service") >= 0;
+    }
+    
 }

data/platform/bb/RubyVM/src/com/rho/sync/ISyncProtocol.java

@@ -35,7 +35,7 @@ public interface ISyncProtocol
     public abstract String getClientCreateUrl();
 
     public abstract String getClientRegisterUrl();
-    public abstract String getClientRegisterBody( String strClientID, String strPin, int nPort, String strType );
+    public abstract String getClientRegisterBody( String strClientID, String strPin, int nPort, String strType, String strPushType );
 
     public abstract String getClientResetUrl(String strClientID);
     public abstract String getClientChangesUrl();

data/platform/bb/RubyVM/src/com/rho/sync/SyncEngine.java

@@ -50,7 +50,9 @@ public class SyncEngine implements NetRequest.IRhoSession
 	RhoConf RHOCONF(){ return RhoConf.getInstance(); }
 	
     public static final int esNone = 0, esSyncAllSources = 1, esSyncSource = 2, esSearch=3, esStop = 4, esExit = 5;
-
+    public static final int ebsNotSynced = 0, ebsSynced = 1, ebsLoadBlobs = 2;    
+    //public static final String RHO_SETTING_BULKSYNC_STATE  = "bulksync_state";
+    
     static class SourceID
     {
         String m_strName = "";
@@ -116,6 +118,22 @@ public class SyncEngine implements NetRequest.IRhoSession
             return strValue.compareTo("1") == 0 || strValue.compareTo("true") == 0 ? true : false;
         	
         }
+        
+        public int getIntProperty(Integer nSrcID, String szPropName)
+        {
+            String strValue = getProperty(nSrcID, szPropName);
+
+            return strValue != null && strValue.length() > 0 ? Integer.valueOf(strValue).intValue() : 0;
+        }
+        
+        void clearProperties()
+        {
+        	synchronized(m_mxSrcOptions)
+        	{
+        		m_hashSrcOptions.clear();
+        	}
+        }
+        
     };
     
     Vector/*<SyncSource*>*/ m_sources = new Vector();
@@ -252,7 +270,7 @@ public class SyncEngine implements NetRequest.IRhoSession
         stopSync();
     }
     
-    void doSyncAllSources(String strQueryParams)
+    void doSyncAllSources(String strQueryParams, boolean bSyncOnlyChangedSources)
     {
 	    try
 	    {
@@ -268,7 +286,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 			    PROF.CREATE_COUNTER("Pull");
 			    PROF.START("Sync");
 	
-	            syncAllSources(strQueryParams);
+	            syncAllSources(strQueryParams, bSyncOnlyChangedSources);
 	
 			    PROF.DESTROY_COUNTER("Net");	    
 			    PROF.DESTROY_COUNTER("Parse");
@@ -351,7 +369,10 @@ public class SyncEngine implements NetRequest.IRhoSession
 		
 		        String szData = null;
 		        if ( strTestResp != null && strTestResp.length() > 0 )
+		        {
 		        	szData = strTestResp;
+		        	getNotify().setFakeServerResponse(true);
+		        }
 		        else
 		        	szData = resp.getCharData();		        
 		
@@ -409,15 +430,6 @@ public class SyncEngine implements NetRequest.IRhoSession
 		            pSrc.processServerResponse_ver3(oSrcArr);
 		
 		            nSearchCount += pSrc.getCurPageCount();
-		            
-		            if ( pSrc.getServerError().length() > 0 )
-		            {
-		            	if ( m_strServerError.length() > 0 )
-		            		m_strServerError +=  "&";
-		            	
-		            	m_strServerError += pSrc.getServerError();
-		            	m_nErrCode = pSrc.getErrorCode();
-		            }		            
 		        }
 		
 		        if ( nSearchCount == 0 )
@@ -430,6 +442,9 @@ public class SyncEngine implements NetRequest.IRhoSession
 					}		        	
 		            break;
 		        }
+		        
+		        if ( strTestResp!= null && strTestResp.length() > 0 )
+		        	break;		        
 		    }  
 		
 		    getNotify().fireAllSyncNotifications(true, m_nErrCode, m_strError, m_strServerError);
@@ -655,7 +670,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 	            else
 	            	getUserDB().executeSQL("INSERT INTO client_info (client_id) values (?)", clientID);
 	            
-		    	if ( ClientRegister.getInstance() != null )
+		    	if ( clientID != null && clientID.length() > 0 && ClientRegister.getInstance() != null )
 		    		ClientRegister.getInstance().startUp();	    	
 	            
 		    }else if ( bResetClient )
@@ -741,30 +756,98 @@ public class SyncEngine implements NetRequest.IRhoSession
 	    if ( !RhoConf.getInstance().isExist("bulksync_state") )
 	        return;
 		
-	    int nBulkSyncState = RhoConf.getInstance().getInt("bulksync_state");;
-	    if ( nBulkSyncState >= 1 || !isContinueSync() )
-	        return;
-
-		LOG.INFO("Bulk sync: start");
-		getNotify().fireBulkSyncNotification(false, "start", "", RhoAppAdapter.ERR_NONE);
+	    int nBulkSyncState = RHOCONF().getInt("bulksync_state");
+		if ( !isContinueSync() ) {
+			return;
+		}
 		
-		Vector/*<String>*/ arPartNames = DBAdapter.getDBAllPartitionNames();
-	    for( int i = 0; i < (int)arPartNames.size()&& isContinueSync(); i++ )
-	        loadBulkPartition( (String)arPartNames.elementAt(i));
-
+		switch (nBulkSyncState) {
+			case ebsNotSynced:
+				loadBulkPartitions();
+				
+				if ( !isContinueSync() ) {
+					return;
+				}
+				
+				//no break here is intentional.
+			case ebsLoadBlobs:
+				if ( !processBlobs() ) {
+					return;
+				}
+				break;
+				
+			default:
+				return;
+		}
+	    
 	    if (isContinueSync())
 	    {
-	    	RhoConf.getInstance().setInt("bulksync_state", 1, true);
-	        getNotify().fireBulkSyncNotification(true, "", "", RhoAppAdapter.ERR_NONE);
+	    	RHOCONF().setInt("bulksync_state", ebsSynced, true);
+	    	getNotify().fireBulkSyncNotification(true, "complete", "", RhoAppAdapter.ERR_NONE);
 	    }
 	}
 
+	void loadBulkPartitions()throws Exception 
+	{
+		LOG.INFO( "Bulk sync: start" );
+		getNotify().fireBulkSyncNotification(false, "start", "", RhoAppAdapter.ERR_NONE);        
+		Vector/*<String>*/ arPartNames = DBAdapter.getDBAllPartitionNames();
+		
+		for (int i = 0; i < (int)arPartNames.size() && isContinueSync(); i++)
+		{
+			if ( ((String)arPartNames.elementAt(i)).compareTo("local") !=0 )
+				loadBulkPartition( (String)arPartNames.elementAt(i) );
+		}
+	}
+
+	boolean processBlobs()throws Exception 
+	{
+		LOG.INFO("Bulk sync: download BLOBs");
+		
+		RHOCONF().setInt("bulksync_state", ebsLoadBlobs, true );
+		getNotify().fireBulkSyncNotification( false, "blobs", "", RhoAppAdapter.ERR_NONE);
+		
+		LOG.TRACE( "=== Processing server blob attributes ===" );
+		
+		for ( int i = 0; i < (int)m_sources.size(); ++i ) 
+		{
+			SyncSource src = (SyncSource)m_sources.elementAt(i);
+			if ( !src.processServerBlobAttrs() ) {
+				getNotify().fireBulkSyncNotification(false, "error", "", RhoAppAdapter.ERR_UNEXPECTEDSERVERRESPONSE);
+				return false;
+			}
+		}
+		
+		LOG.TRACE( "=== Processing server blob attributes DONE ===" );
+		
+		DBAdapter.initAttrManager();
+		
+		for ( int i = 0; i < (int)m_sources.size(); ++i ) 
+		{
+			SyncSource src = (SyncSource)m_sources.elementAt(i);
+			if (!src.processAllBlobs()) {
+				getNotify().fireBulkSyncNotification(false, "error", "", RhoAppAdapter.ERR_UNEXPECTEDSERVERRESPONSE);
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
 	void loadBulkPartition(String strPartition )throws Exception
 	{
 		DBAdapter dbPartition = getDB(strPartition); 		
 	    String serverUrl = RhoConf.getInstance().getPath("syncserver");
 	    String strUrl = serverUrl + "bulk_data";
-	    String strQuery = "?client_id=" + m_clientID + "&partition=" + strPartition;
+	    String strQuery = "?client_id=" + m_clientID + "&partition=" + strPartition + "&sources=";
+		for ( int i = 0; i < (int)m_sources.size(); ++i ) 
+		{
+			strQuery += URI.urlEncode( ((SyncSource)m_sources.elementAt(i)).getName() );
+			if ( i < (int)m_sources.size()-1 ) {
+				strQuery += ",";
+			}
+		}
+	    
 	    String strDataUrl = "", strCmd = "";
 
 	    getNotify().fireBulkSyncNotification(false, "start", strPartition, RhoAppAdapter.ERR_NONE);
@@ -802,7 +885,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 	    if ( strCmd.compareTo("nop") == 0)
 	    {
 		    LOG.INFO("Bulk sync return no data.");
-		    getNotify().fireBulkSyncNotification(true, "", strPartition, RhoAppAdapter.ERR_NONE);		    
+		    getNotify().fireBulkSyncNotification(true, "ok", strPartition, RhoAppAdapter.ERR_NONE);		    
 		    return;
 	    }
 
@@ -846,10 +929,11 @@ public class SyncEngine implements NetRequest.IRhoSession
 		getNotify().fireBulkSyncNotification(false, "change_db", strPartition, RhoAppAdapter.ERR_NONE);
 		
 	    dbPartition.setBulkSyncDB(fDataName, fScriptName);
+	    getSourceOptions().clearProperties();
 	    processServerSources("{\"partition\":\"" + strPartition + "\"}");
 	    
 		LOG.INFO("Bulk sync: end change db");
-		getNotify().fireBulkSyncNotification(false, "", strPartition, RhoAppAdapter.ERR_NONE);
+		getNotify().fireBulkSyncNotification(false, "ok", strPartition, RhoAppAdapter.ERR_NONE);
 	}
 	
 	void downloadBulkDataAndUnzip(String strDataUrl, String fDataName, String strPartition)throws Exception
@@ -915,7 +999,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 	    return -1;
 	}
 */
-	void syncOneSource(int i, String strQueryParams)throws Exception
+	void syncOneSource(int i, String strQueryParams, boolean syncOnlyIfChanged)throws Exception
 	{
     	SyncSource src = null;
     	//boolean bError = false;
@@ -927,7 +1011,13 @@ public class SyncEngine implements NetRequest.IRhoSession
 		    if ( isSessionExist() && getState() != esStop )
 		    {
 		    	src.m_strQueryParams = strQueryParams;
-		        src.sync();
+				if (syncOnlyIfChanged) {
+					if (src.haveChangedValues() ) {
+						src.sync();
+					}
+				} else {
+					src.sync();
+				}
 		    }
 		    
 		    //getNotify().onSyncSourceEnd(i, m_sources);
@@ -947,7 +1037,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 	    //return !bError;
 	}
 	
-	void syncAllSources(String strQueryParams)throws Exception
+	void syncAllSources(String strQueryParams, boolean bSyncOnlyChangedSources)throws Exception
 	{
 //	    boolean bError = false;
 
@@ -958,7 +1048,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 	    //TODO: do not stop on error source
 	    for( int i = 0; i < (int)m_sources.size() && isContinueSync(); i++ )
 	    {
-	        /*bError = !*/syncOneSource(i, strQueryParams);
+	        /*bError = !*/syncOneSource(i, strQueryParams, bSyncOnlyChangedSources);
 	    }
 
 	    if ( !isSchemaChanged()  && getState() != SyncEngine.esStop )

data/platform/bb/RubyVM/src/com/rho/sync/SyncNotify.java

@@ -60,6 +60,11 @@ public class SyncNotify {
         	m_strParams = strParams; 
         	m_bRemoveAfterFire = bRemoveAfterFire; 
         }
+        
+        public String toString()
+        {
+        	return "Url: " + m_strUrl + ";Params:" + m_strParams + ";RemoveAfterFire: " + m_bRemoveAfterFire;
+        }
     };
 	
 	public static final Integer enNone = new Integer(0), enDelete=new Integer(1), enUpdate=new Integer(2), enCreate=new Integer(3);
@@ -83,18 +88,22 @@ public class SyncNotify {
     ISyncStatusListener m_syncStatusListener = null;
     boolean m_bEnableReporting = false;
     boolean m_bEnableReportingGlobal = true;
-    String m_strNotifyBody = "";
+    Vector/*<String>*/ m_arNotifyBody = new Vector();
+    boolean m_bFakeServerResponse = false;
+    boolean m_isInsideCallback = false;
     NetRequest m_NetRequest;
     
     SyncEngine getSync(){ return m_syncEngine; }
     NetRequest getNet() { return m_NetRequest;}
 
-	String getNotifyBody(){ return m_strNotifyBody; }
-	void cleanNotifyBody(){ m_strNotifyBody = ""; }
+    void cleanNotifyBody(){ m_arNotifyBody.removeAllElements(); setFakeServerResponse(false); }
+    boolean isFakeServerResponse(){ return m_bFakeServerResponse; }
+    void setFakeServerResponse(boolean bFakeServerResponse){ m_bFakeServerResponse = bFakeServerResponse; }
 
     boolean isReportingEnabled(){return m_bEnableReporting&&m_bEnableReportingGlobal;}
     void enableReporting(boolean bEnable) {	m_bEnableReporting = bEnable; }
     void enableStatusPopup(boolean bEnable){m_bEnableReportingGlobal = bEnable;}
+    boolean isInsideCallback() { return m_isInsideCallback; }
     
     SyncNotify( SyncEngine syncEngine ) 
     {
@@ -486,6 +495,11 @@ public class SyncNotify {
 	    return pSN != null ? pSN : m_emptyNotify;
 	}
 	
+	void fireSyncNotification2( SyncSource src, boolean bFinish, int nErrCode, String strServerError)
+	{
+	    doFireSyncNotification(src, bFinish, nErrCode, "", "", strServerError);
+	}
+	
 	void doFireSyncNotification( SyncSource src, boolean bFinish, int nErrCode, String strError, String strParams, String strServerError )
 	{
 		if ( getSync().isStoppedByUser() )
@@ -559,13 +573,6 @@ public class SyncNotify {
 						    	
 						    	strBody += "&" + strServerError;
 						    }
-						    else if ( src != null && src.m_strServerError != null && src.m_strServerError.length() > 0  )
-						    {
-							    if ( src.m_strServerError.length() > MAX_SERVER_ERROR_LEN )
-							    	src.m_strServerError = src.m_strServerError.substring(0, MAX_SERVER_ERROR_LEN);
-						    	
-						    	strBody += "&" + src.m_strServerError;
-						    }
 				        }
 				        
 		                if ( src != null )
@@ -589,7 +596,7 @@ public class SyncNotify {
 		    if ( bRemoveAfterFire )
 		    	clearNotification(src);
 		    
-		    LOG.INFO("Fire notification. Source : " + (src != null ? (src).getName():"") + "; " + pSN.toString());
+		    LOG.INFO("Fire notification. Source : " + (src != null ? (src).getName():"") + "; " + pSN.toString() + ";Body: " + strBody);
 		    
             if ( callNotify(pSN, strBody) )
                 clearNotification(src);
@@ -599,18 +606,41 @@ public class SyncNotify {
 		}
 	}
 
+	String getNotifyBody()
+	{
+	    String emptyBody = "";
+	    if ( m_arNotifyBody.size() == 0 )
+	        return emptyBody;
+
+	    if ( isFakeServerResponse() )
+	        return (String)m_arNotifyBody.elementAt(0);
+
+	    return (String)m_arNotifyBody.elementAt(m_arNotifyBody.size()-1);
+	}
+	
     boolean callNotify(SyncNotification oNotify, String strBody )throws Exception
     {
+        String strUrl = new String(oNotify.m_strUrl); //Need to copy url since notify may be cleared in callback
+        
         if ( getSync().isNoThreadedMode() )
         {
-            m_strNotifyBody = strBody;
+        	m_arNotifyBody.addElement( strBody );
             return false;
         }
 
-        if ( oNotify.m_strUrl.length() == 0 )
+        if ( strUrl.length() == 0 )
             return true;
+
+        if ( strUrl.startsWith("javascript:") )
+        {
+            String js = strUrl.substring(11) + "('" + strBody + "');";
+            RhoClassFactory.createRhoRubyHelper().webview_execute_js(js);
+        	return true;
+        }
         
-        NetResponse resp = getNet().pushData( oNotify.m_strUrl, strBody, null );
+        m_isInsideCallback = true; 
+        NetResponse resp = getNet().pushData( strUrl, strBody, null );
+        m_isInsideCallback = false; 
         if ( !resp.isOK() )
             LOG.ERROR( "Fire object notification failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData() );
         else