Fix current_app on Android

Author: bootstraponline

android_tests/appium.txt

@@ -1,8 +1,8 @@
 [caps]
 platformName = "android"
 app = "./api.apk"
-appPackage = ""
-appActivity = ""
+appPackage = "io.appium.android.apis"
+appActivity = ".ApiDemos"
 
 [appium_lib]
 sauce_username = ""

android_tests/lib/android/specs/common/helper.rb

@@ -15,6 +15,7 @@
     # regular rescue will not handle exceptions outside of StandardError hierarchy
     # must rescue Exception explicitly to rescue everything
     proc { wait(*wait_time) { raise NoMemoryError } }.must_raise Timeout::Error
+    proc { wait(0.2, 0.0) { raise NoMemoryError } }.must_raise Timeout::Error
   end
 
   t 'ignore' do
@@ -40,7 +41,8 @@
 
     # regular rescue will not handle exceptions outside of StandardError hierarchy
     # must rescue Exception explicitly to rescue everything
-    proc { wait(*wait_time) { raise NoMemoryError } }.must_raise Timeout::Error
+    proc { wait_true(*wait_time) { raise NoMemoryError } }.must_raise Timeout::Error
+    proc { wait_true(0.2, 0.0) { raise NoMemoryError } }.must_raise Timeout::Error
   end
 
   t 'back' do

lib/appium_lib/android/helper.rb

@@ -113,9 +113,15 @@ def page opts={}
     # Lists package, activity, and adb shell am start -n value for current app.
     # Works on local host only (not remote).
     # noinspection RubyArgCount
+    # example line:
+    # "mFocusedApp=AppWindowToken{b1420058 token=Token{b128add0 ActivityRecord{b1264d10 u0 com.example.android.apis/.ApiDemos t23}}}"
     def current_app
       line = `adb shell dumpsys window windows`.each_line.grep(/mFocusedApp/).first.strip
-      pair = line.split(' ').last.gsub('}', '').split '/'
+
+      match = line.match(/ ([^\/ ]+\/[^ ]+) /)
+      return nil unless match && match[1]
+
+      pair = match[1].split '/'
       pkg  = pair.first
       act  = pair.last
       OpenStruct.new(line:     line,