rhodes 1.5.2 → 1.5.3

data/platform/android/Rhodes/src/com/rhomobile/rhodes/{TabbedMainView.java → mainview/TabbedMainView.java}

@@ -18,11 +18,15 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  ============================================================================
  */
-package com.rhomobile.rhodes;
+package com.rhomobile.rhodes.mainview;
 
 import java.util.Map;
 import java.util.Vector;
 
+import com.rhomobile.rhodes.Logger;
+import com.rhomobile.rhodes.Rhodes;
+import com.rhomobile.rhodes.RhodesInstance;
+
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;

data/platform/android/build/RhodesSRC_build.files

@@ -1,7 +1,6 @@
 platform/android/Rhodes/src/com/rhomobile/rhodes/AndroidR.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/HttpLog.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/Logger.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/MainView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkConnectivityListener.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkStateTracker.java
@@ -10,9 +9,7 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/RhoLogConf.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesInstance.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/SimpleMainView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/TabbedMainView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/Utils.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java
@@ -24,6 +21,9 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePicker.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePickerScreen.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocation.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/MainView.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/Annotation.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/AnnotationsOverlay.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java

data/platform/android/build/android.rake

@@ -138,6 +138,7 @@ namespace "config" do
       $rubypath = "res/build-tools/RhoRuby.exe"
 
       # Add PATH to cygwin1.dll
+      ENV['CYGWIN'] = 'nodosfilewarning'
       if $path_cygwin_modified.nil?
         ENV['PATH'] = Jake.get_absolute("res/build-tools") + ";" + ENV['PATH']
         path_cygwin_modified = true

data/platform/bb/rhodes/src/com/rho/net/NetworkAccess.java

@@ -205,16 +205,34 @@ public class NetworkAccess implements INetworkAccess {
 				String url = strUrl;
 				if (!ignoreSuffix)
 					url += URLsuffix;
+				
+				if (url.startsWith("https"))
+					url += ";EndToEndDesired;RdHTTPS";
+				
 				LOG.INFO(url);
-				conn = Connector.open(url);
+				conn = Connector.open(url, Connector.READ_WRITE, true);
+			} catch (java.io.InterruptedIOException ioe) {
+				LOG.ERROR("Connector.open InterruptedIOException", ioe );
+				if (conn != null)
+					conn.close();
+				conn = null;
+				throw ioe;
 			} catch (IOException ioe) {
-				if ( URLsuffix.length() > 0 )
+				String strMsg = ioe.getMessage(); 
+				
+		    	boolean bTimeout = strMsg != null && (strMsg.indexOf("timed out") >= 0 || strMsg.indexOf("Timed out") >= 0);
+				
+				if ( !bTimeout && URLsuffix.length() > 0 )
 				{
 					LOG.ERROR("Connector.open exception", ioe );
 					
 					try{
-						LOG.INFO(strUrl);
-						conn = Connector.open(strUrl);
+						String url = strUrl;
+						if (url.startsWith("https"))
+							url += ";EndToEndDesired;RdHTTPS";
+						
+						LOG.INFO(url);
+						conn = Connector.open(url, Connector.READ_WRITE, true);
 					} catch (IOException ioe2) {
 						LOG.ERROR("Connector.open exception", ioe2 );
 						if (conn != null)

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

@@ -259,7 +259,7 @@ final public class RhodesApplication extends UiApplication implements RenderingA
 			synchronized(this)
 			{
 				m_response = resp;
-				this.notify();
+				this.notifyAll();
 			}
 		}
 	}

data/platform/bb/rhodes/src/rhomobile/camera/CameraScreen.java

@@ -186,11 +186,17 @@ public class CameraScreen extends MainScreen {
 		            }
 		            
 		            fname = makeFileName(ext);
+	        		LOG.TRACE("camera filename: " + fname);
 	        		
 		        	file.open(fname, false, false);
+
+	        		LOG.TRACE("camera file open. Encoding: " + encoding);
 		        	
 		            //Retrieve the raw image from the VideoControl
 		        	byte[] image = _videoControl.getSnapshot(encoding);
+		        	
+	        		LOG.TRACE("camera getSnapshot called.");
+		        	
 		        	//Write image data
 		        	file.getOutStream().write(image,0,image.length);
 		        	image = null;
@@ -201,7 +207,7 @@ public class CameraScreen extends MainScreen {
 	        	fname = Utilities.replaceAll(fname,"/","%2F");
 	        } catch(Exception e) {
 	        	error = true;
-	        	LOG.ERROR(e);
+	        	LOG.ERROR("Read camera image file failed.", e);
 	        	Dialog.alert( "Error " + e.getClass() + ":  " + e.getMessage() );
 	        } finally {
 				try{
@@ -266,8 +272,11 @@ public class CameraScreen extends MainScreen {
 	    		// First of all, attempting to capture picture using MM API
 	    		
 	            //Create a player for the Blackberry's camera.
-	            player = Manager.createPlayer( "capture://video" ); 
-	            LOG.TRACE("Recording using MM API");
+	        	// do not use it:
+	        	//http://supportforums.blackberry.com/t5/Java-Development/ControlledAccessException-from-getSnapshot/m-p/284997;jsessionid=59C552A3EC61C282E67BDF229DDD2701
+	        	
+	        //    player = Manager.createPlayer( "capture://video" ); 
+	        //    LOG.TRACE("Recording using MM API");
 	        }
     	}
     	catch(Exception e) {
@@ -278,6 +287,7 @@ public class CameraScreen extends MainScreen {
     	try
         {
     		if (player != null) {
+    			LOG.INFO("Use VideoControl");
 	            //Set the player to the REALIZED state (see Player docs.)
 	            player.realize();
 	
@@ -301,6 +311,8 @@ public class CameraScreen extends MainScreen {
 	            initializeEncodingList();
     		}
     		else {
+    			LOG.INFO("Use filesystem hook");
+    			
     			RhodesApplication app = RhodesApplication.getInstance();
     			_fileListener = new CameraFilesListener(this);
     			app.addFileSystemJournalListener(_fileListener);

data/platform/iphone/Classes/WebViewController.m

@@ -41,11 +41,12 @@ extern int webview_active_tab();
 {
     WebViewController *wc;
     NSString *url;
+    bool callback;
 }
 
 @property (nonatomic,copy) NSString *url;
 
-- (id)init:(WebViewController*)w url:(NSString*)u;
+- (id)init:(WebViewController*)w url:(NSString*)u callback:(bool)c;
 - (void)onAction:(id)sender;
 
 @end
@@ -54,14 +55,22 @@ extern int webview_active_tab();
 
 @synthesize url;
 
-- (id)init:(WebViewController *)w url:(NSString*)u {
-    self->wc = w;
+- (id)init:(WebViewController *)w url:(NSString*)u callback:(bool)c {
+    wc = w;
     self.url = u;
+    callback = c;
     return self;
 }
 
+- (void)doAction {
+    if (callback)
+        rho_net_request([url UTF8String]);
+    else
+        [wc navigate:url];
+}
+
 - (void)onAction:(id)sender {
-    [wc navigate:url];
+    [self performSelectorOnMainThread:@selector(doAction) withObject:nil waitUntilDone:NO];
 }
 
 @end
@@ -168,9 +177,14 @@ extern int webview_active_tab();
                    target:nil action:nil];
         }
         else {
+            bool callback = false;
+            if ([url length] > 9 && [[url substringToIndex:9] isEqual:@"callback:"]) {
+                callback = true;
+                url = [url substringFromIndex:9];
+            }
             NSString *u = [NSString stringWithUTF8String:rho_http_normalizeurl([url UTF8String])];
-            UIBarButtonItemAction *action = [[UIBarButtonItemAction alloc] init:self url:u];
-            if (!img) {
+            UIBarButtonItemAction *action = [[UIBarButtonItemAction alloc] init:self url:u callback:callback];
+            if (img) {
                 btn = [[UIBarButtonItem alloc]
                        initWithImage:img style:UIBarButtonItemStylePlain
                        target:action action:@selector(onAction:)];
@@ -274,7 +288,7 @@ extern int webview_active_tab();
     webView = [[UIWebView alloc] initWithFrame:wvFrame];
     webView.scalesPageToFit = YES;
     webView.userInteractionEnabled = YES;
-    webView.detectsPhoneNumbers = YES;
+    //webView.detectsPhoneNumbers = YES;
     webView.multipleTouchEnabled = YES;
     webView.autoresizesSubviews = YES;
     webView.delegate = self;

data/platform/iphone/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.5.2</string>
+	<string>1.5.3</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 </dict>

data/platform/iphone/rbuild/iphone.rake

@@ -57,8 +57,7 @@ namespace "config" do
     $tmpdir =  $bindir +"/tmp"
 
     $homedir = `echo ~`.to_s.strip
-    $simapp="#{$homedir}/Library/Application Support/iPhone Simulator/User/Applications"
-    $simlink="#{$homedir}/Library/Application Support/iPhone Simulator/User/Library/Preferences"
+    $simdir = "#{$homedir}/Library/Application Support/iPhone Simulator/"
     $sim="/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications"
     $guid="364FFCAF-C71D-4543-B293-9058E31CFFEE"
     $applog = File.join($homedir,$app_config["applog"]) if $app_config["applog"] 
@@ -189,37 +188,46 @@ namespace "run" do
      
      rhorunner = $config["build"]["iphonepath"] + "/build/#{$configuration}-iphonesimulator/rhorunner.app"
 
-     Find.find($simapp) do |path| 
+  
+     Find.find($simdir) do |path|
        if File.basename(path) == "rhorunner.app"
          $guid = File.basename(File.dirname(path))
        end
      end
-    
-     $simrhodes = File.join($simapp,$guid)
-   
-     mkdir_p File.join($simrhodes,"Documents")
-     mkdir_p File.join($simrhodes,"Library","Preferences")
+
+     Dir.glob($simdir + '*').each do |sdk|
+       simapp = sdk + "/Applications"
+       simlink = sdk + "/Library/Preferences"
+
+       simrhodes = File.join(simapp,$guid)
+
+       mkdir_p File.join(simrhodes,"Documents")
+       mkdir_p File.join(simrhodes,"Library","Preferences")
+
+       `cp -R -p "#{rhorunner}" "#{simrhodes}"`
+       `ln -f -s "#{simlink}/com.apple.PeoplePicker.plist" "#{simrhodes}/Library/Preferences/com.apple.PeoplePicker.plist"`
+       `ln -f -s "#{simlink}/.GlobalPreferences.plist" "#{simrhodes}/Library/Preferences/.GlobalPreferences.plist"`
+
+       `echo "#{$applog}" > "#{simrhodes}/Documents/rhologpath.txt"`
+       rholog = simapp + "/" + $guid + "/Documents/RhoLog.txt"
+
+
+       simpublic = simapp + "/" + $guid + "/Documents/apps/public"
+       apppublic = $app_path + "/sim-public-#{File.basename(sdk)}"
+
+       apprholog = $app_path + "/rholog-#{File.basename(sdk)}.txt"
+       rm_f apprholog
+       rm_f apppublic
+       `ln -f -s "#{simpublic}" "#{apppublic}"`
+       `ln -f -s "#{rholog}" "#{apprholog}"`
+       `echo > "#{rholog}"`
+       f = File.new("#{simapp}/#{$guid}.sb","w")
+       f << "(version 1)\n(debug deny)\n(allow default)\n"
+       f.close
+
+
+     end
      
-     puts `cp -R -p "#{rhorunner}" "#{$simrhodes}"`
-     puts `ln -f -s "#{$simlink}/com.apple.PeoplePicker.plist" "#{$simrhodes}/Library/Preferences/com.apple.PeoplePicker.plist"`
-     puts `ln -f -s "#{$simlink}/.GlobalPreferences.plist" "#{$simrhodes}/Library/Preferences/.GlobalPreferences.plist"`
-
-     puts `echo "#{$applog}" > "#{$simrhodes}/Documents/rhologpath.txt"`
-     rholog = $simapp + "/" + $guid + "/Documents/RhoLog.txt"
-
-
-     simpublic = $simapp + "/" + $guid + "/Documents/apps/public"
-     apppublic = $app_path + "/sim-public"
-
-     apprholog = $app_path + "/rholog.txt"
-     rm_f apprholog
-     rm_f apppublic
-     puts `ln -f -s "#{simpublic}" "#{apppublic}"`
-     puts `ln -f -s "#{rholog}" "#{apprholog}"`
-     puts `echo > "#{rholog}"`
-     f = File.new("#{$simapp}/#{$guid}.sb","w")
-     f << "(version 1)\n(debug deny)\n(allow default)\n"
-     f.close
      
   end
 

data/platform/osx/Rhodes Launcher/launch.rb

@@ -1,10 +1,12 @@
-    require 'Find'
+    require 'find'
     require 'fileutils'
     include FileUtils
 
     chdir File.dirname(__FILE__)
 
     $homedir = `echo ~`.to_s.strip
+    $simdir = "#{$homedir}/Library/Application Support/iPhone Simulator/"
+
     $simapp="#{$homedir}/Library/Application Support/iPhone Simulator/User/Applications"
     $simlink="#{$homedir}/Library/Application Support/iPhone Simulator/User/Library/Preferences"
     $sim="/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications"
@@ -14,26 +16,31 @@
      `killall "iPhone Simulator"`
 
 
-     Find.find($simapp) do |path|
+     Find.find($simdir) do |path|
        if File.basename(path) == "rhorunner.app"
          $guid = File.basename(File.dirname(path))
        end
      end
 
-     simrhodes = File.join($simapp,$guid)
-     rm_rf simrhodes
-
-     mkdir_p File.join(simrhodes,"Documents")
-     mkdir_p File.join(simrhodes,"Library","Preferences")
+    Dir.glob($simdir + '*').each do |sdk|
+       simapp = sdk + "/Applications"
+       simlink = sdk + "/Library/Preferences"
 
-     puts `cp -R -p "rhorunner.app" "#{simrhodes}"`
-     puts `ln -f -s "#{$simlink}/com.apple.PeoplePicker.plist" "#{simrhodes}/Library/Preferences/com.apple.PeoplePicker.plist"`
-     puts `ln -f -s "#{$simlink}/.GlobalPreferences.plist" "#{simrhodes}/Library/Preferences/.GlobalPreferences.plist"`
+       simrhodes = File.join(simapp,$guid)
+       rm_rf simrhodes
 
-     puts `echo "#{$applog}" > "#{simrhodes}/Documents/rhologpath.txt"`
+       mkdir_p File.join(simrhodes,"Documents")
+       mkdir_p File.join(simrhodes,"Library","Preferences")
 
-     f = File.new("#{$simapp}/#{$guid}.sb","w")
-     f << "(version 1)\n(debug deny)\n(allow default)\n"
-     f.close
+       puts `cp -R -p "rhorunner.app" "#{simrhodes}"`
+       puts `ln -f -s "#{simlink}/com.apple.PeoplePicker.plist" "#{simrhodes}/Library/Preferences/com.apple.PeoplePicker.plist"`
+       puts `ln -f -s "#{simlink}/.GlobalPreferences.plist" "#{simrhodes}/Library/Preferences/.GlobalPreferences.plist"`
+ 
+       puts `echo "#{$applog}" > "#{simrhodes}/Documents/rhologpath.txt"`
 
+       f = File.new("#{simapp}/#{$guid}.sb","w")
+       f << "(version 1)\n(debug deny)\n(allow default)\n"
+       f.close
+     end
      system("open \"#{$sim}/iPhone Simulator.app\"")
+

data/platform/shared/common/RhodesApp.cpp

@@ -948,5 +948,12 @@ int rho_base64_decode(const char *src, int srclen, char *dst)
     return out;
 }
 
+void rho_net_request(const char *url)
+{
+    rho::common::CAutoPtr<rho::common::IRhoClassFactory> factory = rho::common::createClassFactory();
+    rho::common::CAutoPtr<rho::net::INetRequest> request = factory->createNetRequest();
+    request->pullData(url, null);
+}
+
 }
 

data/platform/shared/common/RhodesApp.h

@@ -157,6 +157,7 @@ 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);
 
 #ifdef __cplusplus
 };

data/platform/shared/ruby/wince/io_wce.c

@@ -146,6 +146,8 @@ int _open(const char *path, int oflag, va_list arg)
 
         case _O_RDONLY:         /* read access */
                 fileaccess = GENERIC_READ;
+                fileshare = FILE_SHARE_READ;
+
                 break;
         case _O_WRONLY:         /* write access */
                 /* giving it read access as well

data/platform/shared/rubyJVM/src/com/rho/RhoRuby.java

@@ -60,7 +60,8 @@ public class RhoRuby {
 		{
 			String strMsg = exc.getMessage(); 
 			
-	    	return strMsg != null && strMsg.indexOf("timed out") >= 0 ? RhoRuby.ERR_NOSERVERRESPONSE : RhoRuby.ERR_NETWORK;
+	    	return strMsg != null && (strMsg.indexOf("timed out") >= 0 || strMsg.indexOf("Timed out") >= 0)
+	    		? RhoRuby.ERR_NOSERVERRESPONSE : RhoRuby.ERR_NETWORK;
 		}
 		
 		return ERR_NONE;

data/platform/shared/rubyJVM/src/com/rho/sync/SyncEngine.java

@@ -530,13 +530,13 @@ public class SyncEngine implements NetRequest.IRhoSession
 
 	String loadSession()throws DBException
 	{
-	    String strRes = "";
+	    m_strSession = "";
 	    IDBResult res = getDB().executeSQL("SELECT session FROM sources WHERE session IS NOT NULL");
 	    
 	    if ( !res.isEnd() )
-	    	strRes = res.getStringByIdx(0);
+	    	m_strSession = res.getStringByIdx(0);
 	    
-	    return strRes;
+	    return m_strSession;
 	}
 	
 	public void logout()throws Exception

data/platform/shared/sync/SyncEngine.cpp

@@ -238,7 +238,8 @@ boolean CSyncEngine::resetClientIDByNet(const String& strClientID)//throws Excep
         strQuery += "&" + CClientRegister::getInstance()->getRegisterBody();
     
     NetResponse( resp, getNet().pullData(strUrl+strQuery, this) );
-    if ( resp.isOK() )
+    return resp.isOK();
+/*    if ( resp.isOK() )
     {
         if ( CClientRegister::getInstance() != null )
             return CClientRegister::getInstance()->doRegister(*this);
@@ -246,7 +247,7 @@ boolean CSyncEngine::resetClientIDByNet(const String& strClientID)//throws Excep
         return true;
     }
 
-    return false;
+    return false;*/
 }
 
 String CSyncEngine::requestClientIDByNet()
@@ -391,13 +392,13 @@ boolean CSyncEngine::isLoggedIn()
 
 String CSyncEngine::loadSession()
 {
-    String strRes = "";
+    m_strSession = "";
     DBResult( res , getDB().executeSQL("SELECT session FROM sources WHERE session IS NOT NULL") );
     
     if ( !res.isEnd() )
-    	strRes = res.getStringByIdx(0);
+    	m_strSession = res.getStringByIdx(0);
     
-    return strRes;
+    return m_strSession;
 }
 
 void CSyncEngine::logout()