rhodes 3.0.2 → 3.1.0.beta.1

data/platform/android/Rhodes/src/com/rhomobile/rhodes/{Utils.java → util/Utils.java}

@@ -1,4 +1,30 @@
-package com.rhomobile.rhodes;
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+package com.rhomobile.rhodes.util;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -188,22 +214,6 @@ public class Utils {
 		return new File(filePath).getName();
 	}
 	
-	public static boolean isAppHashChanged() {
-		try {
-			RhodesService r = RhodesService.getInstance();
-			File hash = new File(r.getRootPath(), "hash");
-			if (!hash.exists())
-				return true;
-			
-			FileSource as = new AssetsSource(r.getResources().getAssets());
-			FileSource fs = new FileSource();
-			return !Utils.isContentsEquals(as, "hash", fs, hash.getPath());
-		}
-		catch (IOException e) {
-			return true;
-		}
-	}
-	
 	public static void platformLog(String tag, String message) {
 		StringBuilder s = new StringBuilder();
 		s.append("ms[");

data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientNew.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package com.rhomobile.rhodes.webview;
 
 import android.webkit.WebStorage;

data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientOld.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package com.rhomobile.rhodes.webview;
 
 import com.rhomobile.rhodes.RhodesActivity;

data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettings.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package com.rhomobile.rhodes.webview;
 
 import android.webkit.WebSettings;

data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsNew.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package com.rhomobile.rhodes.webview;
 
 import android.content.Context;
@@ -14,6 +40,7 @@ public class RhoWebSettingsNew implements RhoWebSettings {
 		
 		webSettings.setDatabaseEnabled(true);
 		webSettings.setJavaScriptEnabled(true);
+		webSettings.setDomStorageEnabled(true);
 		
 		Context context = w.getContext();
 		String databasePath = context.getDir("database", Context.MODE_PRIVATE).getPath();

data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsOld.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package com.rhomobile.rhodes.webview;
 
 import android.webkit.WebSettings;

data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebViewClient.java

@@ -0,0 +1,107 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+package com.rhomobile.rhodes.webview;
+
+import com.rhomobile.rhodes.Logger;
+import com.rhomobile.rhodes.RhoConf;
+import com.rhomobile.rhodes.RhodesActivity;
+import com.rhomobile.rhodes.RhodesService;
+
+import android.graphics.Bitmap;
+import android.net.http.SslError;
+import android.view.Window;
+import android.webkit.SslErrorHandler;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+
+public class RhoWebViewClient extends WebViewClient
+{
+    private final String TAG = RhoWebViewClient.class.getSimpleName();
+    
+    @Override
+    public boolean shouldOverrideUrlLoading(WebView view, String url) {
+        Logger.I(TAG, "Loading URL: " + url);
+        return RhodesService.getInstance().handleUrlLoading(url);
+    }
+    
+    @Override
+    public void onPageStarted(WebView view, String url, Bitmap favicon) {
+        if (RhodesActivity.ENABLE_LOADING_INDICATION)
+            RhodesActivity.safeGetInstance().getWindow().setFeatureInt(Window.FEATURE_PROGRESS, 0);
+        super.onPageStarted(view, url, favicon);
+    }
+    
+    @Override
+    public void onPageFinished(WebView view, String url) {
+        // Set title
+        String title = view.getTitle();
+        RhodesActivity.safeGetInstance().setTitle(title);
+        if (RhodesActivity.ENABLE_LOADING_INDICATION)
+            RhodesActivity.safeGetInstance().getWindow().setFeatureInt(
+                    Window.FEATURE_PROGRESS, RhodesActivity.MAX_PROGRESS);
+        
+        super.onPageFinished(view, url);
+    }
+    
+    public void onReceivedError(android.webkit.WebView view, int errorCode, java.lang.String description, java.lang.String failingUrl)
+    {
+        StringBuilder msg = new StringBuilder(failingUrl);
+        msg.append(" failed: ");
+        msg.append(errorCode);
+        msg.append(" - " + description);
+        Logger.E(TAG, msg.toString());
+    }
+
+    @Override
+    public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
+        
+        if(RhoConf.getBool("no_ssl_verify_peer")) {
+            Logger.D(TAG, "Skip SSL error.");
+            handler.proceed();
+        } else {
+            StringBuilder msg = new StringBuilder();
+            msg.append("SSL error - ");
+            switch(error.getPrimaryError()) {
+            case SslError.SSL_NOTYETVALID:
+                msg.append("The certificate is not yet valid: ");
+                break;
+            case SslError.SSL_EXPIRED:
+                msg.append("The certificate has expired: ");
+                break;
+            case SslError.SSL_IDMISMATCH:
+                msg.append("Hostname mismatch: ");
+                break;
+            case SslError.SSL_UNTRUSTED:
+                msg.append("The certificate authority is not trusted: ");
+                break;
+            }
+            msg.append(error.getCertificate().toString());
+            Logger.W(TAG, msg.toString());
+            handler.cancel();
+        }
+    }
+}

data/platform/android/build/RhodesSRC_build.files

@@ -6,8 +6,6 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/LocalFileProvider.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/Logger.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/NavBar.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkConnectivityListener.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkStateTracker.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/PushReceiver.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/PushService.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RhoConf.java
@@ -21,8 +19,6 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesAppOptions.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesApplication.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.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
 platform/android/Rhodes/src/com/rhomobile/rhodes/alert/PopupActivity.java
@@ -35,6 +31,11 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerOl
 platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothSession.java 
 platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/UUIDHelper.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/camera/CameraService.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/camera/CameraOldService.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/camera/CameraSemiService.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/camera/CameraNewService.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/camera/CameraSettings.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/camera/FileList.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCaptureCallback.java
@@ -46,6 +47,7 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/file/RhoFileApi.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/SplashScreen.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
@@ -56,6 +58,7 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MultiTouchHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/OneTouchHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/TouchHandler.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/ExtrasHolder.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/RhoNativeViewManager.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessor.java
@@ -81,8 +84,12 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/uri/TelUriHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/UriHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/VideoUriHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/util/PerformOnUiThread.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/util/PhoneId.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/util/Utils.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/util/ContextFactory.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientNew.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientOld.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettings.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsNew.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsOld.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebViewClient.java

data/platform/android/build/android.rake

@@ -1,13 +1,39 @@
-#
+#------------------------------------------------------------------------
+# (The MIT License)
+# 
+# Copyright (c) 2008-2011 Rhomobile, Inc.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+# 
+# http://rhomobile.com
+#------------------------------------------------------------------------
+
 require File.dirname(__FILE__) + '/androidcommon.rb'
+require File.dirname(__FILE__) + '/android_tools.rb'
 require 'pathname'
 
 USE_OWN_STLPORT = false
-#USE_TRACES = false
+#USE_TRACES = # see androidcommon.h
 
 ANDROID_API_LEVEL_TO_MARKET_VERSION = {}
 ANDROID_MARKET_VERSION_TO_API_LEVEL = {}
-{2 => "1.1", 3 => "1.5", 4 => "1.6", 5 => "2.0", 6 => "2.0.1", 7 => "2.1", 8 => "2.2", 9 => "2.3.1", 10 => "2.3.3", 11 => "3.0", 12 => "3.1" }.each do |k,v|
+{2 => "1.1", 3 => "1.5", 4 => "1.6", 5 => "2.0", 6 => "2.0.1", 7 => "2.1", 8 => "2.2", 9 => "2.3.1", 10 => "2.3.3", 11 => "3.0", 12 => "3.1", 13 => "3.2"  }.each do |k,v|
   ANDROID_API_LEVEL_TO_MARKET_VERSION[k] = v
   ANDROID_MARKET_VERSION_TO_API_LEVEL[v] = k
 end
@@ -196,11 +222,12 @@ def set_app_name_android(newname)
             browsable_filter = true if cat_name.to_s =~ /\.BROWSABLE$/
           end
           if default_filter and browsable_filter
-            if $uri_custom.nil?
-              filter.add_element "data", { "android:scheme" => $uri_scheme }
-            else
-              filter.add_element( "data", { "android:scheme" => $uri_scheme, "android:host" => $uri_custom } )
+            filter.elements.each("data") do |d|
+              filter.delete d
             end
+            uri_params = {"android:scheme" => $uri_scheme, "android:host" => $uri_host}
+            uri_params["android:pathPrefix"] = $uri_path_prefix unless $uri_path_prefix.nil?
+            filter.add_element "data", uri_params
           end
         end
       end
@@ -278,8 +305,10 @@ namespace "config" do
     $emuversion = $app_config["android"]["version"] unless $app_config["android"].nil?
     $emuversion = $config["android"]["version"] if $emuversion.nil? and !$config["android"].nil?
 
-    $uri_scheme = $app_config["android"]["BundleURLScheme"] unless $app_config["android"].nil?
-    $uri_scheme = $config["android"]["BundleURLScheme"] if $uri_scheme.nil? and not $config["android"].nil?
+    $uri_scheme = $app_config["android"]["URIScheme"] unless $app_config["android"].nil?
+    $uri_scheme = "http" if $uri_scheme.nil?
+
+    $uri_host = $app_config["android"]["URIHost"] unless $app_config["android"].nil?
 
     $min_sdk_level = $app_config["android"]["minSDK"] unless $app_config["android"].nil?
     $min_sdk_level = $config["android"]["minSDK"] if $min_sdk_level.nil? and not $config["android"].nil?
@@ -338,9 +367,9 @@ namespace "config" do
     $app_package_name = "com.#{$vendor}." + $appname.downcase.gsub(/[^A-Za-z_0-9]/, '') unless $app_package_name
     $app_package_name.gsub!(/\.[\d]/, "._")
 
-    if $uri_scheme.nil?
-      $uri_custom = $app_package_name 
-      $uri_scheme = "http"
+    if $uri_host.nil?
+      $uri_host = "rhomobile.com"
+      $uri_path_prefix = "/#{$app_package_name}"
     end
 
     $rhomanifest = File.join $androidpath, "Rhodes", "AndroidManifest.xml"
@@ -660,7 +689,7 @@ namespace "build" do
 
     end
 #    desc "Build RhoBundle for android"
-    task :rhobundle => ["config:android","build:bundle:noxruby",:extensions,:librhodes] do
+    task :rhobundle => ["config:android","build:bundle:noxruby",:extensions] do
 #      Rake::Task["build:bundle:noxruby"].execute
 
       assets = File.join(Jake.get_absolute($androidpath), "Rhodes", "assets")
@@ -701,7 +730,7 @@ namespace "build" do
 
       ENV['RHO_PLATFORM'] = 'android'
       ENV["ANDROID_NDK"] = $androidndkpath
-      ENV["ANDROID_API_LEVEL"] = $min_sdk_level.to_s
+      ENV["ANDROID_API_LEVEL"] = $found_api_level.to_s
       ENV["TARGET_TEMP_DIR"] = $extensionsdir
       ENV["RHO_ROOT"] = $startdir
       ENV["BUILD_DIR"] ||= $startdir + "/platform/android/build"
@@ -1077,6 +1106,7 @@ namespace "build" do
       args = []
       args << "-I#{$appincdir}"
       args << "-I#{srcdir}/../include"
+      args << "-I#{srcdir}/../include/rhodes/details"
       args << "-I#{$shareddir}"
       args << "-I#{$shareddir}/common"
       args << "-I#{$shareddir}/sqlite"
@@ -1147,7 +1177,7 @@ namespace "build" do
     end
 
  #   desc "Build Rhodes for android"
-    task :rhodes => :rhobundle do
+    task :rhodes => [:rhobundle, :librhodes] do
       javac = $config["env"]["paths"]["java"] + "/javac" + $exe_ext
 
 
@@ -1277,6 +1307,11 @@ namespace "build" do
 
       generate_rjava
 
+      mkdir_p File.join($app_rjava_dir, "R") if not File.exists? File.join($app_rjava_dir, "R")
+      buf = File.new(File.join($app_rjava_dir, "R.java"),"r").read.gsub(/^\s*package\s*#{$app_package_name};\s*$/,"\npackage com.rhomobile.rhodes;\n")
+      File.open(File.join($app_rjava_dir, "R", "R.java"),"w") { |f| f.write(buf) }
+
+
       srclist = File.join($builddir, "RhodesSRC_build.files")
       newsrclist = File.join($tmpdir, "RhodesSRC_build.files")
       lines = []
@@ -1297,6 +1332,7 @@ namespace "build" do
         end
       end
       lines << "\"" +File.join($app_rjava_dir, "R.java")+"\""
+      lines << "\"" +File.join($app_rjava_dir, "R", "R.java")+"\""
       lines << "\"" +$app_android_r+"\""
       lines << "\"" +$app_native_libs_java+"\""
       lines << "\"" +$app_capabilities_java+"\""
@@ -1450,14 +1486,6 @@ namespace "package" do
   end
 end
 
-def get_app_log(appname, device, silent = false)
-  pkgname = "com.#{$vendor}." + appname.downcase.gsub(/[^A-Za-z_0-9]/, '')
-  path = File.join('/data/data', pkgname, 'rhodata', 'RhoLog.txt')
-  cc_run($adb, [device ? '-d' : '-e', 'pull', path, $app_path]) or return false
-  puts "RhoLog.txt stored to " + $app_path unless silent
-  return true
-end
-
 namespace "device" do
   namespace "android" do
 
@@ -1576,7 +1604,7 @@ namespace "device" do
     end
 
     task :getlog => "config:android" do
-      get_app_log($appname, true) or exit 1
+      AndroidTools.get_app_log($appname, true) or exit 1
     end
   end
 end
@@ -1584,75 +1612,11 @@ end
 namespace "emulator" do
   namespace "android" do
     task :getlog => "config:android" do
-      get_app_log($appname, false) or exit 1
+      AndroidTools.get_app_log($appname, false) or exit 1
     end
   end
 end
 
-
-def is_emulator_running
-  `"#{$adb}" devices`.split("\n")[1..-1].each do |line|
-    return true if line =~ /^emulator/
-  end
-  return false
-end
-
-def is_device_running
-  `"#{$adb}" devices`.split("\n")[1..-1].each do |line|
-    return true if line !~ /^emulator/
-  end
-  return false
-end
-
-def run_application (target_flag)
-  args = []
-  args << target_flag
-  args << "shell"
-  args << "am"
-  args << "start"
-  args << "-a"
-  args << "android.intent.action.MAIN"
-  args << "-n"
-  args << $app_package_name + "/#{JAVA_PACKAGE_NAME}.RhodesActivity"
-  Jake.run($adb, args)
-end
-
-def application_running(flag, pkgname)
-  pkg = pkgname.gsub(/\./, '\.')
-  `"#{$adb}" #{flag} shell ps`.split.each do |line|
-    return true if line =~ /#{pkg}/
-  end
-  false
-end
-
-def kill_adb_and_emulator
-  if RUBY_PLATFORM =~ /windows|cygwin|mingw/
-    # Windows
-    `taskkill /F /IM adb.exe`
-    `taskkill /F /IM emulator.exe`
-  else
-    `killall -9 adb`
-    `killall -9 emulator`
-  end
-end
-
-def logcat(device_flag = '-e', log_path = $applog_path)
-  if !log_path.nil?
-    rm_rf log_path unless !File.exist(log_path)
-    Thread.new { Jake.run($adb, [device_flag, 'logcat', '>>', log_path], nil, true) }
-  end
-end
-
-def logcat_process(device_flag = '-e', log_path = $applog_path)
-  if !log_path.nil?
-    Thread.new { system("\"#{$adb}\" #{device_flag} logcat >> \"#{log_path}\" ") }  
-  end
-end
-
-def logclear(device_flag = '-e')
-  Jake.run($adb, [device_flag, 'logcat', '-c'], nil, true) 
-end
-
 namespace "android" do
     task :get_log => "config:android" do
 		puts "log_file=" + $applog_path
@@ -1669,18 +1633,18 @@ namespace "run" do
 
         device_flag = '-e'
 
-        logclear(device_flag)
+        AndroidTools.logclear(device_flag)
         run_emulator( :hidden => true ) if device_flag == '-e'
         do_uninstall(device_flag)
         
         # Failsafe to prevent eternal hangs
         Thread.new {
           sleep 2000
-          kill_adb_and_emulator
+          AndroidTools.kill_adb_and_emulator
         }
 
         load_app_and_run(device_flag)
-        logcat(device_flag, log_name)
+        AndroidTools.logcat(device_flag, log_name)
 
         Jake.before_run_spec
         start = Time.now
@@ -1688,7 +1652,7 @@ namespace "run" do
         puts "waiting for application"
 
         for i in 0..60
-            if application_running(device_flag, $app_package_name)
+            if AndroidTools.application_running(device_flag, $app_package_name)
 		break
             else
                 sleep(1)
@@ -1724,7 +1688,7 @@ namespace "run" do
             end
             io.close
             
-            break unless application_running(device_flag, $app_package_name)
+            break unless AndroidTools.application_running(device_flag, $app_package_name)
             sleep(5) unless end_spec
         end
 
@@ -1751,6 +1715,17 @@ namespace "run" do
         load_app_and_run
     end
 
+    task :rhosimulator => "config:common" do    
+    
+        $emuversion = $app_config["android"]["version"] unless $app_config["android"].nil?
+        $emuversion = $config["android"]["version"] if $emuversion.nil? and !$config["android"].nil?
+    
+        $rhosim_config = "platform='android'\r\n"
+        $rhosim_config += "os_version='#{$emuversion}'\r\n" if $emuversion
+        
+        Rake::Task["run:rhosimulator"].invoke            
+    end
+
     task :get_info => "config:android" do
         $androidtargets.each do |level|
             puts "#{get_market_version(level[0])}"
@@ -1795,7 +1770,7 @@ namespace "run" do
 
     def  kill_adb
         # stop app
-        if RUBY_PLATFORM =~ /windows|cygwin|mingw/
+        if RUBY_PLATFORM =~ /(win|w)32$/
           # Windows
           `taskkill /F /IM adb.exe`
         else
@@ -1811,10 +1786,7 @@ namespace "run" do
       puts 'Sleep for 5 sec. waiting for "adb start-server"'
       sleep 5
 
-      #if !$applog_file.nil?
-      #  Thread.new { Jake.run($adb, ['logcat', '>>', $applog_path], nil, true) }
-      #end
-      logcat_process()
+      AndroidTools.logcat_process()
 
       if $appavdname != nil
         $avdname = $appavdname
@@ -1832,7 +1804,7 @@ namespace "run" do
         end
       end
 
-      running = is_emulator_running
+      running = AndroidTools.is_emulator_running
 
       if !running
         # Start the emulator, check on it every 5 seconds until it's running
@@ -1846,17 +1818,11 @@ namespace "run" do
         while (Time.now - startedWaiting < 180 )
           sleep 5
           now = Time.now
-          #emulatorState = ""
-          #Jake.run2($adb,["-e", "get-state"],{:system => false, :hideerrors => :false}) do |line|
-          #  puts "RET: " + line
-          #  emulatorState += line
-          #end
           started = false
           Jake.run2 $adb, ["-e", "shell", "ps"], :system => false, :hideerrors => false do |line|
             started = true if line =~ /android\.process\.acore/
             true
           end
-          #if emulatorState =~ /unknown/
           unless started
             printf("%.2fs: ",(now - startedWaiting))
             if (now - startedWaiting) > (60 * adbRestarts)
@@ -1866,10 +1832,7 @@ namespace "run" do
               Jake.run($adb, ['start-server'], nil, true)
               adbRestarts += 1
 
-              #if !$applog_file.nil?
-              #  Thread.new { Jake.run($adb, ['logcat', '>>', $applog_path], nil, true) }
-              #end
-              logcat_process()
+              AndroidTools.logcat_process()
             else
               puts "Still waiting..."
             end
@@ -1880,7 +1843,7 @@ namespace "run" do
           end
         end
 
-        if !is_emulator_running
+        if !AndroidTools.is_emulator_running
           puts "Emulator still isn't up and running, giving up"
           exit 1
         end
@@ -1919,15 +1882,15 @@ namespace "run" do
       end
 
       puts "Loading complete, starting application.." if done
-      run_application(device_flag) if done
+      AndroidTools.run_application(device_flag) if done
     end
 
     desc "build and install on device"
     task :device => "device:android:install" do
       puts "Starting application..."
-      run_application("-d")
+      AndroidTools.run_application("-d")
       
-      logcat_process("-d")
+      AndroidTools.logcat_process("-d")
     end
   end
 
@@ -1968,7 +1931,7 @@ namespace "uninstall" do
 
   namespace "android" do
     task :emulator => "config:android" do
-      unless is_emulator_running
+      unless AndroidTools.is_emulator_running
         puts "WARNING!!! Emulator is not up and running"
         exit 1
       end
@@ -1977,7 +1940,7 @@ namespace "uninstall" do
 
     desc "uninstall from device"
     task :device => "config:android" do
-      unless is_device_running
+      unless AndroidTools.is_device_running
         puts "WARNING!!! Device is not connected"
         exit 1
       end