rhodes 2.3.2 → 2.4.0.beta.1

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

@@ -22,7 +22,6 @@ public interface IDBResult {
 	
 	//New
     public abstract boolean isEnd();
-    public abstract boolean isOneEnd() throws DBException;
     public abstract void next() throws DBException;
 	public abstract String getStringByIdx(int nCol);
 	public abstract int getIntByIdx(int nCol);

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

@@ -5,6 +5,7 @@ public interface IDBStorage {
 	public abstract void open(String strPath, String strSqlScript, String strEncryptionInfo)throws DBException;
 	public abstract void close()throws DBException;
 	
+	public abstract IDBResult executeSQL(String strStatement, Object[] values, boolean bReportNonUnique, boolean bNoCopy)throws DBException;
 	public abstract IDBResult executeSQL(String strStatement, Object[] values, boolean bReportNonUnique)throws DBException;
 	
 	public abstract void executeBatchSQL(String strStatement)throws DBException;

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

@@ -48,7 +48,7 @@ public class AsyncHttp extends ThreadQueue
     AsyncHttp(RhoClassFactory factory)
     {
     	super(factory);
-        ThreadQueue.setLogCategory(LOG.getLogCategory());
+        super.setLogCategory(LOG.getLogCategory());
 
         setPollInterval(QUEUE_POLL_INTERVAL_INFINITE);
     }

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

@@ -119,7 +119,7 @@ public class ClientRegister extends RhoThread
 			return false;
     	
 		IDBResult res = DBAdapter.getUserDB().executeSQL("SELECT token,token_sent from client_info");
-        if ( !res.isOneEnd() ) {
+        if ( !res.isEnd() ) {
 			String token = res.getStringByIdx(0); 
 			int token_sent = res.getIntByIdx(1);
 			if ( m_strDevicePin.equals(token) && token_sent > 0 ) 

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

@@ -49,7 +49,7 @@ class JSONStructIterator
     void reset()
     {
     	m_enumKeys = m_object.keys();
-    	if ( !isEnd() )
+    	if ( m_enumKeys != null && m_enumKeys.hasMoreElements() )
     		m_strCurKey = (String)m_enumKeys.nextElement();
     }
 

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

@@ -414,7 +414,15 @@ public class SyncEngine implements NetRequest.IRhoSession
 		        }
 		
 		        if ( nSearchCount == 0 )
+		        {
+		        	for ( int i = 0; i < (int)arSources.size(); i++ )
+					{
+						SyncSource pSrc = findSourceByName((String)arSources.elementAt(i));
+						if ( pSrc != null )
+							pSrc.processToken(0);
+					}		        	
 		            break;
+		        }
 		    }  
 		
 		    getNotify().fireAllSyncNotifications(true, m_nErrCode, m_strError, m_strServerError);
@@ -515,7 +523,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 	    {
 	        int nSrcID = resSrc.getIntByIdx(0);
 	        IDBResult res = db.executeSQL("SELECT source_id,sync_type,name, partition from sources WHERE source_id=?", nSrcID);
-	        if ( res.isOneEnd() )
+	        if ( res.isEnd() )
 	            continue;
 
 	        SyncSource src = new SyncSource( res.getIntByIdx(0), res.getStringByIdx(2), "none", db, this );
@@ -603,7 +611,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 		synchronized( m_mxLoadClientID )
 		{
 	        IDBResult res = getUserDB().executeSQL("SELECT client_id,reset from client_info");
-	        if ( !res.isOneEnd() )
+	        if ( !res.isEnd() )
 	            clientID = res.getStringByIdx(0);
 		}
 		
@@ -619,7 +627,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 		    boolean bResetClient = false;
 		    {
 		        IDBResult res = getUserDB().executeSQL("SELECT client_id,reset from client_info");
-		        if ( !res.isOneEnd() )
+		        if ( !res.isEnd() )
 		        {
 		            clientID = res.getStringByIdx(0);
 		            bResetClient = res.getIntByIdx(1) > 0;
@@ -631,7 +639,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 		        clientID = requestClientIDByNet();
 		
 	            IDBResult res = getUserDB().executeSQL("SELECT * FROM client_info");
-	            if ( !res.isOneEnd() )
+	            if ( !res.isEnd() )
 	            	getUserDB().executeSQL("UPDATE client_info SET client_id=?", clientID);
 	            else
 	            	getUserDB().executeSQL("INSERT INTO client_info (client_id) values (?)", clientID);
@@ -922,7 +930,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 		    if ( isSessionExist() && getState() != esStop )
 		        src.sync();
 	
-		    getNotify().onSyncSourceEnd(i, m_sources);
+		    //getNotify().onSyncSourceEnd(i, m_sources);
     	}catch(Exception exc)
     	{
 	    	if ( src.m_nErrCode == RhoAppAdapter.ERR_NONE )
@@ -999,7 +1007,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 		    	return;
 		    
 		    IDBResult res = getUserDB().executeSQL("SELECT * FROM client_info");
-		    if ( !res.isOneEnd() )
+		    if ( !res.isEnd() )
 		    	getUserDB().executeSQL( "UPDATE client_info SET session=?", strSession );
 		    else
 		    	getUserDB().executeSQL("INSERT INTO client_info (session) values (?)", strSession);
@@ -1036,7 +1044,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 	    String strRes = "";
 	    IDBResult res = getUserDB().executeSQL("SELECT session FROM client_info");
 	    
-	    if ( !res.isOneEnd() )
+	    if ( !res.isEnd() )
 	    	strRes = res.getStringByIdx(0);
 	    
 	    return strRes.length() > 0;
@@ -1047,7 +1055,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 		m_strSession = "";
 	    IDBResult res = getUserDB().executeSQL("SELECT session FROM client_info");
 	    
-	    if ( !res.isOneEnd() )
+	    if ( !res.isEnd() )
 	    	m_strSession = res.getStringByIdx(0);
 	    
 	    return m_strSession;

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

@@ -242,8 +242,8 @@ public class SyncNotify {
             if ( hashErrors == null )
                 return "";
 
-        	Enumeration valsErrors = m_hashSrcIDAndObject.elements();
-        	Enumeration keysErrors = m_hashSrcIDAndObject.keys();
+        	Enumeration valsErrors = hashErrors.elements();
+        	Enumeration keysErrors = hashErrors.keys();
     		while (valsErrors.hasMoreElements()) 
     		{
     			String strObject = (String)keysErrors.nextElement();

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

@@ -73,14 +73,11 @@ public class SyncSource
     String m_strSyncType = "";
     boolean m_bTokenFromDB; 
     
-    int m_nCurPageCount, m_nInserted, m_nDeleted, m_nTotalCount, m_nAttribCounter=0;
+    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_strPushBody = "";
-    Vector/*Ptr<CSyncBlob*>*/ m_arSyncBlobs = new Vector();
-    
     int m_nRefreshTime = 0;
     int m_nProgressStep = -1;
     boolean m_bSchemaSource;
@@ -167,7 +164,7 @@ public class SyncSource
         m_nErrCode = RhoAppAdapter.ERR_NONE;
 
         IDBResult res = db.executeSQL("SELECT token,associations from sources WHERE source_id=?", m_nID);
-        if ( !res.isOneEnd() )
+        if ( !res.isEnd() )
         {
         	m_token = res.getLongByIdx(0);
             m_bTokenFromDB = true;
@@ -259,7 +256,7 @@ public class SyncSource
 	        boolean bSyncClient = false;
 	        {
 	            IDBResult res = getDB().executeSQL("SELECT object FROM changed_values WHERE source_id=? LIMIT 1 OFFSET 0", getID());
-	            bSyncClient = !res.isOneEnd();
+	            bSyncClient = !res.isEnd();
 	        }
 	        if ( bSyncClient )
 	        {
@@ -276,7 +273,7 @@ public class SyncSource
 	boolean isPendingClientChanges()throws DBException
 	{
 	    IDBResult res = getDB().executeSQL("SELECT object FROM changed_values WHERE source_id=? and update_type='create' and sent>1  LIMIT 1 OFFSET 0", getID());
-	    return !res.isOneEnd();
+	    return !res.isEnd();
 	}
 
 	void doSyncClientChanges()throws Exception
@@ -470,21 +467,21 @@ public class SyncSource
 	    if ( strBody != null && strBody.length() > 0 )
 	    {
 	        JSONEntry oEntry = new JSONEntry(strBody);
-	        processSyncCommand("insert", oEntry );
+	        processSyncCommand("insert", oEntry, false );
 	    }
 
 	    strBody = makePushBody_Ver3("delete", false);
 	    if ( strBody != null && strBody.length() > 0 )
 	    {
 	        JSONEntry oEntry = new JSONEntry(strBody);
-	        processSyncCommand("delete", oEntry );
+	        processSyncCommand("delete", oEntry, false );
 	    }
 
 	    strBody = makePushBody_Ver3("update", false);
 	    if ( strBody != null && strBody.length() > 0 )
 	    {
 	        JSONEntry oEntry = new JSONEntry(strBody);
-	        processSyncCommand("insert", oEntry );
+	        processSyncCommand("insert", oEntry, false );
 	    }
 	}
 	
@@ -570,7 +567,12 @@ public class SyncSource
 	            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"));
+	                {
+	                	if ( m_strServerError.length() > 0 )
+	                		m_strServerError += "&";
+	                	
+	                    m_strServerError += "server_errors[" + URI.urlEncode(strKey) + "][message]=" + URI.urlEncode(errIter.getCurValue().getString("message"));
+	                }
 	            }
 	            else
 	            {
@@ -580,7 +582,23 @@ public class SyncSource
 	                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"));
+	                	if ( m_strServerError.length() > 0 )
+	                		m_strServerError += "&";
+	                    
+	                    m_strServerError += "server_errors[" + arErrTypes[i] + "][" + URI.urlEncode(strObject) + "][message]=" + URI.urlEncode(errIter.getCurValue().getString("message"));
+	                }else
+	                {
+		                JSONStructIterator attrIter = new JSONStructIterator(errIter.getCurValue());
+		                for( ; !attrIter.isEnd(); attrIter.next() )
+		                {
+			                String strAttrName = attrIter.getCurKey();
+			                String strAttrValue = attrIter.getCurString();
+			                
+			                if ( m_strServerError.length() > 0 )
+			                	m_strServerError += "&";
+			                
+			                m_strServerError += "server_errors[" + arErrTypes[i] + "][" + URI.urlEncode(strObject) + "][attributes][" + URI.urlEncode(strAttrName) + "]=" + URI.urlEncode(strAttrValue);
+		                }
 	                }
 	            }
 	        }
@@ -687,11 +705,11 @@ public class SyncSource
 		            getDB().executeSQL("UPDATE sources SET metadata=? WHERE source_id=?", strMetadata, getID() );
 		        }
 		        if ( oCmds.hasName("links") && getSync().isContinueSync() )
-		            processSyncCommand("links", oCmds.getEntry("links") );
+		            processSyncCommand("links", oCmds.getEntry("links"), true );
 		        if ( oCmds.hasName("delete") && getSync().isContinueSync() )
-		            processSyncCommand("delete", oCmds.getEntry("delete") );
+		            processSyncCommand("delete", oCmds.getEntry("delete"), true );
 		        if ( oCmds.hasName("insert") && getSync().isContinueSync() )
-		            processSyncCommand("insert", oCmds.getEntry("insert") );
+		            processSyncCommand("insert", oCmds.getEntry("insert"), true );
 	
 		        PROF.STOP("Data");
 	
@@ -709,7 +727,7 @@ public class SyncSource
 		PROF.STOP("Data1");
 	}
 	
-	void processSyncCommand(String strCmd, JSONEntry oCmdEntry)throws Exception
+	void processSyncCommand(String strCmd, JSONEntry oCmdEntry, boolean bCheckUIRequest)throws Exception
 	{
 	    JSONStructIterator objIter = new JSONStructIterator(oCmdEntry);
 
@@ -740,16 +758,19 @@ public class SyncSource
 	        if ( getSyncType().compareTo("none") == 0 )
 	        	continue;
 	        
-	        int nSyncObjectCount  = getNotify().incLastSyncObjectCount(getID());
-	        if ( getProgressStep() > 0 && (nSyncObjectCount%getProgressStep() == 0) )
-	            getNotify().fireSyncNotification(this, false, RhoAppAdapter.ERR_NONE, "");
-	        
-	        if ( getDB().isUIWaitDB() )
+	        if ( bCheckUIRequest )
 	        {
-		        LOG.INFO("Commit transaction because of UI request.");
-	            getDB().endTransaction();
-	            SyncThread.getInstance().sleep(1000);
-	            getDB().startTransaction();
+		        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();
+		            SyncThread.getInstance().sleep(1000);
+		            getDB().startTransaction();
+		        }
 	        }
 	    }
 	}
@@ -870,7 +891,7 @@ public class SyncSource
 	        //Remove item if all nulls
 	        String strSelect = "SELECT * FROM " + getName() + " WHERE object=?";
 	        IDBResult res = getDB().executeSQL( strSelect, strObject );
-	        if ( !res.isOneEnd() )
+	        if ( !res.isEnd() )
 	        {
 	            boolean bAllNulls = true;
 	            for( int i = 0; i < res.getColCount(); i ++)
@@ -931,7 +952,7 @@ public class SyncSource
 	        {
 	            String strSelect = "SELECT " + oAttrValue.m_strAttrib + " FROM " + getName() + " WHERE object=?";
 	            IDBResult res = getDB().executeSQL( strSelect, strObject);
-	            if (!res.isOneEnd())
+	            if (!res.isEnd())
 	            {
 	                strDbValue = res.getStringByIdx(0);
 	                bDownload = strDbValue == null || strDbValue.length() == 0;
@@ -941,7 +962,7 @@ public class SyncSource
 	            IDBResult res = getDB().executeSQL(
 	                "SELECT value FROM object_values WHERE object=? and attrib=? and source_id=?",
 	                strObject, oAttrValue.m_strAttrib, getID() );
-	            if (!res.isOneEnd())
+	            if (!res.isEnd())
 	            {
 	                strDbValue = res.getStringByIdx(0);
 	                bDownload = strDbValue == null || strDbValue.length() == 0;
@@ -962,12 +983,14 @@ public class SyncSource
 	        
 	        return bRes;
 	    }
-	    
+/*	    
 	    String fName = makeFileName( oAttrValue );	  
 	    String fOldName = RhodesApp.getInstance().resolveDBFilesPath(strDbValue);
 	    RhoClassFactory.createFile().renameOverwrite(fOldName, fName); 
 	    
 	    oAttrValue.m_strValue = FilePath.getRelativePath( fName, RhodesApp.getInstance().getRhoRootPath());
+*/	    
+	    oAttrValue.m_strValue = strDbValue;
 	    return true;
 	}
 	

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

@@ -171,7 +171,7 @@ public class SyncThread extends ThreadQueue
 	SyncThread(RhoClassFactory factory)throws Exception
 	{
 		super(factory);
-		ThreadQueue.setLogCategory(LOG.getLogCategory());
+		super.setLogCategory(LOG.getLogCategory());
 		
 		if( RhoConf.getInstance().isExist("sync_poll_interval") )
 			setPollInterval(RhoConf.getInstance().getInt("sync_poll_interval"));
@@ -179,8 +179,6 @@ public class SyncThread extends ThreadQueue
 		m_oSyncEngine = new SyncEngine();
 		m_oSyncEngine.setFactory(factory);
 	
-	    m_oSyncEngine.setFactory(factory);
-
 	    LOG.INFO("sync_poll_interval: " + RhoConf.getInstance().getInt("sync_poll_interval"));
 	    LOG.INFO("syncserver: " + RhoConf.getInstance().getString("syncserver"));
 	    LOG.INFO("bulksync_state: " + RhoConf.getInstance().getInt("bulksync_state"));

data/platform/bb/build/RubyVM_build.files

@@ -47,6 +47,7 @@ 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/RhoTimer.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

@@ -265,8 +265,8 @@ namespace "build" do
     
 #    desc "Build rhoBundle"
     #XXX change to ns build, rhobundle
-    task :rhobundle => :rubyvm do
-	  jpath = $config["env"]["paths"]["java"]  
+    task :rhobundle => ["config:checkbb", :rubyvm] do
+      jpath = $config["env"]["paths"]["java"]  
       java = jpath && jpath.length()>0 ? File.join( jpath, "java") : "jar"
       jdehome = $config["env"]["paths"][$bbver]["jde"]
       jarexe =  jpath && jpath.length()>0 ? File.join( jpath, "jar" ) : "jar"
@@ -387,8 +387,8 @@ namespace "build" do
     end
     
     task :devrhobundle => [:set_dev_outname,:rhobundle] do
-      cp $preverified + "/RhoBundle.jar", "platform/bb/RhoBundle/RhoBundle.jar"
-	  #cp $preverified + "/RhoBundle.jar", "platform/bb/Rhodes/RhoBundle.jar"
+      #cp $preverified + "/RhoBundle.jar", "platform/bb/RhoBundle/RhoBundle.jar"
+	  cp $preverified + "/RhoBundle.jar", "platform/bb/Rhodes/RhoBundle.jar"
       
       sdcardpath = $config["env"]["paths"][$bbver]["jde"] +"/simulator/sdcard/Rho/rhodes"
       
@@ -573,8 +573,8 @@ namespace "build" do
 
    
 #    desc "Build rhodes"
-    task :rhodes => [ :rubyvm, :rhobundle ] do
-	  jpath = $config["env"]["paths"]["java"]
+    task :rhodes => ["config:checkbb",:rubyvm, :rhobundle ] do
+      jpath = $config["env"]["paths"]["java"]
       javac = jpath && jpath.length() > 0 ? File.join(jpath, "javac" ) : "javac"
       jdehome = $config["env"]["paths"][$bbver]["jde"]
 
@@ -960,6 +960,15 @@ end
 namespace "run" do
   namespace "bb" do
 
+      def getLogFilePath
+        jde = $config["env"]["paths"][$bbver]["jde"]
+        return jde + "/simulator/sdcard/Rho/" + $outfilebase + "/RhoLog.txt"
+      end
+      # >>>>>>>>>>>>>>>>>>>>>
+      task :get_log => ["config:bb"] do
+         puts "log_file=" + getLogFilePath
+      end
+
       task :stopmdsandsim => ["config:bb"] do
         stopsim  
         stopmds
@@ -975,7 +984,7 @@ namespace "run" do
         startsim
       end
 
-      task :spec => ["run:bb:stopmdsandsim", "clean:bb", "package:bb:production_sim"] do
+      task :spec => ["config:checkbb", "run:bb:stopmdsandsim", "clean:bb", "package:bb:production_sim"] do
         jde = $config["env"]["paths"][$bbver]["jde"]
         cp_r File.join($targetdir,"/."), jde + "/simulator"
         rm_rf jde + "/simulator/sdcard/Rho"
@@ -1026,7 +1035,7 @@ namespace "run" do
       load_to_sim(false)
     end
 
-	desc "Start Blackberry simulator"
+    desc "Start Blackberry simulator"
     task :startsim => ["config:bb"] do
       startsim
     end  
@@ -1034,7 +1043,6 @@ namespace "run" do
     task :stopmdsandsim_ex => ["config:bb"] do
         
         stopsim if $bbver.split('.')[0].to_i < 5
-
         stopmds
     end  
 
@@ -1091,6 +1099,18 @@ namespace "config" do
     jdehome  = $config["env"]["paths"][$bbver]["jde"]
     mdshome  = $config["env"]["paths"][$bbver]["mds"]
 
+    begin
+      puts Jake.run('javac', [], nil, false)
+    rescue
+      puts "Java directory does not in your PATH enviroment variable."
+      throw "main JAVA directory missing"
+    end
+
+#    if $retJava == nil or $retJava == ""
+#      puts "Java directory does not in your PATH enviroment variable."
+#      throw "main JAVA directory missing"
+#    end
+
     puts "BBVER: " + $bbver
     puts "JAVAHOME: " + javahome
     puts "JDEHOME: " + jdehome