rhodes 2.3.0 → 2.3.1.beta.1

data/platform/wm/rhodes/AppManager.cpp

@@ -3,7 +3,7 @@
 #include "AppManager.h"
 
 #ifdef ENABLE_DYNAMIC_RHOBUNDLE
-#include "rho/net/NetRequest.h"
+#include "net/INetRequest.h"
 
 #include "common/RhodesApp.h"
 
@@ -107,10 +107,10 @@ void CAppManager::ReloadRhoBundle(HWND hwnd, const char* szUrl, const char* szZi
 	}
 
 	//trying to load file
-	rho::net::CNetRequest request;
 	//NB: for mobile devices should use filesystem instead of RAM
-	NetResponse (resp, request.pullData(szUrl, null));
-	if (resp.getDataSize() > 0 && resp.getCharData()) {
+	NetResponse resp = getNetRequest().pullData(szUrl, null);
+	if (resp.getDataSize() > 0 && resp.getCharData()) 
+    {
 		loadData = resp.getCharData();
 		loadSize = resp.getDataSize();
 		errCode = RRB_NONE_ERR;

data/platform/wm/rhodes/MainWindow.cpp

@@ -19,7 +19,6 @@
 #include "ext/rho/rhoruby.h"
 #include "rubyext/WebView.h"
 #include "camera/Camera.h"
-#include "rho/net/NetRequest.h"
 #include "sync/SyncThread.h"
 #include "common/RhoFilePath.h"
 #include "common/RhoFile.h"

data/platform/wm/rhodes/MapView/MapViewManager.cpp

@@ -133,6 +133,10 @@ LRESULT CRhoMapViewDlg::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*
 		IDrawingImage* pinCalloutLinkImg = ourDrawingDevice.createImage(fullImagePath, true);
 		ourMapView->setPinCalloutLinkImage(pinCalloutLinkImg, pin_callout_info);
 
+		strImagePath = "lib/res/esri.png";
+		fullImagePath = CFilePath::join( RHODESAPP().getRhoRootPath(), strImagePath);
+		IDrawingImage* esriLogoImg = ourDrawingDevice.createImage(fullImagePath, true);
+		ourMapView->setESRILogoImage(esriLogoImg);
 	}
 
 #else 

data/platform/wm/rhodes/Vibrate.cpp

@@ -10,7 +10,7 @@ IMPLEMENT_LOGCLASS(CVibrate, "Vibrate");
 CVibrate *CVibrate::m_pInstance = NULL;
 CMutex CVibrate::m_mxLocker;
 
-CVibrate::CVibrate (IRhoClassFactory* factory) : CRhoThread(factory), m_nDuration(2), m_bToggled(false)
+CVibrate::CVibrate () : CRhoThread(), m_nDuration(2), m_bToggled(false)
 {
 }
 
@@ -21,7 +21,7 @@ CVibrate::~CVibrate ()
 
 void CVibrate::createCVibrate()
 {
-    static CVibrate instance(rho_impl_createClassFactory());
+    static CVibrate instance;
     m_pInstance = &instance;
 }
 

data/platform/wm/rhodes/Vibrate.h

@@ -19,7 +19,7 @@ class CVibrate :  public CRhoThread
     void untoggle ();
     
   private:
-    CVibrate (IRhoClassFactory* factory);
+    CVibrate ();
     ~CVibrate ();
     
     virtual void run();

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

@@ -5,13 +5,15 @@
 #include "sync/ClientRegister.h"
 #include "RhoCryptImpl.h"
 
-namespace rho{
-namespace common{
-IRhoClassFactory* rho_impl_createClassFactory()
+static rho::common::CRhoClassFactory g_oRhoClassFactory;
+rho::common::IRhoClassFactory* rho_get_RhoClassFactory()
 {
-    return new rho::common::CRhoClassFactory;
+    return &g_oRhoClassFactory;
 }
 
+namespace rho{
+namespace common{
+
 IRhoCrypt* CRhoClassFactory::createRhoCrypt()
 {
     return new CRhoCryptImpl();
@@ -23,7 +25,7 @@ IRhoCrypt* CRhoClassFactory::createRhoCrypt()
 extern "C" {
 void rho_clientregister_create(const char* szDevicePin)
 {
-    rho::sync::CClientRegister::Create(rho::common::rho_impl_createClassFactory(), szDevicePin);
+    rho::sync::CClientRegister::Create(szDevicePin);
 }
 
 void rho_clientregister_destroy()

data/platform/wm/rhodes/rho/common/RhoClassFactory.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "common/IRhoClassFactory.h"
-#include "../net/NetRequest.h"
+#include "../net/NetRequestImpl.h"
 #include "RhoThreadImpl.h"
 
 namespace rho {
@@ -11,9 +11,9 @@ class CRhoClassFactory : public IRhoClassFactory
 {
 public:
     virtual ~CRhoClassFactory(void){}
-    net::INetRequest* createNetRequest()
+    virtual net::INetRequestImpl* createNetRequestImpl()
     {
-        return new net::CNetRequest();
+        return new net::CNetRequestImpl();
     }
 
     virtual IRhoThreadImpl* createThreadImpl()

data/platform/wm/rhodes/rho/net/NetRequestImpl.cpp

@@ -3,7 +3,6 @@
 #include "NetRequestImpl.h"
 #include "common/RhoFile.h"
 #include "common/RhoFilePath.h"
-#include "NetRequest.h"
 #include "common/StringConverter.h"
 #include "net/URI.h"
 #include "common/RhoConf.h"
@@ -23,15 +22,25 @@ common::CMutex CNetRequestImpl::m_mxInternet;
 HINTERNET CNetRequestImpl::m_hInternet;
 HANDLE    CNetRequestImpl::m_hWceConnMgrConnection;
 
-CNetRequestImpl::CNetRequestImpl(CNetRequest* pParent, const char* method, const String& strUrl, 
-    IRhoSession* oSession, Hashtable<String,String>* pHeaders, boolean sslVerifyPeer)
+CNetRequestImpl::CNetRequestImpl()
+{
+    m_hConnection = 0;
+    m_hRequest = 0;
+
+    m_pszErrFunction = 0;
+
+    memset(&m_uri, 0, sizeof(m_uri) );
+    m_pHeaders = 0;
+    m_bCancel = false;
+    m_pSession = 0;
+    m_sslVerifyPeer = true;
+}
+
+void CNetRequestImpl::init(const char* method, const String& strUrl, IRhoSession* oSession, Hashtable<String,String>* pHeaders)
 {
-    m_pParent = pParent;
-    m_pParent->m_pCurNetRequestImpl = this;
     m_pHeaders = pHeaders;
     m_bCancel = false;
     m_pSession = oSession;
-    m_sslVerifyPeer = sslVerifyPeer;
 
     m_pszErrFunction = NULL;
     m_hConnection = NULL;
@@ -166,8 +175,10 @@ String CNetRequestImpl::getBodyContentType()
         return "application/x-www-form-urlencoded";
 }
 
-CNetResponseImpl* CNetRequestImpl::sendString(const String& strBody)
+INetResponse* CNetRequestImpl::doRequest( const char* method, const String& strUrl, const String& strBody, IRhoSession* oSession, Hashtable<String,String>* pHeaders )
 {
+    init( method, strUrl, oSession, pHeaders );
+
     CNetResponseImpl* pNetResp = new CNetResponseImpl;
 
     do
@@ -362,8 +373,10 @@ void CNetRequestImpl::readResponse(CNetResponseImpl* pNetResp)
         pNetResp->setCookies(makeClientCookie());
 }
 
-CNetResponseImpl* CNetRequestImpl::downloadFile(common::CRhoFile& oFile)
+INetResponse* CNetRequestImpl::pullFile(const String& strUrl, common::CRhoFile& oFile, IRhoSession* oSession, Hashtable<String,String>* pHeaders)
 {
+    init("GET", strUrl, oSession, pHeaders);
+
     CNetResponseImpl* pNetResp = new CNetResponseImpl;
     const int nDownloadBufferSize = 1024*100;
     char* pDownloadBuffer = 0;
@@ -495,8 +508,10 @@ int CNetRequestImpl::processMultipartItems( VectorPtr<CMultipartItem*>& arItems
     return nSize;
 }
 
-CNetResponseImpl* CNetRequestImpl::sendMultipartData(VectorPtr<CMultipartItem*>& arItems)
+INetResponse* CNetRequestImpl::pushMultipartData(const String& strUrl, VectorPtr<CMultipartItem*>& arItems, IRhoSession* oSession, Hashtable<String,String>* pHeaders)
 {
+    init("POST", strUrl, oSession, pHeaders );
+
     CNetResponseImpl* pNetResp = new CNetResponseImpl;
 
     do
@@ -669,7 +684,6 @@ void CNetRequestImpl::close()
 CNetRequestImpl::~CNetRequestImpl()
 {
     close();
-    m_pParent->m_pCurNetRequestImpl = null;
 }
 
 void CNetRequestImpl::readInetFile( HINTERNET hRequest, CNetResponseImpl* pNetResp, common::CRhoFile* pFile /*=NULL*/,

data/platform/wm/rhodes/rho/net/NetRequestImpl.h

@@ -20,25 +20,52 @@ class CNetResponseImpl : public INetResponse
 public:
     CNetResponseImpl() : m_bValid(false),m_nRespCode(-1){}
 
-    bool isValid()const{ return m_bValid; }
-    void setValid(bool b){ m_bValid = b; }
-
     virtual const char* getCharData()
     {
         return m_bValid ? m_data.c_str() : "";
     }
 
+    virtual void setCharData(const char* szData)
+    {
+        m_bValid = true;
+        m_data = szData;
+    }
+
     virtual unsigned int getDataSize()
     {
         return m_bValid ? m_data.size() : 0;
     }
 
+    virtual String getCookies()
+    {
+        return m_cookies;
+    }
+    virtual int getRespCode(){ return m_nRespCode;}
+
+    bool isValid()const{ return m_bValid; }
+    void setValid(bool b){ m_bValid = b; }
+
     String& getRawData(){ return m_data; }
 
-    boolean isResponseRecieved(){ return m_nRespCode!=-1;}
+    void setCookies(String s)
+    {
+        m_cookies = s;
+    }
+    
     void setResponseCode(int nRespCode){ m_nRespCode = nRespCode;}
 
-    int getRespCode(){ return m_nRespCode;}
+    boolean isSuccess()
+    {
+        return m_nRespCode > 0 && m_nRespCode < 400;
+    }
+
+	boolean isOK()
+	{
+		return m_nRespCode == 200 || m_nRespCode == 206;
+	}
+
+/*
+    boolean isResponseRecieved(){ return m_nRespCode!=-1;}
 
 	boolean isOK()
 	{
@@ -59,20 +86,11 @@ public:
     {
         return m_nRespCode > 0 && m_nRespCode < 400;
     }
-
-    void setCookies(String s)
-    {
-        m_cookies = s;
-    }
-    
-    String getCookies()
-    {
-        return m_cookies;
-    }
+*/
 };
 
 class CNetRequest;
-class CNetRequestImpl
+class CNetRequestImpl : public INetRequestImpl
 {
     DEFINE_LOGCLASS;
 
@@ -86,28 +104,34 @@ class CNetRequestImpl
     URL_COMPONENTS m_uri;
     CAtlStringW m_strReqUrlW;
     String      m_strUrl;
-    CNetRequest* m_pParent;
     Hashtable<String,String>* m_pHeaders;
     boolean m_bCancel;
     IRhoSession* m_pSession;
     boolean m_sslVerifyPeer;
 
 public :
-    CNetRequestImpl(CNetRequest* pParent, const char* method, const String& strUrl, 
-        IRhoSession* oSession, Hashtable<String,String>* pHeaders, boolean sslVerifyPeer);
+    CNetRequestImpl();
     ~CNetRequestImpl();
 
-    void close();
-    void cancel();
-    bool isError(){ return m_pszErrFunction!= null; }
-    CNetResponseImpl* sendString(const String& strBody);
+    virtual INetResponse* doRequest( const char* method, const String& strUrl, const String& strBody, IRhoSession* oSession, Hashtable<String,String>* pHeaders );
+    virtual INetResponse* pullFile(const String& strUrl, common::CRhoFile& oFile, IRhoSession* oSession, Hashtable<String,String>* pHeaders);
+    virtual INetResponse* pushMultipartData(const String& strUrl, VectorPtr<CMultipartItem*>& arItems, IRhoSession* oSession, Hashtable<String,String>* pHeaders);
+
+    virtual void cancel();
 
-    CNetResponseImpl* sendMultipartData(VectorPtr<CMultipartItem*>& arItems);
+    virtual boolean getSslVerifyPeer() { return m_sslVerifyPeer; }
+    virtual void setSslVerifyPeer(boolean mode){ m_sslVerifyPeer = mode; }
 
-    CNetResponseImpl* downloadFile(common::CRhoFile& oFile);
+    virtual INetResponse* createEmptyNetResponse(){ return new CNetResponseImpl(); }
 
     static void deinitConnection();
+
 private:
+    void close();
+    bool isError(){ return m_pszErrFunction!= null; }
+
+    void init( const char* method, const String& strUrl, IRhoSession* oSession, Hashtable<String,String>* pHeaders);
+
     String makeClientCookie();
 
     void ErrorMessage(LPCTSTR pszFunction);

data/platform/wm/rhodes/rho/rubyext/calendar.cpp

@@ -430,7 +430,9 @@ extern "C" VALUE event_fetch_by_id(const char *eid)
     return rho_ruby_get_NIL();
 }
 
-extern "C" void event_save(VALUE rEvent)
+static rho::String return_string_value;
+
+extern "C" const char* event_save(VALUE rEvent)
 {
     calendar_check();
     IPOutlookApp * polApp = COutlookApp::getInstance()->getApp();
@@ -447,7 +449,18 @@ extern "C" void event_save(VALUE rEvent)
         eventFromRuby(rEvent, pEvent);
 
         CHECK(pEvent->Save());
+
+    	if (pEvent != NULL) {
+    		long lOid = 0;
+    		if ( SUCCEEDED(pEvent->get_Oid(&lOid)) )  {
+				return_string_value = convertToStringA(lOid);
+				const char* rrr = return_string_value.c_str();
+        		return rrr;
+ 			}
+    	}
+
     END_CHECK
+    return NULL;
 }
 
 extern "C" void event_delete(const char *eid)
@@ -476,8 +489,9 @@ extern "C" VALUE event_fetch_by_id(const char *eid)
     return  rho_ruby_get_NIL();
 }
 
-extern "C" void event_save(VALUE rEvent)
+extern "C" const char* event_save(VALUE rEvent)
 {
+    return NULL;
 }
 
 extern "C" void event_delete(const char *eid)