rhoconnect-client 5.5.2 → 5.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d85fe275d20b5e252bc6a2c8a1fa47c07f64e7f
-  data.tar.gz: 083ae8b533f16f59ba9f15111c0176c8a7312f95
+  metadata.gz: b5869ebe10a85d3053d6329261a284194f517820
+  data.tar.gz: b68d84b90dc53b59dbfa30926fd7fdd40cbdf40e
 SHA512:
-  metadata.gz: e3b2bc0337f2a50eedbdaf2b0345a2155bdf30737c84f67cfdfe2d5a75f309feec3e8d6fdeaf7143f276b9121ef0b0cb2eb6a1fc027817df4df40d8c2a7a33de
-  data.tar.gz: 8b80b3e17e5e8225aed80f1ef38732560a5285f9f9c4878a6566513300efbe8af1ad5c93a62d2fda443cd90c555b5b9062082c04a1b1f5c49b3113c01431007f
+  metadata.gz: 7ae37c2b91b684e5178c9f854ba4ec2ddb751f9dde49a2650b12c6ec52d04d5640816dd8564d91998d18c7dd6bad3e61d2ec747b1746b3bd5007ca56c9bd49eb
+  data.tar.gz: 3251fd5755d925338d2f86b67f460bc1ceca3d2d63ac5b63a221edf8392049aa2ff734507210b76b61d626bc6e574e9c4d46bafa8dd75df6c115bb6d636033ee

data/ext/rhoconnect-client/ext/shared/sync/ClientRegister.cpp

@@ -239,9 +239,12 @@ String CClientRegister::getRegisterBody(const String& strClientID)
 
     int port = RHOCONF().getInt("push_port");
 
+    String appId = RHOCONF().getString("rho_app_id");
+    String appVer = RHOCONF().getString("app_version");
+
 	String body = CSyncThread::getSyncEngine().getProtocol().getClientRegisterBody( strClientID, m_strDevicePin,
 		port > 0 ? port : DEFAULT_PUSH_PORT, rho_rhodesapp_getplatform(), rho::System::getPhoneId(),
-		                strPushType);
+		                strPushType, appId, appVer);
 
 	LOG(INFO)+"getRegisterBody() BODY is: " + body;
 	return body;
@@ -249,7 +252,7 @@ String CClientRegister::getRegisterBody(const String& strClientID)
     
 String CClientRegister::getUnregisterBody(const String& strClientID)
 {    
-	String body = CSyncThread::getSyncEngine().getProtocol().getClientRegisterBody( strClientID, "", 0, "", "", "" );
+	String body = CSyncThread::getSyncEngine().getProtocol().getClientRegisterBody( strClientID, "", 0, "", "", "", "", "" );
 	LOG(INFO)+"getUnregisterBody() BODY is: " + body;
 	return body;
 }
@@ -279,19 +282,21 @@ boolean CClientRegister::doRegister(CSyncEngine& oSync)
         LOG(WARNING)+"Sync client_id is empty, do register later";
 		return false;
 	}
-    
-    IDBResult res = CDBAdapter::getUserDB().executeSQL("SELECT token,token_sent from client_info");
-    if ( !res.isEnd() ) {
-		String token = res.getStringByIdx(0); 
-		int token_sent = res.getIntByIdx(1) && !RHOCONF().getBool("register_push_at_startup");
-                
-		if ( m_strDevicePin.compare(token) == 0 && token_sent > 0 ) 
-		{
-			//token in db same as new one and it was already send to the server
-			//so we do nothing
+    {
+        // IDBResult hold mutex of DB - we should free it ASAP
+        IDBResult res = CDBAdapter::getUserDB().executeSQL("SELECT token,token_sent from client_info");
+        if ( !res.isEnd() ) {
+            String token = res.getStringByIdx(0);
+            int token_sent = res.getIntByIdx(1) && !RHOCONF().getBool("register_push_at_startup");
             
-			return true; 
-		}
+            if ( m_strDevicePin.compare(token) == 0 && token_sent > 0 )
+            {
+                //token in db same as new one and it was already send to the server
+                //so we do nothing
+                
+                return true; 
+            }
+        }
     }
     
 	String strBody = getRegisterBody(client_id);

data/ext/rhoconnect-client/ext/shared/sync/ISyncProtocol.h

@@ -68,7 +68,7 @@ struct ISyncProtocol
     virtual String getClientCreateUrl() = 0;
 
     virtual String getClientRegisterUrl(const String& strClientID) = 0;
-	virtual String getClientRegisterBody(const String& strClientID, const String& strPin, int nPort, const String& strType, const String& strPhoneID, const String& strDevicePushType = "") = 0;
+	virtual String getClientRegisterBody(const String& strClientID, const String& strPin, int nPort, const String& strType, const String& strPhoneID, const String& strDevicePushType = "", const String& strAppId = "", const String& strAppVersion = "") = 0;
 	virtual String getClientAnsRegisterBody(const String& strClientID, const String& strPin, int nPort, const String& strType, const String& strPhoneID ) = 0;
 
     virtual const char* getClientResetMethod() = 0;

data/ext/rhoconnect-client/ext/shared/sync/SyncProtocol_3.h

@@ -98,7 +98,7 @@ struct CSyncProtocol_3 : public ISyncProtocol
         return RHOCONF().getPath("syncserver") + "clientregister";
     }
 
-    String getClientRegisterBody( const String& strClientID, const String& strPin, int nPort, const String& strType, const String& strPhoneID, const String& strDevicePushType)
+    String getClientRegisterBody( const String& strClientID, const String& strPin, int nPort, const String& strType, const String& strPhoneID, const String& strDevicePushType, const String&, const String&)
     {
         return "{\"client_id\":" + json::CJSONEntry::quoteValue(strClientID) + 
             ",\"device_pin\":" + json::CJSONEntry::quoteValue(strPin) +

data/ext/rhoconnect-client/ext/shared/sync/SyncProtocol_4.h

@@ -121,7 +121,16 @@ struct CSyncProtocol_4 : public ISyncProtocol
         return RHOCONF().getPath("syncserver") + getClientNamespaceUrl() + strClientID + "/register";
     }
 
-    String getClientRegisterBody( const String& /*strClientID*/, const String& strPin, int nPort, const String& strType, const String& strPhoneID, const String& strDevicePushType)
+    String getClientRegisterBody( 
+        const String& /*strClientID*/, 
+        const String& strPin, 
+        int nPort, 
+        const String& strType, 
+        const String& strPhoneID, 
+        const String& strDevicePushType,
+        const String& strAppId,
+        const String& strAppVersion
+    )
     {
         String strPort = "";
         if (nPort != 0) {
@@ -133,6 +142,8 @@ struct CSyncProtocol_4 : public ISyncProtocol
             ",\"device_port\":" + json::CJSONEntry::quoteValue(strPort) +
             ",\"device_type\":" + json::CJSONEntry::quoteValue(strType) +
             ",\"device_push_type\":" + json::CJSONEntry::quoteValue(strDevicePushType) +
+            ",\"device_app_id\":" + json::CJSONEntry::quoteValue(strAppId) +
+            ",\"device_app_version\":" + json::CJSONEntry::quoteValue(strAppVersion) +
             "}";
     }
 

data/ext/rhoconnect-client/ext/shared/sync/SyncSource.cpp

@@ -327,7 +327,13 @@ void CSyncSource::doSyncClientChanges()
     int i = 0;
 
     getDB().Lock();
+    
+    // add file.blob attrib_type for blob attribs in changed_values
+    getDB().updateAllBlobAttribChanges();
+    
+    // unpack object in changed_values with update_type==create to set of objects's attribs
     getDB().updateAllAttribChanges();
+    
     checkIgnorePushObjects();
     if ( getSync().getSourceOptions().getBoolProperty(getID(), "full_update") )
         getDB().updateFullUpdateChanges( getID() );

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhoconnect-client
 version: !ruby/object:Gem::Version
-  version: 5.5.2
+  version: 5.5.15
 platform: ruby
 authors:
 - Rhomobile Dev Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies: []
 description: RhoConnect client extension
 email: rhomobile@googlegroups.com