rhodes 3.4.2 → 3.5.1.12

data/platform/shared/sync/ClientRegister.h

@@ -29,12 +29,14 @@
 
 #include "logging/RhoLog.h"
 #include "common/RhoThread.h"
+#include "common/RhoStd.h"
 #include "net/INetRequest.h"
 #include "common/IRhoClassFactory.h"
 
 namespace rho{
 namespace sync{
 
+class ILoginListener;
 class CSyncEngine;
 
 #define WAIT_BEFOREKILL_SECONDS  3
@@ -42,33 +44,44 @@ class CSyncEngine;
 #define POLL_INTERVAL_INFINITE (unsigned int)(-1)
 #define DEFAULT_PUSH_PORT 100
 
-class CClientRegister : public common::CRhoThread
+class CClientRegister : protected common::CRhoThread
 {
     DEFINE_LOGCLASS;
 
-	static CClientRegister* m_pInstance;
-	NetRequest              m_NetRequest;
-	String                  m_strDevicePin;
+    static CClientRegister* m_pInstance;
+    static bool s_sslVerifyPeer;
+    static VectorPtr<ILoginListener*> s_loginListeners;
+
+    NetRequest              m_NetRequest;
+    String                  m_strDevicePin;
     unsigned int            m_nPollInterval;
-	bool m_isAns;
 public:
-    static CClientRegister* Create(const char* device_pin, bool isAns = false);
+    static void SetSslVerifyPeer(boolean b);
+    static void AddLoginListener(ILoginListener* listener);
+    static CClientRegister* Get();
+    static CClientRegister* Create();
+    static CClientRegister* Create(const String& devicePin);
+    static void Stop();
     static void Destroy();
-	static CClientRegister* getInstance() { return m_pInstance; }
-	
-	virtual void run();	
+    static CClientRegister* getInstance() { return m_pInstance; }
 
-    const String& getDevicePin(){return m_strDevicePin;}
-
-    String getRegisterBody(const String& strClientID);
+    void setRhoconnectCredentials(const String& user, const String& pass, const String& session);
+    void dropRhoconnectCredentials(const String& session);
+    void setDevicehPin(const String& pin);
+    const String& getDevicePin() const { return m_strDevicePin; }
 
     void startUp();
 
-    void setSslVerifyPeer(boolean b){m_NetRequest.setSslVerifyPeer(b);}
+protected:
+    virtual void run();
+
 private:
-	CClientRegister(const char* device_pin, const bool isAns = false);
+    String getRegisterBody(const String& strClientID);
+
+    CClientRegister();
     ~CClientRegister();
 
+    void doStop();
     boolean doRegister(CSyncEngine& oSync);
     net::CNetRequestWrapper getNet(){ return getNetRequest(&m_NetRequest); }
 
@@ -83,8 +96,6 @@ extern "C" {
 #endif //__cplusplus
 	
 void rho_clientregister_create(const char* szDevicePin);
-void rho_clientansregister_create(const char* szDevicePin);
-void rho_clientregister_destroy();
 
 #ifdef __cplusplus
 };

data/platform/shared/sync/ILoginListener.h

@@ -0,0 +1,44 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+*
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+*
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+#pragma once
+
+#include "common/RhoStd.h"
+
+namespace rho {
+namespace sync {
+
+class CSyncEngine;
+
+class ILoginListener {
+public:
+    virtual ~ILoginListener() {}
+    virtual void onLogin(const String& user, const String& pass, const String& session) const = 0;
+    virtual void onLogout(const String& session) const = 0;
+};
+
+
+}}

data/platform/shared/sync/SyncEngine.cpp

@@ -76,8 +76,7 @@ void CSyncEngine::setSslVerifyPeer(boolean b)
     m_NetRequest.setSslVerifyPeer(b); 
     m_NetRequestClientID.setSslVerifyPeer(b); 
 
-    if ( CClientRegister::getInstance() != null )
-        CClientRegister::getInstance()->setSslVerifyPeer(b);
+    CClientRegister::SetSslVerifyPeer(b);
 }
 
 void CSyncEngine::CSourceOptions::setProperty(int nSrcID, const char* szPropName, const char* szPropValue)
@@ -125,7 +124,15 @@ int CSyncEngine::CSourceOptions::getIntProperty(int nSrcID, const char* szPropNa
 
     return strValue.length() ? atoi(strValue.c_str()) : 0;
 }
-
+	
+void CSyncEngine::CSourceOptions::clearProperties()
+{
+	synchronized(m_mxSrcOptions)
+	{
+		m_hashSrcOptions.clear();
+	}
+}
+	
 void CSyncEngine::prepareSync(ESyncState eState, const CSourceID* oSrcID)
 {
     setState(eState);
@@ -169,7 +176,7 @@ void CSyncEngine::prepareSync(ESyncState eState, const CSourceID* oSrcID)
     stopSync();
 }
 
-void CSyncEngine::doSyncAllSources(const String& strQueryParams)
+void CSyncEngine::doSyncAllSources(const String& strQueryParams, boolean bSyncOnlyChangedSources)
 {
     prepareSync(esSyncAllSources, null);
 
@@ -183,7 +190,7 @@ void CSyncEngine::doSyncAllSources(const String& strQueryParams)
 	    PROF_CREATE_COUNTER("Pull");
 	    PROF_START("Sync");
 
-        syncAllSources(strQueryParams);
+        syncAllSources(strQueryParams, bSyncOnlyChangedSources);
 
 	    PROF_DESTROY_COUNTER("Net");	    
 	    PROF_DESTROY_COUNTER("Parse");
@@ -548,9 +555,6 @@ String CSyncEngine::loadClientID()
             else
                 getUserDB().executeSQL("INSERT INTO client_info (client_id) values (?)", clientID);
 
-            if ( CClientRegister::getInstance() != null )
-                CClientRegister::getInstance()->startUp();
-
         }else if ( bResetClient )
         {
     	    if ( !resetClientIDByNet(clientID) )
@@ -710,13 +714,24 @@ void CSyncEngine::loadBulkPartition(const String& strPartition )
     db::CDBAdapter& dbPartition = getDB(strPartition); 
     String serverUrl = RHOCONF().getPath("syncserver");
     String strUrl = serverUrl + "bulk_data";
-    String strQuery = "?client_id=" + m_clientID + "&partition=" + strPartition + "&sources=";
+	
+	//old code
+    String strQuery = "?client_id=" + m_clientID + "&partition=" + strPartition + "&sources=";	
 	for ( int i = 0; i < (int)m_sources.size(); ++i ) {
 		strQuery += URI::urlEncode(m_sources[i]->getName());
 		if ( i < (int)m_sources.size()-1 ) {
 			strQuery += ",";
 		}
 	}
+		
+	//new code
+/*
+    String strQuery = "?client_id=" + m_clientID + "&partition=" + strPartition;
+	for ( int i = 0; i < (int)m_sources.size(); ++i ) {
+		strQuery += "&sources[]=";
+		strQuery += URI::urlEncode(m_sources[i]->getName());
+	}	
+*/	
     String strDataUrl = "", strCmd = "", strCryptKey = "";
 
   	getNotify().fireBulkSyncNotification(false, "start", strPartition, RhoAppAdapter.ERR_NONE);
@@ -798,6 +813,7 @@ void CSyncEngine::loadBulkPartition(const String& strPartition )
    	getNotify().fireBulkSyncNotification(false, "change_db", strPartition, RhoAppAdapter.ERR_NONE);
     
     dbPartition.setBulkSyncDB(fDataName, strCryptKey);
+	getSourceOptions().clearProperties();
     processServerSources(String("{\"partition\":\"") + strPartition + "\"}");
 
 	LOG(INFO) + "Bulk sync: end change db";
@@ -838,7 +854,7 @@ int CSyncEngine::getStartSource()
     return -1;
 }*/
 
-void CSyncEngine::syncOneSource(int i, const String& strQueryParams)
+void CSyncEngine::syncOneSource(int i, const String& strQueryParams, boolean syncOnlyIfChanged)
 {
     CSyncSource& src = *m_sources.elementAt(i);
     if ( src.getSyncType().compare("bulk_sync_only")==0 )
@@ -847,7 +863,13 @@ void CSyncEngine::syncOneSource(int i, const String& strQueryParams)
     if ( isSessionExist() && getState() != esStop )
     {
         src.m_strQueryParams = strQueryParams;
-        src.sync();
+		if (syncOnlyIfChanged) {
+			if (src.haveChangedValues() ) {
+				src.sync();
+			}
+		} else {
+			src.sync();
+		}
     }
 
     getNotify().onSyncSourceEnd(i, m_sources);
@@ -855,7 +877,7 @@ void CSyncEngine::syncOneSource(int i, const String& strQueryParams)
 //    return src.m_nErrCode == RhoAppAdapter.ERR_NONE;
 }
 
-void CSyncEngine::syncAllSources(const String& strQueryParams)
+void CSyncEngine::syncAllSources(const String& strQueryParams, boolean bSyncOnlyChangedSources)
 {
 //    boolean bError = false;
 
@@ -865,7 +887,7 @@ void CSyncEngine::syncAllSources(const String& strQueryParams)
 
     for( int i = 0; i < (int)m_sources.size() && isContinueSync(); i++ )
     {
-        /*bError = !*/syncOneSource(i, strQueryParams);
+        /*bError = !*/syncOneSource(i, strQueryParams, bSyncOnlyChangedSources);
     }
 
     if ( !isSchemaChanged() && getState() != CSyncEngine::esStop )
@@ -942,11 +964,9 @@ void CSyncEngine::login(String name, String password, const CSyncNotification& o
 	
     PROF_STOP("Login");
 
-    if ( CClientRegister::getInstance() != null )
-    {
-        getUserDB().executeSQL("UPDATE client_info SET token_sent=?", 0 );
-        CClientRegister::getInstance()->startUp();
-    }
+    getUserDB().executeSQL("UPDATE client_info SET token_sent=?", 0 );
+    CClientRegister::Get()->setRhoconnectCredentials(name, password, strSession);
+
 	//}catch(Exception exc)
 	//{
 	//	LOG.ERROR("Login failed.", exc);
@@ -966,17 +986,23 @@ boolean CSyncEngine::isLoggedIn()
 
 String CSyncEngine::loadSession()
 {
-    m_strSession = "";
-    IDBResult res = getUserDB().executeSQL("SELECT session FROM client_info");
+    synchronized(m_mxSessionID)
+    {
+        m_strSession = "";
+        IDBResult res = getUserDB().executeSQL("SELECT session FROM client_info");
     
-    if ( !res.isEnd() )
-    	m_strSession = res.getStringByIdx(0);
+        if ( !res.isEnd() )
+    	    m_strSession = res.getStringByIdx(0);
     
-    return m_strSession;
+        return m_strSession;
+    }
 }
 
 void CSyncEngine::logout_int()
 {
+    CClientRegister::Get()->dropRhoconnectCredentials(m_strSession);
+    //CClientRegister::Destroy();
+
     getUserDB().executeSQL( "UPDATE client_info SET session=NULL" );
     m_strSession = "";
 
@@ -988,7 +1014,7 @@ void CSyncEngine::logout()
     stopSync();
     logout_int();
 }
-	
+
 void CSyncEngine::setSyncServer(const char* syncserver)
 {
 	String strOldSrv = RHOCONF().getString("syncserver");

data/platform/shared/sync/SyncEngine.h

@@ -68,6 +68,7 @@ public:
         String getProperty(int nSrcID, const char* szPropName);
         boolean getBoolProperty(int nSrcID, const char* szPropName);
         int getIntProperty(int nSrcID, const char* szPropName);
+		void clearProperties();
     };
 
 private:
@@ -76,7 +77,7 @@ private:
     common::CAutoPtr<ISyncProtocol> m_SyncProtocol;
     ESyncState m_syncState;
     String     m_clientID;
-    common::CMutex m_mxLoadClientID;
+    common::CMutex m_mxLoadClientID, m_mxSessionID;
     String m_strSession;
     CSyncNotify m_oSyncNotify;
     boolean m_bStopByUser;
@@ -96,7 +97,7 @@ public:
     static CSourceOptions& getSourceOptions(){ return m_oSourceOptions; }
     net::CNetRequestWrapper getNet(){ return getNetRequest(&m_NetRequest); }
 
-    void doSyncAllSources(const String& strQueryParams);
+    void doSyncAllSources(const String& strQueryParams, boolean bSyncOnlyChangedSources);
     void doSyncSource(const CSourceID& oSrcID, const String& strQueryParams);
     void doSearch(rho::Vector<rho::String>& arSources, String strParams, String strAction, boolean bSearchSyncChanges, int nProgressStep);
 
@@ -127,7 +128,12 @@ public:
     void setSchemaChanged(boolean bChanged){ m_bIsSchemaChanged = bChanged; }
     boolean isSchemaChanged(){ return m_bIsSchemaChanged; }
 //IRhoSession
-    virtual const String& getSession(){ return m_strSession; }
+    virtual const String& getSession()
+    { 
+        synchronized(m_mxSessionID){
+            return m_strSession;
+        }
+    }
     virtual const String& getContentType(){ return getProtocol().getContentType();}
 
     void loadAllSources();
@@ -166,8 +172,8 @@ private:
     void processServerSources(String strSources);
     void checkSourceAssociations();
 
-    void syncOneSource(int i, const String& strQueryParams);
-    void syncAllSources(const String& strQueryParams);
+    void syncOneSource(int i, const String& strQueryParams, boolean bSyncOnlyIfChanged);
+    void syncAllSources(const String& strQueryParams, boolean bSyncOnlyChangedSources);
 	
 	boolean processBlobs();
 	void loadBulkPartitions();

data/platform/shared/sync/SyncSource.cpp

@@ -150,9 +150,10 @@ void CSyncSource::sync()
 //    {
         if ( isEmptyToken() )
             processToken(1);
+	
+			syncClientChanges();
+			syncServerChanges();		
 
-        syncClientChanges();
-        syncServerChanges();
 /*
         boolean bSyncedServer = syncClientChanges();
         if ( !bSyncedServer )
@@ -180,11 +181,8 @@ 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();
-    }
+    boolean bSyncClient  = haveChangedValues();
+
     if ( bSyncClient )
         doSyncClientChanges();
 
@@ -351,7 +349,7 @@ void CSyncSource::doSyncClientChanges()
     {
         LOG(INFO) + "Push client changes to server. Source: " + getName() + "Size :" + strBody.length();
         if ( !RHOCONF().getBool("log_skip_post") )
-            LOG(INFO) + "Push body: " + strBody;		
+            LOG(TRACE) + "Push body: " + strBody;		
 
         if ( getSync().getSourceOptions().getBoolProperty(getID(), "set_sync_push_body" ) )
             getSync().getSourceOptions().setProperty(getID(), "sync_push_body", strBody.c_str() );
@@ -870,7 +868,7 @@ void CSyncSource::processSyncCommand(const String& strCmd, CJSONEntry oCmdEntry,
         String strObject = objIter.getCurKey();
         CJSONStructIterator attrIter( objIter.getCurValue() );
         if ( m_bSchemaSource )
-            processServerCmd_Ver3_Schema(strCmd,strObject,attrIter);
+            processServerCmd_Ver3_Schema(strCmd,strObject,attrIter,bCheckUIRequest);
         else
         {
             for( ; !attrIter.isEnd(); attrIter.next() )
@@ -878,7 +876,7 @@ void CSyncSource::processSyncCommand(const String& strCmd, CJSONEntry oCmdEntry,
                 String strAttrib = attrIter.getCurKey();
                 String strValue = attrIter.getCurString();
 
-                processServerCmd_Ver3(strCmd,strObject,strAttrib,strValue);
+                processServerCmd_Ver3(strCmd,strObject,strAttrib,strValue,bCheckUIRequest);
             }
         }
 
@@ -947,7 +945,7 @@ void CSyncSource::updateAssociation(const String& strOldObject, const String& st
         strNewObject, strAttrib, getID(), strOldObject );
 }
 
-void CSyncSource::processServerCmd_Ver3_Schema(const String& strCmd, const String& strObject, CJSONStructIterator& attrIter)//throws Exception
+void CSyncSource::processServerCmd_Ver3_Schema(const String& strCmd, const String& strObject, CJSONStructIterator& attrIter, boolean bCheckUIRequest)//throws Exception
 {
     if ( strCmd.compare("insert") == 0 )
     {
@@ -957,13 +955,9 @@ void CSyncSource::processServerCmd_Ver3_Schema(const String& strCmd, const Strin
         {
             CAttrValue oAttrValue(attrIter.getCurKey(),attrIter.getCurString());
 
-            String strFreezedProps = getSync().getSourceOptions().getProperty(getID(), "freezed");
-            if ( strFreezedProps.length() > 0 && strFreezedProps.find(oAttrValue.m_strAttrib) == String::npos )
-            {
-                LOG(INFO) + "Skip Non-exist property : " + oAttrValue.m_strAttrib + ". For model : " + getName();
-                continue;
-            }
-
+    	    if ( bCheckUIRequest && !checkFreezedProps(oAttrValue.m_strAttrib))
+    		    continue;
+			
             if ( !processBlob(strCmd,strObject,oAttrValue) )
                 break;
 
@@ -1140,20 +1134,17 @@ boolean CSyncSource::processServerBlobAttrs() {
 	if ( m_bSchemaSource ) {
 		return true;
 	} else {
-		static const String selAttrsRequest = "SELECT source_attribs,blob_attribs from sources WHERE source_id=?";
-		static const String updAttrsRequest = "UPDATE sources SET source_attribs=?,blob_attribs=? WHERE source_id=?";
-		static const String updObjectsRequest = "UPDATE object_values SET attrib=? WHERE attrib=? and source_id=?";
 		static const String blobSfx = "-rhoblob";
 		
-		db::CDBAdapter& db = getDB();
-		db.startTransaction();
-		IDBResult res = db.executeSQL(selAttrsRequest.c_str(),getID());
+		getDB().startTransaction();
+		IDBResult res = getDB().executeSQL( "SELECT source_attribs,blob_attribs from sources WHERE source_id=?", getID() );
 		
 		Vector<String> attrsToRename;
 		
 		String newAttrs = "";
 		
-		for ( ; !res.isEnd(); res.next() ) {
+		for ( ; !res.isEnd(); res.next() ) 
+        {
 			String attrs = res.getStringByIdx(0);
 			String blobs = res.getStringByIdx(1);
 			
@@ -1166,12 +1157,12 @@ boolean CSyncSource::processServerBlobAttrs() {
 				String attrVal = tokenizer.nextToken();
 				
 				
-				if ( String_endsWith(attrName, blobSfx.c_str() ) ) {
+				if ( String_endsWith( attrName, blobSfx ) ) {
 					if ( blobs.length() > 0 ) {
 						blobs += ",";
 					}
 					blobs += attrName.substr(0,attrName.length()-blobSfx.length()) + "," + attrVal;
-					attrsToRename.push_back(attrName);
+					attrsToRename.addElement(attrName);
 				} else {
 					if (newAttrs.length() > 0 ) {
 						newAttrs += ",";
@@ -1182,32 +1173,35 @@ boolean CSyncSource::processServerBlobAttrs() {
 			
 			LOG(TRACE) + "Updating attributes for source " + getName() + ". Old attribs=" + attrs + ", new attribs=" + newAttrs + ", blob attribs=" + blobs;
 			
-			db.executeSQL(updAttrsRequest.c_str(), newAttrs, blobs, getID() );
+			getDB().executeSQL("UPDATE sources SET source_attribs=?,blob_attribs=? WHERE source_id=?", newAttrs, blobs, getID() );
 		}
 		
-		for ( Vector<String>::const_iterator it = attrsToRename.begin(); it != attrsToRename.end(); ++it ) {
-			LOG(TRACE) + "Updating objects with blob attribute " + (*it) + " for source " + getName();
-			db.executeSQL(updObjectsRequest.c_str(), (*it).substr(0,(*it).length()-blobSfx.length()), *it, getID() );
+		for ( int i = 0; i < (int)attrsToRename.size(); i++ ) 
+		{
+			String strAttr = (String)attrsToRename.elementAt(i);
+			LOG(TRACE) + "Updating objects with blob attribute " + strAttr + " for source " + getName();
+			getDB().executeSQL( "UPDATE object_values SET attrib=? WHERE attrib=? and source_id=?", strAttr.substr( 0, strAttr.length()-blobSfx.length()), strAttr, getID() );
 		}
-		
-		db.endTransaction();
+
+		getDB().endTransaction();
 	}
 	return true;
 }
 
 	
-boolean CSyncSource::processAllBlobs() {
-	
+boolean CSyncSource::processAllBlobs() 
+{
 	if (m_bSchemaSource) {
-		db::CDBAdapter& db = getDB();
-		Vector<String> blobAttrs = db.getAttrMgr().getBlobAttrs( getID() );
-		
-		for ( Vector<String>::const_iterator it = blobAttrs.begin(); it != blobAttrs.end(); ++it ) {
-			String sql = "SELECT object," + (*it) + " FROM " + getName();
+		Vector<String> blobAttrs = getDB().getAttrMgr().getBlobAttrs( getID() );
+
+		for ( int i = 0; i < (int)blobAttrs.size(); i ++ ) 
+		{
+			String strAttr = (String)blobAttrs.elementAt(i);
+			String sql = "SELECT object," + strAttr + " FROM " + getName();
 			
-			IDBResult res = db.executeSQL(sql.c_str());
+			IDBResult res = getDB().executeSQL( sql.c_str() );
 			
-			LOG(TRACE) + "Processing blobs for source " + getName() + ", attribute " + *it;
+			LOG(TRACE) + "Processing blobs for source " + getName() + ", attribute " + strAttr;
 			
 			for ( ; !res.isEnd(); res.next() )
 			{ 
@@ -1216,26 +1210,26 @@ boolean CSyncSource::processAllBlobs() {
 				
 				if ( value.find("://") != String::npos ) {
 					LOG(TRACE) + "Processing remote blob: " + value;
-					CAttrValue attr((*it).c_str(),value.c_str());
+					CAttrValue attr( strAttr, value );
 					if ( !downloadBlob( attr ) ) {
 						return false;
 					}
 					
-					sql = "UPDATE " + getName() + " SET " + (*it) + "=? WHERE object=?";
+					sql = "UPDATE " + getName() + " SET " + strAttr + "=? WHERE object=?";
 					
-					db.executeSQL(sql.c_str(), attr.m_strValue.c_str(), object.c_str() );
+					getDB().executeSQL( sql.c_str(), attr.m_strValue, object  );
 				}
 			}
 		}
 	} else {
-		db::CDBAdapter& db = getDB();
-		Vector<String> blobAttrs = db.getAttrMgr().getBlobAttrs( getID() );
+		Vector<String> blobAttrs = getDB().getAttrMgr().getBlobAttrs( getID() );
 	
-		for ( Vector<String>::const_iterator it = blobAttrs.begin(); it != blobAttrs.end(); ++it ) {
-			const char* attrName = (*it).c_str();
-			IDBResult res = db.executeSQL("SELECT object,value FROM object_values WHERE attrib=? and source_id=?",attrName,getID());
+		for ( int i = 0; i < (int)blobAttrs.size(); i ++ ) 
+		{
+			String strAttr = (String)blobAttrs.elementAt(i);
+			IDBResult res = getDB().executeSQL("SELECT object,value FROM object_values WHERE attrib=? and source_id=?", strAttr, getID());
 		
-			LOG(TRACE) + "Processing blobs for source " + getName() + ", attribute " + *it;
+			LOG(TRACE) + "Processing blobs for source " + getName() + ", attribute " + strAttr;
 		
 			for ( ; !res.isEnd(); res.next() )
 			{ 
@@ -1244,12 +1238,12 @@ boolean CSyncSource::processAllBlobs() {
 			
 				if ( value.find("://") != String::npos ) {
 					LOG(TRACE) + "Processing remote blob: " + value;
-					CAttrValue attr((*it).c_str(),value.c_str());
+					CAttrValue attr( strAttr, value );
 					if ( !downloadBlob( attr ) ) {
 						return false;
 					}
 				
-					db.executeSQL("UPDATE object_values SET value=? where object=? and source_id=? and attrib=?", attr.m_strValue.c_str(), object.c_str(), getID(), attrName);
+					getDB().executeSQL("UPDATE object_values SET value=? where object=? and source_id=? and attrib=?", attr.m_strValue, object, getID(), strAttr);
 				}
 			}
 		}
@@ -1258,18 +1252,44 @@ boolean CSyncSource::processAllBlobs() {
 	return true;
 }
 
-void CSyncSource::processServerCmd_Ver3(const String& strCmd, const String& strObject, const String& strAttriba, const String& strValuea)//throws Exception
+boolean CSyncSource::checkFreezedProps(String strProp)
+{
+	String strFreezedProps = getSync().getSourceOptions().getProperty(getID(), "freezed");
+	
+	if ( strFreezedProps.length() > 0 )
+	{
+		CTokenizer oTokenizer( strFreezedProps, "," );
+		boolean bFound =false;
+		while (oTokenizer.hasMoreTokens() && (!bFound) ) 
+		{
+			String tok = oTokenizer.nextToken();
+			if (tok.length() == 0)
+				continue;
+		
+			if (tok.compare(strProp)==0)
+			{
+				bFound = true;
+			}
+		}
+	
+		if (!bFound)
+		{
+			LOG(INFO) + "Skip Non-exist property : " + strProp + ". For model : " + getName();
+			return false;				
+		}
+	}
+	
+	return true;
+}
+
+void CSyncSource::processServerCmd_Ver3(const String& strCmd, const String& strObject, const String& strAttriba, const String& strValuea, boolean bCheckUIRequest)//throws Exception
 {
     CAttrValue oAttrValue(strAttriba,strValuea);
 
     if ( strCmd.compare("insert") == 0 )
     {
-        String strFreezedProps = getSync().getSourceOptions().getProperty(getID(), "freezed");
-        if ( strFreezedProps.length() > 0 && strFreezedProps.find(oAttrValue.m_strAttrib) == String::npos )
-        {
-            LOG(INFO) + "Skip Non-exist property : " + oAttrValue.m_strAttrib + ". For model : " + getName();
-            return;
-        }
+    	if ( bCheckUIRequest && !checkFreezedProps(oAttrValue.m_strAttrib))
+    		return;
 
         if ( !processBlob(strCmd,strObject,oAttrValue) )
             return;
@@ -1304,7 +1324,7 @@ void CSyncSource::processServerCmd_Ver3(const String& strCmd, const String& strO
         {
             getNotify().onObjectChanged(getID(), strObject, CSyncNotify::enDelete);
             // oo conflicts
-            getDB().executeSQL("UPDATE changed_values SET sent=3 where object=? and attrib=? and update_type=? and source_id=?", strObject, oAttrValue.m_strAttrib, getID(), "create" );
+            getDB().executeSQL("UPDATE changed_values SET sent=3 where object=? and attrib=? and source_id=? and update_type=?", strObject, oAttrValue.m_strAttrib, getID(), "create" );
             //
         }
 
@@ -1418,5 +1438,11 @@ void CSyncSource::processToken(uint64 token)
 
 }
 
+bool CSyncSource::haveChangedValues()
+{
+	IDBResult res = getDB().executeSQL("SELECT object FROM changed_values WHERE source_id=? and sent<=1 LIMIT 1 OFFSET 0", getID());
+	return !res.isEnd();
+}
+
 }
 }