Merge "Fix Until.scrollFinished(..)"

2 files changed, 9 insertions, 4 deletions

diff --git a/src/main/java/android/support/test/uiautomator/UiDevice.java b/src/main/java/android/support/test/uiautomator/UiDevice.java
index c51ad8b..6fbf759 100644
--- a/src/main/java/android/support/test/uiautomator/UiDevice.java
+++ b/src/main/java/android/support/test/uiautomator/UiDevice.java
@@ -217,7 +217,8 @@ public class UiDevice implements Searchable {
 
         @Override
         public boolean accept(AccessibilityEvent event) {
-            return mCondition.apply(event);
+            // Guard against nulls
+            return Boolean.TRUE.equals(mCondition.apply(event));
         }
     }
 
diff --git a/src/main/java/android/support/test/uiautomator/Until.java b/src/main/java/android/support/test/uiautomator/Until.java
index 332a747..86736c7 100644
--- a/src/main/java/android/support/test/uiautomator/Until.java
+++ b/src/main/java/android/support/test/uiautomator/Until.java
@@ -358,7 +358,7 @@ public class Until {
     public static EventCondition<Boolean> scrollFinished(final Direction direction) {
         return new EventCondition<Boolean>() {
             private Direction mDirection = direction;
-            private Boolean mResult = false;
+            private Boolean mResult = null;
 
             @Override
             Boolean apply(AccessibilityEvent event) {
@@ -399,12 +399,16 @@ public class Until {
                             throw new IllegalArgumentException("Invalid Direction");
                     }
                 }
-                return mResult;
+
+                // Keep listening for events until the result is set to true (we reached the end)
+                return Boolean.TRUE.equals(mResult);
             }
 
             @Override
             Boolean getResult() {
-                return mResult;
+                // If we didn't recieve any scroll events (mResult == null), assume we're already at
+                // the end and return true.
+                return mResult == null || mResult;
             }
         };
     }