platform/shared/common/RhodesApp.h in rhodes-2.2.6 vs platform/shared/common/RhodesApp.h in rhodes-2.3.0.beta.1

@@ -2,10 +2,12 @@
 
 #include "RhodesAppBase.h"
 
 #ifdef __cplusplus
 
+#include "common/ThreadQueue.h"
+
 #include "net/INetRequest.h"
 
 #include "net/HttpServer.h"
 #include "SplashScreen.h"
 #include "AppMenu.h"
@@ -22,11 +24,11 @@
     DEFINE_LOGCLASS;
 
 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;
 
     String m_strListeningPorts;
@@ -34,11 +36,12 @@
     common::CAutoPtr<net::CHttpServer> m_httpServer;
     CSplashScreen m_oSplashScreen;
     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;
     String m_currentUrls[5];
 
@@ -50,45 +53,57 @@
 	
     common::CMutex m_mxScreenRotationCallback;
     String m_strScreenRotationCallback, m_strScreenRotationCallbackParams;
     
     boolean m_bDeactivationMode;
-    int m_activateCounter;
+    //int m_activateCounter;
 
+    common::CAutoPtr<common::CThreadQueue> m_appCallbacksQueue;
+
 public:
     ~CRhodesApp(void);
 
     static CRhodesApp* Create(const String& strRootPath);
     static void Destroy();
     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);
     void navigateBack();
     
     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; }
     CSplashScreen& getSplashScreen(){return m_oSplashScreen;}
 
@@ -107,11 +122,11 @@
     void setScreenRotationNotification(String strUrl, String strParams);
     void callScreenRotationCallback(int width, int height, int degrees);
 
     void loadUrl(String url);
 
-    boolean isLocalServerStarted();
+    void notifyLocalServerStarted();
     const char* getFreeListeningPort();
 
 protected:
     virtual void run();
 
@@ -135,11 +150,11 @@
 void rho_rhodesapp_create(const char* szRootPath);
 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();
 void rho_rhodesapp_keeplastvisitedurl(const char* szUrl);
 const char* rho_rhodesapp_getcurrenturl(int tabindex);
@@ -162,10 +177,12 @@
 void rho_rhodesapp_callSignatureCallback(const char* strCallbackUrl, const char* strSignaturePath, 
   const char* strError, int bCancel );
 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);
 const char* rho_rhodesapp_getappbackurl();
 
@@ -174,20 +191,17 @@
 void rho_rhodesapp_callScreenRotationCallback(int width, int height, int degrees);
 void rho_rhodesapp_callPopupCallback(const char *strCallbackUrl, const char *id, const char *title);
 
 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);
 
 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
 };
 #endif //__cplusplus