rhodes 2.0.2 → 2.0.3

data/platform/iphone/Classes/WebView.m

@@ -22,6 +22,7 @@
     // perform actual url loading from time to time
     int index;
     [value getValue:&index];
+    [[Rhodes sharedInstance] hideSplash];
     [[[Rhodes sharedInstance] mainView] navigateRedirect:url tab:index];
 }
 @end

data/platform/iphone/Info.plist

@@ -10,6 +10,12 @@
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
 	<string>icon.png</string>
+	<key>CFBundleIconFiles</key>
+	<array>
+		<string>icon57</string>
+		<string>icon72</string>
+		<string>icon114</string>
+	</array>
 	<key>CFBundleIdentifier</key>
 	<string>com.rhomobile.rhosyncclient</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -21,7 +27,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.0.2</string>
+	<string>2.0.3</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 </dict>

data/platform/iphone/rbuild/iphone.rake

@@ -23,6 +23,38 @@ def set_app_name(newname)
 
 end
 
+ICONS = ['icon', 'icon57', 'icon72', 'icon114']
+
+def restore_app_icon
+  puts "restore icon"
+  ipath = $config["build"]["iphonepath"]
+  ICONS.each do |name|
+    ibak = File.join(ipath, name + '.bak')
+    icon = File.join(ipath, name + '.png')
+    next if !File.exists? ibak
+    rm_f icon
+    cp ibak, icon
+    rm_f ibak
+  end
+end
+
+def set_app_icon
+  puts "set icon"
+  ipath = $config["build"]["iphonepath"]
+  begin
+    ICONS.each do |name|
+      ibak = File.join(ipath, name + '.bak')
+      icon = File.join(ipath, name + '.png')
+      appicon = File.join($app_path, 'icon', name + '.png')
+      cp icon, ibak unless File.exists? ibak
+      cp appicon, ipath
+    end
+  rescue => e
+    puts "WARNING!!! Can not change icon: #{e.to_s}"
+  end
+
+end
+
 def set_signing_identity(identity,profile,entitlements)
   fname = $config["build"]["iphonepath"] + "/rhorunner.xcodeproj/project.pbxproj"
   buf = ""
@@ -76,6 +108,8 @@ namespace "config" do
     $excludelib = ['**/builtinME.rb','**/ServeME.rb','**/TestServe.rb']
     $tmpdir =  $bindir +"/tmp"
 
+    $devroot = '/Developer' if $devroot.nil?
+
     $homedir = ENV['HOME']
     $simdir = "#{$homedir}/Library/Application Support/iPhone Simulator/"
     $sim="/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications"
@@ -97,6 +131,14 @@ namespace "config" do
       $sdk = $app_config["iphone"]["sdk"]
     end
 
+    if $sdk =~ /iphonesimulator/
+      $sdkroot = $devroot + "/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" +
+        $sdk.gsub(/iphonesimulator/,"") + ".sdk"
+    else
+      $sdkroot = $devroot + "/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS" +
+        $sdk.gsub(/iphoneos/,"") + ".sdk"
+    end
+
     unless File.exists? $homedir + "/.profile"
       File.open($homedir + "/.profile","w") {|f| f << "#" }
       chmod 0744, $homedir + "/.profile"
@@ -138,14 +180,11 @@ namespace "build" do
       simulator = $sdk =~ /iphonesimulator/
       ENV["PLATFORM_DEVELOPER_BIN_DIR"] ||= "/Developer/Platforms/" + ( simulator ? "iPhoneSimulator" : "iPhoneOS" ) +
         ".platform/Developer/usr/bin"
+      ENV["SDKROOT"] = $sdkroot
+
+      #ENV["SDKROOT"] = $xcode_sdk_dir if not $xcode_sdk_dir.nil?
+
 
-      if simulator
-        ENV["SDKROOT"] ||= "/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" +
-              $sdk.gsub(/iphonesimulator/,"") + ".sdk"
-      else
-        ENV["SDKROOT"] ||= "/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS" +
-              $sdk.gsub(/iphoneos/,"") + ".sdk"
-      end
       ENV["BUILD_DIR"] ||= $startdir + "/platform/iphone/build"
       ENV["TARGET_TEMP_DIR"] ||= $startdir + "/platform/iphone/build/rhorunner.build/#{$configuration}-" +
         ( simulator ? "iphonesimulator" : "iphoneos") + "/rhorunner.build"
@@ -171,9 +210,7 @@ namespace "build" do
     task :rhodes => ["config:iphone", "build:iphone:rhobundle"] do
   
       set_app_name($app_config["name"]) unless $app_config["name"].nil?
-      ipath = $config["build"]["iphonepath"]
-      cp File.join(ipath, 'icon.png'), File.join(ipath, 'icon.png.bak') unless File.exists? File.join(ipath, 'icon.png.bak')
-      cp $app_path + "/icon/icon.png", ipath
+      set_app_icon
 
       set_signing_identity($signidentity,$provisionprofile,$entitlements.to_s) if $signidentity.to_s != ""
 
@@ -185,9 +222,7 @@ namespace "build" do
 
       chdir $startdir
       set_app_name("Rhodes") unless $app_config["name"].nil?
-      rm_f File.join(ipath, 'icon.png')
-      cp File.join(ipath, 'icon.png.bak'), File.join(ipath, 'icon.png')
-      rm_f File.join(ipath, 'icon.png.bak')
+      restore_app_icon
 
       unless ret == 0
         puts "Error cleaning"
@@ -208,15 +243,66 @@ namespace "run" do
      end
      `killall "iPhone Simulator"`
 
-     puts "sdk: #{$sdk.inspect.to_s}"
      sdkver = $sdk.gsub(/^iphonesimulator/, '')
-     
+
+     elements = []
+     binplist = File.join(ENV['HOME'], 'Library', 'Preferences', 'com.apple.iphonesimulator.plist')
+     xmlplist = '/tmp/iphone.plist'
+     if File.exists? binplist
+       `plutil -convert xml1 -o #{xmlplist} #{binplist}`
+
+       elements = []
+       doc = REXML::Document.new(File.new(xmlplist))
+       nextignore = false
+       doc.elements.each('plist/dict/*') do |element|
+         if nextignore
+           nextignore = false
+           next
+         end
+         if element.name == 'key'
+           if element.text == 'currentSDKRoot' or element.text == 'SimulateDevice'
+             nextignore = true
+             next
+           end
+         end
+         
+         elements << element
+       end
+     end
+
+     e = REXML::Element.new 'key'
+     e.text = 'SimulateDevice'
+     elements << e
+     e = REXML::Element.new 'string'
+     e.text = sdkver == '3.2' ? 'iPad' : 'iPhone'
+     elements << e
+     e = REXML::Element.new 'key'
+     e.text = 'currentSDKRoot'
+     elements << e
+     e = REXML::Element.new 'string'
+     e.text = $sdkroot
+     elements << e
+
+     File.open(xmlplist, 'w') do |f|
+       f.puts "<?xml version=\"1.0\" encoding=\"UTF-8'\"?>"
+       f.puts "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">"
+       f.puts "<plist version=\"1.0\">"
+       f.puts "<dict>"
+       elements.each do |e|
+         f.puts "\t#{e.to_s}"
+       end
+       f.puts "</dict>"
+       f.puts "</plist>"
+     end
+
+     `plutil -convert binary1 -o #{binplist} #{xmlplist}`
+
      rhorunner = $config["build"]["iphonepath"] + "/build/#{$configuration}-iphonesimulator/rhorunner.app"
      puts "rhorunner: #{rhorunner}"
 
-  
      puts "our app name: #{$app_config['name']}"
      puts "simdir: #{$simdir}"
+
      Dir.glob(File.join($simdir, sdkver, "Applications", "*")).each do |simapppath|
        need_rm = true if File.directory? simapppath
        if File.exists?(File.join(simapppath, 'rhorunner.app', 'name'))

data/platform/iphone/rhorunner.xcodeproj/project.pbxproj

@@ -37,6 +37,9 @@
 		BDB15ED510B2EC8700003DFA /* librhorubylib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F59F16000E9449B8004103B4 /* librhorubylib.a */; };
 		BDB373661144220F006EA6DA /* SimpleMainView.m in Sources */ = {isa = PBXBuildFile; fileRef = BDB373651144220F006EA6DA /* SimpleMainView.m */; };
 		BDB373C511444A8F006EA6DA /* Rhodes.m in Sources */ = {isa = PBXBuildFile; fileRef = BDB373C411444A8F006EA6DA /* Rhodes.m */; };
+		BDC6F34911F4ABBF0056C1C3 /* icon57.png in Resources */ = {isa = PBXBuildFile; fileRef = BDC6F34611F4ABBF0056C1C3 /* icon57.png */; };
+		BDC6F34A11F4ABBF0056C1C3 /* icon72.png in Resources */ = {isa = PBXBuildFile; fileRef = BDC6F34711F4ABBF0056C1C3 /* icon72.png */; };
+		BDC6F34B11F4ABBF0056C1C3 /* icon114.png in Resources */ = {isa = PBXBuildFile; fileRef = BDC6F34811F4ABBF0056C1C3 /* icon114.png */; };
 		BDE35A7A107F900A009941C7 /* RhoFileImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = BDE35A79107F900A009941C7 /* RhoFileImpl.m */; };
 		BDFBD99610B1B99A00BAAFAB /* Entitlements.plist in Resources */ = {isa = PBXBuildFile; fileRef = BDFBD99510B1B99A00BAAFAB /* Entitlements.plist */; };
 		BDFBD99A10B1B9A900BAAFAB /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = BDFBD99910B1B9A900BAAFAB /* Settings.bundle */; };
@@ -183,6 +186,9 @@
 		BDB373651144220F006EA6DA /* SimpleMainView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SimpleMainView.m; sourceTree = "<group>"; };
 		BDB373C3114449B6006EA6DA /* Rhodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Rhodes.h; sourceTree = "<group>"; };
 		BDB373C411444A8F006EA6DA /* Rhodes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Rhodes.m; sourceTree = "<group>"; };
+		BDC6F34611F4ABBF0056C1C3 /* icon57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon57.png; sourceTree = SOURCE_ROOT; };
+		BDC6F34711F4ABBF0056C1C3 /* icon72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon72.png; sourceTree = SOURCE_ROOT; };
+		BDC6F34811F4ABBF0056C1C3 /* icon114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon114.png; sourceTree = SOURCE_ROOT; };
 		BDE35A79107F900A009941C7 /* RhoFileImpl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RhoFileImpl.m; sourceTree = "<group>"; };
 		BDFBD99510B1B99A00BAAFAB /* Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Entitlements.plist; sourceTree = "<group>"; };
 		BDFBD99910B1B9A900BAAFAB /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
@@ -258,6 +264,9 @@
 		080E96DDFE201D6D7F000001 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				BDC6F34611F4ABBF0056C1C3 /* icon57.png */,
+				BDC6F34711F4ABBF0056C1C3 /* icon72.png */,
+				BDC6F34811F4ABBF0056C1C3 /* icon114.png */,
 				BDFBD9A610B1BA2000BAAFAB /* icon.png */,
 				BD97AC1E1160EE7A006960F9 /* Alert */,
 				F579170F0E8AB2A200BBC54D /* AppManager */,
@@ -682,6 +691,9 @@
 				BDFBD9A410B1B9E500BAAFAB /* forward_btn.png in Resources */,
 				BDFBD9A510B1B9E500BAAFAB /* home_btn.png in Resources */,
 				BDFBD9A710B1BA2000BAAFAB /* icon.png in Resources */,
+				BDC6F34911F4ABBF0056C1C3 /* icon57.png in Resources */,
+				BDC6F34A11F4ABBF0056C1C3 /* icon72.png in Resources */,
+				BDC6F34B11F4ABBF0056C1C3 /* icon114.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

data/platform/shared/common/IRhoThreadImpl.h

@@ -7,7 +7,7 @@ struct IRhoRunnable
 {
     enum EPriority{ epNormal = 0, epHigh, epLow};
 
-    virtual void run() = 0;
+    virtual void runObject() = 0;
 };
 
 struct IRhoThreadImpl

data/platform/shared/common/PosixThreadImpl.cpp

@@ -14,27 +14,7 @@ namespace common
 IMPLEMENT_LOGCLASS(CPosixThreadImpl, "RhoThread");
 
 CPosixThreadImpl::CPosixThreadImpl()
-    :m_started(false)
-{}
-
-void *runProc(void *pv)
 {
-    IRhoRunnable *p = static_cast<IRhoRunnable *>(pv);
-    void *pData = rho_nativethread_start();
-    p->run();
-    rho_nativethread_end(pData);
-    return 0;
-}
-
-void CPosixThreadImpl::start(IRhoRunnable *pRunnable, IRhoRunnable::EPriority ePriority)
-{
-    {
-        common::CMutexLock lock(m_mxSync);
-        if (m_started)
-            return;
-        m_started = true;
-    }
-
 #if defined(OS_ANDROID)
     // Android has no pthread_condattr_xxx API
     pthread_cond_init(&m_condSync, NULL);
@@ -44,7 +24,24 @@ void CPosixThreadImpl::start(IRhoRunnable *pRunnable, IRhoRunnable::EPriority eP
     pthread_cond_init(&m_condSync, &sync_details);
     pthread_condattr_destroy(&sync_details);
 #endif
+}
+
+CPosixThreadImpl::~CPosixThreadImpl()
+{
+    pthread_cond_destroy(&m_condSync);
+}
 
+void *runProc(void *pv)
+{
+    IRhoRunnable *p = static_cast<IRhoRunnable *>(pv);
+    void *pData = rho_nativethread_start();
+    p->runObject();
+    rho_nativethread_end(pData);
+    return 0;
+}
+
+void CPosixThreadImpl::start(IRhoRunnable *pRunnable, IRhoRunnable::EPriority ePriority)
+{
     pthread_attr_t  attr;
     int return_val = pthread_attr_init(&attr);
     //return_val = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
@@ -71,8 +68,6 @@ void CPosixThreadImpl::stop(unsigned int nTimeoutToKill)
     //TODO: wait for nTimeoutToKill and kill thread
     void* status;
     pthread_join(m_thread,&status);
-
-    pthread_cond_destroy(&m_condSync);
 }
 
 void CPosixThreadImpl::wait(unsigned int nTimeout)

data/platform/shared/common/PosixThreadImpl.h

@@ -14,6 +14,7 @@ class CPosixThreadImpl : public IRhoThreadImpl
     DEFINE_LOGCLASS;
 public:
     CPosixThreadImpl();
+    ~CPosixThreadImpl();
 
     void start(IRhoRunnable *pRunnable, IRhoRunnable::EPriority ePriority);
     void stop(unsigned int nTimeoutToKill);
@@ -25,7 +26,6 @@ private:
     pthread_cond_t m_condSync;
     common::CMutex m_mxSync;
     pthread_t m_thread;
-    bool m_started;
 };
 
 } // namespace common

data/platform/shared/common/RhoThread.cpp

@@ -6,14 +6,18 @@ namespace common {
 
 CRhoThread::CRhoThread(IRhoClassFactory* factory)
 {
-    m_isInWaitState = false;
-    m_bStop = false;
+    m_nState = TS_NONE;
     m_pImpl = factory->createThreadImpl();
 }
 
 void CRhoThread::start(EPriority ePriority)
 {
-    m_pImpl->start(this, ePriority);
+    if ( !isRunning() )
+    {
+        m_pImpl->start(this, ePriority);
+
+        m_nState = TS_RUNNING;
+    }
 }
 
 }

data/platform/shared/common/RhoThread.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "RhoStd.h"
 #include "IRhoThreadImpl.h"
 #include "AutoPointer.h"
 
@@ -10,20 +11,33 @@ struct IRhoClassFactory;
 class CRhoThread : public IRhoRunnable
 {
     CAutoPtr<IRhoThreadImpl> m_pImpl;
-    bool m_isInWaitState;
-    bool m_bStop;
+    static const int TS_NONE = 0;
+    static const int TS_WAIT = 1;
+    static const int TS_STOPPING = 2;
+    static const int TS_RUNNING = 4;
+
+    int m_nState;
 public:
 
     CRhoThread(IRhoClassFactory* factory);
-    virtual ~CRhoThread(void){}
+    virtual ~CRhoThread(void){};
 
     virtual void start(EPriority ePriority);
-    virtual void stop(unsigned int nTimeoutToKill){ m_bStop = true; m_pImpl->stop(nTimeoutToKill); }
-    virtual void wait(unsigned int nTimeout){ m_isInWaitState = true; m_pImpl->wait(nTimeout); m_isInWaitState = false; }
-    virtual void stopWait(){ if (m_isInWaitState) m_pImpl->stopWait(); }
+    virtual void stop(unsigned int nTimeoutToKill){ m_nState |= TS_STOPPING; m_pImpl->stop(nTimeoutToKill); m_nState &= ~TS_STOPPING; }
+    virtual void wait(unsigned int nTimeout){ m_nState |= TS_WAIT; m_pImpl->wait(nTimeout); m_nState &= ~TS_WAIT; }
+    virtual void stopWait(){ if (isWaiting()) m_pImpl->stopWait(); }
     virtual void sleep(unsigned int nTimeout){ m_pImpl->sleep(nTimeout); }
+    virtual void run() = 0;
+    virtual void runObject()
+    {
+        run();
+        m_nState = TS_NONE;
+    }
+
+    boolean isStopping(){return (m_nState&TS_STOPPING) != 0;}
+    boolean isWaiting(){return (m_nState&TS_WAIT) != 0;}
+    boolean isRunning(){return (m_nState&TS_RUNNING) != 0;}
 
-    bool isStopped(){return m_bStop;}
 };
 
 }

data/platform/shared/common/RhodesApp.cpp

@@ -465,9 +465,15 @@ void CRhodesApp::keepLastVisitedUrl(String strUrl)
 void CRhodesApp::setAppBackUrl(const String& url)
 {
     if ( url.length() > 0 )
+    {
+        m_strAppBackUrlOrig = url;
         m_strAppBackUrl = canonicalizeRhoUrl(url);
+    }
     else
+    {
+        m_strAppBackUrlOrig = "";
         m_strAppBackUrl = "";
+    }
 }
 
 String CRhodesApp::getAppTitle()
@@ -502,7 +508,7 @@ const String& CRhodesApp::getOptionsUrl()
     return m_strOptionsUrl;
 }
 
-const String& CRhodesApp::getCurrentUrl(int index)
+const String& CRhodesApp::getCurrentUrl(int /*index*/)
 { 
     return m_currentUrls[m_currentTabIndex]; 
 }
@@ -533,10 +539,10 @@ void CRhodesApp::navigateToUrl( const String& strUrl)
 
 void CRhodesApp::navigateBack()
 {
-    rho::String strAppUrl = getAppBackUrl();
+    //rho::String strAppUrl = getAppBackUrl();
 
-    if ( strAppUrl.length() > 0 )
-        rho_webview_navigate(strAppUrl.c_str(), 0);
+    if ( m_strAppBackUrlOrig.length() > 0 )
+        loadUrl(m_strAppBackUrlOrig);
     else if ( strcasecmp(getCurrentUrl().c_str(),getStartUrl().c_str()) != 0 )
         rho_webview_navigate_back();
 }
@@ -700,18 +706,16 @@ void CRhodesApp::callScreenRotationCallback(int width, int height, int degrees)
 void CRhodesApp::loadUrl(String url)
 {
     boolean callback = false;
-    if (url.size() >= 9 && url.substr(0, 9) == "callback:")
+    if (String_startsWith(url, "callback:") )
     {
         callback = true;
         url = url.substr(9);
     }
-    char *s = rho_http_normalizeurl(url.c_str());
-    url = s;
-    free(s);
+    url = canonicalizeRhoUrl(url);
     if (callback)
     {
         common::CAutoPtr<net::INetRequest> pNetRequest = m_ptrFactory->createNetRequest();
-        NetResponse(resp, pNetRequest->pullData( url, null ));
+        NetResponse(resp, pNetRequest->pushData( url,  "rho_callback=1", null ));
         (void)resp;
     }
     else