rhodes 2.2.6 → 2.3.0.beta.1

data/platform/shared/common/RhodesApp.h

@@ -4,6 +4,8 @@
 
 #ifdef __cplusplus
 
+#include "common/ThreadQueue.h"
+
 #include "net/INetRequest.h"
 
 #include "net/HttpServer.h"
@@ -24,7 +26,7 @@ public:
 private:
 
     CRhodesApp(const String& strRootPath);
-    boolean m_bExit;
+    boolean m_bExit, m_bRestartServer;
 
     common::CAutoPtr<common::IRhoClassFactory> m_ptrFactory;
     common::CAutoPtr<net::INetRequest> m_NetRequest;
@@ -36,7 +38,8 @@ private:
     CAppMenu m_oAppMenu;
 
     String m_strLoadingPagePath, m_strLoadingPngPath;
-    String m_strStartUrl, m_strOptionsUrl, m_strRhobundleReloadUrl, m_strFirstStartUrl;
+    String m_strStartUrl, m_strOptionsUrl, m_strRhobundleReloadUrl;//, m_strFirstStartUrl;
+    static String m_strStartParameters;
     String m_strRhoMessage;
 
     int m_currentTabIndex;
@@ -52,7 +55,9 @@ private:
     String m_strScreenRotationCallback, m_strScreenRotationCallbackParams;
     
     boolean m_bDeactivationMode;
-    int m_activateCounter;
+    //int m_activateCounter;
+
+    common::CAutoPtr<common::CThreadQueue> m_appCallbacksQueue;
 
 public:
     ~CRhodesApp(void);
@@ -62,6 +67,7 @@ public:
     static CRhodesApp* getInstance(){ return (CRhodesApp*)m_pInstance; }
     void startApp();
     void stopApp();
+    void restartLocalServer(common::CThreadQueue& waitThread);
 
     void  keepLastVisitedUrl(String strUrl);
     void navigateToUrl( const String& strUrl);
@@ -70,23 +76,32 @@ public:
     boolean deactivationMode() const {return m_bDeactivationMode;}
 
     const String& getRhobundleReloadUrl();
+    const String& getBaseUrl();
     const String& getStartUrl();
     const String& getOptionsUrl();
     const String& getCurrentUrl(int index = 0);
-    const String& getFirstStartUrl();
+    //const String& getFirstStartUrl();
+    boolean isOnStartPage();
 
 	const String& getLoadingPngPath(){return m_strLoadingPngPath;}
     const String& getLoadingPagePath(){return m_strLoadingPagePath; }
 
+    static void setStartParameters(const char* szParams ){ m_strStartParameters = (szParams ? szParams : ""); }
+    static const String& getStartParameters(){ return m_strStartParameters; }
+
     const String& getAppBackUrl(){return m_strAppBackUrl;}
     void setAppBackUrl(const String& url);
     String getAppTitle();
+    String getAppName();
+    StringW getAppNameW();
 
     void callCameraCallback(String strCallbackUrl, const String& strImagePath, const String& strError, boolean bCancel );
     void callSignatureCallback(String strCallbackUrl, const String& strSignaturePath, const String& strError, boolean bCancel );
     void callDateTimeCallback(String strCallbackUrl, long lDateTime, const char* szData, int bCancel );
 	void callBluetoothCallback(String strCallbackUrl, const char* body);
     void callAppActiveCallback(boolean bActive);
+    void callUiCreatedCallback();
+    void callUiDestroyedCallback();
     void callPopupCallback(String strCallbackUrl, const String &id, const String &title);
 
     CAppMenu& getAppMenu (void) { return m_oAppMenu; }
@@ -109,7 +124,7 @@ public:
 
     void loadUrl(String url);
 
-    boolean isLocalServerStarted();
+    void notifyLocalServerStarted();
     const char* getFreeListeningPort();
 
 protected:
@@ -137,7 +152,7 @@ void rho_rhodesapp_start();
 void rho_rhodesapp_destroy();
 	
 const char* rho_rhodesapp_getstarturl();
-const char* rho_rhodesapp_getfirststarturl();
+//const char* rho_rhodesapp_getfirststarturl();
 
 const char* rho_rhodesapp_gethomeurl();
 const char* rho_rhodesapp_getoptionsurl();
@@ -164,6 +179,8 @@ void rho_rhodesapp_callSignatureCallback(const char* strCallbackUrl, const char*
 void rho_rhodesapp_callDateTimeCallback(const char* strCallbackUrl, long lDateTime, const char* szData, int bCancel );
 void rho_rhodesapp_callBluetoothCallback(const char* strCallbackUrl, const char* body);
 void rho_rhodesapp_callAppActiveCallback(int nActive);
+void rho_rhodesapp_callUiCreatedCallback();
+void rho_rhodesapp_callUiDestroyedCallback();
 unsigned long rho_rhodesapp_GetCallbackObject(int nIndex);
 
 void rho_rhodesapp_setViewMenu(unsigned long valMenu);
@@ -176,9 +193,6 @@ void rho_rhodesapp_callPopupCallback(const char *strCallbackUrl, const char *id,
 
 int rho_conf_send_log();
 
-int rho_base64_encode(const char *src, int srclen, char *dst);
-int rho_base64_decode(const char *src, int srclen, char *dst);
-
 void rho_net_request(const char *url);
 void rho_net_request_with_data(const char *url, const char *str_body);
 
@@ -186,7 +200,7 @@ void rho_rhodesapp_load_url(const char *url);
 
 int rho_rhodesapp_check_mode();
 
-int rho_is_local_server_started();
+int rho_rhodesapp_canstartapp(const char* szCmdLine, const char* szSeparators);
 
 #ifdef __cplusplus
 };

data/platform/shared/common/RhodesAppBase.cpp

@@ -36,6 +36,7 @@ void CRhodesAppBase::initAppUrls()
 {
     m_strBlobsDirPath = getRhoRootPath() + "db/db-files";
 	m_strDBDirPath = getRhoRootPath() + "db";
+    m_strAppRootPath = getRhoRootPath() + "apps";
 }
 
 String CRhodesAppBase::resolveDBFilesPath(const String& strFilePath)
@@ -127,5 +128,75 @@ const char* rho_rhodesapp_getplatform()
 #endif			
 }
 
-
+	static const char table64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+	
+	int rho_base64_encode(const char *src, int srclen, char *dst)
+	{
+		if (srclen < 0)
+			srclen = strlen(src);
+		if (!dst)
+			return (srclen/3)*4 + (srclen%3 ? 4 : 0) + 1;
+		
+		int out = 0;
+		for(int in = 0; in < srclen; in += 3, out += 4) {
+			
+			unsigned x = 0;
+			int actual = 0;
+			for (int i = 0; i < 3; ++i) {
+				char c;
+				if (in + i >= srclen)
+					c = 0;
+				else {
+					c = src[in + i];
+					actual += 8;
+				}
+				x = (x << 8) + (unsigned char)c;
+			}
+			
+			for (int i = 0; i < 4; ++i) {
+				if (actual <= 0) {
+					dst[out + i] = '=';
+				}
+				else {
+					dst[out + i] = table64[(x >> 18) & 0x3F];
+					x <<= 6;
+					actual -= 6;
+				}
+			}
+		}
+		
+		dst[out++] = '\0';
+		return out;
+	}
+	
+	int rho_base64_decode(const char *src, int srclen, char *dst)
+	{
+		if (srclen < 0)
+			srclen = strlen(src);
+		// Do not decode in case if srclen can not be divided by 4
+		if (srclen%4)
+			return 0;
+		if (!dst)
+			return srclen*3/4 + 1;
+		
+		char *found;
+		int out = 0;
+		for (int in = 0; in < srclen; in += 4, out += 3) {
+			unsigned x = 0;
+			for (int i = 0; i < 4; ++i) {
+				if ((found = strchr(const_cast<char*>(table64), src[in + i])) != NULL)
+					x = (x << 6) + (unsigned int)(found - table64);
+				else if (src[in + i] == '=')
+					x <<= 6;
+			}
+			
+			for (int i = 0; i < 3; ++i) {
+				dst[out + i] = (unsigned char)((x >> 16) & 0xFF);
+				x <<= 8;
+			}
+		}
+		dst[out++] = '\0';
+		return out;
+	}
+	
 } //extern "C"

data/platform/shared/common/RhodesAppBase.h

@@ -21,7 +21,7 @@ protected:
 
     static CRhodesAppBase* m_pInstance;
 
-    String m_strRhoRootPath, m_strBlobsDirPath, m_strDBDirPath;
+    String m_strRhoRootPath, m_strBlobsDirPath, m_strDBDirPath, m_strAppRootPath;
     String m_strHomeUrl;
 
     CRhodesAppBase(const String& strRootPath);
@@ -32,6 +32,7 @@ public:
 
     String resolveDBFilesPath(const String& strFilePath);
     const String& getRhoRootPath(){return m_strRhoRootPath;}
+    const String& getAppRootPath(){return m_strAppRootPath;}
     const String& getBlobsDirPath(){return m_strBlobsDirPath; }
     const String& getDBDirPath(){return m_strDBDirPath; }
     const String& getHomeUrl(){ return m_strHomeUrl; }
@@ -61,6 +62,9 @@ int rho_unzip_file(const char* szZipPath);
 
 void rho_free_callbackdata(void* pData);
 	
+int rho_base64_encode(const char *src, int srclen, char *dst);
+int rho_base64_decode(const char *src, int srclen, char *dst);	
+	
 #ifdef __cplusplus
 };
 #endif //__cplusplus

data/platform/shared/common/SplashScreen.h

@@ -10,12 +10,10 @@ class CSplashScreen
 {
     DEFINE_LOGCLASS;
 	
-	long m_nDelay;
-	CTimeInterval m_startTime;
+    long m_nDelay;
+    CTimeInterval m_startTime;
    	int m_nFlags;
 
-   	long howLongWaitMs();
-
 public: 
     static const int NONE = 0, VZOOM = 1, HZOOM = 2, VCENTER = 4, HCENTER = 8;
    	
@@ -33,6 +31,8 @@ public:
    	void start();
   	void hide();
     void init();
+
+    long howLongWaitMs();
    
 };
 

data/platform/shared/common/ThreadQueue.cpp

@@ -1,5 +1,7 @@
 #include "ThreadQueue.h"
 
+//1. when stop thread - cancel current command. Add cancelCurrentCommand to ThreadQueue and call it from stop
+
 namespace rho {
 namespace common {
 
@@ -15,29 +17,43 @@ CThreadQueue::~CThreadQueue(void)
 {
 }
 
+boolean CThreadQueue::isAlreadyExist(IQueueCommand *pCmd)
+{
+    boolean bExist = false;
+    if ( isSkipDuplicateCmd() )
+    {
+        for (int i = 0; i < (int)m_stackCommands.size(); ++i)
+        {
+            if (m_stackCommands.get(i)->equals(*pCmd))
+            {
+                LOG(INFO) + "Command already exists in queue. Skip it.";
+                bExist = true;
+                break;
+            }
+        }
+    }
+
+    return bExist;
+}
+
 void CThreadQueue::addQueueCommandInt(IQueueCommand* pCmd)
 {
     LOG(INFO) + "addCommand: " + pCmd->toString();
 
     synchronized(m_mxStackCommands);
 
-	boolean bExist = false;
-    if ( isSkipDuplicateCmd() )
-    {
-	    for ( int i = 0; i < (int)m_stackCommands.size(); i++ )
-	    {
-		    if ( m_stackCommands.get(i)->equals(*pCmd) )
-		    {
-                LOG(INFO) + "Command already exists in queue. Skip it.";
-			    bExist = true;
-			    break;
-		    }
-	    }
-    }
+    if ( !isAlreadyExist(pCmd) )
+        m_stackCommands.add(pCmd);
+}
+
+void CThreadQueue::addQueueCommandToFrontInt(IQueueCommand *pCmd)
+{
+    LOG(INFO) + "addCommand to front: " + pCmd->toString();
 
-	if ( !bExist )
-		m_stackCommands.add(pCmd);
+    synchronized(m_mxStackCommands);
 
+    if (!isAlreadyExist(pCmd))
+        m_stackCommands.addToFront(pCmd);
 }
 
 void CThreadQueue::addQueueCommand(IQueueCommand* pCmd)
@@ -46,10 +62,20 @@ void CThreadQueue::addQueueCommand(IQueueCommand* pCmd)
 
     if ( isNoThreadedMode()  )
         processCommands();
-    else
+    else if ( isAlive() )
 	    stopWait(); 
 }
 
+void CThreadQueue::addQueueCommandToFront(IQueueCommand* pCmd)
+{
+    addQueueCommandToFrontInt(pCmd);
+
+    if ( isNoThreadedMode() )
+        processCommands();
+    else if ( isAlive() )
+        stopWait();
+}
+
 void CThreadQueue::run()
 {
 	LOG(INFO) + "Starting main routine...";
@@ -111,7 +137,8 @@ void CThreadQueue::processCommands()//throws Exception
 void CThreadQueue::setPollInterval(int nInterval)
 { 
     m_nPollInterval = nInterval; 
-    stopWait();
+    if ( isAlive() )
+        stopWait();
 }
 
 };

data/platform/shared/common/ThreadQueue.h

@@ -41,6 +41,7 @@ public:
     ~CThreadQueue(void);
 
     virtual void addQueueCommand(IQueueCommand* pCmd);
+    virtual void addQueueCommandToFront(IQueueCommand* pCmd);
 	virtual void run();
 
 	void setPollInterval(int nInterval);
@@ -56,9 +57,12 @@ protected:
     virtual boolean isSkipDuplicateCmd() { return false; }
     virtual void onTimeout(){}
 
+    boolean isAlreadyExist(IQueueCommand *pCmd);
+
     void processCommands();
 
     void addQueueCommandInt(IQueueCommand* pCmd);
+    void addQueueCommandToFrontInt(IQueueCommand* pCmd);
 
     boolean isNoCommands();
 };

data/platform/shared/common/app_build_configs.c

@@ -1,5 +1,4 @@
 // WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!
-// Generated Tue Dec 07 06:35:02 +0300 2010
 
 #include <string.h>
 

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

@@ -4,6 +4,7 @@
 #include "net/CURLNetRequest.h"
 #include "common/PosixThreadImpl.h"
 #include "net/iphone/sslimpl.h"
+#include "RhoCryptImpl.h"
 
 namespace rho {
 namespace common {
@@ -23,6 +24,11 @@ public:
     {
         return new net::SSLImpl();
     }
+
+    IRhoCrypt* createRhoCrypt()
+    {
+        return new CRhoCryptImpl();
+    }
 };
 
 }

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

@@ -0,0 +1,47 @@
+#pragma once
+
+#include "logging/RhoLog.h"
+#include "common/IRhoCrypt.h"
+
+namespace rho{
+namespace common{
+
+class CRhoCryptImpl : public IRhoCrypt
+{
+    DEFINE_LOGCLASS;
+
+	unsigned char *  m_dbKeyData;
+    int32_t   m_dwLastError;
+    String    m_strDBPartition;
+
+public:
+    CRhoCryptImpl(void);
+    ~CRhoCryptImpl(void);
+
+    virtual int db_decrypt( const char* szPartition, int size, unsigned char* data );
+    virtual int db_encrypt( const char* szPartition, int size, unsigned char* data, unsigned char* dataOut );
+    virtual int set_db_CryptKey( const char* szPartition, const char* szKey, bool bPersistent );
+private:
+    bool _checkError( int32_t status, const char* szFunc );
+    int32_t getErrorCode(){ return m_dwLastError; }
+
+    void initContext(const char* szPartition);
+
+	void generateNewKey();
+    void readKeyFromStorage();
+    void writeKeyToStorage();
+};
+
+}
+}
+
+#ifdef __cplusplus
+extern "C" {
+#endif //__cplusplus
+
+void rho_crypt_aes_256_encrypt(int size, unsigned char *in, unsigned char *out);
+void rho_crypt_aes_256_decrypt(int size, unsigned char *in, unsigned char *out);
+
+#ifdef __cplusplus
+};
+#endif //__cplusplus