rhodes 3.2.3 → 3.3.0.beta.1

data/platform/android/build/android_tools.rb

@@ -33,6 +33,64 @@
 
 module AndroidTools
 
+def fill_api_levels(sdkpath)
+    $api_levels = Hash.new
+    $market_versions = Hash.new
+    max_apilevel = 0
+    max_platform = nil 
+    
+    Dir.glob(File.join(sdkpath, "platforms", "*")).each do |platform|
+      props = File.join(platform, "source.properties")
+      unless File.file? props
+        puts "+++ WARNING! No source.properties found in #{platform}"
+        next
+      end
+
+      apilevel = 0
+      marketversion = nil
+      File.open(props, "r") do |f|
+        while line = f.gets
+          apilevel = $1.to_i if line =~ /^\s*AndroidVersion\.ApiLevel\s*=\s*([0-9]+)\s*$/
+          marketversion = $1 if line =~ /^\s*Platform\.Version\s*=\s*([^\s]*)\s*$/
+        end
+      end
+
+      puts "+++ API LEVEL of #{platform}: #{apilevel}" if USE_TRACES
+
+      if apilevel != 0
+        $api_levels[marketversion] = apilevel
+        $market_versions[apilevel] = marketversion
+        if apilevel > max_apilevel
+          max_apilevel = apilevel
+          max_platform = File.basename platform
+        end
+      end
+    end
+    
+    max_platform
+end
+module_function :fill_api_levels
+
+def get_installed_market_versions
+    $api_levels.keys
+end
+module_function :get_installed_market_versions
+
+def get_installed_api_levels
+    $market_versions.keys
+end
+module_function :get_installed_api_levels
+
+def get_market_version(apilevel)
+    $market_versions[apilevel]
+end
+module_function :get_market_version
+
+def get_api_level(marketversion)
+    $api_levels[marketversion]
+end
+module_function :get_api_level
+
 def get_app_log (appname, device, silent = false)
   pkgname = "com.#{$vendor}." + appname.downcase.gsub(/[^A-Za-z_0-9]/, '')
   path = File.join('/data/data', pkgname, 'rhodata', 'RhoLog.txt')

data/platform/android/build/librhocommon_build.files

@@ -17,6 +17,7 @@ platform/shared/common/SplashScreen.cpp
 platform/shared/common/ThreadQueue.cpp
 platform/shared/common/Tokenizer.cpp
 platform/shared/common/RhoTime.cpp
+platform/shared/common/BundleManager.cpp
 platform/shared/net/AsyncHttp.cpp
 platform/shared/net/CURLNetRequest.cpp
 platform/shared/net/HttpServer.cpp

data/platform/android/build/libruby_build.files

@@ -15,6 +15,9 @@ platform/shared/ruby/enc/ascii.c
 platform/shared/ruby/enc/unicode.c
 platform/shared/ruby/enc/us_ascii.c
 platform/shared/ruby/enc/utf_8.c
+platform/shared/ruby/enc/encdb.c
+platform/shared/ruby/enc/iso_8859_1.c
+platform/shared/ruby/enc/iso_8859_9.c
 platform/shared/ruby/enum.c
 platform/shared/ruby/enumerator.c
 platform/shared/ruby/error.c

data/platform/bb/RubyVM/src/com/rho/RhoConf.java

@@ -69,6 +69,16 @@ public class RhoConf {
     	m_mapChangedValues.put(szName, getString(szName) );
     	
         String strData = saveChangesToString();
+        
+        RhoFile.deleteFile(getConfFilePath()+CONF_CHANGES);
+        
+        try{
+        	RhoFile.writeStringToFile(getConfFilePath()+CONF_CHANGES, strData);
+        }catch(Exception exc)
+        {
+        	LOG.ERROR("saveToFile failed.", exc);
+        }
+/*        
     	SimpleFile oFile = null;
 
     	try{
@@ -81,7 +91,7 @@ public class RhoConf {
     	}catch(Exception exc){
     		if ( oFile != null )
     			try{ oFile.close(); }catch(IOException exc2){}
-    	}
+    	}*/
         
     }
 

data/platform/bb/RubyVM/src/com/rho/db/DBAdapter.java

@@ -640,7 +640,7 @@ public class DBAdapter extends RubyBasic
 		
 		//getAttrMgr().load(this);
 		
-		m_dbStorage.setDbCallback(new DBCallback(this));
+		//m_dbStorage.setDbCallback(new DBCallback(this));
 		
 		//m_dbAdapters.addElement(this);
 
@@ -793,7 +793,7 @@ public class DBAdapter extends RubyBasic
 			
 			//getAttrMgr().load(this);
 			
-			m_dbStorage.setDbCallback(new DBCallback(this));
+			//m_dbStorage.setDbCallback(new DBCallback(this));
 			
 		}catch(Exception e)
 		{
@@ -1016,7 +1016,7 @@ public class DBAdapter extends RubyBasic
 			
 			//getAttrMgr().load(this);
 			
-			m_dbStorage.setDbCallback(new DBCallback(this));
+			//m_dbStorage.setDbCallback(new DBCallback(this));
 			
 		}catch(Exception e)
 		{
@@ -1144,8 +1144,6 @@ public class DBAdapter extends RubyBasic
 		{
 			DBAdapter db = (DBAdapter)enumDBs.nextElement();
 			db.getAttrMgr().loadBlobAttrs(db);
-			if ( !db.getAttrMgr().hasBlobAttrs() )
-				db.m_dbStorage.setDbCallback(null);
 		}
     }
     
@@ -1339,6 +1337,14 @@ public class DBAdapter extends RubyBasic
 		
 	}
 	
+	public void setDBCallback(boolean bSet)
+	{
+		if ( bSet )
+			m_dbStorage.setDbCallback(new DBCallback(this));
+		else
+			m_dbStorage.setDbCallback(null);
+	}
+	
 	public static class DBCallback implements IDBCallback
 	{
 		private DBAdapter m_db;

data/platform/bb/RubyVM/src/com/rho/db/DBAttrManager.java

@@ -78,7 +78,8 @@ public class DBAttrManager {
     public void loadBlobAttrs(DBAdapter db)throws DBException
     {
         loadAttrs(db, m_mapBlobAttrs, "blob_attribs", m_mapSrcNames);
-        //TODO: update/delete trigger for schema sources
+        
+        db.setDBCallback(db.getAttrMgr().hasBlobAttrs());
     }
     
     static void loadAttrs(DBAdapter db, Hashtable/*Ptr< int, Hashtable<String,int>* >&*/ mapAttrs, String strDBAttr, Hashtable mapSrcNames)throws DBException
@@ -115,7 +116,7 @@ public class DBAttrManager {
 	
 			mapAttrs.put( nSrcID, mapAttr );
 			if ( mapSrcNames != null )
-				mapSrcNames.put(res.getStringByIdx(2).toUpperCase(), nSrcID);
+				mapSrcNames.put(res.getStringByIdx(2), nSrcID);
 	    }
     }
 }

data/platform/bb/RubyVM/src/com/rho/file/RhoFile.java

@@ -108,6 +108,7 @@ public class RhoFile
 	public static boolean isFileExist(String szFilePath)
 	{
 		IRAFile oFile = null; 
+		//LOG.INFO("isFileExist:" + szFilePath);
 		
 		try
 		{
@@ -116,6 +117,7 @@ public class RhoFile
 			return oFile.exists();
 		}catch(Exception exc)
 		{
+			LOG.ERROR("isFileExist failed:" + szFilePath, exc);
 			return false;
 		}finally
 		{

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

@@ -44,6 +44,7 @@ public class RhoConnection implements IHttpConnection {
     protected Properties resHeaders = new Properties();
     /** Request state **/
     protected boolean requestProcessed = false;
+    protected boolean m_isDispatchCall = false;
     /** Input/Output streams **/
 	private /*ByteArray*/InputStream responseData = null;
 	private ByteArrayOutputStream postData = new ByteArrayOutputStream();
@@ -109,6 +110,8 @@ public class RhoConnection implements IHttpConnection {
 		LOG.TRACE("Close browser connection.");
 	}
     
+	public boolean isDispatchCall(){ return m_isDispatchCall; }
+	
 	public Object getNativeConnection() {
 		throw new RuntimeException("getNativeConnection - Not implemented");
 	}
@@ -139,13 +142,13 @@ public class RhoConnection implements IHttpConnection {
 	}
 
 	public String getHeaderField(String name) throws IOException {
-		//LOG.TRACE("getHeaderField: " + name);
+		LOG.TRACE("getHeaderField: " + name);
 		processRequest();
 		return resHeaders.getPropertyIgnoreCase(name);
 	}
 
 	public String getHeaderField(int index) throws IOException {
-		//LOG.TRACE("getHeaderField: " + index);
+		LOG.TRACE("getHeaderField: " + index);
 		processRequest();
         if (index >= resHeaders.size()) {
             return null;
@@ -154,7 +157,7 @@ public class RhoConnection implements IHttpConnection {
 	}
 
 	public long getHeaderFieldDate(String name, long def) throws IOException {
-		//LOG.TRACE("getHeaderFieldDate: " + name);
+		LOG.TRACE("getHeaderFieldDate: " + name);
 		processRequest();
         try {
             return DateTimeTokenizer.parse(getHeaderField(name));
@@ -169,7 +172,7 @@ public class RhoConnection implements IHttpConnection {
 	}
 
 	public int getHeaderFieldInt(String name, int def) throws IOException {
-		//LOG.TRACE("getHeaderFieldInt: " + name);
+		LOG.TRACE("getHeaderFieldInt: " + name);
 		processRequest();
         try {
             return Integer.parseInt(getHeaderField(name));
@@ -182,7 +185,7 @@ public class RhoConnection implements IHttpConnection {
 	}
 
 	public String getHeaderFieldKey(int index) throws IOException {
-		//LOG.TRACE("getHeaderFieldKey: " + index);
+		LOG.TRACE("getHeaderFieldKey: " + index);
 		processRequest();
         if (index >= resHeaders.size())
             return null;
@@ -216,7 +219,7 @@ public class RhoConnection implements IHttpConnection {
 
 	public String getRef() {
 		LOG.TRACE("getRef: " + uri.getFragment());
-		return uri.getFragment();
+		return uri.getFragment() != null ? uri.getFragment() : "";
 	}
 
 	public String getRequestMethod() {
@@ -225,7 +228,7 @@ public class RhoConnection implements IHttpConnection {
 	}
 
 	public String getRequestProperty(String key) {
-		//LOG.TRACE("getRequestProperty: " + key);
+		LOG.TRACE("getRequestProperty: " + key);
         return reqHeaders.getPropertyIgnoreCase(key);
 	}
 
@@ -309,7 +312,7 @@ public class RhoConnection implements IHttpConnection {
 	 *            the value for the request header field.
 	 */
     protected void setRequestField(String key, String value) {
-    	//LOG.TRACE("setRequestField: key = " + key + "; value = " + value);
+    	LOG.TRACE("setRequestField: key = " + key + "; value = " + value);
 
         /*
 		 * If application setRequestProperties("Connection", "close") then we
@@ -361,19 +364,23 @@ public class RhoConnection implements IHttpConnection {
 	}
 
 	public DataInputStream openDataInputStream() throws IOException {
+		LOG.TRACE("openDataInputStream");
 		return new DataInputStream(openInputStream());
 	}
 
 	public InputStream openInputStream() throws IOException {
+		LOG.TRACE("openInputStream");
 		processRequest();
 		return responseData;
 	}
 
 	public DataOutputStream openDataOutputStream() throws IOException {
+		LOG.TRACE("openDataOutputStream");
 		return new DataOutputStream(postData);
 	}
 
 	public OutputStream openOutputStream() throws IOException {
+		LOG.TRACE("openOutputStream");
 		return postData;
 	}
 	
@@ -414,18 +421,22 @@ public class RhoConnection implements IHttpConnection {
 		
 		resHeaders.addProperty("Location", strLoc );
 		contentLength = 0;
+		
+		responseData = new ByteArrayInputStream("".getBytes());
 	}
 
 	void respondOK(){
 		responseCode = HTTP_OK;
 		responseMsg = "Success";
 		contentLength = 0;
+		responseData = new ByteArrayInputStream("".getBytes());
 	}
 
 	void respondNotModified(){
 		responseCode = HTTP_NOTMODIFIED;
 		responseMsg = "Success";
 		contentLength = 0;
+		responseData = new ByteArrayInputStream("".getBytes());
 	}
 	
 	void respondNotFound( String strError ){
@@ -815,6 +826,7 @@ public class RhoConnection implements IHttpConnection {
 						if ( dispatch() )
 						{
 							requestProcessed = true;
+							m_isDispatchCall = true;
 							return;
 						}
 					}

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

@@ -445,7 +445,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 		        oSrc.getDB().executeSQL("UPDATE sources set last_updated=?,last_inserted_size=?,last_deleted_size=?, "+
 					 "last_sync_duration=?,last_sync_success=?, backend_refresh_time=? WHERE source_id=?", 
 					 new Long(endTime.toULong()/1000), new Integer(oSrc.getInsertedCount()), new Integer(oSrc.getDeletedCount()), 
-					 new Long((endTime.minus(startTime)).toULong()), new Integer(oSrc.getGetAtLeastOnePage()?1:0), 
+					 new Long((endTime.minus(startTime)).toULong()), new Integer(oSrc.m_nErrCode == RhoAppAdapter.ERR_NONE?1:0), 
 					 new Integer(oSrc.getRefreshTime()),  oSrc.getID() );
 		    }
 		    //
@@ -961,7 +961,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 	        /*bError = !*/syncOneSource(i, strQueryParams);
 	    }
 
-	    if ( !isSchemaChanged() )
+	    if ( !isSchemaChanged()  && getState() != SyncEngine.esStop )
 	    	getNotify().fireSyncNotification(null, true, RhoAppAdapter.ERR_NONE, RhoAppAdapter.getMessageText("sync_completed"));
 	}
 	
@@ -1067,9 +1067,12 @@ public class SyncEngine implements NetRequest.IRhoSession
 	
 	public void logout()throws Exception
 	{
-	    if(m_NetRequest!=null) 
-	        m_NetRequest.cancel();
-		
+		stopSync();
+		logout_int();
+	}
+
+	public void logout_int()throws Exception
+	{
 		getUserDB().executeSQL( "UPDATE client_info SET session = NULL");
 	    m_strSession = "";
 	
@@ -1087,7 +1090,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 			
 			getUserDB().executeSQL("DELETE FROM client_info");
 
-			logout();
+			logout_int();
 		}
 	}
 	

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

@@ -85,13 +85,12 @@ public class SyncSource
     boolean m_bTokenFromDB; 
     
     int m_nCurPageCount, m_nInserted, m_nDeleted, m_nTotalCount;
-    boolean m_bGetAtLeastOnePage = false;
     int m_nErrCode = RhoAppAdapter.ERR_NONE;
     String m_strError = "", m_strServerError = "";
     String m_strQueryParams = "";
     
     int m_nRefreshTime = 0;
-    int m_nProgressStep = -1;
+    int m_nProgressStep = 0;
     boolean m_bSchemaSource;
     
     static class CAssociation
@@ -124,7 +123,6 @@ public class SyncSource
     int getProgressStep(){ return m_nProgressStep; }
     void setProgressStep(int nProgressStep){ m_nProgressStep = nProgressStep; }
 
-    boolean getGetAtLeastOnePage(){ return m_bGetAtLeastOnePage; }
     int getRefreshTime(){ return m_nRefreshTime; }
     Vector/*<CAssociation>*/ getAssociations(){ return m_arAssociations; }
     
@@ -150,12 +148,12 @@ public class SyncSource
         m_nID = new Integer(0);
         
         m_bTokenFromDB = true;
-
+        m_nProgressStep = 0;
+        
         m_nCurPageCount = 0;
         m_nInserted = 0;
         m_nDeleted = 0;
         m_nTotalCount = 0;
-        m_bGetAtLeastOnePage = false;
 
         m_nErrCode = RhoAppAdapter.ERR_NONE;
         m_bSchemaSource = db.isTableExist(m_strName);
@@ -168,12 +166,12 @@ public class SyncSource
         m_nID = new Integer(id);
         m_strName = name;
         m_strSyncType = strSyncType;
+        m_nProgressStep = 0;
         
         m_nCurPageCount = 0;
         m_nInserted = 0;
         m_nDeleted = 0;
         m_nTotalCount = 0;
-        m_bGetAtLeastOnePage = false;
 
         m_nErrCode = RhoAppAdapter.ERR_NONE;
 
@@ -243,12 +241,21 @@ public class SyncSource
 	    	//getSync().stopSync();
 	    	throw exc;
 	    }finally{
-		   TimeInterval endTime = TimeInterval.getCurrentTime();
-		   getDB().executeSQL("UPDATE sources set last_updated=?,last_inserted_size=?,last_deleted_size=?, "+
-			 "last_sync_duration=?,last_sync_success=?, backend_refresh_time=? WHERE source_id=?", 
-             new Long(endTime.toULong()/1000), new Integer(getInsertedCount()), new Integer(getDeletedCount()), 
-             new Long((endTime.minus(startTime)).toULong()), 
-             new Integer(m_bGetAtLeastOnePage?1:0), new Integer(m_nRefreshTime), getID() );
+			TimeInterval endTime = TimeInterval.getCurrentTime();
+			   
+			int nSyncSucess = m_nErrCode == RhoAppAdapter.ERR_NONE ? 1 : 0;
+			if ( nSyncSucess > 0 )
+				getDB().executeSQL("UPDATE sources set last_updated=?,last_inserted_size=?,last_deleted_size=?, "+
+						 "last_sync_duration=?,last_sync_success=?, backend_refresh_time=? WHERE source_id=?", 
+			             new Long(endTime.toULong()/1000), new Integer(getInsertedCount()), new Integer(getDeletedCount()), 
+			             new Long((endTime.minus(startTime)).toULong()), 
+			             new Integer(nSyncSucess), new Integer(m_nRefreshTime), getID() );
+			else
+				getDB().executeSQL("UPDATE sources set last_inserted_size=?,last_deleted_size=?, "+
+						 "last_sync_duration=?,last_sync_success=?, backend_refresh_time=? WHERE source_id=?", 
+			             new Integer(getInsertedCount()), new Integer(getDeletedCount()), 
+			             new Long((endTime.minus(startTime)).toULong()), 
+			             new Integer(nSyncSucess), new Integer(m_nRefreshTime), getID() );
 	    }
 	}
 	
@@ -514,7 +521,9 @@ public class SyncSource
 	            oItem.m_strContentType = "application/octet-stream";
 	            oItem.m_strName = strAttrib + "-" + strObject;
 
-	            m_arBlobAttrs.addElement(strAttrib);
+	            if ( m_arBlobAttrs.indexOf(strAttrib) == -1 )
+	            	m_arBlobAttrs.addElement(strAttrib);
+	            
 	            m_arMultipartItems.addElement(oItem);
 	        }
 
@@ -872,21 +881,39 @@ public class SyncSource
 	        
 	        if ( bCheckUIRequest )
 	        {
-		        int nSyncObjectCount  = getNotify().incLastSyncObjectCount(getID());
-		        if ( getProgressStep() > 0 && (nSyncObjectCount%getProgressStep() == 0) )
-		            getNotify().fireSyncNotification(this, false, RhoAppAdapter.ERR_NONE, "");
-		        
 		        if ( getDB().isUIWaitDB() )
 		        {
 			        LOG.INFO("Commit transaction because of UI request.");
 		            getDB().endTransaction();
+		            
+		            checkProgressStepNotify(false);
+		            
 		            SyncThread.getInstance().sleep(1000);
 		            getDB().startTransaction();
-		        }
+		        }else
+		        	checkProgressStepNotify(true);
 	        }
 	    }
 	}
 	
+	void checkProgressStepNotify(boolean bEndTransaction)throws Exception
+	{
+	    int nSyncObjectCount  = getNotify().incLastSyncObjectCount(getID());
+	    if ( getProgressStep() > 0 && (nSyncObjectCount%getProgressStep() == 0) )
+	    {
+	        if ( bEndTransaction )
+	        {
+	            LOG.INFO("Commit transaction because of Sync Progress notification.");
+	            getDB().endTransaction();
+	        }
+
+	        getNotify().fireSyncNotification(this, false, RhoAppAdapter.ERR_NONE, "");
+
+	        if ( bEndTransaction )
+	            getDB().startTransaction();
+	    }
+	}
+
 	void processAssociations(String strOldObject, String strNewObject)throws Exception
 	{
         for ( int i = 0; i < m_arAssociations.size(); i++ )