kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix crash if url not found

Browse source
This commit is contained in:
Matthew Wong 2016-03-07 20:35:24 -05:00
parent ba3cf0162d
commit c9725d7186
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java
View file

@ -200,6 +200,7 @@ public class AutofillService extends AccessibilityService {
setMatchingPasswords(appName, packageName, false);
} else {
// now we may have found a title but webViewURL could be null
packageName = setMatchingPasswords(webViewTitle, webViewURL, true);
appName = packageName;
isWeb = true;
@ -255,6 +256,7 @@ public class AutofillService extends AccessibilityService {
}
}
// TODO split this into 2 functions for isWeb and !isWeb
private String setMatchingPasswords(String appName, String packageName, boolean isWeb) {
// Return the URL needed to open the corresponding Settings.
String settingsURL = packageName;
@ -272,12 +274,14 @@ public class AutofillService extends AccessibilityService {
} else {
prefs = getSharedPreferences("autofill_web", Context.MODE_PRIVATE);
preference = defValue;
Map<String, ?> prefsMap = prefs.getAll();
for (String key : prefsMap.keySet()) {
if ((webViewURL.toLowerCase().contains(key.toLowerCase()) || key.toLowerCase().contains(webViewURL.toLowerCase()))
&& !prefs.getString(key, null).equals("")) {
preference = prefs.getString(key, null);
settingsURL = key;
if (webViewURL != null) {
Map<String, ?> prefsMap = prefs.getAll();
for (String key : prefsMap.keySet()) {
if ((webViewURL.toLowerCase().contains(key.toLowerCase()) || key.toLowerCase().contains(webViewURL.toLowerCase()))
&& !prefs.getString(key, null).equals("")) {
preference = prefs.getString(key, null);
settingsURL = key;
}
}
}
}