From a3e10d3ca83c78f19d342a76caebefa924b8d705 Mon Sep 17 00:00:00 2001 From: Matthew Wong Date: Thu, 31 Dec 2015 07:20:48 -0500 Subject: Fix 'Delete' nullpointerexception and revert to working URL-getting --- app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java') diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java index c17d25d5..305dfdfa 100644 --- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java +++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java @@ -111,10 +111,9 @@ public class AutofillService extends AccessibilityService { webViewURL = null; if (webViewTitle != null) { - List nodes = new ArrayList<>(); - if (event.getSource().getPackageName().equals("com.android.chrome")) { - nodes = getRootInActiveWindow().findAccessibilityNodeInfosByViewId("com.android.chrome:id/url_bar"); - } else if (event.getSource().getPackageName().equals("com.android.browser")) { + List nodes = getRootInActiveWindow() + .findAccessibilityNodeInfosByViewId("com.android.chrome:id/url_bar"); + if (nodes.size() == 0) { nodes = getRootInActiveWindow().findAccessibilityNodeInfosByViewId("com.android.browser:id/url"); } for (AccessibilityNodeInfo node : nodes) -- cgit v1.2.3