fix: Avoid throwing an exception if range bounds are corrupted (#437)

appium · Aug 10, 2021 · e3ce25d · e3ce25d
1 parent 4f7a273
commit e3ce25d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 17 deletions.
diff --git a/app/src/main/java/io/appium/uiautomator2/core/AxNodeInfoHelper.java b/app/src/main/java/io/appium/uiautomator2/core/AxNodeInfoHelper.java
@@ -22,7 +22,7 @@
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.Bundle;
-import android.util.Range;
+import android.util.Pair;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
 
@@ -71,17 +71,16 @@ public static String toUuid(AccessibilityNodeInfo info) {
     }
 
     @Nullable
-    public static Range<Integer> getSelectionRange(@Nullable AccessibilityNodeInfo nodeInfo) {
+    public static Pair<Integer, Integer> getSelectionRange(@Nullable AccessibilityNodeInfo nodeInfo) {
         if (nodeInfo == null) {
             return null;
         }
 
         int selectionStart = nodeInfo.getTextSelectionStart();
         int selectionEnd = nodeInfo.getTextSelectionEnd();
-        if (selectionStart >= 0 && selectionStart != selectionEnd) {
-            return new Range<>(selectionStart, selectionEnd);
-        }
-        return null;
+        return selectionStart >= 0 && selectionStart != selectionEnd
+            ? new Pair<>(selectionStart, selectionEnd)
+            : null;
     }
 
     @Nullable

diff --git a/app/src/main/java/io/appium/uiautomator2/model/UiElementSnapshot.java b/app/src/main/java/io/appium/uiautomator2/model/UiElementSnapshot.java
@@ -17,7 +17,7 @@
 package io.appium.uiautomator2.model;
 
 import android.annotation.TargetApi;
-import android.util.Range;
+import android.util.Pair;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.Toast;
 
@@ -147,12 +147,12 @@ private static void putAttribute(Map<Attribute, Object> attribs, Attribute key,
             case SCROLLABLE:
                 return node.isScrollable();
             case SELECTION_START: {
-                Range<Integer> selectionRange = AxNodeInfoHelper.getSelectionRange(node);
-                return selectionRange == null ? null : selectionRange.getLower();
+                Pair<Integer, Integer> selectionRange = AxNodeInfoHelper.getSelectionRange(node);
+                return selectionRange == null ? null : selectionRange.first;
             }
             case SELECTION_END: {
-                Range<Integer> selectionRange = AxNodeInfoHelper.getSelectionRange(node);
-                return selectionRange == null ? null : selectionRange.getUpper();
+                Pair<Integer, Integer> selectionRange = AxNodeInfoHelper.getSelectionRange(node);
+                return selectionRange == null ? null : selectionRange.second;
             }
             case SELECTED:
                 return node.isSelected();

diff --git a/app/src/main/java/io/appium/uiautomator2/model/UiObject2Element.java b/app/src/main/java/io/appium/uiautomator2/model/UiObject2Element.java
@@ -16,7 +16,7 @@
 
 package io.appium.uiautomator2.model;
 
-import android.util.Range;
+import android.util.Pair;
 import android.view.accessibility.AccessibilityNodeInfo;
 
 import androidx.annotation.Nullable;
@@ -135,10 +135,10 @@ public String getAttribute(String attr) throws UiObjectNotFoundException {
                 break;
             case SELECTION_END:
             case SELECTION_START:
-                Range<Integer> selectionRange = AxNodeInfoHelper.getSelectionRange(toAxNodeInfo(element));
+                Pair<Integer, Integer> selectionRange = AxNodeInfoHelper.getSelectionRange(toAxNodeInfo(element));
                 result = selectionRange == null
                         ? null
-                        : (dstAttribute == Attribute.SELECTION_END ? selectionRange.getUpper() : selectionRange.getLower());
+                        : (dstAttribute == Attribute.SELECTION_END ? selectionRange.second : selectionRange.first);
                 break;
             default:
                 throw generateNoAttributeException(attr);

diff --git a/app/src/main/java/io/appium/uiautomator2/model/UiObjectElement.java b/app/src/main/java/io/appium/uiautomator2/model/UiObjectElement.java
@@ -16,7 +16,7 @@
 
 package io.appium.uiautomator2.model;
 
-import android.util.Range;
+import android.util.Pair;
 import android.view.accessibility.AccessibilityNodeInfo;
 
 import androidx.annotation.Nullable;
@@ -131,9 +131,9 @@ public String getAttribute(String attr) throws UiObjectNotFoundException {
             }
             case SELECTION_END:
             case SELECTION_START:
-                Range<Integer> selectionRange = AxNodeInfoHelper.getSelectionRange(toAxNodeInfo(element));
+                Pair<Integer, Integer> selectionRange = AxNodeInfoHelper.getSelectionRange(toAxNodeInfo(element));
                 result = selectionRange == null ? null
-                        : (dstAttribute == Attribute.SELECTION_END ? selectionRange.getUpper() : selectionRange.getLower());
+                        : (dstAttribute == Attribute.SELECTION_END ? selectionRange.second : selectionRange.first);
                 break;
             default:
                 throw generateNoAttributeException(attr);