rhodes 3.3.3.beta.4 → 3.3.3

data/platform/shared/RhoConnectClient/RhoConnectClient.h

@@ -59,19 +59,24 @@ typedef struct _RHO_CONNECT_NOTIFY
     char* source_name;
     char* status;
     char* sync_type;
+    char* bulk_status;
+    char* partition;
     int error_code;
     char* error_message;
     char* callback_params;
-    unsigned long create_errors;
+    
+    unsigned long create_errors_messages;
 
     unsigned long update_errors_obj;
     unsigned long update_errors_attrs;
+    unsigned long update_errors_messages;
 
     unsigned long update_rollback_obj;
     unsigned long update_rollback_attrs;
 
     unsigned long delete_errors_obj;
     unsigned long delete_errors_attrs;
+    unsigned long delete_errors_messages;
 
 }RHO_CONNECT_NOTIFY;
 
@@ -93,6 +98,8 @@ void rho_connectclient_initmodel(RHOM_MODEL* model);
 void rho_connectclient_destroymodel(RHOM_MODEL* model);
 
 void rho_connectclient_init(RHOM_MODEL* pModels, int nModels);
+void rho_connectclient_updatemodels(RHOM_MODEL* pModels, int nModels);
+
 void rho_connectclient_destroy();
 void rho_connectclient_database_client_reset();
 void rho_connectclient_database_full_reset_and_logout();
@@ -123,6 +130,7 @@ unsigned long rho_connectclient_find_all(const char* szModel, unsigned long hash
 unsigned long rho_connectclient_findbysql(const char* szModel, const char* szSql, unsigned long arParams );
 
 int rho_connectclient_is_changed(const char* szModel);
+void rho_connectclient_set_synctype(const char* szModel, RHOM_SYNC_TYPE sync_type);
 
 void rho_connectclient_save( const char* szModel, unsigned long hash );
 void rho_connectclient_itemdestroy( const char* szModel, unsigned long hash );
@@ -141,6 +149,7 @@ void rho_connectclient_stop_bulkupdate(const char* szModel);
 void rho_connectclient_on_sync_create_error(const char* szModel, RHO_CONNECT_NOTIFY* oNotify, const char* szAction );
 void rho_connectclient_on_sync_update_error(const char* szModel, RHO_CONNECT_NOTIFY* oNotify, const char* szAction );
 void rho_connectclient_on_sync_delete_error(const char* szModel, RHO_CONNECT_NOTIFY* oNotify, const char* szAction );
+void rho_connectclient_push_changes(const char* szModel );
 
 #ifdef __cplusplus
 };

data/platform/shared/common/BundleManager.cpp

@@ -36,19 +36,12 @@ using namespace rho;
 using namespace rho::common;
 extern "C" void rho_sys_app_exit();
 extern "C" void rho_sys_impl_exit_with_errormessage(const char* szTitle, const char* szMsg);
-extern "C" void rho_sys_impl_before_exit();
 
-#if !defined(OS_WINDOWS) && !defined(OS_WINCE) && !defined(OS_MACOSX)
+#if !defined(OS_WINDOWS_DESKTOP) && !defined(OS_WINCE) && !defined(OS_MACOSX)
 void rho_sys_impl_exit_with_errormessage(const char* szTitle, const char* szMsg)
 {
 }
 #endif
-#if !defined(OS_ANDROID)
-extern "C"
-void rho_sys_impl_before_exit()
-{
-}
-#endif
 
 namespace rho {
 namespace common {
@@ -58,8 +51,9 @@ class CFileTransaction
     unsigned int m_nError;
     String m_strError;
     String m_strFolder;
+    boolean m_bRollbackInDestr;
 public:
-    CFileTransaction(const String& strFolder);
+    CFileTransaction(const String& strFolder, boolean bRollbackInDestr = true);
     ~CFileTransaction();
     unsigned int start();
     void commit();
@@ -77,8 +71,6 @@ class CReplaceBundleThread : public rho::common::CRhoThread
 
     String m_bundle_path;
 
-    unsigned int removeFilesByList( const String& strListPath, const String& strSrcFolder );
-    unsigned int moveFilesByList( const String& strListPath, const String& strSrcFolder, const String& strDstFolder );
     void doReplaceBundle();
 public:
 
@@ -93,10 +85,13 @@ public:
     virtual void run();
 
     static void showError(int nError, const String& strError );
+
+    static unsigned int removeFilesByList( const String& strListPath, const String& strSrcFolder );
+    static unsigned int moveFilesByList( const String& strListPath, const String& strSrcFolder, const String& strDstFolder );
 };
 IMPLEMENT_LOGCLASS(CReplaceBundleThread,"RhoBundle");
 
-CFileTransaction::CFileTransaction(const String& strFolder) : m_strFolder(strFolder)
+CFileTransaction::CFileTransaction(const String& strFolder, boolean bRollbackInDestr) : m_strFolder(strFolder), m_bRollbackInDestr(bRollbackInDestr)
 {
 }
 
@@ -132,7 +127,8 @@ unsigned int CFileTransaction::start()
 
 CFileTransaction::~CFileTransaction()
 {
-    rollback();
+    if (m_bRollbackInDestr)
+        rollback();
 }
 
 void CFileTransaction::commit()
@@ -201,12 +197,13 @@ unsigned int CFileTransaction::rollback()
 
 unsigned int CReplaceBundleThread::removeFilesByList( const String& strListPath, const String& strSrcFolder )
 {
-	LOG(TRACE) + "Removing files by list: " + strSrcFolder;
+	LOG(TRACE) + "Removing files by list: " + strSrcFolder + ", list: " + strListPath;
 
     unsigned int nError = 0;
     String strList;
     CRhoFile::loadTextFile(strListPath.c_str(), strList);
 
+
     CTokenizer oTokenizer( strList, "\n" );
 	while (oTokenizer.hasMoreTokens()) 
     {
@@ -331,7 +328,11 @@ void CReplaceBundleThread::doReplaceBundle()
 
 #ifdef OS_ANDROID
     //rho_file_patch_stat_table(CFilePath::join(m_bundle_path, "RhoBundle/apps/rhofilelist.txt"))
-    CRhoFile::copyFile(CFilePath::join(m_bundle_path, "RhoBundle/rho.dat").c_str(), RHODESAPP().getRhoRootPath().c_str());
+    if (CRhoFile::copyFile(CFilePath::join(m_bundle_path, "RhoBundle/rho.dat").c_str(), CFilePath::join(RHODESAPP().getRhoRootPath().c_str(), "rho.dat").c_str()))
+    {
+        int err = errno;
+        LOG(ERROR) + "Cannot copy rho.dat, errno: " + LOGFMT("%d") + err;
+    }
 #endif
 
 
@@ -352,7 +353,7 @@ void rho_sys_replace_current_bundle(const char* path)
 
 int rho_sys_check_rollback_bundle(const char* szRhoPath)
 {
-    CFileTransaction oFT( CFilePath::join(szRhoPath, "apps") );
+    CFileTransaction oFT( CFilePath::join(szRhoPath, "apps"), false );
     return oFT.rollback() != 0 ? 0 : 1;
 }
 
@@ -361,6 +362,16 @@ int rho_sys_delete_folder(const char* szRhoPath)
     return CRhoFile::deleteFolder(szRhoPath);
 }
 
+int rho_sysimpl_remove_bundle_files(const char* path, const char* fileListName)
+{
+    unsigned int nError = CReplaceBundleThread::removeFilesByList(CFilePath::join(path, fileListName), path);
+    if ( nError != 0 )
+    {
+        CReplaceBundleThread::showError(nError, String("Remove of bundle files is failed: ") += path);
+    }
+    return nError;
+}
+
 } //extern "C"
 
 

data/platform/shared/common/ExtManager.h

@@ -56,12 +56,17 @@ struct IRhoExtension
     virtual long OnNavigateTimeout(const wchar_t* szUrlBeingNavigatedTo, const CRhoExtData& oExtData){return 0;}
     virtual long OnSIPState(bool bSIPState, const CRhoExtData& oExtData){return 0;}
     virtual long OnAlertPopup(int nEnum, void* pData, const CRhoExtData& oExtData){return 0;}
+    virtual long OnAuthenticationRequest(int nEnum, void* pData, const CRhoExtData& oExtData){return 0;}
+    virtual long OnGeolocationData(int nEnum, void* pData, const CRhoExtData& oExtData){return 0;}
     virtual long OnNavigateError(const wchar_t* szUrlBeingNavigatedTo, const CRhoExtData& oExtData){return 0;}
     virtual void OnAppActivate(bool bActivate, const CRhoExtData& oExtData){}
+    virtual void OnWindowChanged(LPVOID lparam){}
 };
 
 struct IRhoExtManager
 {
+    enum ELogExtLevels { eLogError = 0, eLogWarning, eLogInfo, eLogUser, eLogDebug, eLogLevelsCount };
+
     virtual ~IRhoExtManager(){}
 
     virtual void onUnhandledProperty( const wchar_t* pModuleName, const wchar_t* pName, const wchar_t* pValue, const CRhoExtData& oExtData ) = 0;
@@ -75,7 +80,7 @@ struct IRhoExtManager
     virtual bool existsJavascript(const wchar_t* szJSFunction) = 0;
     virtual void executeJavascript(const wchar_t* szJSFunction) = 0;
 
-    virtual void rhoLog(int nSeverity, const char* szModule, const char* szMsg, const char* szFile, int nLine) = 0;
+    virtual void rhoLog(ELogExtLevels eLogLevel, const char* szModule, const char* szMsg, const char* szFile, int nLine) = 0;
     virtual StringW getCurrentUrl() = 0;
     virtual void stopNavigate() = 0;
     virtual void historyForward() = 0;
@@ -91,6 +96,9 @@ struct IRhoExtManager
     virtual StringW getPageTitle(UINT iTab) = 0;
 
     virtual StringW getConfigPath() = 0;
+
+    virtual void setBrowserGesturing(bool bEnableGesturing) = 0;
+    virtual void passSipPositionToEngine() = 0;
 };
 
 class CExtManager : public IRhoExtManager
@@ -112,8 +120,11 @@ public:
     long OnNavigateTimeout(const wchar_t* szUrlBeingNavigatedTo);
     long OnSIPState(bool bSIPState);
     long OnAlertPopup(int nEnum, void* pData);
+    long OnAuthenticationRequest(int nEnum, void* pData);
+    long OnGeolocationData(int nEnum, void* pData);
     long OnNavigateError(const wchar_t* szUrlBeingNavigatedTo);
     void OnAppActivate(bool bActivate);
+    void OnWindowChanged(LPVOID lparam);
 
     CRhoExtData makeExtData();
     void close();
@@ -129,7 +140,7 @@ public:
 
     virtual void executeJavascript(const wchar_t* szJSFunction);
     virtual bool existsJavascript(const wchar_t* szJSFunction);
-    virtual void rhoLog(int nSeverity, const char* szModule, const char* szMsg, const char* szFile, int nLine);
+    virtual void rhoLog(ELogExtLevels eLogLevel, const char* szModule, const char* szMsg, const char* szFile, int nLine);
     virtual StringW getCurrentUrl();
     virtual void stopNavigate();
     virtual void historyForward();
@@ -144,6 +155,8 @@ public:
     virtual int getTextZoom(); //Enum (0 to 4)
     virtual StringW getPageTitle(UINT iTab);
     virtual StringW getConfigPath();
+    virtual void setBrowserGesturing(bool bEnableGesturing);
+    virtual void passSipPositionToEngine();
 };
 
 } //namespace common

data/platform/shared/common/RhoConf.cpp

@@ -42,9 +42,12 @@ namespace common{
 
 RhoSettings g_RhoSettings;
 
-void RhoSettings::saveToFile(const char* szName)
+void RhoSettings::saveToFile(const char* szName, boolean bRemove/* = false*/)
 {
-    m_mapChangedValues.put(szName, getString(szName) );
+    if ( !bRemove )
+        m_mapChangedValues.put(szName, getString(szName) );
+    else
+        m_mapChangedValues.remove(szName);
 
     String strData;
     saveChangesToString(strData);
@@ -253,6 +256,13 @@ bool   RhoSettings::isExist(const char* szName){
 	return it != m_mapValues.end();
 }
 
+void  RhoSettings::removeProperty(const char* szName, boolean bSaveToFile)
+{
+    m_mapValues.remove(szName);
+    if ( bSaveToFile ) 
+        saveToFile( szName, true );
+}
+
 }
 }
 
@@ -307,6 +317,11 @@ int rho_conf_is_property_exists(const char* name)
     return RHOCONF().isExist(name) ? 1 : 0;
 }
 
+void  rho_conf_remove_property(const char* name)
+{
+    RHOCONF().removeProperty(name, true);
+}
+
 void rho_conf_freeString(char* str) {
 	if ( str )
 		free(str);

data/platform/shared/common/RhoConf.h

@@ -55,6 +55,7 @@ public:
     void   setBool(const char* szName, bool bVal, boolean bSaveToFile);
 
     bool   isExist(const char* szName);
+    void   removeProperty(const char* szName, boolean bSaveToFile);
 
     const String& getConfFilePath()const{ return m_strConfFilePath;}
     void setConfFilePath(const char* szConfFilePath){ m_strConfFilePath = szConfFilePath; }
@@ -76,7 +77,7 @@ protected:
     void setPropertyByName(const char* szName, int nNameLen, const char* szValue, int nValueLen, Hashtable<String,String>& mapValues );
     void loadProperty( const char* start, int len, Hashtable<String,String>& mapValues );
 
-    void saveToFile(const char* szName);
+    void saveToFile(const char* szName, boolean bRemove = false );
     void readChanges();
     void checkConflicts();
 };
@@ -106,6 +107,7 @@ void  rho_conf_freeString(char* str);
 void  rho_conf_setString(const char* szName, const char* value);
 //void  rho_conf_save();
 int   rho_conf_is_property_exists(const char* name);
+void  rho_conf_remove_property(const char* name);
 
 #ifdef __cplusplus
 }

data/platform/shared/common/RhoDefs.h

@@ -34,7 +34,7 @@
 #elif defined(_WIN32_WCE)
 # define OS_WINCE _WIN32_WINCE
 #elif defined(WIN32)
-# define OS_WINDOWS
+# define OS_WINDOWS_DESKTOP
 #elif defined(__CYGWIN__) || defined(__CYGWIN32__)
 # define OS_CYGWIN
 #elif defined(linux) || defined(__linux) || defined(__linux__)
@@ -46,7 +46,7 @@
 #else
 #endif
 
-#if defined(OS_WINDOWS) || defined(OS_WINCE)
+#if defined(OS_WINDOWS_DESKTOP) || defined(OS_WINCE)
 #define WINDOWS_PLATFORM
 #endif
 
@@ -97,7 +97,7 @@
 
 typedef int LogSeverity;
 
-#if defined( OS_WINDOWS ) || defined( OS_WINCE )
+#if defined( WINDOWS_PLATFORM )
 #ifndef _CRT_SECURE_NO_WARNINGS
 #define _CRT_SECURE_NO_WARNINGS 1
 #endif //_CRT_SECURE_NO_WARNINGS
@@ -116,9 +116,9 @@ typedef int LogSeverity;
 
 #endif
 
-#if !defined(OS_ANDROID)
-#include "tcmalloc/rhomem.h"
-#endif
+//#if !defined(OS_ANDROID)
+//#include "tcmalloc/rhomem.h"
+//#endif
 
 #ifdef RHODES_EMULATOR
 #define RHO_RB_EXT ".rb"

data/platform/shared/common/RhoFatalError.h

@@ -41,7 +41,7 @@ public:
     static void processFatalError(){
         #ifdef RHO_DEBUG
 
-        #if defined (OS_WINDOWS)
+        #if defined (OS_WINDOWS_DESKTOP)
             //__debugbreak();
             DebugBreak();
         #elif defined (OS_WINCE)

data/platform/shared/common/RhoFile.cpp

@@ -49,7 +49,7 @@
 
 #if defined(OS_WINCE)
     extern "C" int  _rename(const char *, const char *);
-#elif defined(OS_WINDOWS)
+#elif defined(OS_WINDOWS_DESKTOP)
     extern "C" int  rename(const char *, const char *);
 #endif
 
@@ -360,7 +360,7 @@ void CRhoFile::loadTextFile(const char* szFilePath, String& strFile)
 }
 
 unsigned int CRhoFile::deleteFile( const char* szFilePath ){
-#if defined(OS_WINDOWS) || defined(OS_WINCE)
+#if defined(WINDOWS_PLATFORM)
     return (unsigned int)_unlink(szFilePath);
 #else
     return (unsigned int)remove(szFilePath);
@@ -368,7 +368,7 @@ unsigned int CRhoFile::deleteFile( const char* szFilePath ){
 }
 
 unsigned int CRhoFile::deleteEmptyFolder( const char* szFilePath ){
-#if defined(OS_WINDOWS) || defined(OS_WINCE)
+#if defined(WINDOWS_PLATFORM)
     return (unsigned int)_rmdir(szFilePath);
 #else
     return (unsigned int)rmdir(szFilePath);
@@ -378,7 +378,7 @@ unsigned int CRhoFile::deleteEmptyFolder( const char* szFilePath ){
 
 void CRhoFile::deleteFilesInFolder(const char* szFolderPath)
 {
-#if defined(OS_WINDOWS) || defined(OS_WINCE)
+#if defined(WINDOWS_PLATFORM)
     StringW wFolderName;
     common::convertToStringW(szFolderPath,wFolderName);
     StringW wFolderMask = wFolderName + L"/*";
@@ -497,7 +497,7 @@ void CRhoFile::deleteFilesInFolder(const char* szFolderPath)
     
 /*static*/ unsigned int CRhoFile::deleteFolder(const char* szFolderPath) 
 {
-#if defined(OS_WINDOWS) || defined(OS_WINCE)
+#if defined(WINDOWS_PLATFORM)
 
 	StringW  swPath;
     convertToStringW(szFolderPath, swPath);
@@ -512,7 +512,7 @@ void CRhoFile::deleteFilesInFolder(const char* szFolderPath)
         fop.pFrom = name;
 	fop.pTo = NULL;
 	fop.fFlags = FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOCONFIRMMKDIR 
-#if defined(OS_WINDOWS) || defined(OS_PLATFORM_MOTCE)
+#if defined(OS_WINDOWS_DESKTOP) || defined(OS_PLATFORM_MOTCE)
                  | FOF_NOERRORUI
 #endif        
         ;
@@ -532,7 +532,7 @@ void CRhoFile::deleteFilesInFolder(const char* szFolderPath)
 
 }
 
-#if defined(OS_WINDOWS) || defined(OS_WINCE)
+#if defined(WINDOWS_PLATFORM)
 static unsigned int copyFolder(const StringW& strSrc, const StringW& strDst, boolean bMove)
 {
     unsigned int nErr = 0;
@@ -580,7 +580,7 @@ static unsigned int copyFolder(const StringW& strSrc, const StringW& strDst, boo
 
 /*static*/ unsigned int CRhoFile::copyFoldersContentToAnotherFolder(const char* szSrcFolderPath, const char* szDstFolderPath) 
 {
-#if defined(OS_WINDOWS) || defined(OS_WINCE)
+#if defined(WINDOWS_PLATFORM)
 
     StringW strSrcW, strDstW;
     common::convertToStringW(szSrcFolderPath,strSrcW);
@@ -601,7 +601,7 @@ static unsigned int copyFolder(const StringW& strSrc, const StringW& strDst, boo
 
 /*static*/ unsigned int CRhoFile::moveFoldersContentToAnotherFolder(const char* szSrcFolderPath, const char* szDstFolderPath) 
 {
-#if defined(OS_WINDOWS) || defined(OS_WINCE)
+#if defined(WINDOWS_PLATFORM)
 
     StringW strSrcW, strDstW;
     common::convertToStringW(szSrcFolderPath,strSrcW);

data/platform/shared/common/RhoFilePath.h

@@ -58,11 +58,15 @@ public:
 
     String makeFullPath(const char* szFileName){
         String res = m_szPath;
-        if ( res.length() > 0 && !findLastSlash() )
-            res += "/";
+        if (res.length() > 0)
+        {
+            const char* pSlash = findLastSlash();
+            if (!pSlash || (pSlash != (res.c_str() + res.length())))
+                res += "/";
+        }
 
         res += szFileName;
-        
+
         return res;
     }
 

data/platform/shared/common/RhoPort.h

@@ -34,7 +34,7 @@
 #define stricmp strcasecmp
 #endif
 
-#ifdef OS_WINDOWS
+#ifdef OS_WINDOWS_DESKTOP
 #define strncasecmp _strnicmp
 #endif
 
@@ -73,7 +73,7 @@ extern long _timezone;
 #endif
 #endif
 
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 #define _USE_MATH_DEFINES
 #endif
 
@@ -112,7 +112,7 @@ typedef unsigned __int64 uint64;
 #define FMTI64 "%I64d"
 #define FMTU64 "%I64u"
 
-#else // !(defined( OS_WINDOWS ) || defined( OS_WINCE ))
+#else // !defined( WINDOWS_PLATFORM)
 
 #define FMTI64 "%lli"
 #define FMTU64 "%llu"