rhodes 2.3.0 → 2.3.1.beta.1

data/platform/shared/common/RhoAppAdapter.h

@@ -23,7 +23,7 @@ static const int ERR_GEOLOCATION = 12;
 
 static String getMessageText(const char* szName);
 static String getErrorText(int nError);
-static int    getErrorFromResponse(net::INetResponse& resp);
+static int    getErrorFromResponse(NetResponse& resp);
 static void   loadServerSources(const String& strSources);
 static void   loadAllSyncSources();
 static const char* getRhoDBVersion();

data/platform/shared/common/RhoFile.cpp

@@ -245,5 +245,15 @@ void CRhoFile::deleteFilesInFolder(const char* szFolderPath)
     }
 }
 
+/*static*/ void  CRhoFile::writeStringToFile( const char* szFilePath, String& strData )
+{
+    common::CRhoFile oFile;
+    if ( oFile.open( szFilePath, common::CRhoFile::OpenForWrite) )
+    {
+        oFile.write(strData.c_str(), strData.length() );
+        oFile.close();
+    }
+}
+
 }
 }

data/platform/shared/common/RhoFile.h

@@ -43,6 +43,7 @@ public:
     static void         loadTextFile(const char* szFilePath, String& strFile);
     static void         createFolder(const char* szDirPath);
     static void         readStringFromFile( const char* szFilePath, String& strData );
+    static void         writeStringToFile( const char* szFilePath, String& strData );
 private:
     CRhoFile(const CRhoFile&);
     void operator=(const CRhoFile&);

data/platform/shared/common/RhoMutexLock.h

@@ -60,7 +60,7 @@ private:
     void operator=(const CMutexLock&);
 };
 
-#define synchronized(mutex) CMutexLock __lock(mutex);
+#define synchronized(mutex) rho::common::CMutexLock __lock(mutex);
 
 class CLocalMutexLock {
 public:

data/platform/shared/common/RhoStd.h

@@ -196,6 +196,11 @@ public:
     {
         return VectorPtr<Type>::elementAt(i);
     }
+
+    void remove(int nItem)
+    {
+        VectorPtr<Type>::removeElementAt(nItem);
+    }
 };
 
 template<class TKEY, class TVALUE>

data/platform/shared/common/RhoThread.cpp

@@ -4,10 +4,10 @@
 namespace rho {
 namespace common {
 
-CRhoThread::CRhoThread(IRhoClassFactory* factory)
+CRhoThread::CRhoThread()
 {
     m_nState = TS_NONE;
-    m_pImpl = factory->createThreadImpl();
+    m_pImpl = rho_get_RhoClassFactory()->createThreadImpl();
 }
 
 void CRhoThread::start(EPriority ePriority)

data/platform/shared/common/RhoThread.h

@@ -7,7 +7,6 @@
 namespace rho {
 namespace common {
 
-struct IRhoClassFactory;
 class CRhoThread : public IRhoRunnable
 {
     CAutoPtr<IRhoThreadImpl> m_pImpl;
@@ -19,7 +18,7 @@ class CRhoThread : public IRhoRunnable
     int m_nState;
 public:
 
-    CRhoThread(IRhoClassFactory* factory);
+    CRhoThread();
     virtual ~CRhoThread(void){};
 
     virtual void start(EPriority ePriority);

data/platform/shared/common/RhodesApp.cpp

@@ -53,7 +53,7 @@ public:
     };
 
 public:
-    CAppCallbacksQueue(IRhoClassFactory *factory);
+    CAppCallbacksQueue();
 	~CAppCallbacksQueue();
 
     //void call(callback_t type);
@@ -99,8 +99,8 @@ char const *CAppCallbacksQueue::toString(int type)
     }
 }
 
-CAppCallbacksQueue::CAppCallbacksQueue(IRhoClassFactory *factory)
-    :CThreadQueue(factory), m_expected(local_server_started)
+CAppCallbacksQueue::CAppCallbacksQueue()
+    :CThreadQueue(), m_expected(local_server_started)
 {
     CThreadQueue::setLogCategory(getLogCategory());
     //setPollInterval(1);
@@ -143,7 +143,7 @@ void CAppCallbacksQueue::processCommand(IQueueCommand* pCmd)
     if (cmd->type > m_expected)
     {
         boolean bDuplicate = false;
-        for( int i = 0; i < m_commands.size() ; i++)
+        for( int i = 0; i < (int)m_commands.size() ; i++)
         {
             if ( m_commands.elementAt(i) == cmd->type )
             {
@@ -181,15 +181,13 @@ void CAppCallbacksQueue::processCommand(IQueueCommand* pCmd)
             break;
 
         case local_server_started:
-            // Nothing
+            m_expected = ui_created;
             break;
         case ui_created:
             {
-                common::CAutoPtr<common::IRhoClassFactory> factory = rho_impl_createClassFactory();
-                common::CAutoPtr<net::INetRequest> pNetRequest = factory->createNetRequest();
                 String strUrl = RHODESAPP().getBaseUrl();
                 strUrl += "/system/uicreated";
-                NetResponse(resp, pNetRequest->pullData( strUrl, null ) );
+                NetResponse resp = getNetRequest().pullData( strUrl, null );
                 if ( !resp.isOK() )
                     LOG(ERROR) + "activate app failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData();
 
@@ -198,19 +196,9 @@ void CAppCallbacksQueue::processCommand(IQueueCommand* pCmd)
             break;
         case app_activated:
             {
-/*                static bool navigatedToStartUrl = false;
-                if (!navigatedToStartUrl)
-                {
-                    LOG(INFO) + "navigate to first start url";
-                    RHODESAPP().navigateToUrl(RHODESAPP().getFirstStartUrl());
-                    navigatedToStartUrl = true;
-                }*/
-
-                common::CAutoPtr<common::IRhoClassFactory> factory = rho_impl_createClassFactory();
-                common::CAutoPtr<net::INetRequest> pNetRequest = factory->createNetRequest();
                 String strUrl = RHODESAPP().getBaseUrl();
                 strUrl += "/system/activateapp";
-                NetResponse(resp, pNetRequest->pullData( strUrl, null ) );
+                NetResponse resp = getNetRequest().pullData( strUrl, null );
                 if ( !resp.isOK() )
                     LOG(ERROR) + "activate app failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData();
 
@@ -249,9 +237,7 @@ CRhodesApp::CRhodesApp(const String& strRootPath)
     m_bRestartServer = false;
     //m_activateCounter = 0;
 
-    m_ptrFactory = rho_impl_createClassFactory();
-    m_NetRequest = m_ptrFactory->createNetRequest();
-    m_appCallbacksQueue = new CAppCallbacksQueue(rho_impl_createClassFactory());
+    m_appCallbacksQueue = new CAppCallbacksQueue();
 
 #if defined( OS_WINCE ) || defined (OS_WINDOWS)
     //initializing winsock
@@ -275,12 +261,12 @@ void CRhodesApp::run()
 {
     LOG(INFO) + "Starting RhodesApp main routine...";
     RhoRubyStart();
-    rubyext::CGeoLocation::Create(m_ptrFactory);
+    rubyext::CGeoLocation::Create();
 
     rho_db_init_attr_manager();
 
     LOG(INFO) + "Starting sync engine...";
-    sync::CSyncThread::Create(rho_impl_createClassFactory());
+    sync::CSyncThread::Create();
 
     LOG(INFO) + "RhoRubyInitApp...";
     RhoRubyInitApp();
@@ -345,7 +331,7 @@ class CRhoCallInThread : public common::CRhoThread
 {
 public:
     CRhoCallInThread(T* cb)
-        :CRhoThread(rho_impl_createClassFactory()), m_cb(cb)
+        :CRhoThread(), m_cb(cb)
     {
         start(epNormal);
     }
@@ -369,23 +355,21 @@ void rho_rhodesapp_call_in_thread(T *cb)
 
 class CRhoCallbackCall
 {
-    common::CAutoPtr<common::IRhoClassFactory> m_ptrFactory;
     String m_strCallback, m_strBody;
 public:
-    CRhoCallbackCall(const String& strCallback, const String& strBody, common::IRhoClassFactory* factory)
-      :m_ptrFactory(factory), m_strCallback(strCallback), m_strBody(strBody)
+    CRhoCallbackCall(const String& strCallback, const String& strBody)
+      : m_strCallback(strCallback), m_strBody(strBody)
     {}
 
     void run(common::CRhoThread &)
     {
-        common::CAutoPtr<net::INetRequest> pNetRequest = m_ptrFactory->createNetRequest();
-        common::CAutoPtr<net::INetResponse> presp = pNetRequest->pushData( m_strCallback, m_strBody, null );
+        getNetRequest().pushData( m_strCallback, m_strBody, null );
     }
 };
 
 void CRhodesApp::runCallbackInThread(const String& strCallback, const String& strBody)
 {
-    rho_rhodesapp_call_in_thread(new CRhoCallbackCall(strCallback, strBody, rho_impl_createClassFactory() ) );
+    rho_rhodesapp_call_in_thread(new CRhoCallbackCall(strCallback, strBody ) );
 }
 
 static void callback_activateapp(void *arg, String const &strQuery)
@@ -443,7 +427,7 @@ void CRhodesApp::callUiCreatedCallback()
 void CRhodesApp::callUiDestroyedCallback()
 {
     String strUrl = m_strHomeUrl + "/system/uidestroyed";
-    NetResponse(resp,getNet().pullData( strUrl, null ));
+    NetResponse resp = getNetRequest().pullData( strUrl, null );
     if ( !resp.isOK() )
     {
         LOG(ERROR) + "UI destroy callback failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData();
@@ -480,7 +464,7 @@ void CRhodesApp::callAppActiveCallback(boolean bActive)
         m_appCallbacksQueue->addQueueCommand(new CAppCallbacksQueue::Command(CAppCallbacksQueue::app_deactivated));
 
         String strUrl = m_strHomeUrl + "/system/deactivateapp";
-        NetResponse(resp,getNet().pullData( strUrl, null ));
+        NetResponse resp = getNetRequest().pullData( strUrl, null );
         if ( !resp.isOK() )
         {
             LOG(ERROR) + "deactivate app failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData();
@@ -491,8 +475,10 @@ void CRhodesApp::callAppActiveCallback(boolean bActive)
 
             if (bStop)
             {
+#if !defined( OS_WINCE ) && !defined (OS_WINDOWS)
                 LOG(INFO) + "Stopping local server.";
                 m_httpServer->stop();
+#endif
             }
         }
 
@@ -515,7 +501,7 @@ void CRhodesApp::callCameraCallback(String strCallbackUrl, const String& strImag
         strBody = "status=ok&image_uri=db%2Fdb-files%2F" + strImagePath;
 
     strBody += "&rho_callback=1";
-    NetRequest( getNet().pushData( strCallbackUrl, strBody, null ) );
+    getNetRequest().pushData( strCallbackUrl, strBody, null );
 }
 
 void CRhodesApp::callSignatureCallback(String strCallbackUrl, const String& strSignaturePath, 
@@ -533,7 +519,7 @@ void CRhodesApp::callSignatureCallback(String strCallbackUrl, const String& strS
 			strBody = "status=ok&signature_uri=db%2Fdb-files%2F" + strSignaturePath;
 		
 		strBody += "&rho_callback=1";
-		NetRequest( getNet().pushData( strCallbackUrl, strBody, null ) );
+		getNetRequest().pushData( strCallbackUrl, strBody, null );
 	}
 	
 void CRhodesApp::callDateTimeCallback(String strCallbackUrl, long lDateTime, const char* szData, int bCancel )
@@ -552,14 +538,14 @@ void CRhodesApp::callDateTimeCallback(String strCallbackUrl, long lDateTime, con
     }
 
     strBody += "&rho_callback=1";
-    NetRequest( getNet().pushData( strCallbackUrl, strBody, null ) );
+    getNetRequest().pushData( strCallbackUrl, strBody, null );
 }
 
 void CRhodesApp::callBluetoothCallback(String strCallbackUrl, const char* body) {
 	strCallbackUrl = canonicalizeRhoUrl(strCallbackUrl);
 	String strBody = body;
 	strBody += "&rho_callback=1";
-	NetRequest( getNet().pushData( strCallbackUrl, strBody, null ) );
+	getNetRequest().pushData( strCallbackUrl, strBody, null );
 }
 
 void CRhodesApp::callPopupCallback(String strCallbackUrl, const String &id, const String &title)
@@ -570,7 +556,7 @@ void CRhodesApp::callPopupCallback(String strCallbackUrl, const String &id, cons
     strCallbackUrl = canonicalizeRhoUrl(strCallbackUrl);
     String strBody = "button_id=" + id + "&button_title=" + title;
     strBody += "&rho_callback=1";
-    NetRequest( getNet().pushData( strCallbackUrl, strBody, null ) );
+    getNetRequest().pushData( strCallbackUrl, strBody, null );
 }
 
 static void callback_syncdb(void *arg, String const &/*query*/ )
@@ -642,7 +628,7 @@ const String& CRhodesApp::getRhoMessage(int nError, const char* szName)
         strUrl += szName;
     }
 
-    NetResponse(resp,getNet().pullData( strUrl, null ));
+    NetResponse resp = getNetRequest().pullData( strUrl, null );
     if ( !resp.isOK() )
     {
         LOG(ERROR) + "getRhoMessage failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData();
@@ -975,7 +961,7 @@ boolean CRhodesApp::sendLog()
 
     boolean bOldSaveToFile = LOGCONF().isLogToFile();
     LOGCONF().setLogToFile(false);
-    NetResponse( resp, getNet().pushMultipartData( strQuery, oItem, &(rho::sync::CSyncThread::getSyncEngine()), null ) );
+    NetResponse resp = getNetRequest().pushMultipartData( strQuery, oItem, &(rho::sync::CSyncThread::getSyncEngine()), null );
     LOGCONF().setLogToFile(bOldSaveToFile);
 
     if ( !resp.isOK() )
@@ -1045,8 +1031,7 @@ boolean CRhodesApp::callPushCallback(String strData)
         if ( m_strPushCallbackParams.length() > 0 )
             strBody += "&" + m_strPushCallbackParams;
 
-        common::CAutoPtr<net::INetRequest> pNetRequest = m_ptrFactory->createNetRequest();
-        NetResponse(resp,pNetRequest->pushData( m_strPushCallback, strBody, null ));
+        NetResponse resp = getNetRequest().pushData( m_strPushCallback, strBody, null );
         if (!resp.isOK())
             LOG(ERROR) + "Push notification failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData();
         else
@@ -1084,9 +1069,7 @@ void CRhodesApp::callScreenRotationCallback(int width, int height, int degrees)
         if ( m_strScreenRotationCallbackParams.length() > 0 )
             strBody += "&" + m_strPushCallbackParams;
 			
-		common::CAutoPtr<net::INetRequest> pNetRequest = m_ptrFactory->createNetRequest();
-		NetResponse(resp, pNetRequest->pushData( m_strScreenRotationCallback, strBody, null));
-		
+		NetResponse resp = getNetRequest().pushData( m_strScreenRotationCallback, strBody, null);
         if (!resp.isOK()) {
             LOG(ERROR) + "Screen rotation notification failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData();
         }
@@ -1128,9 +1111,7 @@ void CRhodesApp::loadUrl(String url)
     url = canonicalizeRhoUrl(url);
     if (callback)
     {
-        common::CAutoPtr<net::INetRequest> pNetRequest = m_ptrFactory->createNetRequest();
-        NetResponse(resp, pNetRequest->pushData( url,  "rho_callback=1", null ));
-        (void)resp;
+        getNetRequest().pushData( url,  "rho_callback=1", null );
     }
     else
         navigateToUrl(url);
@@ -1388,15 +1369,12 @@ int rho_conf_send_log()
 
 void rho_net_request(const char *url)
 {
-    rho::common::CAutoPtr<rho::common::IRhoClassFactory> factory = rho_impl_createClassFactory();
-    rho::common::CAutoPtr<rho::net::INetRequest> request = factory->createNetRequest();
-    request->pullData(url, null);
+    getNetRequest().pullData(url, null);
 }
 
-void rho_net_request_with_data(const char *url, const char *str_body) {
-    rho::common::CAutoPtr<rho::common::IRhoClassFactory> factory = rho_impl_createClassFactory();
-    rho::common::CAutoPtr<rho::net::INetRequest> request = factory->createNetRequest();
-    request->pushData(url, str_body, null);
+void rho_net_request_with_data(const char *url, const char *str_body) 
+{
+    getNetRequest().pushData(url, str_body, null);
 }
 	
 void rho_rhodesapp_load_url(const char *url)

data/platform/shared/common/RhodesApp.h

@@ -28,9 +28,6 @@ private:
     CRhodesApp(const String& strRootPath);
     boolean m_bExit, m_bRestartServer;
 
-    common::CAutoPtr<common::IRhoClassFactory> m_ptrFactory;
-    common::CAutoPtr<net::INetRequest> m_NetRequest;
-
     String m_strListeningPorts;
 
     common::CAutoPtr<net::CHttpServer> m_httpServer;
@@ -132,8 +129,6 @@ protected:
 
     void initHttpServer();
     void initAppUrls();
-
-    net::INetRequest& getNet(){ return *m_NetRequest; }
 };
 
 }

data/platform/shared/common/RhodesAppBase.cpp

@@ -25,7 +25,7 @@ CRhodesAppBase* CRhodesAppBase::m_pInstance = 0;
     m_pInstance = 0;
 }
 
-CRhodesAppBase::CRhodesAppBase(const String& strRootPath) : CRhoThread(rho_impl_createClassFactory())
+CRhodesAppBase::CRhodesAppBase(const String& strRootPath) : CRhoThread()
 {
     m_strRhoRootPath = strRootPath;
 

data/platform/shared/common/SplashScreen.cpp

@@ -31,8 +31,7 @@ void CSplashScreen::hide()
 	if ( nWaitMs <= 0 )
 		return;
 
-    CAutoPtr<IRhoClassFactory> ptrFactory = rho_impl_createClassFactory();
-    CAutoPtr<IRhoThreadImpl> ptrThread = ptrFactory->createThreadImpl();
+    CAutoPtr<IRhoThreadImpl> ptrThread = rho_get_RhoClassFactory()->createThreadImpl();
 
     ptrThread->sleep(nWaitMs);
 }

data/platform/shared/common/ThreadQueue.cpp

@@ -5,12 +5,11 @@
 namespace rho {
 namespace common {
 
-CThreadQueue::CThreadQueue(common::IRhoClassFactory* factory) : CRhoThread(factory)
+CThreadQueue::CThreadQueue() : CRhoThread()
 {
     m_nPollInterval = QUEUE_POLL_INTERVAL_SECONDS;
     m_bNoThreaded = false;
-
-    m_ptrFactory = factory;
+    m_pCurCmd = null;
 }
 
 CThreadQueue::~CThreadQueue(void)
@@ -76,6 +75,34 @@ void CThreadQueue::addQueueCommandToFront(IQueueCommand* pCmd)
         stopWait();
 }
 
+void CThreadQueue::stop(unsigned int nTimeoutToKill)
+{
+    cancelCurrentCommand();
+    CRhoThread::stop(nTimeoutToKill);
+}
+
+void CThreadQueue::cancelCurrentCommand()
+{
+    synchronized(m_mxStackCommands);
+    if ( m_pCurCmd != null )
+        m_pCurCmd->cancel();
+}
+
+void CThreadQueue::processCommandBase(IQueueCommand* pCmd)
+{
+    {
+        synchronized(m_mxStackCommands);
+        m_pCurCmd = pCmd;
+    }
+
+    processCommand(pCmd);
+
+    {
+        synchronized(m_mxStackCommands);
+        m_pCurCmd = null;
+    }
+}
+
 void CThreadQueue::run()
 {
 	LOG(INFO) + "Starting main routine...";
@@ -130,7 +157,7 @@ void CThreadQueue::processCommands()//throws Exception
     		pCmd = (IQueueCommand*)m_stackCommands.removeFirst();
     	}
 		
-		processCommand(pCmd);
+		processCommandBase(pCmd);
 	}
 }
 

data/platform/shared/common/ThreadQueue.h

@@ -25,24 +25,26 @@ public:
         virtual ~IQueueCommand(){};
         virtual boolean equals(const IQueueCommand& cmd) = 0;
         virtual String toString() = 0;
+        virtual void cancel(){}
     };
 
 private:
 
-    common::CAutoPtr<common::IRhoClassFactory> m_ptrFactory;
 	int           m_nPollInterval;
    	common::CMutex m_mxStackCommands;
 	LinkedListPtr<IQueueCommand*> m_stackCommands;
+    IQueueCommand* m_pCurCmd;
 
     boolean m_bNoThreaded;
 public:
-    CThreadQueue(common::IRhoClassFactory* factory);
+    CThreadQueue();
 
     ~CThreadQueue(void);
 
     virtual void addQueueCommand(IQueueCommand* pCmd);
     virtual void addQueueCommandToFront(IQueueCommand* pCmd);
 	virtual void run();
+    virtual void stop(unsigned int nTimeoutToKill);
 
 	void setPollInterval(int nInterval);
     int  getPollInterval()const{ return m_nPollInterval;}
@@ -50,7 +52,11 @@ public:
     boolean isNoThreadedMode(){ return m_bNoThreaded; }
     void setNonThreadedMode(boolean b){m_bNoThreaded = b;}
 
-    common::IRhoClassFactory* getFactory(){ return m_ptrFactory; }
+    void cancelCurrentCommand();
+    common::CMutex& getCommandLock(){ return m_mxStackCommands; }
+    IQueueCommand* getCurCommand(){ return m_pCurCmd; }
+    LinkedListPtr<IQueueCommand*>& getCommands(){ return m_stackCommands; }
+
 protected:
     virtual int getLastPollInterval(){ return 0;}
     virtual void processCommand(IQueueCommand* pCmd) = 0;
@@ -60,6 +66,7 @@ protected:
     boolean isAlreadyExist(IQueueCommand *pCmd);
 
     void processCommands();
+    void processCommandBase(IQueueCommand* pCmd);
 
     void addQueueCommandInt(IQueueCommand* pCmd);
     void addQueueCommandToFrontInt(IQueueCommand* pCmd);

data/platform/shared/common/Tokenizer.cpp

@@ -12,32 +12,36 @@ CTokenizer::CTokenizer(String str,String delims) {
 	
 String CTokenizer::nextToken() 
 {
-	eatDelimeters();
+	//eatDelimeters();
 	int start = m_position;
 	while (m_position<m_length && m_delims.find(m_str.at(m_position)) == String::npos ) {
 		m_position++;
 	}
-	
-	return m_str.substr(start,m_position-start);
+
+    String strToken = m_str.substr(start,m_position-start);
+	eatDelimeters();
+	return strToken;
 }
 	
 void CTokenizer::eatDelimeters() 
 {
-	while (m_position<m_length) {
-		char c = m_str.at(m_position);
+    if ( m_position == m_length )
+		m_position++;
+	else if (m_position<m_length)
+    {
+        char c = m_str.at(m_position);
 		if (m_delims.find(c) != String::npos ) {
 			m_position++;		
 		} else {
 			return;
 		}
-		
 	}
 }
 	
 boolean CTokenizer::hasMoreTokens() 
 {
-	eatDelimeters();
-	return (m_position < m_length);
+	//eatDelimeters();
+	return (m_position <= m_length);
 }
 
 }	

data/platform/shared/common/iphone/RhoClassFactory.cpp

@@ -2,20 +2,17 @@
 #include "sync/SyncThread.h"
 #include "sync/ClientRegister.h"
 
-namespace rho{
-namespace common{
-	IRhoClassFactory* rho_impl_createClassFactory()
-	{
-		return new rho::common::CRhoClassFactory;
-	}
-}
+static rho::common::CRhoClassFactory g_oRhoClassFactory;
+rho::common::IRhoClassFactory* rho_get_RhoClassFactory()
+{
+    return &g_oRhoClassFactory;
 }
 
 extern "C" {
 	
 void rho_clientregister_create(const char* szDevicePin)
 {
-	rho::sync::CClientRegister::Create(new rho::common::CRhoClassFactory, szDevicePin);
+	rho::sync::CClientRegister::Create(szDevicePin);
 }
 	
 };

data/platform/shared/common/iphone/RhoClassfactory.h

@@ -12,7 +12,7 @@ namespace common {
 class CRhoClassFactory : public common::IRhoClassFactory
 {
 public:
-    net::INetRequest* createNetRequest()
+    net::INetRequestImpl* createNetRequestImpl()
     {
         return new net::CURLNetRequest();
     }

data/platform/shared/common/map/ESRIMapEngine.cpp

@@ -11,8 +11,7 @@
 //1. move classes to files, raname namespace to rho::map
 //2. image cache: remove only unvisible images
 //3. see TODO inside
-//4. when stop thread - cancel current net request. Add cancelCurrentCommand to ThreadQueue and call it from stop
-//5. move all platform code to appropriate folders
+//4. move all platform code to appropriate folders
 
 #ifdef min
 #undef min
@@ -176,8 +175,7 @@ void ESRIMapView::Tile::swap(ESRIMapView::Tile &tile)
 
 IMPLEMENT_LOGCLASS(ESRIMapView::MapFetch,"MapFetch");
 ESRIMapView::MapFetch::MapFetch(ESRIMapView *view)
-    :CThreadQueue(rho_impl_createClassFactory()),
-    m_mapview(view), m_net_request(getFactory()->createNetRequest())
+    :CThreadQueue(), m_mapview(view)
 {
     CThreadQueue::setLogCategory(getLogCategory());
 
@@ -198,7 +196,7 @@ void ESRIMapView::MapFetch::fetchTile(String const &baseUrl, int zoom, uint64 la
 bool ESRIMapView::MapFetch::fetchData(String const &url, void **data, size_t *datasize)
 {
     RHO_MAP_TRACE1("fetchData: url=%s", url.c_str());
-    NetResponse(resp, m_net_request->doRequest("GET", url, "", 0, 0));
+    NetResponse resp = getNet().doRequest("GET", url, "", 0, 0);
     if (!resp.isOK())
         return false;
     *datasize = resp.getDataSize();
@@ -260,7 +258,7 @@ String ESRIMapView::MapFetch::Command::toString()
 
 IMPLEMENT_LOGCLASS(ESRIMapView::CacheUpdate,"CacheUpdate");
 ESRIMapView::CacheUpdate::CacheUpdate(ESRIMapView *view)
-    :CThreadQueue(rho_impl_createClassFactory()), m_mapview(view)
+    :CThreadQueue(), m_mapview(view)
 {
     CThreadQueue::setLogCategory(getLogCategory());
     start(epNormal);
@@ -434,7 +432,7 @@ ESRIMapView::ESRIMapView(IDrawingDevice *device)
     m_zoom_enabled(true), m_scroll_enabled(true), m_maptype("roadmap"),
     m_zoom(MIN_ZOOM), m_latitude(degreesToPixelsY(0, MAX_ZOOM)), m_longitude(degreesToPixelsX(0, MAX_ZOOM)),
     m_selected_annotation_index(-1),
-    m_pinCallout(0), m_pinCalloutLink(0), m_pin(0)
+    m_pinCallout(0), m_pinCalloutLink(0), m_pin(0), m_esriLogo(0)
 {
     String url = RHOCONF().getString("esri_map_url_roadmap");
     if (url.empty())
@@ -669,6 +667,11 @@ void ESRIMapView::setPinImage(IDrawingImage *pin, PIN_INFO pin_info)
 	m_pin_info = pin_info;
 }
 
+void ESRIMapView::setESRILogoImage(IDrawingImage *esriLogoImg) {
+    m_esriLogo = esriLogoImg;	
+}
+
+
 void ESRIMapView::setPinCalloutImage(IDrawingImage *pinCallout, PIN_INFO pin_callout_info)
 {
     m_pinCallout = pinCallout;
@@ -733,6 +736,13 @@ void ESRIMapView::paint(IDrawingContext *context)
             paintCallout(context, m_annotations.elementAt(m_selected_annotation_index));
     }
 
+    // draw esri logo
+    if (m_esriLogo != 0) {
+       int left = 0;
+	   int top = m_height - m_esriLogo->height();
+	   context->drawImage(left, top, m_esriLogo);
+    }
+
 /*
     TilesCache::list cache;
     {