From 640f6ff9bd2645382323b9375c57af11e5931d3b Mon Sep 17 00:00:00 2001
From: Matthew Wong <wongma@protonmail.ch>
Date: Sat, 15 Aug 2015 13:00:12 -0400
Subject: Prepend first/never keywords with / . file names won't begin with /

---
 .../main/java/com/zeapo/pwdstore/autofill/AutofillFragment.java   | 8 ++++----
 .../java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java | 4 ++--
 .../main/java/com/zeapo/pwdstore/autofill/AutofillService.java    | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'app/src')

diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillFragment.java b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillFragment.java
index 8cf58206..e708c19d 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillFragment.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillFragment.java
@@ -54,10 +54,10 @@ public class AutofillFragment extends DialogFragment {
             case "":
                 ((RadioButton) view.findViewById(R.id.use_default)).toggle();
                 break;
-            case "first":
+            case "/first":
                 ((RadioButton) view.findViewById(R.id.first)).toggle();
                 break;
-            case "never":
+            case "/never":
                 ((RadioButton) view.findViewById(R.id.never)).toggle();
                 break;
             default:
@@ -87,10 +87,10 @@ public class AutofillFragment extends DialogFragment {
                         editor.remove(packageName);
                         break;
                     case R.id.first:
-                        editor.putString(packageName, "first");
+                        editor.putString(packageName, "/first");
                         break;
                     case R.id.never:
-                        editor.putString(packageName, "never");
+                        editor.putString(packageName, "/never");
                         break;
                     default:
                         EditText matched = (EditText) view.findViewById(R.id.matched);
diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
index 8971c0af..a131598a 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
@@ -104,10 +104,10 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecycl
                 // "android:windowBackground"
                 holder.view.setBackgroundResource(R.color.indigo_50);
                 break;
-            case "first":
+            case "/first":
                 holder.secondary.setText(R.string.autofill_apps_first);
                 break;
-            case "never":
+            case "/never":
                 holder.secondary.setText(R.string.autofill_apps_never);
                 break;
             default:
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 cd318394..ea09c863 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java
@@ -125,17 +125,17 @@ public class AutofillService extends AccessibilityService {
         final String appName = (applicationInfo != null ? packageManager.getApplicationLabel(applicationInfo) : "").toString();
 
         // if autofill_default is checked and prefs.getString DNE, 'Automatically match with password'/"first" otherwise "never"
-        String defValue = settings.getBoolean("autofill_default", true) ? "first" : "never";
+        String defValue = settings.getBoolean("autofill_default", true) ? "/first" : "/never";
         SharedPreferences prefs = getSharedPreferences("autofill", Context.MODE_PRIVATE);
         String preference = prefs.getString(event.getPackageName().toString(), defValue);
         switch (preference) {
-            case "first":
+            case "/first":
                 if (!PasswordRepository.isInitialized()) {
                     PasswordRepository.initialize(this);
                 }
                 items = recursiveFilter(appName, null);
                 break;
-            case "never":
+            case "/never":
                 return;
             default:
                 if (!PasswordRepository.isInitialized()) {
-- 
cgit v1.2.3