rhodes 3.3.1 → 3.3.2.beta.1

data/platform/iphone/Classes/Rhodes.m

@@ -550,10 +550,11 @@ static Rhodes *instance = NULL;
         [appManager configure];
         
         const char *szRootPath = rho_native_rhopath();
+        const char *szUserPath = rho_native_rhouserpath();
         NSLog(@"Init logconf");
-        rho_logconf_Init(szRootPath, "");
+        rho_logconf_Init_with_separate_user_path(szRootPath, "", szUserPath);
         NSLog(@"Create rhodes app");
-        rho_rhodesapp_create(szRootPath);
+        rho_rhodesapp_create_with_separate_user_path(szRootPath, szUserPath);
         app_created = YES;
         
         rotationLocked = rho_conf_getBool("disable_screen_rotation");

data/platform/iphone/Classes/Signature/SignatureDelegate.m

@@ -85,7 +85,7 @@
 
 
 - (void)useImage:(UIImage*)theImage { 
-    NSString *folder = [[AppManager getApplicationsRootPath] stringByAppendingPathComponent:@"/../db/db-files"];
+    NSString *folder = [[AppManager getDbPath] stringByAppendingPathComponent:@"/db-files"];
 
     NSFileManager *fileManager = [NSFileManager defaultManager];
     if (![fileManager fileExistsAtPath:folder])

data/platform/iphone/Info.plist

@@ -38,7 +38,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.3.0</string>
+	<string>3.3.2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchImageFile</key>

data/platform/iphone/rbuild/iphone.rake

@@ -255,7 +255,7 @@ def prepare_production_plist (app_path, app_name)
     $plist_title = app_name
     $plist_subtitle = app_name
     $plist_icon_url = "http://example.com/icon57.png"
-    $plist_ipa_url = "http://example.com/Application.ipa"
+    $plist_ipa_url = "http://example.com/"+app_name+".ipa"
     
     appname = $app_config["name"] ? $app_config["name"] : "rhorunner"
     vendor = $app_config['vendor'] ? $app_config['vendor'] : "rhomobile"
@@ -267,10 +267,10 @@ def prepare_production_plist (app_path, app_name)
 
     if !$app_config["iphone"].nil?
       if !$app_config["iphone"]["production"].nil?
-        plist_title = $app_config["iphone"]["production"]["app_plist_title"] unless $app_config["iphone"]["production"]["app_plist_title"].nil? 
-        plist_subtitle = $app_config["iphone"]["production"]["app_plist_subtitle"] unless $app_config["iphone"]["production"]["app_plist_subtitle"].nil? 
-        plist_icon_url = $app_config["iphone"]["production"]["app_plist_icon_url"] unless $app_config["iphone"]["production"]["app_plist_icon_url"].nil? 
-        plist_ipa_url = $app_config["iphone"]["production"]["app_plist_ipa_url"] unless $app_config["iphone"]["production"]["app_plist_ipa_url"].nil? 
+        $plist_title = $app_config["iphone"]["production"]["app_plist_title"] unless $app_config["iphone"]["production"]["app_plist_title"].nil? 
+        $plist_subtitle = $app_config["iphone"]["production"]["app_plist_subtitle"] unless $app_config["iphone"]["production"]["app_plist_subtitle"].nil? 
+        $plist_icon_url = $app_config["iphone"]["production"]["app_plist_icon_url"] unless $app_config["iphone"]["production"]["app_plist_icon_url"].nil? 
+        $plist_ipa_url = $app_config["iphone"]["production"]["app_plist_ipa_url"] unless $app_config["iphone"]["production"]["app_plist_ipa_url"].nil? 
       end
     end        
   
@@ -397,7 +397,7 @@ end
 
 def restore_entitlements_file
   enti_rho_name = File.join($config["build"]["iphonepath"], "Entitlements.plist")
-  if File.exists? (enti_rho_name + '_bak')
+  if File.exists?(enti_rho_name + '_bak')
     puts 'restore Entitlements.plist ...'
     rm_f enti_rho_name
     cp (enti_rho_name + '_bak'), enti_rho_name   
@@ -942,7 +942,7 @@ namespace "run" do
        simapp = File.join($simdir, $emulator_version, "Applications")
        
        
-       rholog = simapp + "/" + $guid + "/Documents/RhoLog.txt"
+       rholog = simapp + "/" + $guid + "/Library/Private Documents/rholog.txt"
        puts "log_file=" + rholog
     end 
 
@@ -1068,7 +1068,7 @@ namespace "run" do
 
 #>>>>>>>>>>
         `echo "#{$applog}" > "#{$simrhodes}/Documents/rhologpath.txt"`
-        rholog = simapp + "/" + $guid + "/Documents/RhoLog.txt"
+        rholog = simapp + "/" + $guid + "/Library/Private Documents/rholog.txt"
 
 
         simpublic = simapp + "/" + $guid + "/Documents/apps/public"

data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>RhoSimulator 3.3.0.beta.1, Copyright 2010-2011 Rhomobile, Inc.</string>
+	<string>RhoSimulator 3.3.2.beta.1, Copyright 2010-2012 Rhomobile, Inc.</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>

data/platform/osx/build/osx.rake

@@ -107,7 +107,7 @@ PRE_TARGETDEPS += #{$pre_targetdeps}
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>RhoSimulator #{$rhodes_version}, Copyright 2010-2011 Rhomobile, Inc.</string>
+	<string>RhoSimulator #{$rhodes_version}, Copyright 2010-2012 Rhomobile, Inc.</string>
 	<key>CFBundleSignature</key>
 	<string>@TYPEINFO@</string>
 	<key>CFBundleExecutable</key>

data/platform/shared/RhoConnectClient/RhoConnectClient.cpp

@@ -1408,7 +1408,7 @@ namespace rho {
 	
 	/*static*/ String _CRhoAppAdapter::getErrorText(int nError)
 	{
-		return String();
+		return String(); //TODO?
 	}
 	
 	/*static*/ int  _CRhoAppAdapter::getErrorFromResponse(NetResponse& resp)

data/platform/shared/common/RhoConf.cpp

@@ -50,7 +50,7 @@ void RhoSettings::saveToFile(const char* szName)
     saveChangesToString(strData);
 
     CRhoFile oFile;
-    oFile.open( (getConfFilePath()+CONF_CHANGES).c_str(), common::CRhoFile::OpenForWrite);
+    oFile.open( (getAppConfUserFilePath()+CONF_CHANGES).c_str(), common::CRhoFile::OpenForWrite);
     oFile.write( strData.c_str(), strData.size() );
 }
 
@@ -93,10 +93,10 @@ void RhoSettings::readChanges()
     String strTimestamp;
     CRhoFile::readStringFromFile((getConfFilePath()+CONF_TIMESTAMP).c_str(), strTimestamp);
 
-    if ( CRhoFile::isFileExist((getConfFilePath()+CONF_CHANGES).c_str()) )
+    if ( CRhoFile::isFileExist((getAppConfUserFilePath()+CONF_CHANGES).c_str()) )
     {
         String strSettings;
-        CRhoFile::readStringFromFile((getConfFilePath()+CONF_CHANGES).c_str(), strSettings);
+        CRhoFile::readStringFromFile((getAppConfUserFilePath()+CONF_CHANGES).c_str(), strSettings);
         loadFromString( strSettings.c_str(), m_mapChangedValues );
 
         String strOldTimestamp = "";
@@ -258,10 +258,18 @@ bool   RhoSettings::isExist(const char* szName){
 
 extern "C" {
 	
-void rho_conf_Init(const char* szRootPath){
+void rho_conf_Init(const char* szRootPath)
+{
+    rho_conf_Init_with_separate_user_path(szRootPath, szRootPath);
+}
+    
+void  rho_conf_Init_with_separate_user_path(const char* szRootPath, const char* szUserPath)
+{
 	rho::common::CFilePath oRhoPath( szRootPath );
-
+	rho::common::CFilePath oUserPath( szUserPath );
+    
     RHOCONF().setAppConfFilePath(oRhoPath.makeFullPath(CONF_FILENAME).c_str());
+    RHOCONF().setAppConfUserFilePath(oUserPath.makeFullPath(CONF_FILENAME).c_str());
 #ifdef RHODES_EMULATOR
     rho::String strPath = rho::common::CFilePath::join( szRootPath, RHO_EMULATOR_DIR);
     strPath = rho::common::CFilePath::join( strPath, CONF_FILENAME);
@@ -269,9 +277,10 @@ void rho_conf_Init(const char* szRootPath){
 #else
     RHOCONF().setConfFilePath(oRhoPath.makeFullPath(CONF_FILENAME).c_str());
 #endif
-
+    
     RHOCONF().loadFromFile();
 }
+    
 
 int rho_conf_getBool(const char* szName) {
     return RHOCONF().getBool(szName) ? 1 : 0;

data/platform/shared/common/RhoConf.h

@@ -38,7 +38,7 @@ namespace common{
 #define RHODBVERSION "DBVersion"
 
 class RhoSettings{
-    String      m_strConfFilePath, m_strAppConfFilePath;
+    String      m_strConfFilePath, m_strAppConfFilePath, m_strAppConfUserPath;
     Hashtable<String,String> m_mapValues;
     Hashtable<String,String> m_mapChangedValues;
     HashtablePtr<String,Vector<String>* > m_mapConflictedValues;
@@ -58,8 +58,12 @@ public:
 
     const String& getConfFilePath()const{ return m_strConfFilePath;}
     void setConfFilePath(const char* szConfFilePath){ m_strConfFilePath = szConfFilePath; }
+    
     const String& getAppConfFilePath()const{ return m_strAppConfFilePath;}
     void setAppConfFilePath(const char* szConfFilePath){ m_strAppConfFilePath = szConfFilePath; }
+    
+    const String& getAppConfUserFilePath()const{ return m_strAppConfUserPath;}
+    void setAppConfUserFilePath(const char* szUserPath){ m_strAppConfUserPath = szUserPath; }
 
     void loadFromFile();
 
@@ -92,6 +96,7 @@ extern "C"{
 #endif //__cplusplus
 
 void  rho_conf_Init(const char* szRootPath);
+void  rho_conf_Init_with_separate_user_path(const char* szRootPath, const char* szUserPath);
 int  rho_conf_getBool(const char* szName);
 void  rho_conf_setBool(const char* szName, bool value);
 int   rho_conf_getInt(const char* szName);

data/platform/shared/common/RhodesApp.cpp

@@ -260,12 +260,12 @@ void CAppCallbacksQueue::processCommand(IQueueCommand* pCmd)
     m_commands.clear();
 }
 
-/*static*/ CRhodesApp* CRhodesApp::Create(const String& strRootPath)
+/*static*/ CRhodesApp* CRhodesApp::Create(const String& strRootPath, const String& strUserPath)
 {
     if ( m_pInstance != null) 
         return (CRhodesApp*)m_pInstance;
 
-    m_pInstance = new CRhodesApp(strRootPath);
+    m_pInstance = new CRhodesApp(strRootPath, strUserPath);
 
     String push_pin = RHOCONF().getString("push_pin");
     if(!push_pin.empty())
@@ -285,8 +285,8 @@ void CAppCallbacksQueue::processCommand(IQueueCommand* pCmd)
 
 }
 
-CRhodesApp::CRhodesApp(const String& strRootPath)
-    :CRhodesAppBase(strRootPath)
+CRhodesApp::CRhodesApp(const String& strRootPath, const String& strUserPath)
+    :CRhodesAppBase(strRootPath, strUserPath)
 {
     m_bExit = false;
     m_bDeactivationMode = false;
@@ -773,11 +773,12 @@ const String& CRhodesApp::getRhoMessage(int nError, const char* szName)
 void CRhodesApp::initHttpServer()
 {
     String strAppRootPath = getRhoRootPath();
+    String strAppUserPath = getRhoUserPath();
 #ifndef RHODES_EMULATOR
     strAppRootPath += "apps";
 #endif
 
-    m_httpServer = new net::CHttpServer(atoi(getFreeListeningPort()), strAppRootPath);
+    m_httpServer = new net::CHttpServer(atoi(getFreeListeningPort()), strAppRootPath, strAppUserPath);
     m_httpServer->register_uri("/system/geolocation", rubyext::CGeoLocation::callback_geolocation);
     m_httpServer->register_uri("/system/syncdb", callback_syncdb);
     m_httpServer->register_uri("/system/redirect_to", callback_redirect_to);
@@ -1401,9 +1402,15 @@ int	rho_http_snprintf(char *buf, size_t buflen, const char *fmt, ...)
 	
 void rho_rhodesapp_create(const char* szRootPath)
 {
-    rho::common::CRhodesApp::Create(szRootPath);
+    rho::common::CRhodesApp::Create(szRootPath, szRootPath);
 }
 
+void rho_rhodesapp_create_with_separate_user_path(const char* szRootPath, const char* szUserPath)
+{
+    rho::common::CRhodesApp::Create(szRootPath, szUserPath);
+}
+    
+    
 void rho_rhodesapp_start()
 {
     RHODESAPP().startApp();
@@ -1453,6 +1460,12 @@ const char* rho_rhodesapp_getblobsdirpath()
 {
     return RHODESAPP().getBlobsDirPath().c_str();
 }
+    
+const char* rho_rhodesapp_getuserrootpath()
+{
+    return RHODESAPP().getRhoUserPath().c_str();
+}
+    
 
 const char* rho_rhodesapp_getdbdirpath()
 {

data/platform/shared/common/RhodesApp.h

@@ -51,7 +51,7 @@ public:
 
 private:
 
-    CRhodesApp(const String& strRootPath);
+    CRhodesApp(const String& strRootPath, const String& strUserPath);
     boolean m_bExit, m_bRestartServer;
 
     String m_strListeningPorts;
@@ -88,7 +88,7 @@ private:
 public:
     ~CRhodesApp(void);
 
-    static CRhodesApp* Create(const String& strRootPath);
+    static CRhodesApp* Create(const String& strRootPath, const String& strUserPath);
     static void Destroy();
     static CRhodesApp* getInstance(){ return (CRhodesApp*)m_pInstance; }
     void startApp();
@@ -188,6 +188,7 @@ extern "C" {
 #endif //__cplusplus
 	
 void rho_rhodesapp_create(const char* szRootPath);
+void rho_rhodesapp_create_with_separate_user_path(const char* szRootPath, const char* szUserPath);    
 void rho_rhodesapp_start();	
 void rho_rhodesapp_destroy();
 	
@@ -203,6 +204,7 @@ const char* rho_rhodesapp_getloadingpagepath();
 const char* rho_rhodesapp_getblobsdirpath();
 const char* rho_rhodesapp_getdbdirpath();
 const char* rho_rhodesapp_getapprootpath();
+const char* rho_rhodesapp_getuserrootpath();
 	
 void rho_http_redirect(void* httpContext, const char* szUrl);
 void rho_http_senderror(void* httpContext, int nError, const char* szMsg);

data/platform/shared/common/RhodesAppBase.cpp

@@ -36,12 +36,12 @@ namespace common{
 IMPLEMENT_LOGCLASS(CRhodesAppBase,"RhodesApp");
 CRhodesAppBase* CRhodesAppBase::m_pInstance = 0;
 
-/*static*/ CRhodesAppBase* CRhodesAppBase::Create(const String& strRootPath)
+/*static*/ CRhodesAppBase* CRhodesAppBase::Create(const String& strRootPath, const String& strUserPath)
 {
     if ( m_pInstance != null) 
         return m_pInstance;
 
-    m_pInstance = new CRhodesAppBase(strRootPath);
+    m_pInstance = new CRhodesAppBase(strRootPath, strUserPath);
     return m_pInstance;
 }
 
@@ -53,9 +53,10 @@ CRhodesAppBase* CRhodesAppBase::m_pInstance = 0;
     m_pInstance = 0;
 }
 
-CRhodesAppBase::CRhodesAppBase(const String& strRootPath) : CRhoThread()
+CRhodesAppBase::CRhodesAppBase(const String& strRootPath, const String& strUserPath) : CRhoThread()
 {
     m_strRhoRootPath = strRootPath;
+    m_strAppUserPath = strUserPath;
 
     initAppUrls();
 }
@@ -63,14 +64,14 @@ CRhodesAppBase::CRhodesAppBase(const String& strRootPath) : CRhoThread()
 void CRhodesAppBase::initAppUrls() 
 {
 #ifndef RHODES_EMULATOR
-    m_strBlobsDirPath = getRhoRootPath() + "db/db-files";
-	m_strDBDirPath = getRhoRootPath() + "db";
+    m_strBlobsDirPath = getRhoUserPath() + "db/db-files";
+	m_strDBDirPath = getRhoUserPath() + "db";
 
     m_strAppRootPath = getRhoRootPath() + "apps";
     //m_strRhodesPath = "";
 #else
-    m_strBlobsDirPath = getRhoRootPath() + RHO_EMULATOR_DIR"/db/db-files";
-    m_strDBDirPath = getRhoRootPath() + RHO_EMULATOR_DIR"/db";
+    m_strBlobsDirPath = getRhoUserPath() + RHO_EMULATOR_DIR"/db/db-files";
+    m_strDBDirPath = getRhoUserPath() + RHO_EMULATOR_DIR"/db";
 
     m_strAppRootPath = getRhoRootPath();
 #endif
@@ -79,7 +80,7 @@ void CRhodesAppBase::initAppUrls()
 String CRhodesAppBase::getRelativeDBFilesPath(const String& strFilePath)
 {
 #ifndef RHODES_EMULATOR
-    String strDbFileRoot = getRhoRootPath();
+    String strDbFileRoot = getRhoUserPath();//getRhoRootPath();
 #else
     String strDbFileRoot = getRhoRootPath() + RHO_EMULATOR_DIR;
 #endif
@@ -93,7 +94,7 @@ String CRhodesAppBase::getRelativeDBFilesPath(const String& strFilePath)
 String CRhodesAppBase::resolveDBFilesPath(const String& strFilePath)
 {
 #ifndef RHODES_EMULATOR
-    String strDbFileRoot = getRhoRootPath();
+    String strDbFileRoot = getRhoUserPath();//getRhoRootPath();
 #else
     String strDbFileRoot = getRhoRootPath() + RHO_EMULATOR_DIR;
 #endif
@@ -297,7 +298,7 @@ int rho_base64_decode(const char *src, int srclen, char *dst)
 	dst[out++] = '\0';
 	return out;
 }
-	
+
 } //extern "C"
 
 #if !defined(OS_ANDROID)
@@ -306,3 +307,10 @@ rho::String rho_sysimpl_get_phone_id()
     return "";
 }
 #endif
+
+#if !defined(OS_MACOSX) || defined(RHODES_EMULATOR)
+const char* rho_native_rhouserpath()
+{
+    return rho_native_rhopath();
+}
+#endif

data/platform/shared/common/RhodesAppBase.h

@@ -47,18 +47,19 @@ protected:
 
     static CRhodesAppBase* m_pInstance;
 
-    String m_strRhoRootPath, m_strBlobsDirPath, m_strDBDirPath, m_strAppRootPath;//, m_strRhodesPath;
+    String m_strRhoRootPath, m_strBlobsDirPath, m_strDBDirPath, m_strAppRootPath, m_strAppUserPath;//, m_strRhodesPath;
     String m_strHomeUrl;
 
-    CRhodesAppBase(const String& strRootPath);
+    CRhodesAppBase(const String& strRootPath, const String& strUserPath);
 public:
-    static CRhodesAppBase* Create(const String& strRootPath);
+    static CRhodesAppBase* Create(const String& strRootPath, const String& strUserPath);
     static void Destroy();
     static CRhodesAppBase* getInstance(){ return m_pInstance; }
 
     String resolveDBFilesPath(const String& strFilePath);
     String getRelativeDBFilesPath(const String& strFilePath);
     const String& getRhoRootPath(){return m_strRhoRootPath;}
+    const String& getRhoUserPath(){return m_strAppUserPath;}
     //const String& getRhodesPath(){return m_strRhodesPath;}
     //void setRhodesPath(const String& path){m_strRhodesPath = path;}
     const String& getAppRootPath(){return m_strAppRootPath;}
@@ -87,6 +88,8 @@ extern "C" {
 #endif //__cplusplus
 
 const char* rho_native_rhopath();
+const char* rho_native_rhouserpath();
+
 const char* rho_rhodesapp_getplatform();
 //const char* rho_rhodesapp_getrhodespath();
 void rho_file_recursive_createdir(const char* szPath, const char* szBasePath);