rhodes 3.4.2 → 3.5.1.12

data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/GoogleMapView.java

@@ -62,8 +62,8 @@ public class GoogleMapView extends MapActivity {
 
 	private static final String TAG = "GoogleMapView";
 	
-	private static final String SETTINGS_PREFIX = RhodesService.INTENT_EXTRA_PREFIX + "settings.";
-	private static final String ANNOTATIONS_PREFIX = RhodesService.INTENT_EXTRA_PREFIX + "annotations.";
+	private static final String SETTINGS_PREFIX = RhodesService.INTENT_EXTRA_PREFIX + ".settings.";
+	private static final String ANNOTATIONS_PREFIX = RhodesService.INTENT_EXTRA_PREFIX + ".annotations.";
 	
 	private static GoogleMapView mc = null;
 	
@@ -224,7 +224,7 @@ public class GoogleMapView extends MapActivity {
 		
 		MapController controller = view.getController();
 		String type = extras.getString(SETTINGS_PREFIX + "region");
-		if (type.equals("square")) {
+		if ("square".equals(type)) {
 			String latitude = extras.getString(SETTINGS_PREFIX + "region.latitude");
 			String longitude = extras.getString(SETTINGS_PREFIX + "region.longitude");
 			if (latitude != null && longitude != null) {
@@ -253,7 +253,7 @@ public class GoogleMapView extends MapActivity {
 				}
 			}
 		}
-		else if (type.equals("circle")) {
+		else if ("circle".equals(type)) {
 			String center = extras.getString(SETTINGS_PREFIX + "region.center");
 			String radius = extras.getString(SETTINGS_PREFIX + "region.radius");
 			if (center != null && radius != null) {

data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java

@@ -36,7 +36,6 @@ import android.graphics.Paint;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.Bundle;
-import android.util.DisplayMetrics;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;

data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality.java

@@ -26,6 +26,8 @@
 
 package com.rhomobile.rhodes.osfunctionality;
 
+import com.rhomobile.rhodes.event.CalendarIDsProvider;
+
 import android.content.Context;
 import android.webkit.WebView;
 
@@ -49,4 +51,6 @@ public interface AndroidFunctionality {
 
     void applyWebSettings(WebView view);
     void pauseWebView( WebView view, boolean doPause );
+    
+    CalendarIDsProvider buildCalendarIDsProvider();
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality01.java

@@ -28,6 +28,7 @@ package com.rhomobile.rhodes.osfunctionality;
 
 import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.RhoConf;
+import com.rhomobile.rhodes.event.CalendarIDsProvider;
 
 import android.content.Context;
 import android.content.pm.ActivityInfo;
@@ -116,4 +117,9 @@ class AndroidFunctionality01 implements AndroidFunctionality {
             }
         }
     }
+
+	@Override
+	public CalendarIDsProvider buildCalendarIDsProvider() {
+		return new CalendarIDsProvider();
+	}
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality08.java

@@ -28,6 +28,8 @@ package com.rhomobile.rhodes.osfunctionality;
 
 import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.RhoConf;
+import com.rhomobile.rhodes.event.CalendarIDsProvider;
+import com.rhomobile.rhodes.event.CalendarIDsProviderFroyo;
 import com.rhomobile.rhodes.util.ContextFactory;
 
 import android.content.Context;
@@ -79,5 +81,10 @@ class AndroidFunctionality08 extends AndroidFunctionality07 implements
             Logger.I(TAG, "Set web plugins state 'OFF'");
         }
     }
+    
+    @Override
+    public CalendarIDsProvider buildCalendarIDsProvider() {
+    	return new CalendarIDsProviderFroyo();
+    }
 
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality12.java

@@ -0,0 +1,6 @@
+package com.rhomobile.rhodes.osfunctionality;
+
+//Android 3.1
+public class AndroidFunctionality12 extends AndroidFunctionality11 implements AndroidFunctionality {
+
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality13.java

@@ -0,0 +1,6 @@
+package com.rhomobile.rhodes.osfunctionality;
+
+//Android 3.2
+public class AndroidFunctionality13 extends AndroidFunctionality12 implements AndroidFunctionality {
+
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality14.java

@@ -0,0 +1,12 @@
+package com.rhomobile.rhodes.osfunctionality;
+
+import com.rhomobile.rhodes.event.CalendarIDsProvider;
+import com.rhomobile.rhodes.event.CalendarIDsProviderICS;
+
+//Android 4.0 ICS
+public class AndroidFunctionality14 extends AndroidFunctionality13 implements AndroidFunctionality {
+	@Override
+    public CalendarIDsProvider buildCalendarIDsProvider() {
+    	return new CalendarIDsProviderICS();
+    }
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionalityManager.java

@@ -40,7 +40,16 @@ public class AndroidFunctionalityManager {
 	public static AndroidFunctionality getAndroidFunctionality() {
 		if (ourFunctionality == null) {
 			int sdkVersion = Build.VERSION.SDK_INT;
-			if (sdkVersion >= Build.VERSION_CODES.HONEYCOMB) { // 3.0.x - 11
+			if ( sdkVersion >= Build.VERSION_CODES.ICE_CREAM_SANDWICH ) { // 4.0 - 14
+				ourFunctionality = new AndroidFunctionality14();
+			}
+			else if ( sdkVersion >= Build.VERSION_CODES.HONEYCOMB_MR2) { // 3.2 - 13
+				ourFunctionality = new AndroidFunctionality13();
+			}
+			else if ( sdkVersion >= Build.VERSION_CODES.HONEYCOMB_MR1 ) { // 3.1 - 12
+				ourFunctionality = new AndroidFunctionality12();
+			}
+			else if (sdkVersion >= Build.VERSION_CODES.HONEYCOMB) { // 3.0.x - 11
 				ourFunctionality = new AndroidFunctionality11();
 			}
 			else if (sdkVersion == Build.VERSION_CODES.GINGERBREAD_MR1) { // 2.3.3 and above - 10

data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/Signature.java

@@ -32,8 +32,6 @@ import java.util.Map;
 import android.content.Intent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
-import android.webkit.WebView;
 import android.widget.AbsoluteLayout;
 
 import com.rhomobile.rhodes.Logger;
@@ -47,7 +45,6 @@ import com.rhomobile.rhodes.util.Utils;
 
 import com.rhomobile.rhodes.extmanager.AbstractRhoExtension;
 import com.rhomobile.rhodes.extmanager.IRhoExtData;
-import com.rhomobile.rhodes.extmanager.IRhoExtension;
 import com.rhomobile.rhodes.extmanager.IRhoExtManager;
 import com.rhomobile.rhodes.extmanager.RhoExtManager;
 
@@ -55,7 +52,7 @@ public class Signature extends AbstractRhoExtension implements IRhoExtension {
 
 	static final String TAG = "Signature";
 	
-	public static final String INTENT_EXTRA_PREFIX = RhodesService.INTENT_EXTRA_PREFIX + "signature.";
+	public static final String INTENT_EXTRA_PREFIX = RhodesService.INTENT_EXTRA_PREFIX + ".signature.";
 	
 	private static final String SIGNATURE_EXT = "signature_ext";
 	
@@ -178,10 +175,10 @@ public class Signature extends AbstractRhoExtension implements IRhoExtension {
 				ourInlineSignatureView = new SignatureView(ContextFactory.getUiContext(), null);
 				
 				{
-					if ((getSharedInstance().mProperties.bgColor & 0xFF000000) != 0xFF000000) {
+					//if ((getSharedInstance().mProperties.bgColor & 0xFF000000) != 0xFF000000) {
 						//ourInlineSignatureView.setVisibility(View.INVISIBLE);
 						ourInlineSignatureView.isTransparency = true;
-					}
+					//}
 					ourInlineSignatureView.setupView(	getSharedInstance().mProperties.penColor, 
 							getSharedInstance().mProperties.penWidth, 
 							getSharedInstance().mProperties.bgColor);

data/platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocketImpl.java

@@ -60,7 +60,7 @@ public class RhoSocketImpl extends SocketImpl {
 	public RhoSocketImpl(int s, RhoSockAddr rem) {
 		Logger.D(TAG, "New socket wrapper. fd: " + s + ", host: " + rem.host + ", port: " + rem.port);
 		
-		soTimeout = RhoConf.getInt("net_timeout");
+		soTimeout = RhoConf.getInt("net_timeout") * 1000;
 		if ( 0 == soTimeout ) {
 			soTimeout = DEFAULT_TIMEOUT;
 		}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/LocalFileHandler.java

@@ -65,7 +65,7 @@ public class LocalFileHandler implements UriHandler
             return false;
         
         String noAnchorUrl = URLUtil.stripAnchor(url);
-        if (isHtmlUrl(noAnchorUrl) || isImageUrl(noAnchorUrl)) {
+        if (isHtmlUrl(noAnchorUrl)) {
             return false;
         }
 

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

@@ -1,10 +1,16 @@
 package com.rhomobile.rhodes.webview;
 
+import java.io.FileOutputStream;
+
 import com.rhomobile.rhodes.Logger;
+import com.rhomobile.rhodes.extmanager.IRhoWebView;
 import com.rhomobile.rhodes.osfunctionality.AndroidFunctionalityManager;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
 
 import android.app.Activity;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Picture;
 import android.os.Build;
 import android.view.View;
 import android.view.ViewGroup;
@@ -183,4 +189,41 @@ public class GoogleWebView implements IRhoWebView {
     public void onResume() {
 	AndroidFunctionalityManager.getAndroidFunctionality().pauseWebView(mWebView,false);
     }
+
+    @Override
+    public void capture(CaptureFormat format, String path) {
+        switch (format) {
+        case CAPTURE_FORMAT_HTML:
+            Logger.T(TAG, "Capturing current page as HTML archive: " + path);
+            mWebView.saveWebArchive(path);
+            break;
+        case CAPTURE_FORMAT_JPEG:
+            Logger.T(TAG, "Capturing current page as JPEG image: " + path);
+            saveJpeg(path);
+            break;
+        default:
+            //Should never happen
+            Logger.E(TAG, "Wrong capture format.");
+            break;
+        }
+    }
+    
+    private void saveJpeg(String path) {
+        Picture picture = mWebView.capturePicture(); 
+        Bitmap bitmap = Bitmap.createBitmap( picture.getWidth(), picture.getHeight(), Bitmap.Config.ARGB_8888); 
+        Canvas canvas = new Canvas(bitmap); 
+        picture.draw(canvas); 
+        FileOutputStream fos = null; 
+        try { 
+            fos = new FileOutputStream(path); 
+            if ( fos != null ) 
+            { 
+                bitmap.compress(Bitmap.CompressFormat.JPEG, 90, fos ); 
+                fos.close(); 
+            } 
+        }
+        catch (Throwable e){
+            Logger.E(TAG, e);
+        }
+    }
 }

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

@@ -28,6 +28,7 @@ package com.rhomobile.rhodes.webview;
 
 import android.app.Activity;
 import android.view.Window;
+import android.webkit.GeolocationPermissions;
 import android.webkit.JsResult;
 import android.webkit.WebChromeClient;
 import android.webkit.WebStorage;
@@ -100,6 +101,10 @@ public class RhoWebChromeClient extends WebChromeClient {
     public boolean onJsConfirm(WebView view, String url, String message, JsResult result) {
         return false;
     }
+    public void onGeolocationPermissionsShowPrompt(String origin, GeolocationPermissions.Callback callback) {
+        callback.invoke(origin, true, false);
+    }
+
 }
 
 

data/platform/android/build/RhodesSRC_build.files

@@ -1,14 +1,14 @@
 platform/android/Rhodes/src/com/rhomobile/rhodes/AndroidR.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/Base64.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/BaseActivity.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/ConnectionChangeReceiver.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/HttpLog.java
 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/MemoryInfoCollector.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/PushReceiver.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/PushService.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/PushContract.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RhoConf.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RhoCryptImpl.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RhoLogConf.java
@@ -42,6 +42,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/event/Event.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/event/EventStore.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/event/CalendarIDsProvider.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/event/CalendarIDsProviderFroyo.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/event/CalendarIDsProviderICS.java
 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
@@ -94,14 +97,14 @@ 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/RhoWebChromeClient.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebViewClient.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/webview/IRhoWebView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/GoogleWebView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/AbstractRhoExtension.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/Config.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/AbstractRhoListener.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtData.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtension.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtManager.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoListener.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoWebView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtDataImpl.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtManagerImpl.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtManager.java
@@ -117,4 +120,7 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunction
 platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality09.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality10.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality11.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality12.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality13.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality14.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionalityManager.java

data/platform/android/build/android.rake

@@ -62,7 +62,7 @@ ANDROID_PERMISSIONS = {
   'bluetooth' => ['BLUETOOTH_ADMIN', 'BLUETOOTH'],
   'calendar' => ['READ_CALENDAR', 'WRITE_CALENDAR'],
   'sdcard' => 'WRITE_EXTERNAL_STORAGE',
-  'push' => proc do |manifest| add_push(manifest) end,
+  'push' => proc do add_gcm_push end,
   'motorola' => ['SYSTEM_ALERT_WINDOW', 'BROADCAST_STICKY', proc do |manifest| add_motosol_sdk(manifest) end],
   'motoroladev' => ['SYSTEM_ALERT_WINDOW', 'BROADCAST_STICKY', proc do |manifest| add_motosol_sdk(manifest) end],
   'webkit_browser' => nil,
@@ -72,47 +72,8 @@ ANDROID_PERMISSIONS = {
 
 ANDROID_CAPS_ALWAYS_ENABLED = ['network_state']
 
-def add_push(manifest)
-  element = REXML::Element.new('permission')
-  element.add_attribute('android:name', "#{$app_package_name}.permission.C2D_MESSAGE")
-  element.add_attribute('android:protectionLevel', 'signature')
-  manifest.add element
-
-  element = REXML::Element.new('uses-permission')
-  element.add_attribute('android:name', "#{$app_package_name}.permission.C2D_MESSAGE")
-  manifest.add element
-
-  element = REXML::Element.new('uses-permission')
-  element.add_attribute('android:name', "com.google.android.c2dm.permission.RECEIVE")
-  manifest.add element
-
-  receiver = REXML::Element.new('receiver')
-  receiver.add_attribute('android:name', "#{JAVA_PACKAGE_NAME}.PushReceiver")
-  receiver.add_attribute('android:permission', "com.google.android.c2dm.permission.SEND")
-
-  action = REXML::Element.new('action')
-  action.add_attribute('android:name', "com.google.android.c2dm.intent.RECEIVE")
-  category = REXML::Element.new('category')
-  category.add_attribute('android:name', $app_package_name)
-
-  ie = REXML::Element.new('intent-filter')
-  ie.add_element(action)
-  ie.add_element(category)
-  receiver.add_element(ie)
-
-  action = REXML::Element.new('action')
-  action.add_attribute('android:name', "com.google.android.c2dm.intent.REGISTRATION")
-  category = REXML::Element.new('category')
-  category.add_attribute('android:name', $app_package_name)
-  
-  ie = REXML::Element.new('intent-filter')
-  ie.add_element(action)
-  ie.add_element(category)
-  receiver.add_element(ie)
-
-  manifest.elements.each('application') do |app|
-    app.add receiver
-  end
+def add_gcm_push
+  $app_config["extensions"] << 'gcm-push' unless $app_config["extensions"].index('gcm-push')
 end
 
 def add_motosol_sdk(manifest)
@@ -239,6 +200,12 @@ namespace "config" do
     $use_google_addon_api = true if $use_geomapping
 
     #Additionally $use_google_addon_api set to true if PUSH capability is enabled
+    
+    $config_xml = $app_config["android"]["rhoelements"]["config"] if $app_config["android"]["rhoelements"] if $app_config["android"]
+    if $config_xml
+      $config_xml = File.expand_path $config_xml, $app_path
+      puts "Custom config.xml path: #{$config_xml}" 
+    end
 
     puts "Use Google addon API: #{$use_google_addon_api}" if USE_TRACES
 
@@ -731,6 +698,7 @@ namespace "build" do
 
       ENV['RHO_PLATFORM'] = 'android'
       ENV["RHO_APP_DIR"] = $app_path
+      ENV["ANDROID_SDK"] = $androidsdkpath
       ENV["ANDROID_NDK"] = $androidndkpath
       ENV["ANDROID_API_LEVEL"] = $found_api_level.to_s
       ENV["RHO_ROOT"] = $startdir
@@ -788,7 +756,6 @@ namespace "build" do
           cp_r add, addspath if File.directory? add
         end
       end
-
     end #task :extensions
 
     task :libsqlite => "config:android" do
@@ -1264,7 +1231,6 @@ namespace "build" do
       generator.maxSdkVer = $max_sdk_level
 
       generator.usesLibraries['com.google.android.maps'] = true if $use_google_addon_api
-      generator.addGooglePush(File.join($androidpath,'Rhodes','PushReceiver.erb')) if $app_config["capabilities"].index 'push'
 
       generator.addUriParams $uri_scheme, $uri_host, $uri_path_prefix
       
@@ -1398,8 +1364,9 @@ namespace "build" do
             cp_r res, $tmpdir
           end
       end
-      
-      unless $config_xml.nil?
+
+      if $config_xml
+        puts "Copying custom config.xml"
         rawres_path = File.join($tmpdir, 'res', 'raw')
         mkdir_p rawres_path unless File.exist? rawres_path
         cp $config_xml, File.join(rawres_path,'config.xml')
@@ -1412,7 +1379,6 @@ namespace "build" do
       buf.gsub!(/public\s*static\s*final\s*int/, "public static int")
       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 = []
@@ -1518,7 +1484,7 @@ namespace "build" do
       end
     end
 
-    task :extensions_adds => "config:android:extensions" do
+    task :extensions_adds => "config:android:extensions" do    
     end
 
     task :upgrade_package => :rhobundle do
@@ -1741,8 +1707,7 @@ namespace "device" do
       puts "Install APK file"
       Jake.run($adb, ["-d", "install", "-r", apkfile])
       unless $?.success?
-        puts "Error installing APK file"
-        exit 1
+        raise "Error installing APK file"
       end
       puts "Install complete"
     end
@@ -1824,29 +1789,27 @@ namespace "device" do
       end
     end
 
-    task :getlog => "config:android" do
-      AndroidTools.get_app_log($appname, true) or exit 1
-    end
+    #task :getlog => "config:android" do
+    #  AndroidTools.get_app_log($appname, true) or exit 1
+    #end
   end
 end
 
-namespace "emulator" do
+#namespace "emulator" do
+#  namespace "android" do
+#    task :getlog => "config:android" do
+#      AndroidTools.get_app_log($appname, false) or exit 1
+#    end
+#  end
+#end
+
+namespace "run" do
   namespace "android" do
-    task :getlog => "config:android" do
-      AndroidTools.get_app_log($appname, false) or exit 1
-    end
-  end
-end
 
-namespace "android" do
     task :get_log => "config:android" do
-		puts "log_file=" + $applog_path
-	end
-end
+      puts "log_file=" + $applog_path
+    end
 
-namespace "run" do
-  namespace "android" do
-    
     task :spec => ["device:android:debug"] do
     
         if $device_flag == '-e'
@@ -1859,7 +1822,7 @@ namespace "run" do
         File.delete(log_name) if File.exist?(log_name)
 
         AndroidTools.logclear($device_flag)
-        run_emulator( :hidden => true ) if $device_flag == '-e'
+        AndroidTools.run_emulator( :hidden => true ) if $device_flag == '-e'
         do_uninstall($device_flag)
         
         # Failsafe to prevent eternal hangs
@@ -1868,11 +1831,12 @@ namespace "run" do
             if $device_flag == '-e'
                 AndroidTools.kill_adb_and_emulator
             else
-                AndroidTools.kill_adb
+                AndroidTools.restart_adb
             end
         }
 
-        load_app_and_run($device_flag)
+        apkfile = File.expand_path(File.join $targetdir, $appname + "-debug.apk")
+        AndroidTools.load_app_and_run($device_flag, apkfile, $app_package_name)
         AndroidTools.logcat($device_flag, log_name)
 
         Jake.before_run_spec
@@ -1932,7 +1896,7 @@ namespace "run" do
             AndroidTools.kill_adb_and_emulator
         else
             do_uninstall($device_flag)
-            AndroidTools.kill_adb
+            AndroidTools.restart_adb
         end
 
         $stdout.flush
@@ -2004,8 +1968,11 @@ namespace "run" do
     end
 
     task :emulator=>['config:android:emulator', 'device:android:debug']  do
-        run_emulator
-        load_app_and_run
+        AndroidTools.run_emulator
+        AndroidTools.restart_adb
+        
+        apkfile = File.expand_path(File.join $targetdir, $appname + "-debug.apk")
+        AndroidTools.load_app_and_run('-e', apkfile, $app_package_name)
     end
 
     desc "Run application on RhoSimulator"    
@@ -2072,130 +2039,16 @@ namespace "run" do
 #
 #    end
 
-    def  run_emulator(options = {})
-      apkfile = Jake.get_absolute $targetdir + "/" + $appname + "-debug.apk"
-
-      #AndroidTools.kill_adb
-      Jake.run($adb, ['start-server'], nil, true)
-
-      rm_f $applog_path if !$applog_path.nil?
-      AndroidTools.logcat_process()
-
-      running = AndroidTools.is_emulator_running
-      if !running
-        $avdname = "rhoAndroid" + $emuversion.gsub(/[^0-9]/, "")
-        $avdname += "google" if $use_google_addon_api
-        $avdname += "motosol" if $use_motosol_api
-        $avdtarget = $androidtargets[get_api_level($emuversion)]
-
-        raise "Unable to run Android emulator. No appropriate target API for SDK version: #{$emuversion}" unless $avdtarget
-
-        if $appavdname != nil
-          $avdname = $appavdname
-        end
-
-        createavd = "\"#{$androidbin}\" create avd --name #{$avdname} --target #{$avdtarget} --sdcard 128M "
-        system("echo no | #{createavd}") unless File.directory?( File.join(ENV['HOME'], ".android", "avd", "#{$avdname}.avd" ) )
-
-        # Start the emulator, check on it every 5 seconds until it's running
-        cmd = "\"#{$emulator}\" -cpu-delay 0"
-        cmd << " -no-window" if options[:hidden]
-        cmd << " -avd #{$avdname}"
-        Thread.new { system(cmd) }
-
-        puts "Waiting for emulator..."
-        res = 'error'        
-        while res =~ /error/ do
-            sleep 5
-            res = Jake.run $adb, ['-e', 'wait-for-device']
-            puts res
-        end
-
-        puts "Waiting up to 600 seconds for emulator..."
-        startedWaiting = Time.now
-        adbRestarts = 1
-        while (Time.now - startedWaiting < 600 )
-          sleep 5
-          now = Time.now
-          started = false
-          booted = true
-          Jake.run2 $adb, ["-e", "shell", "ps"], :system => false, :hideerrors => false do |line|
-            #puts line
-            booted = false if line =~ /bootanimation/
-            started = true if line =~ /android\.process\.acore/
-            true
-          end
-          #puts "started: #{started}, booted: #{booted}"
-          unless started and booted
-            printf("%.2fs: ",(now - startedWaiting))
-            if (now - startedWaiting) > (180 * adbRestarts)
-              # Restart the adb server every 60 seconds to prevent eternal waiting
-              puts "Appears hung, restarting adb server"
-              AndroidTools.kill_adb
-              Jake.run($adb, ['start-server'], nil, true)
-              adbRestarts += 1
-
-              rm_f $applog_path if !$applog_path.nil?
-              AndroidTools.logcat_process()
-            else
-              puts "Still waiting..."
-            end
-          else
-            puts "Success"
-            puts "Device is ready after " + (Time.now - startedWaiting).to_s + " seconds"
-            break
-          end
-        end
-
-        if !AndroidTools.is_emulator_running
-          puts "Emulator still isn't up and running, giving up"
-          exit 1
-        end
-
-      else
-        puts "Emulator is up and running"
-      end
-
-      $stdout.flush
-    end
-    
-    def  load_app_and_run(device_flag = '-e')
-      puts "Loading package"
-      apkfile = Jake.get_absolute $targetdir + "/" + $appname + "-debug.apk"
-      count = 0
-      done = false
-      while count < 20
-        f = Jake.run2($adb, [device_flag, "install", "-r", apkfile], {:nowait => true})
-        theoutput = ""
-        while c = f.getc
-          $stdout.putc c
-          $stdout.flush
-          theoutput << c
-        end
-        f.close
-
-        if theoutput.to_s.match(/Success/)
-          done = true
-          break
-        end
-
-        puts "Failed to load (possibly because emulator not done launching)- retrying"
-        $stdout.flush
-        sleep 1
-        count += 1
-      end
+    desc "build and install on device"
+    task :device => "device:android:debug" do
+      AndroidTools.restart_adb
 
-      puts "Loading complete, starting application.." if done
-      AndroidTools.run_application(device_flag) if done
-    end
+      apkfile = File.join $targetdir, $appname + "-debug.apk"
+      AndroidTools.load_app_and_run('-d', apkfile, $app_package_name)
+      #AndroidTools.run_application("-d", $app_package_name)
 
-    desc "build and install on device"
-    task :device => "device:android:install" do
-      puts "Starting application..."
-      AndroidTools.run_application("-d")
-      puts "Application was started"
-      AndroidTools.logcat_process("-d")
       puts "Starting log process ..."
+      AndroidTools.logcat_process("-d")
     end
   end