rhodes 2.1.0 → 2.2.0.beta.1

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

@@ -20,6 +20,8 @@
  */
 package com.rhomobile.rhodes.uri;
 
+import java.util.Map;
+
 import com.rhomobile.rhodes.Logger;
 
 import android.content.Context;
@@ -38,8 +40,7 @@ public class MailUriHandler implements UriHandler {
 	}
 	
 	public boolean handle(String url) {
-		Uri uri = Uri.parse(url);
-		if (!uri.getScheme().equals("mailto"))
+		if (!MailTo.isMailTo(url))
 			return false;
 	
 		Logger.D(TAG, "This is 'mailto' uri, handle it");
@@ -52,12 +53,19 @@ public class MailUriHandler implements UriHandler {
 		String s = muri.getTo();
 		if (s != null) intent.putExtra(Intent.EXTRA_EMAIL, new String[]{s});
 		
+		s = muri.getCc();
+		if (s != null) intent.putExtra(Intent.EXTRA_CC, new String[]{s});
+		
 		s = muri.getSubject();
 		if (s != null) intent.putExtra(Intent.EXTRA_SUBJECT, s);
 		
 		s = muri.getBody();
 		if (s != null) intent.putExtra(Intent.EXTRA_TEXT, s);
 		
+		Map<String,String> headers = muri.getHeaders();
+		s = headers.get("bcc");
+		if (s != null) intent.putExtra(Intent.EXTRA_BCC, new String[]{s});
+		
 		ctx.startActivity(Intent.createChooser(intent, "Send e-mail..."));
 		return true;
 	}

data/platform/android/build/RhodesSRC_build.files

@@ -1,50 +1,59 @@
-platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/RhoNativeViewManager.java
-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/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/RhoActivity.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhoConf.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhoLogConf.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.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/AndroidR.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/IRhoBluetoothManager.java 
+platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothDeviceListActivity.java 
+platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManager.java 
+platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerNew.java 
+platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerOld.java 
+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/FileList.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCaptureCallback.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java
 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/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/geolocation/GeoLocation.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/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
-platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/RhoNativeViewManager.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/phonebook/ContactAccessor.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorNew.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorOld.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactField.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Phonebook.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/RhoActivity.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoConf.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoLogConf.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/signature/ImageCapture.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/signature/Signature.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/signature/SignatureView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSockAddr.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocket.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocketImpl.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocket.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/socket/SSLImpl.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/ui/AboutDialog.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogOptionsDialog.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogViewDialog.java
@@ -54,8 +63,10 @@ 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/Utils.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.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

data/platform/android/build/android.rake

@@ -20,6 +20,8 @@ def get_api_level(version)
   ANDROID_MARKET_VERSION_TO_API_LEVEL[version]
 end
 
+JAVA_PACKAGE_NAME = 'com.rhomobile.rhodes'
+
 # Here is place were android platform should be specified.
 # For complete list of android API levels and its mapping to
 # market names (such as "Android-1.5" etc) see output of
@@ -34,9 +36,55 @@ ANDROID_PERMISSIONS = {
   'phone' => ['CALL_PHONE', 'READ_PHONE_STATE'],
   'pim' => ['READ_CONTACTS', 'WRITE_CONTACTS', 'GET_ACCOUNTS'],
   'record_audio' => 'RECORD_AUDIO',
-  'vibrate' => 'VIBRATE'
+  'vibrate' => 'VIBRATE',
+  'bluetooth' => ['BLUETOOTH_ADMIN', 'BLUETOOTH'],
+  'calendar' => ['READ_CALENDAR', 'WRITE_CALENDAR'],
+  'push' => proc do |manifest| add_push(manifest) end
 }
 
+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
+end
+
 def set_app_name_android(newname)
   puts "set_app_name"
   $stdout.flush
@@ -80,10 +128,15 @@ def set_app_name_android(newname)
 
   doc.elements.delete "manifest/application/uses-library[@android:name='com.google.android.maps']" unless $use_geomapping
 
-  caps = ['INTERNET', 'PERSISTENT_ACTIVITY']
+  caps_proc = []
+  caps = ['INTERNET', 'PERSISTENT_ACTIVITY', 'WAKE_LOCK']
   $app_config["capabilities"].each do |cap|
     cap = ANDROID_PERMISSIONS[cap]
     next if cap.nil?
+    if cap.is_a? Proc
+      caps_proc << cap
+      next
+    end
     cap = [cap] if cap.is_a? String
     cap = [] unless cap.is_a? Array
     caps += cap
@@ -97,6 +150,14 @@ def set_app_name_android(newname)
   element.add_attribute('android:minSdkVersion', ANDROID_API_LEVEL.to_s)
   manifest.add element
 
+  # Clear C2DM stuff
+  doc.elements.delete "manifest/application/receiver[@android:name='com.rhomobile.rhodes.PushReceiver']"
+  manifest.elements.each('permission') do |e|
+    name = e.attribute('name', 'android')
+    next if name.nil?
+    manifest.delete(e) if name.to_s =~ /\.C2D_MESSAGE$/
+  end
+
   manifest.elements.each('uses-permission') { |e| manifest.delete e }
   caps.sort.each do |cap|
     element = REXML::Element.new('uses-permission')
@@ -104,6 +165,10 @@ def set_app_name_android(newname)
     manifest.add element
   end
 
+  caps_proc.each do |p|
+    p.call manifest
+  end
+
   File.open($appmanifest, "w") { |f| doc.write f, 2 }
 
   buf = File.new($rho_android_r,"r").read.gsub(/^\s*import com\.rhomobile\..*\.R;\s*$/,"\nimport #{$app_package_name}.R;\n")
@@ -158,6 +223,16 @@ namespace "config" do
       exit 1
     end
 
+    errfmt = "WARNING!!! Path to Android %s contain spaces! It will not work because of the Google toolchain restrictions. Move it to another location and reconfigure rhodes."
+    if $androidsdkpath =~ /\s/
+      puts(errfmt % "SDK")
+      exit 1
+    end
+    if $androidndkpath =~ /\s/
+      puts(errfmt % "NDK")
+      exit 1
+    end
+
     $java = $config["env"]["paths"]["java"]
     $androidpath = Jake.get_absolute $config["build"]["androidpath"]
     $bindir = File.join($app_path, "bin")
@@ -187,6 +262,7 @@ namespace "config" do
     $app_rjava_dir = File.join $tmpdir
     $app_native_libs_java = File.join $tmpdir, "NativeLibraries.java"
     $app_capabilities_java = File.join $tmpdir, "Capabilities.java"
+    $app_push_java = File.join $tmpdir, "Push.java"
 
     if RUBY_PLATFORM =~ /(win|w)32$/
       $emulator = #"cmd /c " + 
@@ -194,7 +270,6 @@ namespace "config" do
       $bat_ext = ".bat"
       $exe_ext = ".exe"
       $path_separator = ";"
-      $rubypath = "res/build-tools/RhoRuby.exe"
 
       # Add PATH to cygwin1.dll
       ENV['CYGWIN'] = 'nodosfilewarning'
@@ -209,11 +284,6 @@ namespace "config" do
       $exe_ext = ""
       $path_separator = ":"
       # TODO: add ruby executable for Linux
-      if RUBY_PLATFORM =~ /darwin/
-        $rubypath = "res/build-tools/RubyMac"
-      else
-        $rubypath = "res/build-tools/rubylinux"
-      end
     end
 
     puts "+++ Looking for platform..." if USE_TRACES
@@ -271,7 +341,7 @@ namespace "config" do
     $keystore = nil
     $keystore = $app_config["android"]["production"]["certificate"] if !$app_config["android"].nil? and !$app_config["android"]["production"].nil?
     $keystore = $config["android"]["production"]["certificate"] if $keystore.nil? and !$config["android"].nil? and !$config["android"]["production"].nil?
-    $keystore = File.join(File.expand_path('~'), ".rhomobile", "keystore") if $keystore.nil?
+    $keystore = File.expand_path(File.join(ENV['HOME'], ".rhomobile", "keystore")) if $keystore.nil?
 
     $storepass = nil
     $storepass = $app_config["android"]["production"]["password"] if !$app_config["android"].nil? and !$app_config["android"]["production"].nil?
@@ -388,6 +458,11 @@ namespace "config" do
     end
     $app_config["capabilities"].map! { |cap| cap.is_a?(String) ? cap : nil }.delete_if { |cap| cap.nil? }
 
+    $push_sender = nil
+    $push_sender = $config["android"]["push"]["sender"] if !$config["android"].nil? and !$config["android"]["push"].nil?
+    $push_sender = $app_config["android"]["push"]["sender"] if !$app_config["android"].nil? and !$app_config["android"]["push"].nil?
+    $push_sender = "support@rhomobile.com" if $push_sender.nil?
+
     mkdir_p $bindir if not File.exists? $bindir
     mkdir_p $rhobindir if not File.exists? $rhobindir
     mkdir_p $targetdir if not File.exists? $targetdir
@@ -661,9 +736,9 @@ namespace "build" do
 
       gapi_already_enabled = false
       caps_already_enabled = {}
-      ANDROID_PERMISSIONS.keys.each do |k|
-        caps_already_enabled[k] = false
-      end
+      #ANDROID_PERMISSIONS.keys.each do |k|
+      #  caps_already_enabled[k] = false
+      #end
       if File.file? genconfig_h
         File.open(genconfig_h, 'r') do |f|
           while line = f.gets
@@ -671,8 +746,16 @@ namespace "build" do
               gapi_already_enabled = true
             else
               ANDROID_PERMISSIONS.keys.each do |k|
-                re = /^\s*#\s*define\s+RHO_CAP_#{k.upcase}_ENABLED\s+true\s*$/
-                caps_already_enabled[k] = true if line =~ re
+                if line =~ /^\s*#\s*define\s+RHO_CAP_#{k.upcase}_ENABLED\s+(.*)\s*$/
+                  value = $1.strip
+                  if value == 'true'
+                    caps_already_enabled[k] = true
+                  elsif value == 'false'
+                    caps_already_enabled[k] = false
+                  else
+                    raise "Unknown value for the RHO_CAP_#{k.upcase}_ENABLED: #{value}"
+                  end
+                end
               end
             end
           end
@@ -686,7 +769,7 @@ namespace "build" do
       caps_enabled = {}
       ANDROID_PERMISSIONS.keys.each do |k|
         caps_enabled[k] = $app_config["capabilities"].index(k) != nil
-        regenerate = true if caps_enabled[k] != caps_already_enabled[k]
+        regenerate = true if caps_already_enabled[k].nil? or caps_enabled[k] != caps_already_enabled[k]
       end
 
       if regenerate
@@ -735,18 +818,28 @@ namespace "build" do
 
       # Generate Capabilities.java
       File.open($app_capabilities_java, "w") do |f|
-        f.puts "package com.rhomobile.rhodes;"
+        f.puts "package #{JAVA_PACKAGE_NAME};"
         f.puts "public class Capabilities {"
         ANDROID_PERMISSIONS.keys.sort.each do |k|
           f.puts "  public static boolean #{k.upcase}_ENABLED = true;"
         end
         f.puts "}"
       end
+
+      # Generate Push.java
+      puts "app_push_java: #{$app_push_java.inspect}"
+      File.open($app_push_java, "w") do |f|
+        f.puts "package #{JAVA_PACKAGE_NAME};"
+        f.puts "public class Push {"
+        f.puts "  public static final String SENDER = \"#{$push_sender}\";"
+        f.puts "};"
+      end
+
     end
 
     task :gen_java_ext => "config:android" do
       File.open($app_native_libs_java, "w") do |f|
-        f.puts "package com.rhomobile.rhodes;"
+        f.puts "package #{JAVA_PACKAGE_NAME};"
         f.puts "public class NativeLibraries {"
         f.puts "  public static void load() {"
         f.puts "    // Load native .so libraries"
@@ -864,11 +957,12 @@ namespace "build" do
       lines << $app_android_r
       lines << $app_native_libs_java
       lines << $app_capabilities_java
+      lines << $app_push_java
       if File.exists? File.join($extensionsdir, "ext_build.files")
         puts 'ext_build.files found ! Addditional files for compilation :'
         File.open(File.join($extensionsdir, "ext_build.files")) do |f|
           while line = f.gets
-	    puts 'java file : ' + line
+            puts 'java file : ' + line
             lines << line
           end
         end
@@ -906,6 +1000,13 @@ namespace "build" do
       end
 
       files = []
+      Dir.glob(File.join($extensionsdir, "*.jar")).each do |f|
+        puts Jake.run($jarbin, ["xf", f], File.join($tmpdir, "Rhodes"))
+        unless $?.success?
+          puts "Error running jar (xf)"
+          exit 1
+        end
+      end
       Dir.glob(File.join($tmpdir, "Rhodes", "*")).each do |f|
         relpath = Pathname.new(f).relative_path_from(Pathname.new(File.join($tmpdir, "Rhodes"))).to_s
         files << relpath
@@ -1159,7 +1260,7 @@ def run_application (target_flag)
   args << "-a"
   args << "android.intent.action.MAIN"
   args << "-n"
-  args << $app_package_name + "/com.rhomobile.rhodes.Rhodes"
+  args << $app_package_name + "/#{JAVA_PACKAGE_NAME}.Rhodes"
   Jake.run($adb, args)
 end
 
@@ -1181,6 +1282,21 @@ namespace "run" do
         log_name  = $app_path + '/RhoLog.txt'
         File.delete(log_name) if File.exist?(log_name)
         
+        # Failsafe to prevent eternal hangs
+        Thread.new {
+          sleep 1000
+
+          if RUBY_PLATFORM =~ /darwin/
+            # OS X:
+            `killall -9 adb`
+            `killall -9 emulator`
+          else
+            # Windows
+            `taskkill /F /IM adb.exe`
+            `taskkill /F /IM emulator.exe`
+          end
+        }
+
         load_app_and_run
 
         Jake.before_run_spec
@@ -1212,19 +1328,31 @@ namespace "run" do
             sleep(5) unless end_spec
         end
 
-        #TODO: stop app
         Jake.process_spec_results(start)        
         
+        # stop app
+        if RUBY_PLATFORM =~ /darwin/
+          # OS X:
+          `killall -9 adb`
+          `killall -9 emulator`
+        else
+          # Windows
+          `taskkill /F /IM adb.exe`
+          `taskkill /F /IM emulator.exe`
+        end
+
         $stdout.flush
         
     end
 
     task :phone_spec do
-      Jake.run_spec_app('android','phone_spec')
+      exit 1 if Jake.run_spec_app('android','phone_spec')
+      exit 0
     end
 
     task :framework_spec do
-      Jake.run_spec_app('android','framework_spec')
+      exit 1 if Jake.run_spec_app('android','framework_spec')
+      exit 0
     end
     
     task :emulator => "device:android:debug" do
@@ -1234,7 +1362,13 @@ namespace "run" do
 
     def  run_emulator
       apkfile = Jake.get_absolute $targetdir + "/" + $appname + "-debug.apk"
-      puts `"#{$adb}" start-server`
+
+      Jake.run($adb, ['kill-server'])	
+      #Jake.run($adb, ['start-server'])	
+      #adb_start_server = $adb + ' start-server'
+      Thread.new { Jake.run($adb, ['start-server']) }
+      puts 'Sleep for 5 sec. waiting for "adb start-server"'
+      sleep 5
 
       createavd = "\"#{$androidbin}\" create avd --name #{$avdname} --target #{$avdtarget} --sdcard 32M --skin HVGA"
       system(createavd) unless File.directory?( File.join(ENV['HOME'], ".android", "avd", "#{$avdname}.avd" ) )
@@ -1249,12 +1383,49 @@ namespace "run" do
       end
 
       running = is_emulator_running
-      Thread.new { system("\"#{$emulator}\" -avd #{$avdname}") } unless running
 
-      puts "Waiting for emulator to get started" unless running
-      puts "Emulator is up and running" if running
+      if !running
+        # Start the emulator, check on it every 5 seconds until it's running
+        Thread.new { system("\"#{$emulator}\" -avd #{$avdname}") }
+        puts "Waiting up to 180 seconds for emulator..."
+        startedWaiting = Time.now
+        adbRestarts = 1
+        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
+          if emulatorState =~ /unknown/
+            printf("%.2fs: ",(now - startedWaiting))
+            if (now - startedWaiting) > (60 * adbRestarts)
+              # Restart the adb server every 60 seconds to prevent eternal waiting
+              puts "Appears hung, restarting adb server"
+              Jake.run($adb, ['kill-server'])
+              Thread.new { Jake.run($adb, ['start-server']) }
+              adbRestarts += 1
+            else
+              puts "Still waiting..."
+            end
+          else
+            puts "Success"
+            puts "Device is ready after " + (Time.now - startedWaiting).to_s + " seconds"
+            break
+          end
+        end
+
+        if !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
-      puts `"#{$adb}" -e wait-for-device`
     end
     
     def  load_app_and_run