rhodes 2.4.0 → 2.4.1.beta.1

data/CHANGELOG

@@ -1,3 +1,8 @@
+## 2.4.1
+* iPhone: fix production build
+* Android: fix 2.1 version
+* Sync: do not stop sync on source with pending create objects
+
 ## 2.4
 * Android: support old sdk(s)
 * Blackberry: encryption for hsql database

data/lib/framework/rhodes.rb

@@ -1,6 +1,6 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '2.4.0'
+    VERSION = '2.4.1'
   end
   unless defined? Rhodes::DBVERSION
     DBVERSION = '2.2.0'

data/lib/framework/version.rb

@@ -1,6 +1,6 @@
 module RhodesFramework
   unless defined? RhodesFramework::VERSION
-    VERSION = '2.4.0'
+    VERSION = '2.4.1'
   end
   unless defined? RhodesFramework::DBVERSION
     DBVERSION = '2.2.2'

data/lib/rhodes.rb

@@ -1,6 +1,6 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '2.4.0'
+    VERSION = '2.4.1'
   end
   unless defined? Rhodes::DBVERSION
     DBVERSION = '2.2.0'

data/platform/android/Rhodes/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.rhomobile.rhodes"
     android:installLocation="auto"
-    android:versionCode="30"
-    android:versionName="2.4.0">
+    android:versionCode="31"
+    android:versionName="2.4.1">
     
     <uses-sdk android:minSdkVersion="4" />
     

data/platform/android/Rhodes/jni/src/rhodes.cpp

@@ -564,9 +564,9 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_doSyncSource
 }
 
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesApplication_setStartParameters
-  (JNIEnv *, jclass, jstring strUrl)
+  (JNIEnv *env, jclass, jstring strUrl)
 {
-    std::string const &url = rho_cast<std::string>(strUrl);
+    std::string url = rho_cast<std::string>(env, strUrl);
     RHODESAPP().setStartParameters(url.c_str());
 }
 

data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java

@@ -76,19 +76,6 @@ public class RhodesActivity extends BaseActivity {
 		Thread ct = Thread.currentThread();
 		//ct.setPriority(Thread.MAX_PRIORITY);
 		uiThreadId = ct.getId();
-		
-		Intent intent = getIntent();
-		//intent.putExtra(RHO_URL_START_KEY, "/app/BrowserStart");
-		//intent.putExtra(RHO_URL_PARAMS_KEY, "param1=value1&param2=value2");
-		//Log.d(TAG, "MY URI: " + intent.toUri(Intent.URI_INTENT_SCHEME));
-
-        // Check if we really started through URI
-        if(intent.getData() != null)
-        {
-            //Workaround to get URI string from intent since intent.getData() badly initialized
-            Log.d(TAG, "Application URI: " + intent.toUri(0));
-            RhodesApplication.setStartParameters(intent.toUri(0).toString());
-        }
 
 		if (!RhodesService.isEnableTitle()) {
 			requestWindowFeature(Window.FEATURE_NO_TITLE);
@@ -356,30 +343,34 @@ public class RhodesActivity extends BaseActivity {
 	@Override
 	public void onServiceConnected(ComponentName name, IBinder service) {
 		super.onServiceConnected(name, service);
-		
-		Bundle startParams = null;
-		Object params = getIntent().getExtras();
-		if (params != null && params instanceof Bundle)
-			startParams = (Bundle)params;
-		
-		String rhoStartParams = null;
-		if (startParams != null)
-			rhoStartParams = startParams.getString(RHO_START_PARAMS_KEY);
-		if (rhoStartParams == null)
-			rhoStartParams = "";
-		
-		if (!RhodesService.canStartApp(rhoStartParams, ", ")) {
-			Logger.E(TAG, "This is hidden app and can be started only with security key.");
-			getRhodesApplication().exit();
-			return;
-		}
-		
-		String urlStart = startParams == null ? null : startParams.getString(RHO_URL_START_KEY);
-		if (urlStart != null) {
-			Logger.D(TAG, "PROCESS URL START: " + urlStart);
-			RhoConf.setString("start_path", Uri.decode(urlStart));
-		}
-		
+
+        Logger.D(TAG, "onServiceConnected: " + name.toShortString());
+
+        Intent intent = getIntent();
+        String startParams = (intent.getData() != null) ? intent.toUri(0) : "";
+        Uri uri = Uri.parse(startParams);
+        String scheme = uri.getScheme();
+        if(startParams.compareTo("") != 0)
+        {
+            startParams = startParams.substring(scheme.length() + 1);
+            if(startParams.startsWith("//"))
+                startParams = startParams.substring(2);
+        }
+
+        if(!RhodesService.canStartApp(startParams, "&#"))
+        {
+            Logger.E(TAG, "This is hidden app and can be started only with security key.");
+            getRhodesApplication().exit();
+            return;
+        }
+
+        String urlStart = uri.getPath();
+        if (urlStart.compareTo("") != 0)
+        {
+            Logger.D(TAG, "PROCESS URL START: " + urlStart);
+            RhoConf.setString("start_path", Uri.decode(urlStart));
+        }
+
 		ENABLE_LOADING_INDICATION = !RhoConf.getBool("disable_loading_indication");
 	}
 

data/platform/android/build/androidcommon.rb

@@ -39,7 +39,7 @@ def setup_ndk(ndkpath,apilevel)
   $ndktools = nil
   $ndkabi = "unknown"
   $ndkgccver = "unknown"
-  ["arm-linux-androideabi-4.4.3", "arm-eabi-4.4.0", "arm-eabi-4.2.1"].each do |abi|
+  ["arm-eabi-4.4.0", "arm-eabi-4.2.1"].each do |abi|
     variants = []
     variants << File.join(ndkpath, "toolchains", abi, "prebuilt", $ndkhost)
     variants << File.join(ndkpath, "build/prebuilt", $ndkhost, abi)

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

@@ -578,7 +578,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 	{
 	    Hashtable/*<String, int>*/ hashPassed = new Hashtable();
 	    
-	    for( int nCurSrc = m_sources.size()-1; nCurSrc > 0 ; )
+	    for( int nCurSrc = m_sources.size()-1; nCurSrc >= 0 ; )
 	    {
 	        SyncSource oCurSrc = (SyncSource)m_sources.elementAt(nCurSrc);
 	        if ( oCurSrc.getAssociations().size() == 0 || hashPassed.containsKey(oCurSrc.getName()) )
@@ -590,6 +590,9 @@ public class SyncEngine implements NetRequest.IRhoSession
 	            {
 	                SyncSource.CAssociation oAssoc = (SyncSource.CAssociation)oCurSrc.getAssociations().elementAt(i);
 	                int nAssocSrcIndex = findSrcIndex( m_sources, oAssoc.m_strSrcName);
+	                if ( nAssocSrcIndex >= 0 )
+	                	((SyncSource)m_sources.elementAt(nAssocSrcIndex)).addBelongsTo( oAssoc.m_strAttrib, oCurSrc.getID() );
+	                			
 	                if ( nAssocSrcIndex >=0 && nAssocSrcIndex < nSrc )
 	                {
 	                    m_sources.removeElementAt( nSrc );

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

@@ -91,6 +91,8 @@ public class SyncSource
     Vector/*<CAssociation>*/ m_arAssociations = new Vector();
     Vector/*Ptr<net::CMultipartItem*>*/ m_arMultipartItems = new Vector();
     Vector/*<String>*/                  m_arBlobAttrs = new Vector();
+    Hashtable/*<String,int>*/           m_hashIgnorePushObjects = new Hashtable();
+    Hashtable/*<String,int>*/           m_hashBelongsTo = new Hashtable();
     
     Integer getID() { return m_nID; }
     String getName() { return m_strName; }
@@ -215,10 +217,14 @@ public class SyncSource
 	        {
 		        if ( isEmptyToken() )
 		            processToken(1);
-		    	
+
+		        syncClientChanges();
+		        syncServerChanges();
+		        /*		        
 		        boolean bSyncedServer = syncClientChanges();
 		        if ( !bSyncedServer )
 		        	syncServerChanges();
+		        */
 	        }	        
 	    }catch(Exception exc)
 	    {
@@ -233,7 +239,23 @@ public class SyncSource
              new Integer(m_bGetAtLeastOnePage?1:0), new Integer(m_nRefreshTime), getID() );
 	    }
 	}
+	
+	void syncClientChanges()throws Exception
+	{
+      	PROF.START("Pull");
+
+        boolean bSyncClient = false;
+        {
+            IDBResult res = getDB().executeSQL("SELECT object FROM changed_values WHERE source_id=? and sent<=1 LIMIT 1 OFFSET 0", getID());
+            bSyncClient = !res.isEnd();
+        }
+        if ( bSyncClient )
+            doSyncClientChanges();
 
+        PROF.STOP("Pull");
+	}
+	
+/*
 	boolean syncClientChanges()throws Exception
 	{
 	    boolean bSyncedServer = false;
@@ -274,8 +296,69 @@ public class SyncSource
 	{
 	    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.isEnd();
+	}*/
+
+	void addBelongsTo(String strAttrib, Integer nSrcID)
+	{
+	    m_hashBelongsTo.put(strAttrib, nSrcID);
+	}
+
+	Integer getBelongsToSrcID(String strAttrib)
+	{
+	    if ( m_hashBelongsTo.containsKey(strAttrib) )
+	        return (Integer)m_hashBelongsTo.get(strAttrib);
+
+	    return new Integer(-1);
 	}
 
+	void checkIgnorePushObjects()throws Exception
+	{
+	    // ignore changes in pending creates
+	    {
+	        IDBResult res = getDB().executeSQL("SELECT distinct(object) FROM changed_values where source_id=? and sent>=2", getID() );
+	        for( ; !res.isEnd(); res.next() )
+	        {
+	            String strObject = res.getStringByIdx(0);
+	            m_hashIgnorePushObjects.put(strObject, new Integer(1));
+	        }
+	    }
+
+	    //check for belongs_to
+	    String strAttribQuests = "";
+	    Vector/*<String>*/ arValues = new Vector();
+	    arValues.addElement(getID());
+    	Enumeration keys = m_hashBelongsTo.keys();
+		while (keys.hasMoreElements()) 
+		{
+	        if ( strAttribQuests.length() > 0 )
+	            strAttribQuests += ",";
+
+	        strAttribQuests += "?";
+	        arValues.addElement(keys.nextElement());
+	    }
+
+	    if ( strAttribQuests.length() > 0 )
+	    {
+	        IDBResult res = getDB().executeSQLEx( "SELECT object, attrib, value FROM changed_values where source_id=? and sent<=1 and attrib IN ( " + strAttribQuests + " )",  
+	        		arValues );
+
+	        for( ; !res.isEnd(); res.next() )
+	        {
+	            String strObject = res.getStringByIdx(0);
+	            String strAttrib = res.getStringByIdx(1);
+	            String strValue = res.getStringByIdx(2);
+
+	            IDBResult res2 = getDB().executeSQL(
+	                "SELECT object FROM changed_values where source_id=? and sent>=2 and object=? LIMIT 1 OFFSET 0", 
+	                getBelongsToSrcID(strAttrib), strValue );
+	            
+	            if (!res2.isEnd())
+	                m_hashIgnorePushObjects.put(strObject, new Integer(1) );
+
+	        }
+	    }
+	}
+	
 	void doSyncClientChanges()throws Exception
 	{
 	    String arUpdateTypes[] = {"create", "update", "delete"};
@@ -286,32 +369,41 @@ public class SyncSource
 	    String strBody = "{\"source_name\":" + JSONEntry.quoteValue(getName()) + ",\"client_id\":" + JSONEntry.quoteValue(getSync().getClientID());
 	    boolean bSend = false;
 	    int i = 0;
-	    for( i = 0; i < 3 && getSync().isContinueSync(); i++ )
+	    
+	    getDB().Lock();
+	    try{
+		    checkIgnorePushObjects();
+		    
+		    for( i = 0; i < 3 && getSync().isContinueSync(); i++ )
+		    {
+		        String strBody1;
+		        strBody1 = makePushBody_Ver3(arUpdateTypes[i], true);
+		        if (strBody1.length() > 0)
+		        {
+		            strBody += "," + strBody1;
+	
+		            String strBlobAttrs = "";
+		            for ( int j = 0; j < (int)m_arBlobAttrs.size(); j++)
+		            {
+		                if ( strBlobAttrs.length() > 0 )   
+		                    strBlobAttrs += ",";
+	
+		                strBlobAttrs += JSONEntry.quoteValue((String)m_arBlobAttrs.elementAt(j));
+		            }
+	
+		            if ( strBlobAttrs.length() > 0 )
+		                strBody += ",\"blob_fields\":[" + strBlobAttrs + "]";
+	
+		            arUpdateSent[i] = true;
+		            bSend = true;
+		        }
+		    }
+		    strBody += "}";
+	    }finally
 	    {
-	        String strBody1;
-	        strBody1 = makePushBody_Ver3(arUpdateTypes[i], true);
-	        if (strBody1.length() > 0)
-	        {
-	            strBody += "," + strBody1;
-
-	            String strBlobAttrs = "";
-	            for ( int j = 0; j < (int)m_arBlobAttrs.size(); j++)
-	            {
-	                if ( strBlobAttrs.length() > 0 )   
-	                    strBlobAttrs += ",";
-
-	                strBlobAttrs += JSONEntry.quoteValue((String)m_arBlobAttrs.elementAt(j));
-	            }
-
-	            if ( strBlobAttrs.length() > 0 )
-	                strBody += ",\"blob_fields\":[" + strBlobAttrs + "]";
-
-	            arUpdateSent[i] = true;
-	            bSend = true;
-	        }
+	    	getDB().Unlock();
 	    }
-	    strBody += "}";
-
+	    
 	    if ( bSend )
 	    {
 	        LOG.INFO( "Push client changes to server. Source: " + getName() + "Size :" + strBody.length() );
@@ -399,6 +491,9 @@ public class SyncSource
 	        String value = res.getStringByIdx(2);
 	        String attribType = res.getStringByIdx(3);
 
+	        if ( m_hashIgnorePushObjects.containsKey(strObject) )
+	        	continue;
+	        
 	        if ( attribType.compareTo("blob.file") == 0 )
 	        {
 	            MultipartItem oItem = new MultipartItem();

data/platform/iphone/Info.plist

@@ -38,7 +38,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.4.0</string>
+	<string>2.4.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchImageFile</key>

data/platform/iphone/RhoLib/RhoLib.xcodeproj/project.pbxproj

@@ -471,6 +471,7 @@
 				);
 				PRODUCT_NAME = rholib;
 				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
 				SYMROOT = ../build;
 				USER_HEADER_SEARCH_PATHS = "../../shared/curl/include ../../shared";
 			};
@@ -491,6 +492,7 @@
 				);
 				PRODUCT_NAME = rholib;
 				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
 				SYMROOT = ../build;
 				USER_HEADER_SEARCH_PATHS = "../../shared/curl/include ../../shared";
 			};
@@ -552,6 +554,7 @@
 				);
 				PRODUCT_NAME = rholib;
 				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
 				SYMROOT = ../build;
 				USER_HEADER_SEARCH_PATHS = "../../shared/curl/include ../../shared";
 			};

data/platform/iphone/curl/curl.xcodeproj/project.pbxproj

@@ -643,7 +643,11 @@
 			isa = PBXProject;
 			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "curl" */;
 			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				en,
+			);
 			mainGroup = 08FB7794FE84155DC02AAC07 /* curl */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -757,7 +761,9 @@
 				);
 				PRODUCT_NAME = curl;
 				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
 				SYMROOT = ../build;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -775,7 +781,9 @@
 				);
 				PRODUCT_NAME = curl;
 				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
 				SYMROOT = ../build;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};
@@ -834,7 +842,9 @@
 				);
 				PRODUCT_NAME = curl;
 				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
 				SYMROOT = ../build;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Distribution;
 		};

data/platform/iphone/rhoextlib/rhoextlib.xcodeproj/project.pbxproj

@@ -119,7 +119,11 @@
 			isa = PBXProject;
 			buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "rhoextlib" */;
 			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				en,
+			);
 			mainGroup = 0867D691FE84028FC02AAC07 /* rhoextlib */;
 			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
 			projectDirPath = "";
@@ -161,6 +165,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = rhoextlib;
 				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -179,6 +184,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = rhoextlib;
 				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -249,6 +255,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = rhoextlib;
 				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Distribution;

data/platform/iphone/rhorubylib/rhorubylib.xcodeproj/project.pbxproj

@@ -834,6 +834,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = rhorubylib;
 				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
 				SYMROOT = ../build;
 			};
 			name = Debug;
@@ -855,6 +856,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = rhorubylib;
 				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
 				SYMROOT = ../build;
 			};
 			name = Release;
@@ -917,6 +919,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = rhorubylib;
 				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
 				SYMROOT = ../build;
 			};
 			name = Distribution;

data/platform/iphone/rhosynclib/rhosynclib.xcodeproj/project.pbxproj

@@ -255,7 +255,11 @@
 			isa = PBXProject;
 			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "rhosynclib" */;
 			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				en,
+			);
 			mainGroup = 08FB7794FE84155DC02AAC07 /* rhosynclib */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -311,6 +315,7 @@
 				);
 				PRODUCT_NAME = rhosynclib;
 				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
 			};
 			name = Debug;
 		};
@@ -329,6 +334,7 @@
 				);
 				PRODUCT_NAME = rhosynclib;
 				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
 			};
 			name = Release;
 		};
@@ -393,6 +399,7 @@
 				);
 				PRODUCT_NAME = rhosynclib;
 				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
 			};
 			name = Distribution;
 		};

data/platform/shared/common/RhodesAppBase.cpp

@@ -52,17 +52,11 @@ String CRhodesAppBase::canonicalizeRhoUrl(const String& strUrl)
     if (strUrl.length() == 0 )
         return m_strHomeUrl;
 
-    if ( strncmp("http://", strUrl.c_str(), 7 ) == 0 ||
-        strncmp("https://", strUrl.c_str(), 8 ) == 0 ||
-        strncmp("javascript:", strUrl.c_str(), 11 ) == 0 ||
-        strncmp("mailto:", strUrl.c_str(), 7) == 0 ||
-        strncmp("tel:", strUrl.c_str(), 4) == 0 ||
-        strncmp("wtai:", strUrl.c_str(), 5) == 0 ||
-        strncmp("sms:", strUrl.c_str(), 4) == 0
-        )
-        return strUrl;
-
-    return CFilePath::join(m_strHomeUrl,strUrl);
+    size_t pos = strUrl.find_first_of(":#");
+    if((pos == String::npos) || (strUrl.at(pos) == '#'))
+        return CFilePath::join(m_strHomeUrl,strUrl);
+
+    return strUrl;
 }
 
 } //namespace common

data/platform/shared/sync/SyncEngine.cpp

@@ -446,7 +446,7 @@ void CSyncEngine::checkSourceAssociations()
 {
     Hashtable<String, int> hashPassed;
     
-    for( int nCurSrc = m_sources.size()-1; nCurSrc > 0 ; )
+    for( int nCurSrc = m_sources.size()-1; nCurSrc >= 0 ; )
     {
         CSyncSource& oCurSrc = *(m_sources.elementAt(nCurSrc));
         if ( oCurSrc.getAssociations().size() == 0 || hashPassed.containsKey(oCurSrc.getName()) )
@@ -458,6 +458,9 @@ void CSyncEngine::checkSourceAssociations()
             {
                 const CSyncSource::CAssociation& oAssoc = oCurSrc.getAssociations().elementAt(i);
                 int nAssocSrcIndex = findSrcIndex( m_sources, oAssoc.m_strSrcName);
+                if ( nAssocSrcIndex >= 0 )
+                    m_sources.elementAt(nAssocSrcIndex)->addBelongsTo( oAssoc.m_strAttrib, oCurSrc.getID() );
+
                 if ( nAssocSrcIndex >=0 && nAssocSrcIndex < nSrc )
                 {
                     m_sources.removeElementAt( nSrc, false );

data/platform/shared/sync/SyncSource.cpp

@@ -123,9 +123,13 @@ void CSyncSource::sync()
         if ( isEmptyToken() )
             processToken(1);
 
+        syncClientChanges();
+        syncServerChanges();
+/*
         boolean bSyncedServer = syncClientChanges();
         if ( !bSyncedServer )
             syncServerChanges();
+*/
     }
 
     CTimeInterval endTime = CTimeInterval::getCurrentTime();
@@ -137,6 +141,22 @@ void CSyncSource::sync()
                          getID() );
 }
 
+void CSyncSource::syncClientChanges()
+{
+  	PROF_START("Pull");
+
+    boolean bSyncClient  = true;
+    {
+        IDBResult res = getDB().executeSQL("SELECT object FROM changed_values WHERE source_id=? and sent<=1 LIMIT 1 OFFSET 0", getID());
+        bSyncClient = !res.isEnd();
+    }
+    if ( bSyncClient )
+        doSyncClientChanges();
+
+    PROF_STOP("Pull");
+}
+
+/*
 boolean CSyncSource::syncClientChanges()
 {
     boolean bSyncedServer = false;
@@ -177,6 +197,66 @@ boolean CSyncSource::isPendingClientChanges()
 {
     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.isEnd();
+}*/
+
+void CSyncSource::addBelongsTo(const String& strAttrib, int nSrcID)
+{
+    m_hashBelongsTo.put(strAttrib, nSrcID);
+}
+
+int CSyncSource::getBelongsToSrcID(const String& strAttrib)
+{
+    if ( m_hashBelongsTo.containsKey(strAttrib) )
+        return m_hashBelongsTo.get(strAttrib);
+
+    return -1;
+}
+
+void CSyncSource::checkIgnorePushObjects()
+{
+    // ignore changes in pending creates
+    {
+        IDBResult res = getDB().executeSQL("SELECT distinct(object) FROM changed_values where source_id=? and sent>=2", getID() );
+        for( ; !res.isEnd(); res.next() )
+        {
+            String strObject = res.getStringByIdx(0);
+            m_hashIgnorePushObjects.put(strObject, 1);
+        }
+    }
+
+    //check for belongs_to
+    String strAttribQuests = "";
+    Vector<String> arValues;
+    arValues.addElement(convertToStringA(getID()));
+    for ( Hashtable<String,int>::iterator it = m_hashBelongsTo.begin();  it != m_hashBelongsTo.end(); ++it )
+    {
+        if ( strAttribQuests.length() > 0 )
+            strAttribQuests += ",";
+
+        strAttribQuests += "?";
+        arValues.addElement(it->first);
+    }
+
+    if ( strAttribQuests.length() > 0 )
+    {
+        IDBResult res = getDB().executeSQLEx( (String("SELECT object, attrib, value FROM changed_values where source_id=? and sent<=1 and attrib IN ( ") + strAttribQuests + " )").c_str(), 
+             arValues );
+
+        for( ; !res.isEnd(); res.next() )
+        {
+            String strObject = res.getStringByIdx(0);
+            String strAttrib = res.getStringByIdx(1);
+            String strValue = res.getStringByIdx(2);
+
+            IDBResult res2 = getDB().executeSQL(
+                "SELECT object FROM changed_values where source_id=? and sent>=2 and object=? LIMIT 1 OFFSET 0", 
+                getBelongsToSrcID(strAttrib), strValue );
+            
+            if (!res2.isEnd())
+                m_hashIgnorePushObjects.put(strObject, 1);
+
+        }
+    }
 }
 
 void CSyncSource::doSyncClientChanges()
@@ -189,6 +269,10 @@ void CSyncSource::doSyncClientChanges()
     String strBody = "{\"source_name\":" + CJSONEntry::quoteValue(getName()) + ",\"client_id\":" + CJSONEntry::quoteValue(getSync().getClientID());
     boolean bSend = false;
     int i = 0;
+
+    getDB().Lock();
+    checkIgnorePushObjects();
+
     for( i = 0; i < 3 && getSync().isContinueSync(); i++ )
     {
         String strBody1;
@@ -215,6 +299,8 @@ void CSyncSource::doSyncClientChanges()
     }
     strBody += "}";
 
+    getDB().Unlock();
+
     if ( bSend )
     {
         LOG(INFO) + "Push client changes to server. Source: " + getName() + "Size :" + strBody.length();
@@ -308,6 +394,9 @@ void CSyncSource::makePushBody_Ver3(String& strBody, const String& strUpdateType
         String value = res.getStringByIdx(2);
         String attribType = res.getStringByIdx(3);
 
+        if ( m_hashIgnorePushObjects.containsKey(strObject) )
+            continue;
+
         if ( attribType.compare("blob.file") == 0 )
         {
             CMultipartItem* pItem = new CMultipartItem();

data/platform/shared/sync/SyncSource.h

@@ -62,6 +62,8 @@ private:
     Vector<CAssociation> m_arAssociations;
     VectorPtr<net::CMultipartItem*> m_arMultipartItems;
     Vector<String>                  m_arBlobAttrs;
+    Hashtable<String,int>           m_hashIgnorePushObjects;
+    Hashtable<String,int>           m_hashBelongsTo;
 
 public:
     int m_nErrCode;
@@ -70,7 +72,7 @@ public:
 public:
     CSyncSource(int id, const String& strName, const String& strSyncType, db::CDBAdapter& db, CSyncEngine& syncEngine );
     virtual void sync();
-    virtual boolean syncClientChanges();
+    virtual void syncClientChanges();
 
     int getID()const { return m_nID; }
     String getName() { return m_strName; }
@@ -100,7 +102,11 @@ public:
     CSyncSource(CSyncEngine& syncEngine, db::CDBAdapter& db );
 
     void doSyncClientChanges();
-    boolean isPendingClientChanges();
+    void checkIgnorePushObjects();
+    int    getBelongsToSrcID(const String& strAttrib);
+    void   addBelongsTo(const String& strAttrib, int nSrcID);
+
+    //boolean isPendingClientChanges();
 
     void syncServerChanges();
     void makePushBody_Ver3(String& strBody, const String& strUpdateType, boolean isSync);

data/platform/wm/rhodes.sln

@@ -30,12 +30,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "syncengine", "syncengine\sy
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tcmalloc", "tcmalloc\tcmalloc.vcproj", "{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}"
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RhoLib", "RhoLib\RhoLib.vcproj", "{F196A418-11F1-4067-9F4F-BCC7D70E6EC5}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
@@ -210,34 +204,6 @@ Global
 		{6F57C60E-C083-4D46-A3B9-E17948A33518}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
 		{6F57C60E-C083-4D46-A3B9-E17948A33518}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
 		{6F57C60E-C083-4D46-A3B9-E17948A33518}.Release|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Debug|Mixed Platforms.ActiveCfg = Debug|RhodesCE6 (ARMV4I)
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Debug|Mixed Platforms.Build.0 = Debug|RhodesCE6 (ARMV4I)
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Debug|Mixed Platforms.Deploy.0 = Debug|RhodesCE6 (ARMV4I)
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|RhodesCE6 (ARMV4I)
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Debug|RhodesCE6 (ARMV4I).ActiveCfg = Debug|RhodesCE6 (ARMV4I)
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Debug|RhodesCE6 (ARMV4I).Build.0 = Debug|RhodesCE6 (ARMV4I)
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Debug|RhodesCE6 (ARMV4I).Deploy.0 = Debug|RhodesCE6 (ARMV4I)
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|RhodesCE6 (ARMV4I)
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Debug|Win32.Build.0 = Debug|Win32
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Release|Mixed Platforms.ActiveCfg = Release|RhodesCE6 (ARMV4I)
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Release|Mixed Platforms.Build.0 = Release|RhodesCE6 (ARMV4I)
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Release|Mixed Platforms.Deploy.0 = Release|RhodesCE6 (ARMV4I)
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|RhodesCE6 (ARMV4I)
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Release|RhodesCE6 (ARMV4I).ActiveCfg = Release|RhodesCE6 (ARMV4I)
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Release|RhodesCE6 (ARMV4I).Build.0 = Release|RhodesCE6 (ARMV4I)
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Release|RhodesCE6 (ARMV4I).Deploy.0 = Release|RhodesCE6 (ARMV4I)
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|RhodesCE6 (ARMV4I)
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Release|Win32.ActiveCfg = Release|Win32
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Release|Win32.Build.0 = Release|Win32
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{DCD9FEEA-AEB5-4787-AF75-B8D66C1CDC3B}.Release|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
 		{F196A418-11F1-4067-9F4F-BCC7D70E6EC5}.Debug|Mixed Platforms.ActiveCfg = Debug|RhodesCE6 (ARMV4I)
 		{F196A418-11F1-4067-9F4F-BCC7D70E6EC5}.Debug|Mixed Platforms.Build.0 = Debug|RhodesCE6 (ARMV4I)
 		{F196A418-11F1-4067-9F4F-BCC7D70E6EC5}.Debug|Mixed Platforms.Deploy.0 = Debug|RhodesCE6 (ARMV4I)

data/rhodes.gemspec

@@ -3,7 +3,7 @@ require "lib/rhodes.rb"
 
 Gem::Specification.new do |s|
   s.name = %q{rhodes}
-  s.version = Rhodes::VERSION
+  s.version = "2.4.1.beta.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rhomobile"]

data/spec/phone_spec/app/spec/syncengine_spec.rb

@@ -100,6 +100,7 @@ if !defined?(RHO_WP7)
     Rho::RhoConfig.syncserver.should == saveSrv
   end
 end
+
   it "should not sync without login" do
     SyncEngine.logged_in.should == 0
   
@@ -107,6 +108,7 @@ end
     res['error_code'].to_i.should == ::Rho::RhoError::ERR_CLIENTISNOTLOGGEDIN
 
   end
+
 =begin
   it "should update sources from database" do
     uniq_sources = Rho::RhoConfig::sources.values  
@@ -636,6 +638,102 @@ end
     
   end
 
+  it "should NOT push pending created objects" do
+    item = getProduct.create({:name => 'Test', :brand => "Rho"})
+    records = getTestDB().select_from_table('changed_values','*', 'update_type' => 'create')
+    records.length.should == 1
+    records[0]['attrib'].should == 'object'
+
+    err_resp = "[{\"version\":3},{\"token\":\"\"},{\"count\":0},{\"progress_count\":0},{\"total_count\":0},{\"create-error\":{\"" + item.object + "\":{\"name\":\"wrongname\",\"an_attribute\":\"error create\"},\"" + item.object + "-error\":{\"message\":\"error create\"}}}]"
+    
+    SyncEngine.set_source_property(getProduct().get_source_id.to_i(), "rho_server_response", err_resp )    
+    res = ::Rho::RhoSupport::parse_query_parameters getProduct.sync( "/app/Settings/sync_notify")
+
+    item.update_attributes({:price => "123"})
+
+    records2 = getTestDB().select_from_table('changed_values','*', 'update_type' => 'create')
+    records2.length.should == ($spec_settings[:schema_model] ? 7 : 2)
+
+    records2 = getTestDB().select_from_table('changed_values','*', {'update_type' => 'create', "sent"=>0})
+    records2.length.should == 0
+
+    records3 = getTestDB().select_from_table('changed_values','*', {'update_type' => 'update', "sent"=>0})
+    records3.length.should == 1
+
+    SyncEngine.set_source_property(getProduct().get_source_id.to_i(), "rho_server_response", err_resp )    
+    res = ::Rho::RhoSupport::parse_query_parameters getProduct.sync( "/app/Settings/sync_notify")
+
+    records3 = getTestDB().select_from_table('changed_values','*', {'update_type' => 'update', "sent"=>1})
+    records3.length.should == 1
+    
+  end
+
+  it "should push when pending created objects" do
+    item = getProduct.create({:name => 'Test', :brand => "Rho"})
+    records = getTestDB().select_from_table('changed_values','*', 'update_type' => 'create')
+    records.length.should == 1
+    records[0]['attrib'].should == 'object'
+
+    err_resp = "[{\"version\":3},{\"token\":\"\"},{\"count\":0},{\"progress_count\":0},{\"total_count\":0},{\"create-error\":{\"" + item.object + "\":{\"name\":\"wrongname\",\"an_attribute\":\"error create\"},\"" + item.object + "-error\":{\"message\":\"error create\"}}}]"
+    
+    SyncEngine.set_source_property(getProduct().get_source_id.to_i(), "rho_server_response", err_resp )    
+    res = ::Rho::RhoSupport::parse_query_parameters getProduct.sync( "/app/Settings/sync_notify")
+
+    item2 = getProduct.create({:name => 'Test2', :brand => "Rho2"})
+    records2 = getTestDB().select_from_table('changed_values','*', {'update_type' => 'create', "sent"=>0} )
+    records2.length.should == 1
+    records2[0]['attrib'].should == 'object'
+
+    SyncEngine.set_source_property(getProduct().get_source_id.to_i(), "rho_server_response", "" )    
+    res = ::Rho::RhoSupport::parse_query_parameters getProduct.sync( "/app/Settings/sync_notify")
+    res['status'].should == 'ok'
+    res['error_code'].to_i.should == ::Rho::RhoError::ERR_NONE
+
+    records2 = getTestDB().select_from_table('changed_values','*')
+    records2.length.should == 0
+
+    item3 = getProduct.find(item2.object)
+    item3.should be_nil
+    
+  end
+
+  it "should NOT push when children pending created objects" do
+    cust1 = getCustomer.create( {:first => "CustTest1"})
+    cust2 = getCustomer.create( {:first => "CustTest2"})
+    
+    @product_test_name = Rho::RhoConfig.generate_id().to_s
+    item = getProduct.create({:name => @product_test_name, :quantity => cust1.object, :sku => cust2.object})
+    item2 = getProduct.find(item.object)
+    item2.vars.should == item.vars
+    
+    err_resp = "[{\"version\":3},{\"token\":\"\"},{\"count\":0},{\"progress_count\":0},{\"total_count\":0},{\"create-error\":{\"" + cust1.object + "\":{\"name\":\"wrongname\",\"an_attribute\":\"error create\"},\"" + cust1.object + "-error\":{\"message\":\"error create\"}}}]"
+    SyncEngine.set_source_property(getCustomer().get_source_id.to_i(), "rho_server_response", err_resp )    
+    res = ::Rho::RhoSupport::parse_query_parameters getCustomer.sync( "/app/Settings/sync_notify")
+
+    records2 = getTestDB().select_from_table('changed_values','*', {'update_type' => 'create', 
+        'source_id'=>getCustomer().get_source_id.to_i(), 'sent'=>2})
+    records2.length.should > 0
+    records2 = getTestDB().select_from_table('changed_values','*', {'update_type' => 'create', 
+        'source_id'=>getProduct().get_source_id.to_i(), 'sent'=>0})
+    records2.length.should > 0
+
+    SyncEngine.set_source_property(getCustomer().get_source_id.to_i(), "rho_server_response", "" )    
+    res = ::Rho::RhoSupport::parse_query_parameters getProduct.sync( "/app/Settings/sync_notify")
+    res['status'].should == 'ok'
+    res['error_code'].to_i.should == ::Rho::RhoError::ERR_NONE
+
+    getTestDB().select_from_table('changed_values','*')
+    records2 = getTestDB().select_from_table('changed_values','*', {'update_type' => 'create', 
+        'source_id'=>getCustomer().get_source_id.to_i(), 'sent'=>2})
+    records2.length.should > 0
+    records2 = getTestDB().select_from_table('changed_values','*', {'update_type' => 'create', 
+        'source_id'=>getProduct().get_source_id.to_i(), 'sent'=>1})
+    records2.length.should > 0
+
+    item2 = getProduct.find(item.object)
+    item2.vars.should_not be_nil
+  end
+          
   it "should logout" do
     SyncEngine.logout()
   

data/spec/phone_spec/build.yml

@@ -1,6 +1,6 @@
 --- 
 name: phone_spec
-bbver: 5.0
+bbver: 6.0
 sdk: /Users/crystax/work/rhomobile/rhodes
 #applog: rholog.txt
 version: 1.0.0

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 62196393
+  prerelease: 6
   segments: 
   - 2
   - 4
-  - 0
-  version: 2.4.0
+  - 1
+  - beta
+  - 1
+  version: 2.4.1.beta.1
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 -07:00
-default_executable: 
+date: 2011-04-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: templater
@@ -6268,7 +6269,6 @@ files:
 - spec/phone_spec/Rakefile
 - spec/phone_spec/rhoconfig.txt
 - spec/phone_spec/server.rb
-has_rdoc: true
 homepage: http://www.rhomobile.com
 licenses: []
 
@@ -6299,7 +6299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rhodes
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 2
 summary: The Rhodes framework is the easiest way to develop NATIVE apps with full device capabilities (GPS, PIM, camera, etc.) for any smartphone.