rhodes 2.3.0 → 2.3.1.beta.1

data/platform/shared/sync/SyncEngine.cpp

@@ -29,7 +29,7 @@ using namespace rho::common;
 using namespace rho::json;
 CSyncEngine::CSourceOptions CSyncEngine::m_oSourceOptions;
 
-CSyncEngine::CSyncEngine():m_NetRequest(0), m_syncState(esNone), m_oSyncNotify(*this)
+CSyncEngine::CSyncEngine(): m_syncState(esNone), m_oSyncNotify(*this)
 {
     m_bNoThreaded = false;
     m_bStopByUser = false;
@@ -43,6 +43,15 @@ void CSyncEngine::initProtocol()
     m_SyncProtocol = new CSyncProtocol_3();
 }
 
+void CSyncEngine::setSslVerifyPeer(boolean b)
+{ 
+    m_NetRequest.setSslVerifyPeer(b); 
+    m_NetRequestClientID.setSslVerifyPeer(b); 
+
+    if ( CClientRegister::getInstance() != null )
+        CClientRegister::getInstance()->setSslVerifyPeer(b);
+}
+
 void CSyncEngine::CSourceOptions::setProperty(int nSrcID, const char* szPropName, const char* szPropValue)
 {
     synchronized(m_mxSrcOptions)
@@ -89,6 +98,7 @@ void CSyncEngine::prepareSync(ESyncState eState, const CSourceID* oSrcID)
     m_bStopByUser = false;
     m_nErrCode = RhoAppAdapter.ERR_NONE;
     m_strError = "";
+    m_strServerError = "";
     m_bIsSchemaChanged = false;
 
     loadAllSources();
@@ -118,7 +128,7 @@ void CSyncEngine::prepareSync(ESyncState eState, const CSourceID* oSrcID)
         getNotify().fireSyncNotification(src, true, src->m_nErrCode, "");
     }else
     {
-        getNotify().fireAllSyncNotifications(true, m_nErrCode, m_strError );
+        getNotify().fireAllSyncNotifications(true, m_nErrCode, m_strError, "" );
     }
 
     stopSync();
@@ -188,6 +198,7 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
         if ( strParams.length() > 0 )
             strQuery += strParams.at(0) == '&' ? strParams : "&" + strParams;
 
+        String strTestResp = "";
         for ( int i = 0; i < (int)arSources.size(); i++ )
         {
             CSyncSource* pSrc = findSourceByName(arSources.elementAt(i));
@@ -197,11 +208,13 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
 
                 if ( !pSrc->isTokenFromDB() && pSrc->getToken() > 1 )
                     strQuery += "&sources[][token]=" + convertToStringA(pSrc->getToken());
+
+                strTestResp = getSourceOptions().getProperty(pSrc->getID(), "rho_server_response");
             }
         }
 
-		LOG(INFO) + "Call search on server. Url: " + (strUrl+strQuery);
-        NetResponse(resp,getNet().pullData(strUrl+strQuery, this));
+	    LOG(INFO) + "Call search on server. Url: " + (strUrl+strQuery);
+        NetResponse resp = getNet().pullData(strUrl+strQuery, this);
 
         if ( !resp.isOK() )
         {
@@ -211,7 +224,11 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
             continue;
         }
 
-        const char* szData = resp.getCharData();
+        const char* szData = null;
+        if ( strTestResp.length() > 0 )
+            szData = strTestResp.c_str();
+        else
+            szData = resp.getCharData();
 
         CJSONArrayIterator oJsonArr(szData);
 
@@ -233,8 +250,7 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
                 LOG(ERROR) + "Sync server send search data with incompatible version. Client version: " + convertToStringA(getProtocol().getVersion()) +
                     "; Server response version: " + convertToStringA(nVersion);
                 stopSync();
-                m_nErrCode = RhoAppAdapter.ERR_UNEXPECTEDSERVERRESPONSE;
-                m_strError = resp.getCharData();
+                m_nErrCode = RhoAppAdapter.ERR_SYNCVERSION;
                 continue;
             }
 
@@ -248,7 +264,7 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
                 LOG(ERROR) + "Sync server send search data without source name.";
                 stopSync();
                 m_nErrCode = RhoAppAdapter.ERR_UNEXPECTEDSERVERRESPONSE;
-                m_strError = resp.getCharData();
+                m_strError = szData;
                 continue;
             }
 
@@ -259,7 +275,7 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
                 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;
             }
 
@@ -268,13 +284,22 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
             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
     CTimeInterval endTime = CTimeInterval::getCurrentTime();
@@ -350,11 +375,11 @@ CSyncSource* CSyncEngine::findSourceByName(const String& strSrcName)
 
 void CSyncEngine::applyChangedValues(db::CDBAdapter& db)
 {
-    DBResult( resSrc , db.executeSQL( "SELECT DISTINCT(source_id) FROM changed_values" ) );
+    IDBResult resSrc = db.executeSQL( "SELECT DISTINCT(source_id) FROM changed_values" );
     for ( ; !resSrc.isEnd(); resSrc.next() )
     {
         int nSrcID = resSrc.getIntByIdx(0);
-        DBResult( res, db.executeSQL("SELECT source_id,sync_type,name, partition from sources WHERE source_id=?", nSrcID) );
+        IDBResult res = db.executeSQL("SELECT source_id,sync_type,name, partition from sources WHERE source_id=?", nSrcID);
         if ( res.isEnd() )
             continue;
 
@@ -370,7 +395,7 @@ void CSyncEngine::loadAllSources()
         RhoAppAdapter.loadAllSyncSources();
     else
     {
-        NetResponse(resp,getNet().pushData( getNet().resolveUrl("/system/loadallsyncsources"), "", null ));
+        NetResponse resp = getNet().pushData( getNet().resolveUrl("/system/loadallsyncsources"), "", null );
     }
 
     m_sources.removeAllElements();
@@ -380,7 +405,7 @@ void CSyncEngine::loadAllSources()
     for( int i = 0; i < (int)arPartNames.size(); i++ )
     {
         db::CDBAdapter& dbPart = db::CDBAdapter::getDB(arPartNames.elementAt(i).c_str());
-        DBResult( res, dbPart.executeSQL("SELECT source_id,sync_type,name from sources ORDER BY sync_priority") );
+        IDBResult  res = dbPart.executeSQL("SELECT source_id,sync_type,name from sources ORDER BY sync_priority");
         for ( ; !res.isEnd(); res.next() )
         { 
             String strShouldSync = res.getStringByIdx(1);
@@ -442,7 +467,7 @@ String CSyncEngine::readClientID()
     String clientID = "";
     synchronized(m_mxLoadClientID)
     {
-        DBResult( res, getUserDB().executeSQL("SELECT client_id,reset from client_info limit 1") );
+        IDBResult res = getUserDB().executeSQL("SELECT client_id,reset from client_info limit 1");
         if ( !res.isEnd() )
             clientID = res.getStringByIdx(0);
     }
@@ -457,7 +482,7 @@ String CSyncEngine::loadClientID()
     {
         boolean bResetClient = false;
         {
-            DBResult( res, getUserDB().executeSQL("SELECT client_id,reset from client_info limit 1") );
+            IDBResult res = getUserDB().executeSQL("SELECT client_id,reset from client_info limit 1");
             if ( !res.isEnd() )
             {
                 clientID = res.getStringByIdx(0);
@@ -469,7 +494,7 @@ String CSyncEngine::loadClientID()
         {
             clientID = requestClientIDByNet();
 
-            DBResult( res , getUserDB().executeSQL("SELECT * FROM client_info") );
+            IDBResult res = getUserDB().executeSQL("SELECT * FROM client_info");
             if ( !res.isEnd() )
                 getUserDB().executeSQL("UPDATE client_info SET client_id=?", clientID);
             else
@@ -498,7 +523,7 @@ void CSyncEngine::processServerSources(String strSources)
             RhoAppAdapter.loadServerSources(strSources);
         else
         {
-            NetResponse(resp,getNet().pushData( getNet().resolveUrl("/system/loadserversources"), strSources, null ));
+            NetResponse resp = getNet().pushData( getNet().resolveUrl("/system/loadserversources"), strSources, null );
         }
 
         loadAllSources();
@@ -514,7 +539,7 @@ boolean CSyncEngine::resetClientIDByNet(const String& strClientID)//throws Excep
     //if ( CClientRegister::getInstance() != null )
     //    strBody += CClientRegister::getInstance()->getRegisterBody();
 
-    NetResponse( resp, m_NetRequestClientID->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\","
@@ -552,7 +577,7 @@ String CSyncEngine::requestClientIDByNet()
     //if ( CClientRegister::getInstance() != null )
     //    strBody += CClientRegister::getInstance()->getRegisterBody();
 
-    NetResponse(resp,m_NetRequestClientID->pullData(getProtocol().getClientCreateUrl(), this));
+    NetResponse resp = getNetClientID().pullData(getProtocol().getClientCreateUrl(), this);
     if ( resp.isOK() && resp.getCharData() != null )
     {
         const char* szData = resp.getCharData();
@@ -631,7 +656,7 @@ void CSyncEngine::loadBulkPartition(const String& strPartition )
 
     while(strCmd.length() == 0&&isContinueSync())
     {	    
-        NetResponse( resp, getNet().pullData(strUrl+strQuery, this) );
+        NetResponse resp = getNet().pullData(strUrl+strQuery, this);
         const char* szData = resp.getCharData();
         if ( !resp.isOK() || szData == null || *szData == 0)
         {
@@ -677,7 +702,7 @@ void CSyncEngine::loadBulkPartition(const String& strPartition )
     String strSqlDataUrl = CFilePath::join(getHostFromUrl(serverUrl), strDataUrl) +strZip;
     LOG(INFO) + "Bulk sync: download data from server: " + strSqlDataUrl;
     {
-        NetResponse( resp1, getNet().pullFile(strSqlDataUrl, fDataName+strZip, this, null) );
+        NetResponse resp1 = getNet().pullFile(strSqlDataUrl, fDataName+strZip, this, null);
         if ( !resp1.isOK() )
         {
 	        LOG(ERROR) + "Bulk sync failed: cannot download database file.";
@@ -795,7 +820,7 @@ void CSyncEngine::login(String name, String password, const CSyncNotification& o
     m_bStopByUser = false;
 	//try {
 
-    NetResponse( resp, getNet().pullCookies( getProtocol().getLoginUrl(), getProtocol().getLoginBody(name, password), this ) );
+    NetResponse resp = getNet().pullCookies( getProtocol().getLoginUrl(), getProtocol().getLoginBody(name, password), this );
     int nErrCode = RhoAppAdapter.getErrorFromResponse(resp);
     if ( nErrCode != RhoAppAdapter.ERR_NONE )
     {
@@ -818,7 +843,7 @@ void CSyncEngine::login(String name, String password, const CSyncNotification& o
 	}
 
 	{
-		DBResult( res , getUserDB().executeSQL("SELECT * FROM client_info") );
+		IDBResult res = getUserDB().executeSQL("SELECT * FROM client_info");
 		if ( !res.isEnd() )
 			getUserDB().executeSQL( "UPDATE client_info SET session=?", strSession );
 		else
@@ -834,7 +859,7 @@ void CSyncEngine::login(String name, String password, const CSyncNotification& o
                 RhoAppAdapter.resetDBOnSyncUserChanged();
             else
             {
-                NetResponse(resp,getNet().pushData( getNet().resolveUrl("/system/resetDBOnSyncUserChanged"), "", null ));
+                NetResponse resp = getNet().pushData( getNet().resolveUrl("/system/resetDBOnSyncUserChanged"), "", null );
             }
         }
     }
@@ -857,8 +882,8 @@ void CSyncEngine::login(String name, String password, const CSyncNotification& o
 boolean CSyncEngine::isLoggedIn()
  {
     String strRes = "";
-    DBResult( res , getUserDB().executeSQL("SELECT session FROM client_info") );
-    if ( !res.isEnd() )
+    IDBResult res = getUserDB().executeSQL("SELECT session FROM client_info");
+    if ( !res.isOneEnd() )
     	strRes = res.getStringByIdx(0);
     
     return strRes.length() > 0;
@@ -867,7 +892,7 @@ boolean CSyncEngine::isLoggedIn()
 String CSyncEngine::loadSession()
 {
     m_strSession = "";
-    DBResult( res , getUserDB().executeSQL("SELECT session FROM client_info") );
+    IDBResult res = getUserDB().executeSQL("SELECT session FROM client_info");
     
     if ( !res.isEnd() )
     	m_strSession = res.getStringByIdx(0);
@@ -877,8 +902,7 @@ String CSyncEngine::loadSession()
 
 void CSyncEngine::logout()
 {
-    if(m_NetRequest) 
-        m_NetRequest->cancel();
+    m_NetRequest.cancel();
 
     getUserDB().executeSQL( "UPDATE client_info SET session=NULL" );
     m_strSession = "";

data/platform/shared/sync/SyncEngine.h

@@ -44,7 +44,7 @@ public:
 
 private:
     VectorPtr<CSyncSource*> m_sources;
-    common::CAutoPtr<net::INetRequest> m_NetRequest, m_NetRequestClientID;
+    NetRequest m_NetRequest, m_NetRequestClientID;
     common::CAutoPtr<ISyncProtocol> m_SyncProtocol;
     ESyncState m_syncState;
     String     m_clientID;
@@ -55,21 +55,18 @@ private:
     int m_nSyncPageSize;
 	boolean m_bNoThreaded;
     int m_nErrCode;
-    String m_strError;
+    String m_strError, m_strServerError;
     boolean m_bIsSearch, m_bIsSchemaChanged;
     static CSourceOptions m_oSourceOptions;
 
+    net::CNetRequestWrapper getNetClientID(){ return getNetRequest(&m_NetRequestClientID); }
+
 public:
     CSyncEngine();
     ~CSyncEngine(void){}
 
-    void setFactory(common::IRhoClassFactory* factory){ 
-        m_NetRequest = factory->createNetRequest();
-        //clientID may be requested by ClientRegister thread
-        m_NetRequestClientID = factory->createNetRequest();
-        m_oSyncNotify.setFactory(factory);
-    }
     static CSourceOptions& getSourceOptions(){ return m_oSourceOptions; }
+    net::CNetRequestWrapper getNet(){ return getNetRequest(&m_NetRequest); }
 
     void doSyncAllSources();
     void doSyncSource(const CSourceID& oSrcID);
@@ -86,10 +83,12 @@ public:
     boolean isSearch()const{ return m_bIsSearch; }
     boolean isContinueSync()const{ return m_syncState != esExit && m_syncState != esStop; }
 	boolean isSyncing()const{ return m_syncState == esSyncAllSources || m_syncState == esSyncSource; }
-    void stopSync(){ if (isContinueSync()){ setState(esStop); if(m_NetRequest) m_NetRequest->cancel();} }
+    void stopSync(){ if (isContinueSync()){ setState(esStop); m_NetRequest.cancel();m_NetRequestClientID.cancel();} }
     void stopSyncByUser(){ m_bStopByUser = true; stopSync(); }
-    void exitSync(){ setState(esExit); m_NetRequest->cancel(); }
+    void exitSync(){ setState(esExit); m_NetRequest.cancel(); m_NetRequestClientID.cancel();}
     boolean isStoppedByUser(){ return m_bStopByUser; }
+    void setSslVerifyPeer(boolean b);
+
 //private:
     String getClientID()const{ return m_clientID; }
     void setSession(String strSession){m_strSession=strSession;}
@@ -113,7 +112,6 @@ public:
     void doBulkSync();//throws Exception
 
     CSyncNotify& getNotify(){ return m_oSyncNotify; }
-    net::INetRequest& getNet(){ return *m_NetRequest; }
     ISyncProtocol& getProtocol(){ return *m_SyncProtocol; }
 
     CSyncSource* findSourceByName(const String& strSrcName);

data/platform/shared/sync/SyncNotify.cpp

@@ -101,7 +101,7 @@ void CSyncNotify::fireObjectsNotification()
                 if ( nNotifyType == enDelete )
                 {
                     //TODO: get db for source
-                    DBResult( res , getDB().executeSQL("SELECT object FROM object_values where object=? LIMIT 1 OFFSET 0", itObject->first ));
+                    IDBResult res = getDB().executeSQL("SELECT object FROM object_values where object=? LIMIT 1 OFFSET 0", itObject->first );
                     if ( !res.isEnd() )
                         nNotifyType = enUpdate;    
                 }
@@ -217,7 +217,7 @@ void CSyncNotify::onSyncSourceEnd( int nSrc, VectorPtr<CSyncSource*>& sources )
 		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, "");
@@ -329,10 +329,10 @@ void CSyncNotify::fireBulkSyncNotification( boolean bFinish, String status, Stri
     strParams += "&bulk_status="+status;
     strParams += "&sync_type=bulk";
 
-    doFireSyncNotification( null, bFinish, nErrCode, "", strParams );
+    doFireSyncNotification( null, bFinish, nErrCode, "", strParams, "" );
 }
 
-void CSyncNotify::fireAllSyncNotifications( boolean bFinish, int nErrCode, String strError )
+void CSyncNotify::fireAllSyncNotifications( boolean bFinish, int nErrCode, String strError, String strServerError )
 {
     if ( getSync().getState() == CSyncEngine::esExit )
 		return;
@@ -341,7 +341,7 @@ void CSyncNotify::fireAllSyncNotifications( boolean bFinish, int nErrCode, Strin
     {
         CSyncNotification* pSN = getSyncNotifyBySrc(null);    
         if ( pSN != null )
-            doFireSyncNotification( null, bFinish, nErrCode, strError, "" );
+            doFireSyncNotification( null, bFinish, nErrCode, strError, "", strServerError );
     }
 }
 
@@ -361,7 +361,7 @@ void CSyncNotify::fireSyncNotification( CSyncSource* src, boolean bFinish, int n
         }
 	}
 
-    doFireSyncNotification(src, bFinish, nErrCode, "", "" );
+    doFireSyncNotification(src, bFinish, nErrCode, "", "", "" );
 }
 
 CSyncNotification* CSyncNotify::getSyncNotifyBySrc(CSyncSource* src)
@@ -384,7 +384,7 @@ CSyncNotification* CSyncNotify::getSyncNotifyBySrc(CSyncSource* src)
     return pSN != null ? pSN : &m_emptyNotify;
 }
 
-void CSyncNotify::doFireSyncNotification( CSyncSource* src, boolean bFinish, int nErrCode, String strError, String strParams)
+void CSyncNotify::doFireSyncNotification( CSyncSource* src, boolean bFinish, int nErrCode, String strError, String strParams, String strServerError)
 {
 	if ( getSync().isStoppedByUser() )
 		return;
@@ -432,13 +432,17 @@ void CSyncNotify::doFireSyncNotification( CSyncSource* src, boolean bFinish, int
 
 	        	    strBody += "error";				        	
 			        strBody += "&error_code=" + convertToStringA(nErrCode);
-                    strBody += "&error_type=" + (src != null ? (*src).m_strErrorType : String());
 		            strBody += "&error_message=";
 
                     if ( strError.length() > 0 )
                         URI::urlEncode(strError,strBody);
                     else if ( src != null )
                         URI::urlEncode( (*src).m_strError,strBody);
+
+                    if ( strServerError.length() > 0 )
+                        strBody += "&" + strServerError;
+                    else if ( src != null && (*src).m_strServerError.length() > 0  )
+                        strBody += "&" + (*src).m_strServerError;
 	            }
 
                 if ( src != null )
@@ -449,7 +453,12 @@ void CSyncNotify::doFireSyncNotification( CSyncSource* src, boolean bFinish, int
 
             strBody += "&rho_callback=1";
             if ( pSN->m_strParams.length() > 0 )
-                strBody += "&" + pSN->m_strParams;
+            {
+                if ( !String_startsWith( pSN->m_strParams, "&" ) )
+                    strBody += "&";
+
+                strBody += pSN->m_strParams;
+            }
 
             bRemoveAfterFire = bRemoveAfterFire && pSN->m_bRemoveAfterFire;
         }
@@ -476,7 +485,7 @@ boolean CSyncNotify::callNotify(const CSyncNotification& oNotify, const String&
     if ( strUrl.length() == 0 )
         return true;
 
-    NetResponse(resp,getNet().pushData( strUrl, strBody, null ));
+    NetResponse resp = getNet().pushData( strUrl, strBody, null );
     if ( !resp.isOK() )
         LOG(ERROR) + "Fire notification failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData();
     else
@@ -548,11 +557,7 @@ int CSyncNotify::getLastSyncObjectCount(int nSrcID)
 void CSyncNotify::callLoginCallback(const CSyncNotification& oNotify, int nErrCode, String strMessage)
 {
 	if ( getSync().isStoppedByUser() )
-	{
-		LOG(INFO) + "Login was stopped by application.";
-
 		return;
-	}
 
 	//try{
     String strBody = "error_code=" + convertToStringA(nErrCode);

data/platform/shared/sync/SyncNotify.h

@@ -4,6 +4,7 @@
 #include "logging/RhoLog.h"
 #include "common/AutoPointer.h"
 #include "common/IRhoClassFactory.h"
+#include "net/INetRequest.h"
 
 typedef int (*RHOC_CALLBACK)(const char* szNotify, void* callback_data);
 
@@ -12,10 +13,6 @@ namespace db {
     class CDBAdapter;
 }
 
-namespace net {
-    struct INetRequest;
-}
-
 namespace sync {
 class CSyncEngine;
 class CSyncSource;
@@ -67,18 +64,14 @@ private:
     String m_strNotifyBody;
     String m_strStatusHide;
 
-   	common::CAutoPtr<net::INetRequest>     m_NetRequest;
+   	NetRequest     m_NetRequest;
 
-    net::INetRequest& getNet(){ return *m_NetRequest; }
+    net::CNetRequestWrapper getNet(){ return getNetRequest(&m_NetRequest); }
     CSyncEngine& getSync(){ return m_syncEngine; }
 public:
     CSyncNotify( CSyncEngine& syncEngine ) : m_syncEngine(syncEngine), m_bEnableReporting(false), 
         m_bEnableReportingGlobal(false){}
 
-    void setFactory(common::IRhoClassFactory* factory){ 
-        m_NetRequest = factory->createNetRequest();
-    }
-
     //Object notifications
     void fireObjectsNotification();
     void onObjectChanged(int nSrcID, const String& strObject, int nType);
@@ -115,7 +108,7 @@ public:
     const String& getNotifyBody(){ return m_strNotifyBody; }
     void cleanNotifyBody(){ m_strNotifyBody = ""; }
 
-    void fireAllSyncNotifications( boolean bFinish, int nErrCode, String strError );
+    void fireAllSyncNotifications( boolean bFinish, int nErrCode, String strError, String strServerError );
     void reportSyncStatus(String status, int error, String strDetails);
     void showStatusPopup(const String& status);
 private:
@@ -124,7 +117,7 @@ private:
     String makeCreateObjectErrorBody(int nSrcID);
     void processSingleObject();
 
-    void doFireSyncNotification( CSyncSource* src, boolean bFinish, int nErrCode, String strError, String strParams);
+    void doFireSyncNotification( CSyncSource* src, boolean bFinish, int nErrCode, String strError, String strParams, String strServerError);
 
     boolean callNotify(const CSyncNotification& oNotify, const String& strBody );