rhodes 3.2.2 → 3.2.3

data/CHANGELOG

@@ -1,3 +1,9 @@
+## 3.2.3
+* Fix Blob sync issue in Rhoconnect-client
+* Fix logging issue on iPhone and Android
+* Fix Cookie issue on Windows phone 7
+* Implement Security token ruby callback
+
 ## 3.2.2
 * Fix iPhone build for AppStore
 * Fix Android infinite loop while using GPS

data/lib/framework/rho/rhoapplication.rb

@@ -114,8 +114,23 @@ module Rho
         start_url = Rho::RhoConfig.start_path
         start_url = "" unless start_url
         
+        security_token_not_passed = System.get_property('security_token_not_passed')
+        security_token_not_passed = false if security_token_not_passed.nil?
+        invalid_security_token_start_path_exist = Rho::RhoConfig.exists? 'invalid_security_token_start_path'
+        invalid_security_token_start_path = Rho::RhoConfig.invalid_security_token_start_path
+        
+        if security_token_not_passed
+            if invalid_security_token_start_path_exist
+                start_url = invalid_security_token_start_path
+            else
+                # exit from application - old way
+                puts 'security_token is not passed - application will closed'
+                System.exit
+            end
+        end
+
         puts "on_ui_created.navigate to start url: '#{start_url}'"
-		WebView.navigate(start_url)
+        WebView.navigate(start_url)
     end
 
     def on_ui_destroyed

data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java

@@ -518,7 +518,7 @@ public class RhodesActivity extends BaseActivity {
         if(!RhodesApplication.canStart(paramString))
         {
             Logger.E(TAG, "This is hidden app and can be started only with security key.");
-            RhodesService.exit();
+            //RhodesService.exit();
             return;
         }
 

data/platform/bb/RubyVM/src/com/rho/RhodesApp.java

@@ -51,6 +51,7 @@ public class RhodesApp
 	Mutex m_mxScreenRotationCallback = new Mutex();
     String m_strScreenRotationCallback = "", m_strScreenRotationCallbackParams = "";
     static String m_strStartParameters = "";
+    static boolean m_bSecurityTokenNotPassed = false;
     
     int m_currentTabIndex = 0;
     String[] m_currentUrls = new String[5];
@@ -86,6 +87,9 @@ public class RhodesApp
     public static void setStartParameters(String szParams ){ m_strStartParameters = (szParams != null? szParams : ""); }
     public static String getStartParameters(){ return m_strStartParameters; }
     
+    public static void setSecurityTokenNotPassed(boolean is_not_passed) {m_bSecurityTokenNotPassed = is_not_passed;}
+    public static boolean isSecurityTokenNotPassed() {return m_bSecurityTokenNotPassed;}
+    
     RhodesApp(String strRootPath)
     {
         m_strRhoRootPath = strRootPath;

data/platform/bb/rhodes/src/com/rho/rubyext/System.java

@@ -389,6 +389,8 @@ public class System {
     		Version.SoftVersion ver = Version.getSoftVersion();
     		return ObjectFactory.createString((ver.nMajor < 6 ? "BB" : "WEBKIT")+"/"+DeviceInfo.getSoftwareVersion() ); 
     	}
+        if (strPropName.equalsIgnoreCase("security_token_not_passed"))
+        	return ObjectFactory.createBoolean(RHODESAPP().isSecurityTokenNotPassed());
 
     	return RubyConstant.QNIL;
     }

data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java

@@ -1147,8 +1147,7 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
         		 AppBuildConfig.getItem("security_token").compareTo(m_strSecurityToken) != 0)
             {
                 LOG.INFO("This is hidden app and can be started only with security key.");
-                System.exit(0);
-                return;
+                RhodesApp.setSecurityTokenNotPassed(true);
             }
             
 	        LOG.INFO(" STARTING RHODES: ***----------------------------------*** " );

data/platform/iphone/Classes/Rhodes.m

@@ -807,7 +807,7 @@ static Rhodes *instance = NULL;
     if ( !rho_rhodesapp_canstartapp([start_parameter UTF8String], ", ") )
     {
 		NSLog(@"This is hidden app and can be started only with security key.");
-		exit(EXIT_SUCCESS);
+		//exit(EXIT_SUCCESS);
     }
 	
 	return NO;

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.2.0.beta.5, Copyright 2010-2011 Rhomobile, Inc.</string>
+	<string>RhoSimulator 3.2.2, Copyright 2010-2011 Rhomobile, Inc.</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>

data/platform/shared/common/RhodesApp.cpp

@@ -65,6 +65,7 @@ namespace common{
 
 IMPLEMENT_LOGCLASS(CRhodesApp,"RhodesApp");
 String CRhodesApp::m_strStartParameters;
+boolean CRhodesApp::m_bSecurityTokenNotPassed = false;
 
 class CAppCallbacksQueue : public CThreadQueue
 {
@@ -1572,6 +1573,8 @@ int rho_rhodesapp_canstartapp(const char* szCmdLine, const char* szSeparators)
     CRhodesApp::setStartParameters(szCmdLine);
     RAWLOGC_INFO1("RhodesApp", "New start params: %s", strCmdLine.c_str());
 
+    CRhodesApp::setSecurityTokenNotPassed(false);
+    
 	const char* szAppSecToken = get_app_build_config_item("security_token");
     if ( !szAppSecToken || !*szAppSecToken)
         return 1;
@@ -1587,8 +1590,10 @@ int rho_rhodesapp_canstartapp(const char* szCmdLine, const char* szSeparators)
 		else
 			strCmdLineSecToken = tmp;
 	}
+    int result = strCmdLineSecToken.compare(szAppSecToken) != 0 ? 0 : 1; 
+    CRhodesApp::setSecurityTokenNotPassed(!result);
 
-    return strCmdLineSecToken.compare(szAppSecToken) != 0 ? 0 : 1;
+    return result; 
 }
 
 } //extern "C"

data/platform/shared/common/RhodesApp.h

@@ -64,6 +64,7 @@ private:
     String m_strLoadingPagePath, m_strLoadingPngPath;
     String m_strStartUrl, m_strOptionsUrl, m_strRhobundleReloadUrl;//, m_strFirstStartUrl;
     static String m_strStartParameters;
+    static boolean m_bSecurityTokenNotPassed;
     String m_strRhoMessage;
     String m_EmptyString;
 
@@ -111,6 +112,8 @@ public:
     const String& getLoadingPagePath(){return m_strLoadingPagePath; }
 
     static void setStartParameters(const char* szParams ){ m_strStartParameters = (szParams ? szParams : ""); }
+    static void setSecurityTokenNotPassed(boolean is_not_passed) {m_bSecurityTokenNotPassed = is_not_passed;}
+    static boolean isSecurityTokenNotPassed() {return m_bSecurityTokenNotPassed;}
     static const String& getStartParameters(){ return m_strStartParameters; }
 
     const String& getAppBackUrl();

data/platform/shared/db/DBAdapter.cpp

@@ -137,7 +137,7 @@ void CDBAdapter::open (String strDbPath, String strVer, boolean bTemp)
         return;
 
     LOG(INFO) + "Open DB: " + strDbPath;
-    close();
+    //close();
 
     m_mxRuby.create();
     m_strDbPath = strDbPath;
@@ -660,7 +660,7 @@ void CDBAdapter::setBulkSyncDB(String fDataName, String strCryptKey)
     db.close();
 
     String dbOldName = m_strDbPath;
-    close();
+    close(false);
 
     CRhoFile::deleteFilesInFolder(RHODESAPPBASE().getBlobsDirPath().c_str());
 
@@ -753,7 +753,7 @@ String strTrigger = String("CREATE TRIGGER rhodeleteSchemaTrigger BEFORE DELETE
 */
 }
 
-void CDBAdapter::close()
+void CDBAdapter::close(boolean bCloseRubyMutex/* = true*/)
 {
     for (Hashtable<String,sqlite3_stmt*>::iterator it = m_mapStatements.begin();  it != m_mapStatements.end(); ++it )
         sqlite3_finalize( it->second );
@@ -769,7 +769,8 @@ void CDBAdapter::close()
     m_ptrCrypt = 0;
     m_strCryptKey = "";
 
-    m_mxRuby.close();
+    if ( bCloseRubyMutex )
+        m_mxRuby.close();
 }
 
 int CDBAdapter::prepareSqlStatement(const char* szSql, int nByte, sqlite3_stmt **ppStmt)
@@ -1162,7 +1163,7 @@ CRubyMutex::CRubyMutex(boolean bIgnore) : m_nLockCount(0), m_valThread(0), m_val
 
 void CRubyMutex::create()
 {
-    if ( !m_bIgnore )
+    if ( !m_bIgnore && !m_valMutex)
         m_valMutex = rho_ruby_create_mutex();
 }
 

data/platform/shared/db/DBAdapter.h

@@ -109,7 +109,7 @@ public:
     ~CDBAdapter(void){}
 
     void open (String strDbPath, String strVer, boolean bTemp);
-    void close();
+    void close(boolean bCloseRubyMutex = true);
     sqlite3* getDbHandle(){ return m_dbHandle; }
     CDBAttrManager& getAttrMgr(){ return m_attrMgr; }
 

data/platform/shared/net/CURLNetRequest.cpp

@@ -417,7 +417,7 @@ int CURLNetRequest::getResponseCode(CURLcode err, char const *body, size_t bodys
         RAWTRACE1("RESPONSE----- (%d bytes)", bodysize);
         if ( !rho_conf_getBool("log_skip_post") )
         {
-            RAWTRACE(body);
+            RAWTRACE_DATA(body, bodysize);
         }
         RAWTRACE("END RESPONSE-----");
     }

data/platform/shared/rubyext/System.cpp

@@ -123,6 +123,14 @@ VALUE rho_sys_get_property(char* szPropName)
 
 	if (strcasecmp("has_sqlite",szPropName) == 0)
         return rho_ruby_create_boolean(1);
+    
+    if (strcasecmp("security_token_not_passed",szPropName) == 0) {
+        int passed = 0;
+        if ((RHODESAPP().isSecurityTokenNotPassed())) {
+            passed = 1;
+        }
+        return rho_ruby_create_boolean(passed);
+    }
 
     RAWLOG_ERROR1("Unknown Rho::System property : %s", szPropName);
 

data/platform/wm/rhodes/Rhodes.cpp

@@ -293,7 +293,7 @@ HRESULT CRhodesModule::PreMessageLoop(int nShowCmd) throw()
     if ( !rho_rhodesapp_canstartapp(g_strCmdLine.c_str(), " /-,") )
     {
 		LOG(INFO) + "This is hidden app and can be started only with security key.";
-		return S_FALSE;
+		//return S_FALSE;
     }
 
 	LOG(INFO) + "Rhodes started";

data/platform/wp7/RhoRubyLib/net/NetRequest.cs

@@ -515,6 +515,7 @@ namespace rho.net
                     m_strRespBody = m_strRespBody.Replace('"', ' ');
                     string[] cookies = m_strRespBody.Split(':');
                     m_strCookies = cookies[1].Trim();
+                    m_strCookies = Uri.UnescapeDataString(m_strCookies);
                 }
                 pResp.setCookies(m_strCookies);
             }

data/version

@@ -1 +1 @@
-3.2.2
+3.2.3

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 3
   - 2
-  - 2
-  version: 3.2.2
+  - 3
+  version: 3.2.3
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-10 00:00:00 -08:00
+date: 2011-11-23 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency