Permalink
Browse files

Changed the regular expression in ADB.prototype.waitForActivity to make

the period optional at the begining of the activity.  At least for API 17 I
don't see it.  Here is the line for mFocusedApp for my app:
mFocusedApp=AppWindowToken{b52c36d0 token=Token{b524e338 ActivityRecord{b528ae18 u0 com.xxxxx.android.root/com.xxxxx.android.activity.LoginScreenActivity}}}

Removed backup file and added ignore
  • Loading branch information...
1 parent 6a51422 commit fd2444b837337c4b555e47ecaca72af31f80b248 @xuru xuru committed with bootstraponline Mar 26, 2013
Showing with 3 additions and 1 deletion.
  1. +2 −0 .gitignore
  2. +1 −1 uiautomator/adb.js
View
@@ -36,3 +36,5 @@ sample-code/apps/ApiDemos/tests/proguard-project.txt
sample-code/apps/ApiDemos/tests/project.properties
app/android/AndroidManifest.xml.apk
app/android/AndroidManifest.xml
+.*~
+*~
View
@@ -630,7 +630,7 @@ ADB.prototype.waitForActivity = function(cb) {
, match = null
, foundActivity = false
, found = null
- , searchRe = new RegExp(/mFocusedApp.+ ([a-zA-Z0-9\.]+)\/\.([^\}]+)\}/)
+ , searchRe = new RegExp(/mFocusedApp.+ ([a-zA-Z0-9\.]+)\/\.?([^\}]+)\}/)
, targetActivity = this.appWaitActivity || this.appActivity;
var getFocusedApp = _.bind(function() {

0 comments on commit fd2444b

Please sign in to comment.