rhodes 2.0.2 → 2.0.3

data/platform/shared/sync/SyncEngine.h

@@ -46,6 +46,7 @@ private:
     int m_nSyncPageSize;
 	boolean m_bNoThreaded;
     int m_nErrCode;
+    String m_strError;
 
 public:
     CSyncEngine();
@@ -83,7 +84,7 @@ public:
 
     void loadAllSources();
     void syncAllSources();
-    void prepareSync(ESyncState eState);
+    void prepareSync(ESyncState eState, const CSourceID* oSrcID);
 
     VectorPtr<CSyncSource*>& getSources(){ return m_sources; }
     int getStartSource();

data/platform/shared/sync/SyncNotify.cpp

@@ -211,9 +211,10 @@ void CSyncNotify::onSyncSourceEnd( int nSrc, VectorPtr<CSyncSource*>& sources )
 {
     CSyncSource& src = *sources.elementAt(nSrc);
 
-    fireSyncNotification(&src, true, src.m_nErrCode, "");
     if ( getSync().getState() == CSyncEngine::esStop )
-		fireAllSyncNotifications(true, src.m_nErrCode, "", sources );
+		fireAllSyncNotifications(true, src.m_nErrCode, src.m_strError, sources, nSrc );
+    else
+        fireSyncNotification(&src, true, src.m_nErrCode, "");
 
     cleanCreateObjectErrors();
 }
@@ -293,14 +294,6 @@ void CSyncNotify::reportSyncStatus(String status, int error, String strDetails)
 	//LOG(INFO) + "Status: "+status;
 }
 
-void CSyncNotify::fireAllSyncNotifications( boolean bFinish, int nErrCode, String strMessage, VectorPtr<CSyncSource*>& sources )
-{
-    for( int i = 0; i < (int)sources.size(); i++ )
-    {
-    	doFireSyncNotification( sources.elementAt(i), bFinish, nErrCode, strMessage );
-    }
-}
-
 void CSyncNotify::fireBulkSyncNotification( boolean bFinish, String status, String partition, int nErrCode )
 {
     if ( getSync().getState() == CSyncEngine::esExit )
@@ -357,6 +350,33 @@ void CSyncNotify::fireBulkSyncNotification( boolean bFinish, String status, Stri
     	clearBulkSyncNotification();
 }
 
+void CSyncNotify::fireAllSyncNotifications( boolean bFinish, int nErrCode, String strError, VectorPtr<CSyncSource*>& sources, int nCurSrc )
+{
+    synchronized(m_mxSyncNotifications)
+    {
+        if ( nCurSrc >= 0 )
+        {
+            CSyncNotification* pSN = getSyncNotifyBySrc(*sources.elementAt(nCurSrc));    
+            if ( pSN != null )
+            {
+                doFireSyncNotification( sources.elementAt(nCurSrc), bFinish, nErrCode, strError );
+                return;
+            }
+        }
+
+        //find any source with notify
+        for( int i = 0; i < (int)sources.size(); i++ )
+        {
+            CSyncNotification* pSN = getSyncNotifyBySrc(*sources.elementAt(i));    
+            if ( pSN != null )
+            {
+    	        doFireSyncNotification( sources.elementAt(i), bFinish, nErrCode, strError );
+                break;
+            }
+        }
+    }
+}
+
 void CSyncNotify::fireSyncNotification( CSyncSource* psrc, boolean bFinish, int nErrCode, String strMessage)
 {
     if ( getSync().getState() == CSyncEngine::esExit )
@@ -373,10 +393,24 @@ void CSyncNotify::fireSyncNotification( CSyncSource* psrc, boolean bFinish, int
         }
 	}
 
-	doFireSyncNotification(psrc, bFinish, nErrCode, strMessage );
+	doFireSyncNotification(psrc, bFinish, nErrCode, "" );
 }
 
-void CSyncNotify::doFireSyncNotification( CSyncSource* psrc, boolean bFinish, int nErrCode, String strMessage)
+CSyncNotify::CSyncNotification* CSyncNotify::getSyncNotifyBySrc(CSyncSource& src)
+{
+    CSyncNotification* pSN = null;
+	if ( src.isSearch() )
+		pSN = m_pSearchNotification;
+	else
+		pSN = m_mapSyncNotifications.get(src.getID());
+    
+	if ( pSN == null && !getSync().isNoThreadedMode() )
+        return null;
+
+    return pSN != null ? pSN : &m_emptyNotify;
+}
+
+void CSyncNotify::doFireSyncNotification( CSyncSource* psrc, boolean bFinish, int nErrCode, String strError)
 {
 	if ( psrc == null || getSync().isStoppedByUser() )
 		return; //TODO: implement all sources callback
@@ -387,13 +421,8 @@ void CSyncNotify::doFireSyncNotification( CSyncSource* psrc, boolean bFinish, in
     {
         synchronized(m_mxSyncNotifications)
         {
-            CSyncNotification* pSN = 0;
-			if ( src.isSearch() )
-				pSN = m_pSearchNotification;
-			else
-				pSN = m_mapSyncNotifications.get(src.getID());
-            
-			if ( pSN == 0 )
+            CSyncNotification* pSN = getSyncNotifyBySrc(src);
+	        if ( pSN == null )
                 return;
             CSyncNotification& sn = *pSN;
 
@@ -421,7 +450,11 @@ void CSyncNotify::doFireSyncNotification( CSyncSource* psrc, boolean bFinish, in
 	        	    strBody += "error";				        	
 			        strBody += "&error_code=" + convertToStringA(nErrCode);
 		            strBody += "&error_message=";
-                    URI::urlEncode(src.m_strError,strBody);
+
+                    if ( strError.length() > 0 )
+                        URI::urlEncode(strError,strBody);
+                    else
+                        URI::urlEncode(src.m_strError,strBody);
 	            }
 
                 strBody += makeCreateObjectErrorBody(src.getID());

data/platform/shared/sync/SyncNotify.h

@@ -49,6 +49,7 @@ private:
     HashtablePtr<int,CSyncNotification*> m_mapSyncNotifications;
     common::CAutoPtr<CSyncNotification> m_pSearchNotification;
 	CSyncNotification m_bulkSyncNotify;
+    CSyncNotification m_emptyNotify;
     common::CMutex m_mxSyncNotifications;
 
     net::INetRequest& getNet();
@@ -90,13 +91,19 @@ public:
 
     void enableReporting(boolean bEnable){m_bEnableReporting = bEnable;}
 
+//    const String& getNotifyBody(){ return m_strNotifyBody; }
+//    void cleanNotifyBody(){ m_strNotifyBody = ""; }
+
+    void fireAllSyncNotifications( boolean bFinish, int nErrCode, String strError, VectorPtr<CSyncSource*>& sources, int nCurSrc );
+
 private:
+    CSyncNotification* getSyncNotifyBySrc(CSyncSource& src);
+
     String makeCreateObjectErrorBody(int nSrcID);
     void processSingleObject();
 
-    void doFireSyncNotification( CSyncSource* psrc, boolean bFinish, int nErrCode, String strMessage);
+    void doFireSyncNotification( CSyncSource* psrc, boolean bFinish, int nErrCode, String strError);
     void reportSyncStatus(String status, int error, String strDetails);
-    void fireAllSyncNotifications( boolean bFinish, int nErrCode, String strMessage, VectorPtr<CSyncSource*>& sources );
 
     boolean callNotify(const String& strUrl, const String& strBody );
 

data/platform/shared/sync/SyncSource.cpp

@@ -48,7 +48,7 @@ CSyncSource::CSyncSource(CSyncEngine& syncEngine, db::CDBAdapter& db  ) : m_sync
     m_nRefreshTime = 0;
 
     m_nErrCode = RhoRuby.ERR_NONE;
-    m_bIsSearch = false;
+    m_bIsSearch = m_syncEngine.getState() == CSyncEngine::esSearch;
     m_bSchemaSource = db.isTableExist(m_strName);
 }
 
@@ -66,7 +66,7 @@ CSyncSource::CSyncSource(int id, const String& strName, const String& strSyncTyp
     m_nRefreshTime = 0;
 
     m_nErrCode = RhoRuby.ERR_NONE;
-    m_bIsSearch = false;
+    m_bIsSearch = m_syncEngine.getState() == CSyncEngine::esSearch;
 
     DBResult( res, db.executeSQL("SELECT token,associations from sources WHERE source_id=?", m_nID) );
     if ( !res.isEnd() )
@@ -115,7 +115,7 @@ void CSyncSource::sync()
     getNotify().fireSyncNotification(null, false, RhoRuby.ERR_NONE, RhoRuby.getMessageText("syncronizing") + getName() + "...");
 
     CTimeInterval startTime = CTimeInterval::getCurrentTime();
-    m_bIsSearch = false;
+    //m_bIsSearch = false;
 
     if ( isEmptyToken() )
         processToken(1);

data/platform/shared/sync/SyncSource.h

@@ -55,11 +55,11 @@ class CSyncSource
     Hashtable<String,String> m_hashAssociations;
     VectorPtr<net::CMultipartItem*> m_arMultipartItems;
     Vector<String>                  m_arBlobAttrs;
+    boolean m_bIsSearch;
 
 public:
     int m_nErrCode;
     String m_strError;
-    boolean m_bIsSearch;
 
 public:
     CSyncSource(int id, const String& strName, const String& strSyncType, db::CDBAdapter& db, CSyncEngine& syncEngine );

data/platform/shared/sync/SyncThread.cpp

@@ -4,6 +4,7 @@
 #include "common/RhoFilePath.h"
 
 #include "ruby/ext/rho/rhoruby.h"
+#include "sync/ClientRegister.h"
 
 namespace rho {
 namespace sync {
@@ -50,8 +51,6 @@ CSyncThread::~CSyncThread(void)
     stop(SYNC_WAIT_BEFOREKILL_SECONDS);
 
     db::CDBAdapter::closeAll();
-
-    LOG(INFO) + "Sync engine thread shutdown";
 }
 
 int CSyncThread::getLastPollInterval()
@@ -221,9 +220,17 @@ void rho_sync_set_syncserver(char* syncserver)
 	CSyncThread::getSyncEngine().setSyncServer(syncserver);
 
     if ( syncserver && *syncserver )
+    {
         CSyncThread::getInstance()->start(CSyncThread::epLow);
+        if ( CClientRegister::getInstance() != null )
+            CClientRegister::getInstance()->startUp();
+    }
     else
+    {
         CSyncThread::getInstance()->stop(CSyncThread::SYNC_WAIT_BEFOREKILL_SECONDS);
+        if ( CClientRegister::getInstance() != null )
+            CClientRegister::getInstance()->stop(CSyncThread::SYNC_WAIT_BEFOREKILL_SECONDS);
+    }
 }
 
 void rho_sync_login(const char *name, const char *password, const char* callback)

data/platform/wm/rhodes/Alert.cpp

@@ -33,13 +33,24 @@ CAlertDialog::CAlertDialog(Params *params)
 	m_icon     = params->m_icon;
 
 	int id = ID_ALERT_DLG_BUTTON_FIRST;
-	for (Hashtable<String, String>::iterator itr = params->m_buttons.begin(); itr != params->m_buttons.end(); ++itr) {
+    for (int i = 0; i < (int)params->m_buttons.size(); i++) 
+    {
+		if(id > ID_ALERT_DLG_BUTTON_LAST) 
+        {
+			LOG(ERROR) + "too many buttons";
+			break;
+		}
+        m_buttons.addElement(CustomButton( params->m_buttons.elementAt(i).m_strCaption, 
+            params->m_buttons.elementAt(i).m_strID, id++));
+	}
+
+	/*for (Hashtable<String, String>::iterator itr = params->m_buttons.begin(); itr != params->m_buttons.end(); ++itr) {
 		if(id > ID_ALERT_DLG_BUTTON_LAST) {
 			LOG(ERROR) + "too many buttons";
 			break;
 		}
 		m_buttons.addElement(CustomButton(itr->first, itr->second, id++));
-	}
+	}*/
 }
 
 CAlertDialog::~CAlertDialog()
@@ -82,7 +93,7 @@ LRESULT CAlertDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lP
 	unsigned int maxHeight = GetSystemMetrics(SM_CYSCREEN) - (GAP * 2);
 #else
 	int maxWidth  = CMainWindow::getScreenWidth() - (GAP * 2);
-	int maxHeight = CMainWindow::getScreenWidth() - (GAP * 2);
+	int maxHeight = CMainWindow::getScreenHeight() - (GAP * 2);
 #endif
 	int xBorderWidth = GetSystemMetrics(SM_CXEDGE);
 	int yBorderWidth = GetSystemMetrics(SM_CYEDGE);
@@ -135,6 +146,13 @@ LRESULT CAlertDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lP
 
 	int desiredDlgWidth = iconRect.right + msgWidth + (INDENT * 2);
 
+	//space around label on buttons.
+	const int btnHIndent = 12; //horizontal
+	const int btnVIndent = 8;  //vertical
+
+	int btnsNum = m_buttons.size(); 
+	int btnsHeight =tm.tmHeight + btnVIndent;
+
 	//if desired widht is bigger than current - make dialog window bigger
 	if (desiredDlgWidth > (dlgRect.right - dlgRect.left)) {
 		// if desired width is bigger than maximum width 
@@ -147,14 +165,15 @@ LRESULT CAlertDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lP
 		}
 		
 		MoveWindow(0, 0, desiredDlgWidth,
-					MAX(iconRect.bottom, msgHeight) + GetSystemMetrics(SM_CYCAPTION) + INDENT + yBorderWidth * 2);
+					MAX(iconRect.bottom, msgHeight) + GetSystemMetrics(SM_CYCAPTION) + INDENT + yBorderWidth * 2 +
+                    btnsHeight);
 	} else {
 		//TODO: centering message
 	}
 	
 	m_messageCtrl.SetWindowText(convertToStringW(m_message).c_str());
 	
-	LOG(INFO) + "iconHeight  msgHeight " + iconHeight + " "+ msgHeight;
+	//LOG(INFO) + "iconHeight  msgHeight " + iconHeight + " "+ msgHeight;
 
 	if (iconHeight > msgHeight) {
 		msgRect.left = iconRect.right + INDENT;
@@ -187,28 +206,22 @@ LRESULT CAlertDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lP
 
 	GetClientRect(&dlgRect);
 
-	//space around label on buttons.
-	const int btnHIndent = 12; //horizontal
-	const int btnVIndent = 8;  //vertical
-
-	int btnsNum = m_buttons.size(); 
-	int btnsWidth = 0, btnsHeight =tm.tmHeight + btnVIndent;
-
-	for (Vector<CustomButton>::iterator itr = m_buttons.begin(); itr != m_buttons.end(); ++itr) {
-		btnsWidth += (itr->m_title.length() * tm.tmAveCharWidth) + btnHIndent + (INDENT * 2);
-	}
+	//for (Vector<CustomButton>::iterator itr = m_buttons.begin(); itr != m_buttons.end(); ++itr) {
+	//	btnsWidth += (itr->m_title.length() * tm.tmAveCharWidth) + btnHIndent + (INDENT * 2);
+	//}
 
 	POINT point;
 	point.x = INDENT, point.y = (iconHeight > msgHeight ? point.y = iconHeight + 6 : msgHeight + 2) + INDENT;
 
-	unsigned int btnWidth = 0, btnHeight = 0;
+	unsigned int btnWidth = 87, btnHeight = 0;
 	btnHeight = tm.tmHeight + btnVIndent;
 
 	//if (iconHeight + msgHeight + INDENT + btnHeight + INDENT > dlgRect.) {
 	//}
 
-	for (Vector<CustomButton>::iterator itr = m_buttons.begin(); itr != m_buttons.end(); ++itr) {
-		btnWidth = (itr->m_title.length() * tm.tmAveCharWidth) + btnHIndent;
+	for (Vector<CustomButton>::iterator itr = m_buttons.begin(); itr != m_buttons.end(); ++itr) 
+    {
+		//btnWidth = (itr->m_title.length() * tm.tmAveCharWidth) + btnHIndent;
 
 		RECT rc = {point.x, point.y, point.x + btnWidth, point.y + btnHeight};
 		itr->Create(m_hWnd, rc, 
@@ -282,7 +295,7 @@ HICON CAlertDialog::loadIcon()
 
 	for (int i = 0; i < (sizeof(iconTable)/sizeof(iconTable[0])); i++) 
 	{
-		LOG(ERROR) + "ICON == " + iconTable[i].name;
+		//LOG(ERROR) + "ICON == " + iconTable[i].name;
 		if (iconTable[i].name == m_icon)
 			iconId = iconTable[i].id;
 	}
@@ -356,7 +369,8 @@ extern "C" void alert_show_popup(rho_param *p)
 	} else if (p->type == RHO_PARAM_HASH) {
 		String title, message, callback, icon;
 		String btnId, btnTitle;
-		Hashtable<String, String> buttons;
+		//Hashtable<String, String> buttons;
+        Vector<CAlertDialog::Params::CAlertButton> buttons;
 
 		for (int i = 0, lim = p->v.hash->size; i < lim; ++i) {
 			char *name = p->v.hash->name[i];
@@ -425,7 +439,7 @@ extern "C" void alert_show_popup(rho_param *p)
 						continue;
 					}
 
-					buttons.put(btnTitle, btnId);
+                    buttons.addElement( CAlertDialog::Params::CAlertButton(btnTitle, btnId) );
 				}
 			}//buttons
 		}

data/platform/wm/rhodes/Alert.h

@@ -20,6 +20,12 @@ public:
 	class Params {
 	public:
 		enum {DLG_DEFAULT, DLG_CUSTOM};
+        struct CAlertButton
+        {
+            String m_strCaption, m_strID;
+            CAlertButton ( const String& strCaption, const String& strID ): m_strCaption(strCaption), m_strID(strID){}
+
+        };
 
 		Params (String &message)
 		{
@@ -27,7 +33,7 @@ public:
 			m_message  = message;
 		}
 
-		Params (String &title, String &message, String &icon, String &callback, Hashtable<String, String> &buttons)
+		Params (String &title, String &message, String &icon, String &callback, Vector<CAlertButton>& buttons)
 		{
 			m_dlgType  = DLG_CUSTOM;
 			m_title    = title;
@@ -42,7 +48,10 @@ public:
 		String m_message;
 		String m_icon;
 		String m_callback;
-		Hashtable<String, String> m_buttons;
+
+		//Hashtable<String, String> m_buttons;
+        Vector<CAlertButton> m_buttons;
+
 	};
 	
 	class CustomButton : public CButton {

data/platform/wm/rhodes/rho/common/RhoThreadImpl.cpp

@@ -8,26 +8,28 @@ IMPLEMENT_LOGCLASS(CRhoThreadImpl,"RhoThread");
 
 CRhoThreadImpl::CRhoThreadImpl() : m_hAwakeEvent(0), m_hThread(0)
 {
+    m_hAwakeEvent = ::CreateEvent(NULL, FALSE, FALSE, NULL);
+}
 
+CRhoThreadImpl::~CRhoThreadImpl()
+{
+    if ( m_hAwakeEvent )
+        ::CloseHandle(m_hAwakeEvent);
 }
 
 static DWORD WINAPI runProc(void* pv) throw()
 {
 	IRhoRunnable* p = static_cast<IRhoRunnable*>(pv);
-	p->run();
+	p->runObject();
     ::ExitThread(0);
 	return 0;
 }
 
 void CRhoThreadImpl::start(IRhoRunnable* pRunnable, IRhoRunnable::EPriority ePriority)
 {
-    if ( !m_hThread )
-    {
-        m_hAwakeEvent = ::CreateEvent(NULL, FALSE, FALSE, NULL);
-	    DWORD dwThreadID;
-	    m_hThread = ::CreateThread(NULL, 0, runProc, pRunnable, 0, &dwThreadID);
-        setThreadPriority(ePriority);
-    }
+    DWORD dwThreadID;
+    m_hThread = ::CreateThread(NULL, 0, runProc, pRunnable, 0, &dwThreadID);
+    setThreadPriority(ePriority);
 }
 
 void CRhoThreadImpl::setThreadPriority(IRhoRunnable::EPriority ePriority)
@@ -53,11 +55,8 @@ void CRhoThreadImpl::stop(unsigned int nTimeoutToKill)
             ::TerminateThread(m_hThread,0);
         }
         ::CloseHandle(m_hThread);
-        m_hThread = NULL;
+        m_hThread = null;
     }
-
-    if ( m_hAwakeEvent )
-        ::CloseHandle(m_hAwakeEvent);
 }
 
 void CRhoThreadImpl::wait(unsigned int nTimeout)