rhodes 2.3.0 → 2.3.1.beta.1

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

@@ -101,19 +101,18 @@ public class SyncEngine implements NetRequest.IRhoSession
                 }
             }
 
-            return res;
+            return res != null ? res : "";
         }
         public boolean getBoolProperty(Integer nSrcID, String szPropName)
         {
             String strValue = getProperty(nSrcID, szPropName);
-
             return strValue.compareTo("1") == 0 || strValue.compareTo("true") == 0 ? true : false;
         	
         }
     };
     
     Vector/*<SyncSource*>*/ m_sources = new Vector();
-    NetRequest m_NetRequest;
+    NetRequest m_NetRequest, m_NetRequestClientID;
     ISyncProtocol m_SyncProtocol;
     int         m_syncState;
     String     m_clientID = "";
@@ -124,7 +123,7 @@ public class SyncEngine implements NetRequest.IRhoSession
     int m_nSyncPageSize = 2000;
     boolean m_bNoThreaded = false;
     int m_nErrCode = RhoAppAdapter.ERR_NONE;
-    String m_strError = "";
+    String m_strError = "",m_strServerError = "";
     boolean m_bIsSearch, m_bIsSchemaChanged;
     static SourceOptions m_oSourceOptions = new SourceOptions();
     
@@ -133,9 +132,28 @@ public class SyncEngine implements NetRequest.IRhoSession
     boolean isSearch(){ return m_bIsSearch; }
     boolean isContinueSync(){ return m_syncState != esExit && m_syncState != esStop; }
 	boolean isSyncing(){ return m_syncState == esSyncAllSources || m_syncState == esSyncSource; }
-    void stopSync(){ if (isContinueSync()){ setState(esStop); m_NetRequest.cancel(); } }
+    void stopSync()
+    { 
+    	if (isContinueSync())
+    	{ 
+	    	setState(esStop); 
+	    	if (m_NetRequest!=null) 
+	    		m_NetRequest.cancel(); 
+	    	
+	    	if (m_NetRequestClientID!=null) 
+	    		m_NetRequestClientID.cancel(); 
+    	} 
+    }
     void stopSyncByUser(){ m_bStopByUser = true; stopSync(); }
-    void exitSync(){ setState(esExit); m_NetRequest.cancel(); }
+    void exitSync()
+    { 
+    	setState(esExit); 
+    	if (m_NetRequest!=null) 
+    		m_NetRequest.cancel(); 
+    	
+    	if (m_NetRequestClientID!=null) 
+    		m_NetRequestClientID.cancel(); 
+    }
     boolean isStoppedByUser(){ return m_bStopByUser; }
     
     String getClientID(){ return m_clientID; }
@@ -154,6 +172,7 @@ public class SyncEngine implements NetRequest.IRhoSession
     
     SyncNotify getNotify(){ return m_oSyncNotify; }
     NetRequest getNet() { return m_NetRequest;}
+    NetRequest getNetClientID(){ return m_NetRequestClientID; }
     ISyncProtocol getProtocol(){ return m_SyncProtocol; }
     
     boolean isNoThreadedMode(){ return m_bNoThreaded; }
@@ -162,6 +181,7 @@ public class SyncEngine implements NetRequest.IRhoSession
     
     SyncEngine(){
 		m_NetRequest = null;
+		m_NetRequestClientID = null;
     	m_syncState = esNone;
     	
     	initProtocol();
@@ -177,6 +197,8 @@ public class SyncEngine implements NetRequest.IRhoSession
     
     void setFactory(RhoClassFactory factory)throws Exception{ 
 		m_NetRequest = RhoClassFactory.createNetRequest();
+		m_NetRequestClientID = RhoClassFactory.createNetRequest();
+		
 		m_oSyncNotify.setFactory(factory);		
     }
     
@@ -187,6 +209,7 @@ public class SyncEngine implements NetRequest.IRhoSession
         m_bStopByUser = false;
         m_nErrCode = RhoAppAdapter.ERR_NONE;
         m_strError = "";
+        m_strServerError = "";
         m_bIsSchemaChanged = false;
         
         loadAllSources();
@@ -216,7 +239,7 @@ public class SyncEngine implements NetRequest.IRhoSession
             getNotify().fireSyncNotification(src, true, src.m_nErrCode, "");
         }else
         {
-            getNotify().fireAllSyncNotifications(true, m_nErrCode, m_strError);
+            getNotify().fireAllSyncNotifications(true, m_nErrCode, m_strError, "");
         }
         
         stopSync();
@@ -293,6 +316,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 		        if ( strParams.length() > 0 )
 		            strQuery += strParams;
 		
+		        String strTestResp = "";
 		        for ( int i = 0; i < (int)arSources.size(); i++ )
 		        {
 		            SyncSource pSrc = findSourceByName((String)arSources.elementAt(i));
@@ -302,6 +326,8 @@ public class SyncEngine implements NetRequest.IRhoSession
 		
 		                if ( !pSrc.isTokenFromDB() && pSrc.getToken() > 1 )
 		                    strQuery += "&sources[][token]=" + pSrc.getToken();
+		                
+		                strTestResp = getSourceOptions().getProperty(pSrc.getID(), "rho_server_response");
 		            }
 		        }
 		
@@ -316,7 +342,11 @@ public class SyncEngine implements NetRequest.IRhoSession
 		            continue;
 		        }
 		
-		        String szData = resp.getCharData();
+		        String szData = null;
+		        if ( strTestResp != null && strTestResp.length() > 0 )
+		        	szData = strTestResp;
+		        else
+		        	szData = resp.getCharData();		        
 		
 		        JSONArrayIterator oJsonArr = new JSONArrayIterator(szData);
 		
@@ -338,8 +368,7 @@ 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();
-		                m_nErrCode = RhoAppAdapter.ERR_UNEXPECTEDSERVERRESPONSE;
-		                m_strError = resp.getCharData();
+		                m_nErrCode = RhoAppAdapter.ERR_SYNCVERSION;
 		                continue;
 		            }
 		
@@ -353,7 +382,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 		                LOG.ERROR( "Sync server send search data without source name." );
 		                stopSync();
 		                m_nErrCode = RhoAppAdapter.ERR_UNEXPECTEDSERVERRESPONSE;
-		                m_strError = resp.getCharData();
+		                m_strError = szData;
 		                continue;
 		            }
 		
@@ -364,7 +393,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 		                LOG.ERROR("Sync server send search data for unknown source name:" + strSrcName);
 		                stopSync();
 		                m_nErrCode = RhoAppAdapter.ERR_UNEXPECTEDSERVERRESPONSE;
-		                m_strError = resp.getCharData();
+		                m_strError = szData;
 		                continue;
 		            }
 		
@@ -373,13 +402,22 @@ 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 )
 		            break;
 		    }  
 		
-		    getNotify().fireAllSyncNotifications(true, m_nErrCode, m_strError);
+		    getNotify().fireAllSyncNotifications(true, m_nErrCode, m_strError, m_strServerError);
 		
 		    //update db info
 		    TimeInterval endTime = TimeInterval.getCurrentTime();
@@ -404,7 +442,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 	    } catch(Exception exc) {
     		LOG.ERROR("Search failed.", exc);
 
-    		getNotify().fireAllSyncNotifications(true, RhoAppAdapter.ERR_RUNTIME, "");
+    		getNotify().fireAllSyncNotifications(true, RhoAppAdapter.ERR_RUNTIME, "", "");
 	    }
 		    
     }
@@ -637,7 +675,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 //        if ( ClientRegister.getInstance() != null )
 //            strBody += ClientRegister.getInstance().getRegisterBody();
 
-	    NetResponse resp = getNet().pullData(getProtocol().getClientResetUrl(strClientID), this);
+	    NetResponse resp = getNetClientID().pullData(getProtocol().getClientResetUrl(strClientID), this);
 /*	    
 	    processServerSources("{\"server_sources\":[{\"name\":\"Product\",\"partition\":\"application\",\"source_id\":\"2\",\"sync_priority\":\"0\","+
 	    	    "\"schema_version\":\"7.0\",\"schema\":{"+
@@ -665,7 +703,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 //        if ( ClientRegister.getInstance() != null )
 //            strBody += ClientRegister.getInstance().getRegisterBody();
 	
-	    NetResponse resp = getNet().pullData(getProtocol().getClientCreateUrl(), this);
+	    NetResponse resp = getNetClientID().pullData(getProtocol().getClientCreateUrl(), this);
 	    if ( resp.isOK() && resp.getCharData() != null )
 	    {
 	    	String szData = resp.getCharData();

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

@@ -284,7 +284,7 @@ public class SyncNotify {
         	if ( pSN != null )        	
         		fireSyncNotification(src, true, src.m_nErrCode, "");
         	else
-        		fireAllSyncNotifications(true, src.m_nErrCode, src.m_strError );
+        		fireAllSyncNotifications(true, src.m_nErrCode, src.m_strError, "" );
         }
         else
             fireSyncNotification( src, true, src.m_nErrCode, "");
@@ -394,10 +394,10 @@ public class SyncNotify {
 	    strParams += "&bulk_status="+status;
 	    strParams += "&sync_type=bulk";
 
-	    doFireSyncNotification( null, bFinish, nErrCode, "", strParams );
+	    doFireSyncNotification( null, bFinish, nErrCode, "", strParams, "" );
 	}
 
-	void fireAllSyncNotifications( boolean bFinish, int nErrCode, String strError )
+	void fireAllSyncNotifications( boolean bFinish, int nErrCode, String strError, String strServerError )
 	{
 	    if ( getSync().getState() == SyncEngine.esExit )
 			return;
@@ -416,7 +416,7 @@ public class SyncNotify {
 	    {
 	        SyncNotification pSN = getSyncNotifyBySrc(null);    
 	        if ( pSN != null )
-	            doFireSyncNotification( null, bFinish, nErrCode, strError, "" );
+	            doFireSyncNotification( null, bFinish, nErrCode, strError, "", strServerError );
 	    }
 	}
 
@@ -436,7 +436,7 @@ public class SyncNotify {
 			}
 		}
 		
-		doFireSyncNotification(src, bFinish, nErrCode, "", "" );
+		doFireSyncNotification(src, bFinish, nErrCode, "", "", "" );
 	}
 	
 	SyncNotification getSyncNotifyBySrc(SyncSource src)
@@ -459,7 +459,7 @@ public class SyncNotify {
 	    return pSN != null ? pSN : m_emptyNotify;
 	}
 	
-	void doFireSyncNotification( SyncSource src, boolean bFinish, int nErrCode, String strError, String strParams )
+	void doFireSyncNotification( SyncSource src, boolean bFinish, int nErrCode, String strError, String strParams, String strServerError )
 	{
 		if ( getSync().isStoppedByUser() )
 			return;
@@ -509,12 +509,16 @@ public class SyncNotify {
 				        	
 				        	strBody += "error";				        	
 						    strBody += "&error_code=" + nErrCode;
-						    strBody += "&error_type=" + (src != null ? src.m_strErrorType : "");
 						    
 						    if ( strError != null && strError.length() > 0 )
 						    	strBody += "&error_message=" + URI.urlEncode(strError);
 						    else  if ( src != null )
 						    	strBody += "&error_message=" + URI.urlEncode(src.m_strError);
+						    
+						    if ( strServerError != null && strServerError.length() > 0 )
+						    	strBody += "&" + strServerError;
+						    else if ( src != null && src.m_strServerError != null && src.m_strServerError.length() > 0  )
+						    	strBody += "&" + src.m_strServerError;						    
 				        }
 				        
 		                if ( src != null )
@@ -524,8 +528,13 @@ public class SyncNotify {
 			        	strBody += "in_progress";
 			        
 			        strBody += "&rho_callback=1";
-			        if ( pSN.m_strParams.length() > 0 )
-			            strBody += "&" + pSN.m_strParams;
+			        if ( pSN.m_strParams != null && pSN.m_strParams.length() > 0 )
+			        {
+			        	if ( !pSN.m_strParams.startsWith("&") )
+			        		strBody += "&";
+			        	
+			        	strBody += pSN.m_strParams;
+			        }			        	
 			        
 			        bRemoveAfterFire = bRemoveAfterFire && pSN.m_bRemoveAfterFire;
 		        }

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

@@ -76,8 +76,7 @@ public class SyncSource
     int m_nCurPageCount, m_nInserted, m_nDeleted, m_nTotalCount, m_nAttribCounter=0;
     boolean m_bGetAtLeastOnePage = false;
     int m_nErrCode = RhoAppAdapter.ERR_NONE;
-    String m_strError = "";
-    String m_strErrorType = "";
+    String m_strError = "", m_strServerError = "";
     
 	//String m_strPushBody = "";
     Vector/*Ptr<CSyncBlob*>*/ m_arSyncBlobs = new Vector();
@@ -99,6 +98,8 @@ public class SyncSource
     Integer getID() { return m_nID; }
     String getName() { return m_strName; }
     String getSyncType(){ return m_strSyncType; }
+    String getServerError(){ return m_strServerError; }
+    int getErrorCode(){ return m_nErrCode; }    
     int getServerObjectsCount(){ return m_nInserted+m_nDeleted; }
     
     long getToken(){ return m_token; }
@@ -521,11 +522,12 @@ public class SyncSource
 		    	throw exc;
 		    }
 
-	        String szData = resp.getCharData();
-	        //String szData = "[{\"version\":3},{\"token\":\"\"},{\"count\":0},{\"progress_count\":28},{\"total_count\":28},{\"source-error\":{\"login-error\":{\"message\":\"s currently connected from another machine\"}}}]";
-		    //String szData =  "[{\"version\":3},{\"token\":\"\"},{\"count\":0},{\"progress_count\":0},{\"total_count\":0},{\"create-error\":{\"0_broken_object_id\":{\"name\":\"wrongname\",\"an_attribute\":\"error create\"},\"0_broken_object_id-error\":{\"message\":\"error create\"}}}]";
-	        //String szData =  "[{\"version\":3},{\"token\":\"35639160294387\"},{\"count\":3},{\"progress_count\":0},{\"total_count\":3},{\"metadata\":\"{\\\"foo\\\":\\\"bar\\\"}\",\"insert\":{\"1\":{\"price\":\"199.99\",\"brand\":\"Apple\",\"name\":\"iPhone\"}}}]";
-	        //String szData = "[{\"version\":3},{\"token\":\"\"},{\"count\":0},{\"progress_count\":1},{\"total_count\":1},{\"update-error\":{\"1-error\":{\"message\":\"Update failed!\"},\"1\":{\"foo\":\"bar5\"}}}]";
+		    String szData = null;
+		    String strTestResp = getSync().getSourceOptions().getProperty(getID(), "rho_server_response");
+		    if ( strTestResp != null && strTestResp.length() > 0 )
+		    	szData = strTestResp;
+		    else
+		    	szData = resp.getCharData();		    
 
 	        PROF.START("Parse");
 	        JSONArrayIterator oJsonArr = new JSONArrayIterator(szData);
@@ -544,71 +546,47 @@ public class SyncSource
 	    	getSync().stopSync();	    
 	}
 
+	//{"create-error":{"0_broken_object_id":{"name":"wrongname","an_attribute":"error create"},"0_broken_object_id-error":{"message":"error create"}}}
 	boolean processServerErrors(JSONEntry oCmds)throws Exception
 	{
-	    if ( oCmds.hasName("source-error") )
+	    String arErrTypes[] = {"source-error", "search-error", "create-error", "update-error", "delete-error", null};
+	    boolean bRes = false;
+	    for( int i = 0; ; i++ )
 	    {
-	        JSONEntry errSrc = oCmds.getEntry("source-error");
-	        JSONStructIterator errIter = new JSONStructIterator(errSrc);
-	        for( ; !errIter.isEnd(); errIter.next() )
-	        {
-	            m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
-	            m_strError = errIter.getCurValue().getString("message");
-	            m_strErrorType = errIter.getCurKey();
-	        }
-	    }else if ( oCmds.hasName("search-error") )
-	    {
-	        JSONEntry errSrc = oCmds.getEntry("search-error");
-	        JSONStructIterator errIter = new JSONStructIterator(errSrc);
-	        for( ; !errIter.isEnd(); errIter.next() )
-	        {
-	            m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
-	            m_strError = errIter.getCurValue().getString("message");
-	            m_strErrorType = errIter.getCurKey();
-	        }
-	    }else if ( oCmds.hasName("create-error") )
-	    {
-	        m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
-	        m_strErrorType = "create-error";
+	        if ( arErrTypes[i] == null )
+	            break;
+	        if ( !oCmds.hasName(arErrTypes[i]) )
+	            continue;
 
-	        JSONEntry errSrc = oCmds.getEntry(m_strErrorType);
-	        JSONStructIterator errIter = new JSONStructIterator(errSrc);
-	        for( ; !errIter.isEnd(); errIter.next() )
-	        {
-	            String strKey = errIter.getCurKey();
-	            if ( strKey.endsWith("-error") )
-	                m_strError = errIter.getCurValue().getString("message");
-	        }
-	    }else if ( oCmds.hasName("update-error") )
-	    {
+	        bRes = true;
 	        m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
-	        m_strErrorType = "update-error";
 
-	        JSONEntry errSrc = oCmds.getEntry(m_strErrorType);
+	        JSONEntry errSrc = oCmds.getEntry(arErrTypes[i]);
 	        JSONStructIterator errIter = new JSONStructIterator(errSrc);
 	        for( ; !errIter.isEnd(); errIter.next() )
 	        {
 	            String strKey = errIter.getCurKey();
-	            if ( strKey.endsWith("-error") )
-	                m_strError = errIter.getCurValue().getString("message");
-	        }
-	    }else if ( oCmds.hasName("delete-error") )
-	    {
-	        m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
-	        m_strErrorType = "delete-error";
 
-	        JSONEntry errSrc = oCmds.getEntry(m_strErrorType);
-	        JSONStructIterator errIter=new JSONStructIterator(errSrc);
-	        for( ; !errIter.isEnd(); errIter.next() )
-	        {
-	            String strKey = errIter.getCurKey();
-	            if ( strKey.endsWith( "-error") )
-	                m_strError = errIter.getCurValue().getString("message");
+	            if ( i == 0 || i == 1 )//"source-error", "search-error" 
+	            {
+	                if ( errIter.getCurValue().hasName("message") )
+	                    m_strServerError += "server_errors[" + strKey + "][message]=" + URI.urlEncode(errIter.getCurValue().getString("message"));
+	            }
+	            else
+	            {
+	                //"create-error", "update-error", "delete-error"
+	                String strObject = strKey;
+
+	                if ( strObject.endsWith("-error") )
+	                {
+	                    strObject = strObject.substring(0, strKey.length()-6);
+	                    m_strServerError += "server_errors[" + arErrTypes[i] + "][" + strObject + "][message]=" + URI.urlEncode(errIter.getCurValue().getString("message"));
+	                }
+	            }
 	        }
-	    }else
-	        return false;
+	    }
 
-	    return true;
+	    return bRes;
 	}
 	
 	void processServerResponse_ver3(JSONArrayIterator oJsonArr)throws Exception

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

@@ -108,6 +108,8 @@ public class SyncThread extends ThreadQueue
    		    return "Unknown; Code : " + m_nCmdCode;
    		}
    		
+   		public void cancel(){}
+   		
    	};
    	static private class SyncLoginCommand extends SyncCommand
    	{
@@ -800,6 +802,7 @@ public class SyncThread extends ThreadQueue
 						try{
 							boolean bVerify = arg1 == RubyConstant.QTRUE;
 							getSyncEngine().getNet().sslVerifyPeer(bVerify);
+							getSyncEngine().getNetClientID().sslVerifyPeer(bVerify);
 						}catch(Exception e)
 						{
 							LOG.ERROR("set_ssl_verify_peer failed", e);

data/platform/bb/build/RubyVM_build.files

@@ -46,6 +46,7 @@ platform/bb/RubyVM/src/com/rho/StringScanner.java
 platform/bb/RubyVM/src/com/rho/Capabilities.java
 platform/bb/RubyVM/src/com/rho/AppBuildConfig.java
 platform/bb/RubyVM/src/com/rho/Extensions.java
+platform/bb/RubyVM/src/com/rho/RhoCrypto.java
 platform/bb/RubyVM/src/com/rho/sync/JSONArrayIterator.java
 platform/bb/RubyVM/src/com/rho/sync/JSONStructIterator.java
 platform/bb/RubyVM/src/com/rho/sync/JSONEntry.java

data/platform/bb/build/bb.rake

@@ -614,12 +614,12 @@ namespace "build" do
         # http://supportforums.blackberry.com/rim/board/message?board.id=java_dev&thread.id=11152
         mkdir_p vsrcdir + "/com/rho/file"
         cp_r $builddir + "/../rhodes/src/com/rho/file/PersistRAFileImpl.java", vsrcdir + "/com/rho/file"
-        freplace( vsrcdir + "/com/rho/file/PersistRAFileImpl.java", /FileInfoWrapper/, $outfilebase + "_FileInfoWrapper" )
-        freplace( vsrcdir + "/com/rho/file/PersistRAFileImpl.java", /PageWrapper/, $outfilebase + "_PageWrapper" )
+        freplace( vsrcdir + "/com/rho/file/PersistRAFileImpl.java", /FileInfoWrapper/, "_" + $outfilebase + "_FileInfoWrapper" )
+        freplace( vsrcdir + "/com/rho/file/PersistRAFileImpl.java", /PageWrapper/, "_" + $outfilebase + "_PageWrapper" )
 
         fvsrc = File.new( vsrclist, "w" )
         Dir.glob( vsrcdir + "/**/*.java" ).each do |line|
-          fvsrc.puts line
+          fvsrc.puts "\""+line+"\""
         end
         fvsrc.close
 
@@ -1019,8 +1019,7 @@ namespace "run" do
       end
 
       task :phone_spec do
-        exit 1 if Jake.run_spec_app('bb','phone_spec')
-        exit 0
+        exit Jake.run_spec_app('bb','phone_spec')
       end
 
     task :testsim => ["config:bb"] do

data/platform/bb/rhodes/platform/5.0/com/rho/RhodesApplicationPlatform.java

@@ -38,6 +38,7 @@ public class RhodesApplicationPlatform extends UiApplication implements PushAppl
 			m_strStatus = strStatus;
 		}
 		public boolean equals(IQueueCommand cmd){return false;}
+		public void cancel(){}
 		
 		public void execute()
 		{
@@ -62,6 +63,7 @@ public class RhodesApplicationPlatform extends UiApplication implements PushAppl
 			m_conn = conn;
 		}
 		public boolean equals(IQueueCommand cmd){return false;}
+		public void cancel(){}
 		
 		public void execute()
 		{
@@ -189,7 +191,8 @@ public class RhodesApplicationPlatform extends UiApplication implements PushAppl
 
 		LOG.INFO("onStatusChange : " + strMsg);
 		
-		m_PushMessageThread.addQueueCommand( new PushStatusCommand(strMsg) );
+		if ( m_PushMessageThread != null )
+			m_PushMessageThread.addQueueCommand( new PushStatusCommand(strMsg) );
 	}
 	
 	public void onPlatformActivate()

data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteStorage.java

@@ -37,6 +37,12 @@ public class SqliteStorage implements IDBStorage
 		String strDbName = getNameNoExt(strPath);
 		m_fs.delete(strDbName + ".data");
 		m_fs.delete(strDbName + ".data-journal");
+
+		//hsql old files
+		m_fs.delete(strDbName + ".script");
+		m_fs.delete(strDbName + ".script.new");
+		m_fs.delete(strDbName + ".journal");
+		m_fs.delete(strDbName + ".properties");		
 	}
 
 	public IDBResult createResult() {
@@ -245,7 +251,7 @@ public class SqliteStorage implements IDBStorage
 		executeBatchSQL( strTriggers );
 	}
 	
-	public void open(String strPath, String strSqlScript) throws DBException 
+	public void open(String strPath, String strSqlScript, String strEncryptionInfo) throws DBException 
 	{
 		try{
 			String strDbName = getNameNoExt(strPath) + ".data";
@@ -253,8 +259,7 @@ public class SqliteStorage implements IDBStorage
 			//m_dbSess.setDBCallback(this);
 
 			URI myURI = URI.create(strDbName);
-			boolean bEncrypted =  AppBuildConfig.getItem("encrypt_database") != null && 
-           		 AppBuildConfig.getItem("encrypt_database").compareTo("1") == 0;
+			boolean bEncrypted =  strEncryptionInfo != null && strEncryptionInfo.length() >0;
 			DatabaseSecurityOptions dbso = new DatabaseSecurityOptions(bEncrypted);
 			
 			if ( !m_fs.exists(strDbName) )

data/platform/bb/rhodes/src/com/rho/RhodesApplicationPlatform.java

@@ -38,6 +38,7 @@ public class RhodesApplicationPlatform extends UiApplication implements PushAppl
 			m_strStatus = strStatus;
 		}
 		public boolean equals(IQueueCommand cmd){return false;}
+		public void cancel(){}
 		
 		public void execute()
 		{
@@ -62,6 +63,7 @@ public class RhodesApplicationPlatform extends UiApplication implements PushAppl
 			m_conn = conn;
 		}
 		public boolean equals(IQueueCommand cmd){return false;}
+		public void cancel(){}
 		
 		public void execute()
 		{

data/platform/bb/rhodes/src/com/rho/db/SqliteStorage.java

@@ -37,6 +37,12 @@ public class SqliteStorage implements IDBStorage
 		String strDbName = getNameNoExt(strPath);
 		m_fs.delete(strDbName + ".data");
 		m_fs.delete(strDbName + ".data-journal");
+
+		//hsql old files
+		m_fs.delete(strDbName + ".script");
+		m_fs.delete(strDbName + ".script.new");
+		m_fs.delete(strDbName + ".journal");
+		m_fs.delete(strDbName + ".properties");		
 	}
 
 	public IDBResult createResult() {
@@ -245,7 +251,7 @@ public class SqliteStorage implements IDBStorage
 		executeBatchSQL( strTriggers );
 	}
 	
-	public void open(String strPath, String strSqlScript) throws DBException 
+	public void open(String strPath, String strSqlScript, String strEncryptionInfo) throws DBException 
 	{
 		try{
 			String strDbName = getNameNoExt(strPath) + ".data";
@@ -253,8 +259,7 @@ public class SqliteStorage implements IDBStorage
 			//m_dbSess.setDBCallback(this);
 
 			URI myURI = URI.create(strDbName);
-			boolean bEncrypted =  AppBuildConfig.getItem("encrypt_database") != null && 
-           		 AppBuildConfig.getItem("encrypt_database").compareTo("1") == 0;
+			boolean bEncrypted =  strEncryptionInfo != null && strEncryptionInfo.length() >0;
 			DatabaseSecurityOptions dbso = new DatabaseSecurityOptions(bEncrypted);
 			
 			if ( !m_fs.exists(strDbName) )

data/platform/bb/rhodes/src/com/rho/rubyext/RhoCalendar.java

@@ -478,7 +478,10 @@ public class RhoCalendar extends RubyBasic {
 
 	public static RubyValue addEvent(RubyValue arg0, RubyValue arg1)throws Exception 
 	{
-		return saveEvent(arg0, arg1);
+		saveEvent(arg0, arg1);
+		RhoCalendar pb = (RhoCalendar)arg0;		
+		EVRecord record = (EVRecord)arg1;
+		return pb.getEVRecord(record.m_event);
 	}
 	
 	public static RubyValue deleteEvent(RubyValue arg0, RubyValue arg1)throws Exception 

data/platform/bb/rhodes/src/com/rho/rubyext/System.java

@@ -311,6 +311,8 @@ public class System {
     		return ObjectFactory.createBoolean(RhoCalendar.has_calendar());
     	if ( strPropName.equalsIgnoreCase("has_touchscreen") )
     		return ObjectFactory.createBoolean(rhomobile.RhodesApplication.getInstance().hasTouchScreen());
+    	if ( strPropName.equalsIgnoreCase("has_sqlite") )
+    		return ObjectFactory.createBoolean(com.rho.Capabilities.USE_SQLITE);
     	    	
     	return RubyConstant.QNIL;
     }

data/platform/bb/rhodes/src/rhomobile/mapview/ESRIMapField.java

@@ -62,6 +62,8 @@ public class ESRIMapField extends Field implements RhoMapField {
 	
 	private int mWidth;
 	private int mHeight;
+
+	private Bitmap mapLogoImage;
 	
 	private static class ByCoordinatesComparator implements Comparator {
 		
@@ -427,6 +429,8 @@ public class ESRIMapField extends Field implements RhoMapField {
 		mMapUrls.put("satellite", url);
 		
 		mMapType = "roadmap";
+
+		mapLogoImage = Bitmap.getBitmapResource("esri.png");
 		
 		LOG.TRACE("ESRIMapField ctor: mLatitude=" + mLatitude + ", mLongitude=" + mLongitude);
 		
@@ -476,6 +480,11 @@ public class ESRIMapField extends Field implements RhoMapField {
 			
 			paintImage(graphics, img);
 		}
+
+		int logoWidth = mapLogoImage.getWidth();
+		int logoHeight = mapLogoImage.getHeight();
+		graphics.drawBitmap(0, mHeight - logoHeight, logoWidth, logoHeight, mapLogoImage, 0, 0); 
+
 	}
 	
 	private void paintImage(Graphics graphics, CachedImage img) {