rhodes 2.1.0 → 2.2.0.beta.1

data/platform/shared/ruby/main.c

@@ -194,6 +194,14 @@ void Init_NativeBar()
 {
 }
 
+void Init_RhoEvent()
+{
+}
+
+void Init_Calendar()
+{
+}
+
 void Init_MapView()
 {
 }

data/platform/shared/rubyext/GeoLocation.cpp

@@ -91,10 +91,13 @@ void CGeoLocation::setGeoCallback(const char *url, char* params, int timeout_sec
     else
         m_Notify = CGeoNotification(url?url:"",params?params:"");
 
-    setPingTimeoutSec(timeout_sec);
+    if ( url && *url )
+    {
+        setPingTimeoutSec(timeout_sec);
 
-    if ( !rho_geo_is_available() )
-        callGeoCallback(true, true);
+        if ( !rho_geo_is_available() )
+            callGeoCallback(true, true);
+    }
 }
 
 int CGeoLocation::getDefaultPingTimeoutSec()

data/platform/shared/rubyext/System.cpp

@@ -65,4 +65,18 @@ void rho_sys_set_screen_rotation_notification(const char *url, const char* param
 	RHODESAPP().setScreenRotationNotification(url, params);
 }
 
+void rho_sys_unzip_file(const char *url)
+{
+    rho_unzip_file(url);
+}
+
+#if defined(OS_MACOSX) || defined(OS_ANDROID)
+  // implemented in platform code
+#else
+int rho_sys_set_sleeping(int sleeping)
+{
+    return 1;
+}
+#endif //defined(OS_MACOSX) || defined(OS_ANDROID)
+
 } //extern "C"

data/platform/shared/sync/SyncEngine.cpp

@@ -717,6 +717,7 @@ void CSyncEngine::login(String name, String password, const CSyncNotification& o
         " \"belongs_to\":{\"brand\":\"Customer\"}}}}");//, \"schema_version\":\"1.0\"
 */
     PROF_START("Login");
+    m_bStopByUser = false;
 	//try {
 
     NetResponse( resp, getNet().pullCookies( getProtocol().getLoginUrl(), getProtocol().getLoginBody(name, password), this ) );
@@ -734,7 +735,10 @@ void CSyncEngine::login(String name, String password, const CSyncNotification& o
     	getNotify().callLoginCallback(oNotify, RhoAppAdapter.ERR_UNEXPECTEDSERVERRESPONSE, "" );
         return;
     }
-	
+
+   	if ( isStoppedByUser() )
+        return;
+
 	{
 		DBResult( res , getUserDB().executeSQL("SELECT * FROM client_info") );
 		if ( !res.isEnd() )
@@ -780,6 +784,10 @@ String CSyncEngine::loadSession()
 
 void CSyncEngine::logout()
 {
+    m_bStopByUser = true;
+    if(m_NetRequest) 
+        m_NetRequest->cancel();
+
     getUserDB().executeSQL( "UPDATE client_info SET session=NULL" );
     m_strSession = "";
 

data/platform/shared/sync/SyncNotify.cpp

@@ -251,6 +251,12 @@ CSyncNotification::CSyncNotification(String strUrl, String strParams, boolean bR
         m_strUrl = RHODESAPPBASE().canonicalizeRhoUrl(strUrl);
 }
 
+CSyncNotification::~CSyncNotification()
+{
+    if ( m_cCallbackData )
+		rho_free_callbackdata(m_cCallbackData);
+}
+	
 String CSyncNotification::toString()const
 {
 	if ( m_cCallback )
@@ -366,16 +372,15 @@ void CSyncNotify::doFireSyncNotification( CSyncSource* src, boolean bFinish, int
 	if ( getSync().isStoppedByUser() )
 		return;
 
-    CSyncNotification oSN;
+    CSyncNotification* pSN;
     String strBody;
     boolean bRemoveAfterFire = bFinish;
     {
         synchronized(m_mxSyncNotifications)
         {
-            CSyncNotification* pSN = getSyncNotifyBySrc(src);
+            pSN = getSyncNotifyBySrc(src);
 	        if ( pSN == null )
                 return;
-            oSN = *pSN;
 
 		    strBody = "";
 
@@ -420,15 +425,15 @@ void CSyncNotify::doFireSyncNotification( CSyncSource* src, boolean bFinish, int
         	    strBody += "in_progress";
 
             strBody += "&rho_callback=1";
-            if ( oSN.m_strParams.length() > 0 )
-                strBody += "&" + oSN.m_strParams;
+            if ( pSN->m_strParams.length() > 0 )
+                strBody += "&" + pSN->m_strParams;
 
-            bRemoveAfterFire = bRemoveAfterFire && oSN.m_bRemoveAfterFire;
+            bRemoveAfterFire = bRemoveAfterFire && pSN->m_bRemoveAfterFire;
         }
     }
-    LOG(INFO) + "Fire notification. Source : " + (src != null ? (*src).getName():"") + "; " + oSN.toString();
+    LOG(INFO) + "Fire notification. Source : " + (src != null ? (*src).getName():"") + "; " + pSN->toString();
 	
-    if ( callNotify(oSN, strBody) || bRemoveAfterFire)
+    if ( callNotify(*pSN, strBody) || bRemoveAfterFire)
         clearNotification(src);
 }
 
@@ -518,6 +523,9 @@ int CSyncNotify::getLastSyncObjectCount(int nSrcID)
 
 void CSyncNotify::callLoginCallback(const CSyncNotification& oNotify, int nErrCode, String strMessage)
 {
+	if ( getSync().isStoppedByUser() )
+		return;
+
 	//try{
     String strBody = "error_code=" + convertToStringA(nErrCode);
     strBody += "&error_message=";

data/platform/shared/sync/SyncNotify.h

@@ -34,6 +34,7 @@ struct CSyncNotification
 
     String toString()const;
 
+	~CSyncNotification();
 };
 
 class CSyncNotify

data/platform/shared/sync/SyncThread.cpp

@@ -99,8 +99,8 @@ int CSyncThread::getLastPollInterval()
 
 void CSyncThread::processCommands()//throws Exception
 {
-    if ( isNoCommands() )
-        addQueueCommand(new CSyncCommand(scNone,false));
+    if ( isNoCommands() && getPollInterval()>0 )
+        addQueueCommandInt(new CSyncCommand(scSyncAll,false));
 
     CThreadQueue::processCommands();
 }
@@ -118,13 +118,6 @@ void CSyncThread::processCommand(IQueueCommand* pCmd)
     CSyncCommand& oSyncCmd = *((CSyncCommand*)pCmd);
     switch(oSyncCmd.m_nCmdCode)
     {
-    case scNone:
-        if ( getPollInterval() )
-        {
-            checkShowStatus(oSyncCmd);
-            m_oSyncEngine.doSyncAllSources();
-        }
-        break;
     case scSyncAll:
         checkShowStatus(oSyncCmd);
         m_oSyncEngine.doSyncAllSources();
@@ -148,7 +141,7 @@ void CSyncThread::processCommand(IQueueCommand* pCmd)
     		CSyncLoginCommand& oLoginCmd = (CSyncLoginCommand&)oSyncCmd;
 
             checkShowStatus(oSyncCmd);
-            m_oSyncEngine.login(oLoginCmd.m_strName, oLoginCmd.m_strPassword, oLoginCmd.m_oNotify );
+            m_oSyncEngine.login(oLoginCmd.m_strName, oLoginCmd.m_strPassword, *oLoginCmd.m_pNotify );
     	}
         break;
     }
@@ -297,7 +290,8 @@ void rho_sync_set_syncserver(const char* syncserver)
 unsigned long rho_sync_login(const char *name, const char *password, const char* callback)
 {
     rho_sync_stop();
-    CSyncThread::getInstance()->addQueueCommand(new CSyncThread::CSyncLoginCommand(name, password, CSyncNotification(callback, "", false) ) );
+    CSyncThread::getInstance()->addQueueCommand(new CSyncThread::CSyncLoginCommand(name, password, 
+		new CSyncNotification(callback, "", false) ) );
 
     return CSyncThread::getInstance()->getRetValue();
 }
@@ -305,7 +299,8 @@ unsigned long rho_sync_login(const char *name, const char *password, const char*
 unsigned long rho_sync_login_c(const char *name, const char *password, /*RHOC_CALLBACK*/void* callback, void* callback_data)
 {
     rho_sync_stop();
-    CSyncThread::getInstance()->addQueueCommand(new CSyncThread::CSyncLoginCommand(name, password, CSyncNotification((RHOC_CALLBACK)callback,callback_data,false)) );
+    CSyncThread::getInstance()->addQueueCommand(new CSyncThread::CSyncLoginCommand(name, password, 
+		new CSyncNotification((RHOC_CALLBACK)callback,callback_data,false)) );
 
     return CSyncThread::getInstance()->getRetValue();
 }

data/platform/shared/sync/SyncThread.h

@@ -72,14 +72,16 @@ public:
     {
     public:
 	    String m_strName, m_strPassword;
-        CSyncNotification m_oNotify;
-        CSyncLoginCommand(String name, String password, const CSyncNotification& oNotify) : 
-            CSyncCommand(CSyncThread::scLogin,"",false), m_oNotify(oNotify)
+        common::CAutoPtr<CSyncNotification> m_pNotify;
+        CSyncLoginCommand(String name, String password, CSyncNotification* pNotify) : 
+            CSyncCommand(CSyncThread::scLogin,"",false)
 	    {
 		    m_strName = name;
 		    m_strPassword = password;
+			m_pNotify = pNotify;
 	    }
     };
+	
     class CSyncSearchCommand : public CSyncCommand
     {
     public:

data/platform/wm/build/wm.rake

@@ -327,7 +327,13 @@ namespace "run" do
     end
 
     task :phone_spec do
-      Jake.run_spec_app('win32', 'phone_spec')
+      exit 1 if Jake.run_spec_app('win32','phone_spec')
+      exit 0
+    end
+
+    task :framework_spec do
+      exit 1 if Jake.run_spec_app('win32','framework_spec')
+      exit 0
     end
     
   end

data/platform/wm/rhodes/Alert.cpp

@@ -157,7 +157,7 @@ LRESULT CAlertDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lP
 	if (desiredDlgWidth > (dlgRect.right - dlgRect.left)) {
 		// if desired width is bigger than maximum width 
 		// - recalculate dialog window with wrapped text 
-		if (desiredDlgWidth >= maxWidth) {
+		if (desiredDlgWidth >= (int)maxWidth) {
 			msgWidth = maxWidth - (iconRect.right + INDENT*2 + xBorderWidth*2);
 			msgHeight = (((m_message.length() * tm.tmAveCharWidth) / msgWidth) + 1) 
 						* (tm.tmHeight + tm.tmExternalLeading + tm.tmInternalLeading);

data/platform/wm/rhodes/MainWindow.cpp

@@ -25,6 +25,8 @@
 #include "sync/SyncThread.h"
 #include "common/RhoFilePath.h"
 #include "common/RhoFile.h"
+#include "bluetooth/Bluetooth.h"
+
 
 #include <hash_map>
 
@@ -531,6 +533,32 @@ LRESULT CMainWindow::OnAlertHidePopup (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM
 	return 0;
 }
 
+LRESULT CMainWindow::OnBluetoothDiscover (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/) {
+#ifndef OS_WINDOWS
+	RhoDiscoverDlg* dlg = RhoBluetoothManager::getInstance()->getDiscoverDlg();
+	dlg->openDialog(RhoBluetoothManager::getInstance());
+#endif // OS_WINDOWS
+	return 0;
+}
+
+LRESULT CMainWindow::OnBluetoothDiscovered (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/) {
+#ifndef OS_WINDOWS
+	RhoDiscoveredDlg* dlg = RhoBluetoothManager::getInstance()->getDiscoveredDlg();
+	dlg->openDialog(RhoBluetoothManager::getInstance());
+#endif // OS_WINDOWS
+	return 0;
+}
+
+LRESULT CMainWindow::OnBluetoothCallback(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/) {
+	char* callback_url = (char*)wParam;
+	char* body = (char*)lParam;
+	rho_rhodesapp_callBluetoothCallback(callback_url, body);
+	delete callback_url;
+	delete body;
+	return 0;
+}	
+
+
 LRESULT CMainWindow::OnDateTimePicker (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/)
 {
 	CDateTimeMessage *msg = (CDateTimeMessage *)lParam;

data/platform/wm/rhodes/MainWindow.h

@@ -28,6 +28,9 @@ static UINT WM_CONNECTIONSNETWORKCOUNT = ::RegisterWindowMessage(L"RHODES_WM_CON
 static UINT WM_ALERT_SHOW_POPUP        = ::RegisterWindowMessage(L"RHODES_WM_ALERT_SHOW_POPUP");
 static UINT WM_ALERT_HIDE_POPUP        = ::RegisterWindowMessage(L"RHODES_WM_ALERT_HIDE_POPUP");
 static UINT WM_DATETIME_PICKER         = ::RegisterWindowMessage(L"RHODES_WM_DATETIME_PICKER");
+static UINT WM_BLUETOOTH_DISCOVER      = ::RegisterWindowMessage(L"RHODES_WM_BLUETOOTH_DISCOVER");
+static UINT WM_BLUETOOTH_DISCOVERED    = ::RegisterWindowMessage(L"RHODES_WM_BLUETOOTH_DISCOVERED");
+static UINT WM_BLUETOOTH_CALLBACK	   = ::RegisterWindowMessage(L"RHODES_WM_BLUETOOTH_CALLBACK");
 
 
 class CMainWindow :
@@ -94,6 +97,9 @@ public:
         MESSAGE_HANDLER(WM_ALERT_SHOW_POPUP, OnAlertShowPopup)
 		MESSAGE_HANDLER(WM_ALERT_HIDE_POPUP, OnAlertHidePopup);
 		MESSAGE_HANDLER(WM_DATETIME_PICKER, OnDateTimePicker);
+		MESSAGE_HANDLER(WM_BLUETOOTH_DISCOVER, OnBluetoothDiscover);
+		MESSAGE_HANDLER(WM_BLUETOOTH_DISCOVERED, OnBluetoothDiscovered);
+		MESSAGE_HANDLER(WM_BLUETOOTH_CALLBACK, OnBluetoothCallback);
     END_MSG_MAP()
 	
 private:
@@ -127,6 +133,9 @@ private:
     LRESULT OnAlertShowPopup (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
 	LRESULT OnAlertHidePopup (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
 	LRESULT OnDateTimePicker (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
+	LRESULT OnBluetoothDiscover (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
+	LRESULT OnBluetoothDiscovered (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
+	LRESULT OnBluetoothCallback (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
 	
 public:
     BEGIN_SINK_MAP(CMainWindow)

data/platform/wm/rhodes/OutlookApp.cpp

@@ -0,0 +1,72 @@
+#include "StdAfx.h"
+#include "OutlookApp.h"
+
+#ifdef _WIN32_WCE
+#define INITGUID
+#include <pimstore.h>
+#endif //_WIN32_WCE
+
+COutlookApp* COutlookApp::m_pInstance = 0;
+IMPLEMENT_LOGCLASS(COutlookApp,"OutlookApp");
+
+/*static*/ COutlookApp* COutlookApp::Create()
+{
+    if ( m_pInstance ) 
+        return m_pInstance;
+
+    m_pInstance = new COutlookApp();
+    return m_pInstance;
+}
+
+/*static*/ void COutlookApp::Destroy()
+{
+    if ( m_pInstance )
+        delete m_pInstance;
+
+    m_pInstance = 0;
+}
+
+COutlookApp::COutlookApp(void)
+{
+    HRESULT hr = CoInitializeEx( NULL, 0);
+
+#ifdef _WIN32_WCE
+    IUnknown* pUnknown = NULL;
+    hr = CoCreateInstance(__uuidof(Application),//CLSID_Application, 
+        NULL, CLSCTX_INPROC_SERVER, 
+        IID_IUnknown, 
+        (void **)&pUnknown);
+    if (hr != S_OK) {
+        // CoCreateInstance failed.
+        LOG(ERROR) + "CoCreateInstance failed.";
+        return;
+    }
+
+    //IID_IPOutlookApp
+    hr = pUnknown->QueryInterface(__uuidof(IPOutlookApp), (void**)&m_outlookApp); 
+    if (hr != S_OK) {
+        // QueryInterface failed.
+        LOG(ERROR) + "QueryInterface failed.";
+        return;
+    }
+
+    hr = m_outlookApp->Logon(NULL);
+    if (hr != S_OK) {
+        // Logon failed.
+        LOG(ERROR) + "Logon failed.";
+        m_outlookApp->Release();
+        return;
+    }
+#endif //_WIN32_WCE
+}
+
+COutlookApp::~COutlookApp(void)
+{
+#ifdef _WIN32_WCE
+	if(m_outlookApp) 
+		m_outlookApp->Release();
+#endif //_WIN32_WCE
+
+    m_outlookApp = 0;
+	CoUninitialize();
+}

data/platform/wm/rhodes/OutlookApp.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include "logging/RhoLog.h"
+
+struct IPOutlookApp;
+class COutlookApp
+{
+    DEFINE_LOGCLASS;
+
+	IPOutlookApp* m_outlookApp;
+
+    static COutlookApp* m_pInstance;
+    COutlookApp();
+public:
+    ~COutlookApp();
+
+    static COutlookApp* Create();
+    static void Destroy();
+    static COutlookApp* getInstance(){ return m_pInstance; }
+
+    IPOutlookApp* getApp(){ return m_outlookApp;}
+};

data/platform/wm/rhodes/Rhodes.cpp

@@ -503,6 +503,14 @@ extern "C" void Init_NavBar(void)
 {
 }
 
+//extern "C" void Init_RhoEvent()
+//{
+//}
+
+//extern "C" void Init_Calendar()
+//{
+//}
+
 /*BOOL EnumRhodesWindowsProc(HWND hwnd,LPARAM lParam)
 {
 	char buf[255] = {0};

data/platform/wm/rhodes/Rhodes.rc

@@ -207,6 +207,21 @@ BEGIN
     LTEXT           "Time:",IDC_TIME_STATIC,7,3,27,8
 END
 
+IDD_BLUETOOTH_DISCOVER DIALOG  0, 0, 172, 186
+STYLE DS_SETFONT | WS_POPUP | WS_SYSMENU
+FONT 8, "Microsoft Sans Serif"
+BEGIN
+    LISTBOX         IDC_BT_LIST,7,34,145,77,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    CTEXT           "Please wait while searching devices ...",IDC_BT_STATIC,7,19,144,8
+END
+
+IDD_BLUETOOTH_DISCOVERED DIALOG  0, 0, 172, 186
+STYLE DS_SETFONT | WS_POPUP | WS_SYSMENU
+FONT 8, "Microsoft Sans Serif"
+BEGIN
+    CTEXT           "Wait for connection ...",IDC_STATIC,10,49,130,16
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -267,6 +282,22 @@ BEGIN
         RIGHTMARGIN, 162
         TOPMARGIN, 1
     END
+
+    IDD_BLUETOOTH_DISCOVER, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 164
+        TOPMARGIN, 3
+        BOTTOMMARGIN, 179
+    END
+
+    IDD_BLUETOOTH_DISCOVERED, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 164
+        TOPMARGIN, 3
+        BOTTOMMARGIN, 179
+    END
 END
 #endif    // APSTUDIO_INVOKED