From 2d7c37d379ae48fa3ff464032ad4cb1759b1dc31 Mon Sep 17 00:00:00 2001
From: Matthew Wong <wongma@protonmail.ch>
Date: Fri, 31 Jul 2015 09:00:06 -0400
Subject: Add per-app settings page

---
 .../pwdstore/autofill/AutofillRecyclerAdapter.java | 62 ++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java

(limited to 'app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java')

diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
new file mode 100644
index 00000000..b59223bd
--- /dev/null
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
@@ -0,0 +1,62 @@
+package com.zeapo.pwdstore.autofill;
+
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.zeapo.pwdstore.R;
+
+import java.util.ArrayList;
+
+public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecyclerAdapter.ViewHolder> {
+    private ArrayList<ApplicationInfo> apps;
+    private PackageManager pm;
+
+    public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+        public View view;
+        public TextView name;
+        public ImageView icon;
+
+        public ViewHolder(View view) {
+            super(view);
+            this.view = view;
+            name = (TextView) view.findViewById(R.id.app_name);
+            icon = (ImageView) view.findViewById(R.id.app_icon);
+            view.setOnClickListener(this);
+        }
+
+        @Override
+        public void onClick(View v) {
+
+        }
+    }
+
+    public AutofillRecyclerAdapter(ArrayList<ApplicationInfo> apps, PackageManager pm) {
+        this.apps = apps;
+        this.pm = pm;
+    }
+
+    @Override
+    public AutofillRecyclerAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.autofill_row_layout, parent, false);
+        return new ViewHolder(v);
+    }
+
+    @Override
+    public void onBindViewHolder(AutofillRecyclerAdapter.ViewHolder holder, int position) {
+        ApplicationInfo app = apps.get(position);
+        holder.name.setText(pm.getApplicationLabel(app));
+        holder.icon.setImageDrawable(pm.getApplicationIcon(app));
+    }
+
+    @Override
+    public int getItemCount() {
+        return apps.size();
+    }
+}
-- 
cgit v1.2.3


From ad173d9d05c29790d6f647df641e5de28e32fd58 Mon Sep 17 00:00:00 2001
From: Matthew Wong <wongma@protonmail.ch>
Date: Sun, 9 Aug 2015 16:04:09 -0400
Subject: Autofill per-app settings dialog opens on click on suggestion or on
 existing app

---
 .../zeapo/pwdstore/autofill/AutofillActivity.java  | 49 +++++++++++--
 .../zeapo/pwdstore/autofill/AutofillFragment.java  | 82 ++++++++++++++++++++++
 .../pwdstore/autofill/AutofillRecyclerAdapter.java | 53 +++++++++++++-
 .../zeapo/pwdstore/autofill/AutofillService.java   | 15 +++-
 app/src/main/res/layout/autofill_recycler_view.xml |  6 +-
 app/src/main/res/layout/fragment_autofill.xml      | 52 ++++++++++++++
 app/src/main/res/xml/preference.xml                |  2 +-
 7 files changed, 245 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/java/com/zeapo/pwdstore/autofill/AutofillFragment.java
 create mode 100644 app/src/main/res/layout/fragment_autofill.xml

(limited to 'app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java')

diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillActivity.java b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillActivity.java
index 5c42ab8d..77a44c7a 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillActivity.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillActivity.java
@@ -1,5 +1,6 @@
 package com.zeapo.pwdstore.autofill;
 
+import android.app.DialogFragment;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
@@ -33,7 +34,7 @@ public class AutofillActivity extends AppCompatActivity {
     private boolean bound = false;
 
     private RecyclerView recyclerView;
-    private AutofillRecyclerAdapter recyclerAdapter;
+    AutofillRecyclerAdapter recyclerAdapter; // let fragment have access
     private RecyclerView.LayoutManager layoutManager;
 
     @Override
@@ -41,6 +42,7 @@ public class AutofillActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         Intent intent = getIntent();
         Bundle extras = intent.getExtras();
+
         // if called by service just for startIntentSenderForResult
         if (extras != null) {
             try {
@@ -64,21 +66,26 @@ public class AutofillActivity extends AppCompatActivity {
 
         // apps for which the user has custom settings should be in the recycler
         final PackageManager pm = getPackageManager();
-        final List<ApplicationInfo> allApps = pm.getInstalledApplications(0);
         SharedPreferences prefs
                 = getSharedPreferences("autofill", Context.MODE_PRIVATE);
         Map<String, ?> prefApps = prefs.getAll();
         ArrayList<ApplicationInfo> apps = new ArrayList<>();
-        for (ApplicationInfo applicationInfo : allApps) {
-            if (prefApps.containsKey(applicationInfo.packageName)) {
-                apps.add(applicationInfo);
+        for (String packageName : prefApps.keySet()) {
+            try {
+                apps.add(pm.getApplicationInfo(packageName, 0));
+            } catch (PackageManager.NameNotFoundException e) {
+                // remove invalid entries (from uninstalled apps?)
+                SharedPreferences.Editor editor = prefs.edit();
+                editor.remove(packageName).apply();
             }
         }
-        recyclerAdapter = new AutofillRecyclerAdapter(apps, pm);
+        recyclerAdapter = new AutofillRecyclerAdapter(apps, pm, this);
         recyclerView.setAdapter(recyclerAdapter);
 
+        // show the search bar by default but don't open the keyboard
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
         final SearchView searchView = (SearchView) findViewById(R.id.app_search);
+        searchView.clearFocus();
 
         // create search suggestions of apps with icons & names
         final SimpleCursorAdapter.ViewBinder viewBinder = new SimpleCursorAdapter.ViewBinder() {
@@ -97,6 +104,8 @@ public class AutofillActivity extends AppCompatActivity {
                 return true;
             }
         };
+
+        final List<ApplicationInfo> allApps = pm.getInstalledApplications(0);
         searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextSubmit(String query) {
@@ -108,7 +117,9 @@ public class AutofillActivity extends AppCompatActivity {
                 // should be a better/faster way to do this?
                 MatrixCursor matrixCursor = new MatrixCursor(new String[]{"_id", "package", "label"});
                 for (ApplicationInfo applicationInfo : allApps) {
-                    if (applicationInfo.loadLabel(pm).toString().toLowerCase().contains(newText.toLowerCase())) {
+                    // exclude apps that already have settings; the search is just for adding
+                    if (applicationInfo.loadLabel(pm).toString().toLowerCase().contains(newText.toLowerCase())
+                            && !recyclerAdapter.contains(applicationInfo.packageName)) {
                         matrixCursor.addRow(new Object[]{0, applicationInfo.packageName, applicationInfo.loadLabel(pm)});
                     }
                 }
@@ -121,6 +132,30 @@ public class AutofillActivity extends AppCompatActivity {
             }
         });
 
+        searchView.setOnSuggestionListener(new SearchView.OnSuggestionListener() {
+            @Override
+            public boolean onSuggestionSelect(int position) {
+                return false;
+            }
+
+            @Override
+            public boolean onSuggestionClick(int position) {
+                Cursor cursor = searchView.getSuggestionsAdapter().getCursor();
+                String packageName = cursor.getString(1);
+                String appName = cursor.getString(2);
+
+                // similar to what happens in ViewHolder.onClick but position -1
+                DialogFragment df = new AutofillFragment();
+                Bundle args = new Bundle();
+                args.putString("packageName", packageName);
+                args.putString("appName", appName);
+                args.putInt("position", -1);
+                df.setArguments(args);
+                df.show(getFragmentManager(), "autofill_dialog");
+                return false;
+            }
+        });
+
         setTitle("Autofill Apps");
     }
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillFragment.java b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillFragment.java
new file mode 100644
index 00000000..e9aa86f0
--- /dev/null
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillFragment.java
@@ -0,0 +1,82 @@
+package com.zeapo.pwdstore.autofill;
+
+import android.content.DialogInterface;
+import android.support.v7.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+
+import com.zeapo.pwdstore.R;
+
+public class AutofillFragment extends DialogFragment {
+
+    public AutofillFragment() {
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        // this fragment is only created from the settings page (AutofillActivity)
+        // need to interact with the recyclerAdapter which is a member of activity
+        final AutofillActivity callingActivity = (AutofillActivity) getActivity();
+        LayoutInflater inflater = callingActivity.getLayoutInflater();
+        final View view = inflater.inflate(R.layout.fragment_autofill, null);
+
+        builder.setView(view);
+
+        final String packageName = getArguments().getString("packageName");
+        String appName = getArguments().getString("appName");
+
+        builder.setTitle(appName);
+        SharedPreferences prefs
+                = getActivity().getApplicationContext().getSharedPreferences("autofill", Context.MODE_PRIVATE);
+        String preference = prefs.getString(packageName, "first");
+        switch (preference) {
+            case "first":
+                ((RadioButton) view.findViewById(R.id.first)).toggle();
+                break;
+            case "never":
+                ((RadioButton) view.findViewById(R.id.never)).toggle();
+                break;
+            default:
+                ((RadioButton) view.findViewById(R.id.match)).toggle();
+                ((EditText) view.findViewById(R.id.matched)).setText(preference);
+        }
+
+        final SharedPreferences.Editor editor = prefs.edit();
+        builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                RadioGroup radioGroup = (RadioGroup) view.findViewById(R.id.autofill_radiogroup);
+                switch (radioGroup.getCheckedRadioButtonId()) {
+                    case R.id.first:
+                        editor.putString(packageName, "first");
+                        break;
+                    case R.id.never:
+                        editor.putString(packageName, "never");
+                        break;
+                    default:
+                        EditText matched = (EditText) view.findViewById(R.id.matched);
+                        String path = matched.getText().toString();
+                        editor.putString(packageName, path);
+                }
+                editor.apply();
+                int position = getArguments().getInt("position");
+                if (position == -1) {
+                    callingActivity.recyclerAdapter.add(packageName);
+                } else {
+                    callingActivity.recyclerAdapter.notifyItemChanged(position);
+                }
+            }
+        });
+        builder.setNegativeButton("Cancel", null);
+        return builder.create();
+    }
+}
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 b59223bd..eff94c51 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
@@ -1,7 +1,11 @@
 package com.zeapo.pwdstore.autofill;
 
+import android.app.DialogFragment;
+import android.content.Context;
+import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.os.Bundle;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -16,29 +20,40 @@ import java.util.ArrayList;
 public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecyclerAdapter.ViewHolder> {
     private ArrayList<ApplicationInfo> apps;
     private PackageManager pm;
+    private AutofillActivity activity;
 
     public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
         public View view;
         public TextView name;
+        public TextView secondary;
         public ImageView icon;
+        public String packageName;
 
         public ViewHolder(View view) {
             super(view);
             this.view = view;
             name = (TextView) view.findViewById(R.id.app_name);
+            secondary = (TextView) view.findViewById(R.id.secondary_text);
             icon = (ImageView) view.findViewById(R.id.app_icon);
             view.setOnClickListener(this);
         }
 
         @Override
         public void onClick(View v) {
-
+            DialogFragment df = new AutofillFragment();
+            Bundle args = new Bundle();
+            args.putString("packageName", packageName);
+            args.putString("appName", name.getText().toString());
+            args.putInt("position", getAdapterPosition());
+            df.setArguments(args);
+            df.show(activity.getFragmentManager(), "autofill_dialog");
         }
     }
 
-    public AutofillRecyclerAdapter(ArrayList<ApplicationInfo> apps, PackageManager pm) {
+    public AutofillRecyclerAdapter(ArrayList<ApplicationInfo> apps, PackageManager pm, AutofillActivity activity) {
         this.apps = apps;
         this.pm = pm;
+        this.activity = activity;
     }
 
     @Override
@@ -52,11 +67,45 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecycl
     public void onBindViewHolder(AutofillRecyclerAdapter.ViewHolder holder, int position) {
         ApplicationInfo app = apps.get(position);
         holder.name.setText(pm.getApplicationLabel(app));
+        SharedPreferences prefs
+                = activity.getApplicationContext().getSharedPreferences("autofill", Context.MODE_PRIVATE);
+        String preference = prefs.getString(app.packageName, "first");
+        switch (preference) {
+            case "first":
+                holder.secondary.setText("Automatically match with password");
+                break;
+            case "never":
+                holder.secondary.setText("Never autofill");
+                break;
+            default:
+                holder.secondary.setText("Match with " + preference);
+                break;
+        }
         holder.icon.setImageDrawable(pm.getApplicationIcon(app));
+        holder.packageName = app.packageName;
     }
 
     @Override
     public int getItemCount() {
         return apps.size();
     }
+
+    public boolean contains(String packageName) {
+        for (ApplicationInfo app : apps) {
+            if (app.packageName.equals(packageName)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void add(String packageName) {
+        try {
+            ApplicationInfo app = pm.getApplicationInfo(packageName, 0);
+            this.apps.add(app);
+            notifyItemInserted(apps.size());
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
 }
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 f3108733..dbd018b6 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java
@@ -68,9 +68,13 @@ public class AutofillService extends AccessibilityService {
                 && event.getPackageName().equals(packageName) && unlockOK) {
             decryptAndVerify();
         }
+
+        // nothing to do if not password field focus, android version, or field is keychain app
         if (!event.isPassword()
                 || Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2
                 || event.getPackageName().equals("org.sufficientlysecure.keychain")) {
+            // dismiss dialog if WINDOW_STATE_CHANGED unless the keyboard caused it
+            // there may be other exceptions...
             if (!(event.getEventType() == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED
                     && event.getPackageName().toString().contains("com.android.inputmethod"))
                     && dialog != null && dialog.isShowing()) {
@@ -78,14 +82,19 @@ public class AutofillService extends AccessibilityService {
             }
             return;
         }
+
+        // if past this point, a new dialog will be created, so dismiss the existing
         if (dialog != null && dialog.isShowing()) {
             dialog.dismiss();
         }
+
         // ignore the ACTION_FOCUS from decryptAndVerify
         if (ignoreActionFocus) {
             ignoreActionFocus = false;
             return;
         }
+
+        // get the app name and find a corresponding password
         info = event.getSource();
         PackageManager packageManager = getPackageManager();
         ApplicationInfo applicationInfo;
@@ -109,7 +118,7 @@ public class AutofillService extends AccessibilityService {
                     decryptAndVerify();
                 }
             });
-            builder.setNeutralButton("Match", new DialogInterface.OnClickListener() {
+            builder.setNeutralButton("Settings", new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
 
@@ -121,7 +130,7 @@ public class AutofillService extends AccessibilityService {
             dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE);
             dialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
         }
-        dialog.setTitle(items.get(0).getName());
+        dialog.setTitle(items.get(0).toString());
         dialog.show();
         dialog.getWindow().setLayout(WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT);
     }
@@ -202,6 +211,7 @@ public class AutofillService extends AccessibilityService {
             case OpenPgpApi.RESULT_CODE_SUCCESS: {
                 try {
                     String[] passContent = os.toString("UTF-8").split("\n");
+
                     // if the user focused on something else, take focus back
                     // but this will open another dialog...hack to ignore this
                     ignoreActionFocus = info.performAction(AccessibilityNodeInfo.ACTION_FOCUS);
@@ -215,6 +225,7 @@ public class AutofillService extends AccessibilityService {
                         ClipData clip = ClipData.newPlainText("autofill_pm", passContent[0]);
                         clipboard.setPrimaryClip(clip);
                         info.performAction(AccessibilityNodeInfo.ACTION_PASTE);
+
                         clip = ClipData.newPlainText("autofill_pm", "MyPasswordIsDaBest!");
                         clipboard.setPrimaryClip(clip);
                         if (settings.getBoolean("clear_clipboard_20x", false)) {
diff --git a/app/src/main/res/layout/autofill_recycler_view.xml b/app/src/main/res/layout/autofill_recycler_view.xml
index 98ff779d..6130fd1a 100644
--- a/app/src/main/res/layout/autofill_recycler_view.xml
+++ b/app/src/main/res/layout/autofill_recycler_view.xml
@@ -2,13 +2,15 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:orientation="vertical"
               android:layout_width="match_parent"
-              android:layout_height="match_parent">
+              android:layout_height="match_parent"
+              android:focusable="true"
+              android:focusableInTouchMode="true">
 
     <SearchView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/app_search"
-        android:queryHint="Add an app to configure"
+        android:queryHint="Add an app to change its autofill setting"
         android:iconifiedByDefault="false"/>
 
     <android.support.v7.widget.RecyclerView
diff --git a/app/src/main/res/layout/fragment_autofill.xml b/app/src/main/res/layout/fragment_autofill.xml
new file mode 100644
index 00000000..6ad44a0d
--- /dev/null
+++ b/app/src/main/res/layout/fragment_autofill.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:paddingBottom="@dimen/activity_vertical_margin"
+              android:paddingLeft="@dimen/activity_horizontal_margin"
+              android:paddingRight="@dimen/activity_horizontal_margin"
+              android:paddingTop="@dimen/activity_vertical_margin">
+
+    <RadioGroup
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/autofill_radiogroup"
+        >
+
+        <RadioButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Automatically match with password"
+            android:id="@+id/first"
+            android:layout_gravity="center_vertical"
+            android:checked="false"/>
+
+        <RadioButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Match with..."
+            android:id="@+id/match"
+            android:layout_gravity="center_vertical"
+            android:checked="false"
+            android:layout_marginTop="8dp"/>
+
+        <EditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/matched"
+            android:layout_gravity="center_horizontal"
+            android:editable="false"/>
+
+        <RadioButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Never autofill"
+            android:id="@+id/never"
+            android:layout_gravity="center_vertical"
+            android:checked="false"
+            android:layout_marginTop="8dp"/>
+
+    </RadioGroup>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
index 3a8c4fdf..538f0387 100644
--- a/app/src/main/res/xml/preference.xml
+++ b/app/src/main/res/xml/preference.xml
@@ -74,7 +74,7 @@
     <PreferenceCategory android:title="Autofill">
         <Preference
             android:key="autofill_apps"
-            android:summary="Configure behaviour of autofill for specific apps."
+            android:summary="Customize autofill settings for specific apps."
             android:title="Autofill Apps"/>
     </PreferenceCategory>
 
-- 
cgit v1.2.3


From 42a971f348b8c512db4603f4ca0b31c436651225 Mon Sep 17 00:00:00 2001
From: Matthew Wong <wongma@protonmail.ch>
Date: Mon, 10 Aug 2015 13:28:15 -0400
Subject: Move preferences to its own activity, leaving a "blank" openkeychain
 api one

---
 app/src/main/AndroidManifest.xml                   |   7 ++
 .../java/com/zeapo/pwdstore/UserPreference.java    |   6 +-
 .../zeapo/pwdstore/autofill/AutofillActivity.java  | 127 -------------------
 .../zeapo/pwdstore/autofill/AutofillFragment.java  |   4 +-
 .../autofill/AutofillPreferenceActivity.java       | 137 ++++++++++++++++++++-
 .../pwdstore/autofill/AutofillRecyclerAdapter.java |   4 +-
 6 files changed, 150 insertions(+), 135 deletions(-)

(limited to 'app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java')

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3ddc04e8..a6ffa791 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -61,6 +61,13 @@
 					   android:value="com.zeapo.pwdstore.PasswordStore" />
 		</activity>
 
+		<activity android:name=".autofill.AutofillPreferenceActivity">
+			android:parentActivityName=".PasswordStore">
+
+			<meta-data android:name="android.support.PARENT_ACTIVITY"
+					   android:value="com.zeapo.pwdstore.PasswordStore" />
+		</activity>
+
         <activity android:name="net.rdrei.android.dirchooser.DirectoryChooserActivity" />
 	</application>
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/UserPreference.java b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java
index e2a9e5a7..cb2d2881 100644
--- a/app/src/main/java/com/zeapo/pwdstore/UserPreference.java
+++ b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java
@@ -17,7 +17,7 @@ import android.widget.Toast;
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Iterables;
-import com.zeapo.pwdstore.autofill.AutofillActivity;
+import com.zeapo.pwdstore.autofill.AutofillPreferenceActivity;
 import com.zeapo.pwdstore.crypto.PgpHandler;
 import com.zeapo.pwdstore.git.GitActivity;
 import com.zeapo.pwdstore.utils.PasswordRepository;
@@ -187,9 +187,9 @@ public class UserPreference extends AppCompatActivity {
             findPreference("autofill_apps").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
                 @Override
                 public boolean onPreferenceClick(Preference preference) {
-                    Intent intent = new Intent(callingActivity, AutofillActivity.class);
+                    Intent intent = new Intent(callingActivity, AutofillPreferenceActivity.class);
                     startActivity(intent);
-                    return false;
+                    return true;
                 }
             });
         }
diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillActivity.java b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillActivity.java
index 2d538504..5a097d07 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillActivity.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillActivity.java
@@ -1,48 +1,22 @@
 package com.zeapo.pwdstore.autofill;
 
-import android.app.DialogFragment;
 import android.app.PendingIntent;
-import android.content.Context;
 import android.content.Intent;
 import android.content.IntentSender;
-import android.content.SharedPreferences;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.database.Cursor;
-import android.database.MatrixCursor;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.util.Log;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.ImageView;
-import android.widget.SearchView;
-import android.widget.SimpleCursorAdapter;
-import android.widget.TextView;
-
-import com.zeapo.pwdstore.R;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
 
 // blank activity started by service for calling startIntentSenderForResult
 public class AutofillActivity extends AppCompatActivity {
     public static final int REQUEST_CODE_DECRYPT_AND_VERIFY = 9913;
 
-    private RecyclerView recyclerView;
-    AutofillRecyclerAdapter recyclerAdapter; // let fragment have access
-    private RecyclerView.LayoutManager layoutManager;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Intent intent = getIntent();
         Bundle extras = intent.getExtras();
 
-        // if called by service just for startIntentSenderForResult
         if (extras != null) {
             try {
                 PendingIntent pi = intent.getExtras().getParcelable("pending_intent");
@@ -54,108 +28,7 @@ public class AutofillActivity extends AppCompatActivity {
             } catch (IntentSender.SendIntentException e) {
                 Log.e(AutofillService.Constants.TAG, "SendIntentException", e);
             }
-            return;
-        }
-        // otherwise if called from settings
-        setContentView(R.layout.autofill_recycler_view);
-        recyclerView = (RecyclerView) findViewById(R.id.autofill_recycler);
-
-        layoutManager = new LinearLayoutManager(this);
-        recyclerView.setLayoutManager(layoutManager);
-
-        // apps for which the user has custom settings should be in the recycler
-        final PackageManager pm = getPackageManager();
-        SharedPreferences prefs
-                = getSharedPreferences("autofill", Context.MODE_PRIVATE);
-        Map<String, ?> prefApps = prefs.getAll();
-        ArrayList<ApplicationInfo> apps = new ArrayList<>();
-        for (String packageName : prefApps.keySet()) {
-            try {
-                apps.add(pm.getApplicationInfo(packageName, 0));
-            } catch (PackageManager.NameNotFoundException e) {
-                // remove invalid entries (from uninstalled apps?)
-                SharedPreferences.Editor editor = prefs.edit();
-                editor.remove(packageName).apply();
-            }
         }
-        recyclerAdapter = new AutofillRecyclerAdapter(apps, pm, this);
-        recyclerView.setAdapter(recyclerAdapter);
-
-        // show the search bar by default but don't open the keyboard
-        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
-        final SearchView searchView = (SearchView) findViewById(R.id.app_search);
-        searchView.clearFocus();
-
-        // create search suggestions of apps with icons & names
-        final SimpleCursorAdapter.ViewBinder viewBinder = new SimpleCursorAdapter.ViewBinder() {
-            @Override
-            public boolean setViewValue(View view, Cursor cursor, int columnIndex) {
-                if (view instanceof TextView) {
-                    ((TextView) view).setText(cursor.getString(columnIndex));
-                } else if (view instanceof ImageView) {
-                    try {
-                        ((ImageView) view).setImageDrawable(pm.getApplicationIcon(cursor.getString(columnIndex)));
-                    } catch (PackageManager.NameNotFoundException e) {
-                        e.printStackTrace();
-                        return false;
-                    }
-                }
-                return true;
-            }
-        };
-
-        final List<ApplicationInfo> allApps = pm.getInstalledApplications(0);
-        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
-            @Override
-            public boolean onQueryTextSubmit(String query) {
-                return false;
-            }
-
-            @Override
-            public boolean onQueryTextChange(String newText) {
-                // should be a better/faster way to do this?
-                MatrixCursor matrixCursor = new MatrixCursor(new String[]{"_id", "package", "label"});
-                for (ApplicationInfo applicationInfo : allApps) {
-                    // exclude apps that already have settings; the search is just for adding
-                    if (applicationInfo.loadLabel(pm).toString().toLowerCase().contains(newText.toLowerCase())
-                            && !recyclerAdapter.contains(applicationInfo.packageName)) {
-                        matrixCursor.addRow(new Object[]{0, applicationInfo.packageName, applicationInfo.loadLabel(pm)});
-                    }
-                }
-                SimpleCursorAdapter simpleCursorAdapter = new SimpleCursorAdapter(AutofillActivity.this
-                        , R.layout.app_list_item, matrixCursor, new String[]{"package", "label"}
-                        , new int[]{android.R.id.icon1, android.R.id.text1}, 0);
-                simpleCursorAdapter.setViewBinder(viewBinder);
-                searchView.setSuggestionsAdapter(simpleCursorAdapter);
-                return false;
-            }
-        });
-
-        searchView.setOnSuggestionListener(new SearchView.OnSuggestionListener() {
-            @Override
-            public boolean onSuggestionSelect(int position) {
-                return false;
-            }
-
-            @Override
-            public boolean onSuggestionClick(int position) {
-                Cursor cursor = searchView.getSuggestionsAdapter().getCursor();
-                String packageName = cursor.getString(1);
-                String appName = cursor.getString(2);
-
-                // similar to what happens in ViewHolder.onClick but position -1
-                DialogFragment df = new AutofillFragment();
-                Bundle args = new Bundle();
-                args.putString("packageName", packageName);
-                args.putString("appName", appName);
-                args.putInt("position", -1);
-                df.setArguments(args);
-                df.show(getFragmentManager(), "autofill_dialog");
-                return false;
-            }
-        });
-
-        setTitle("Autofill Apps");
     }
 
     @Override
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 c1d75acd..b85dec6a 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillFragment.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillFragment.java
@@ -25,9 +25,9 @@ public class AutofillFragment extends DialogFragment {
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        // this fragment is only created from the settings page (AutofillActivity)
+        // this fragment is only created from the settings page (AutofillPreferenceActivity)
         // need to interact with the recyclerAdapter which is a member of activity
-        final AutofillActivity callingActivity = (AutofillActivity) getActivity();
+        final AutofillPreferenceActivity callingActivity = (AutofillPreferenceActivity) getActivity();
         LayoutInflater inflater = callingActivity.getLayoutInflater();
         final View view = inflater.inflate(R.layout.fragment_autofill, null);
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java
index 6f212149..9dac9a07 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java
@@ -1,4 +1,139 @@
 package com.zeapo.pwdstore.autofill;
 
-public class AutofillPreferenceActivity {
+import android.app.DialogFragment;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.ImageView;
+import android.widget.SearchView;
+import android.widget.SimpleCursorAdapter;
+import android.widget.TextView;
+
+import com.zeapo.pwdstore.R;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class AutofillPreferenceActivity extends AppCompatActivity {
+
+    private RecyclerView recyclerView;
+    AutofillRecyclerAdapter recyclerAdapter; // let fragment have access
+    private RecyclerView.LayoutManager layoutManager;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // otherwise if called from settings
+        setContentView(R.layout.autofill_recycler_view);
+        recyclerView = (RecyclerView) findViewById(R.id.autofill_recycler);
+
+        layoutManager = new LinearLayoutManager(this);
+        recyclerView.setLayoutManager(layoutManager);
+
+        // apps for which the user has custom settings should be in the recycler
+        final PackageManager pm = getPackageManager();
+        SharedPreferences prefs
+                = getSharedPreferences("autofill", Context.MODE_PRIVATE);
+        Map<String, ?> prefApps = prefs.getAll();
+        ArrayList<ApplicationInfo> apps = new ArrayList<>();
+        for (String packageName : prefApps.keySet()) {
+            try {
+                apps.add(pm.getApplicationInfo(packageName, 0));
+            } catch (PackageManager.NameNotFoundException e) {
+                // remove invalid entries (from uninstalled apps?)
+                SharedPreferences.Editor editor = prefs.edit();
+                editor.remove(packageName).apply();
+            }
+        }
+        recyclerAdapter = new AutofillRecyclerAdapter(apps, pm, this);
+        recyclerView.setAdapter(recyclerAdapter);
+
+        // show the search bar by default but don't open the keyboard
+        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+        final SearchView searchView = (SearchView) findViewById(R.id.app_search);
+        searchView.clearFocus();
+
+        // create search suggestions of apps with icons & names
+        final SimpleCursorAdapter.ViewBinder viewBinder = new SimpleCursorAdapter.ViewBinder() {
+            @Override
+            public boolean setViewValue(View view, Cursor cursor, int columnIndex) {
+                if (view instanceof TextView) {
+                    ((TextView) view).setText(cursor.getString(columnIndex));
+                } else if (view instanceof ImageView) {
+                    try {
+                        ((ImageView) view).setImageDrawable(pm.getApplicationIcon(cursor.getString(columnIndex)));
+                    } catch (PackageManager.NameNotFoundException e) {
+                        e.printStackTrace();
+                        return false;
+                    }
+                }
+                return true;
+            }
+        };
+
+        final List<ApplicationInfo> allApps = pm.getInstalledApplications(0);
+        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                return false;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+                // should be a better/faster way to do this?
+                MatrixCursor matrixCursor = new MatrixCursor(new String[]{"_id", "package", "label"});
+                for (ApplicationInfo applicationInfo : allApps) {
+                    // exclude apps that already have settings; the search is just for adding
+                    if (applicationInfo.loadLabel(pm).toString().toLowerCase().contains(newText.toLowerCase())
+                            && !recyclerAdapter.contains(applicationInfo.packageName)) {
+                        matrixCursor.addRow(new Object[]{0, applicationInfo.packageName, applicationInfo.loadLabel(pm)});
+                    }
+                }
+                SimpleCursorAdapter simpleCursorAdapter = new SimpleCursorAdapter(AutofillPreferenceActivity.this
+                        , R.layout.app_list_item, matrixCursor, new String[]{"package", "label"}
+                        , new int[]{android.R.id.icon1, android.R.id.text1}, 0);
+                simpleCursorAdapter.setViewBinder(viewBinder);
+                searchView.setSuggestionsAdapter(simpleCursorAdapter);
+                return false;
+            }
+        });
+
+        searchView.setOnSuggestionListener(new SearchView.OnSuggestionListener() {
+            @Override
+            public boolean onSuggestionSelect(int position) {
+                return false;
+            }
+
+            @Override
+            public boolean onSuggestionClick(int position) {
+                Cursor cursor = searchView.getSuggestionsAdapter().getCursor();
+                String packageName = cursor.getString(1);
+                String appName = cursor.getString(2);
+
+                // similar to what happens in ViewHolder.onClick but position -1
+                DialogFragment df = new AutofillFragment();
+                Bundle args = new Bundle();
+                args.putString("packageName", packageName);
+                args.putString("appName", appName);
+                args.putInt("position", -1);
+                df.setArguments(args);
+                df.show(getFragmentManager(), "autofill_dialog");
+                return false;
+            }
+        });
+
+        setTitle("Autofill Apps");
+    }
 }
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 eff94c51..b43f5d6e 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
 public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecyclerAdapter.ViewHolder> {
     private ArrayList<ApplicationInfo> apps;
     private PackageManager pm;
-    private AutofillActivity activity;
+    private AutofillPreferenceActivity activity;
 
     public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
         public View view;
@@ -50,7 +50,7 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecycl
         }
     }
 
-    public AutofillRecyclerAdapter(ArrayList<ApplicationInfo> apps, PackageManager pm, AutofillActivity activity) {
+    public AutofillRecyclerAdapter(ArrayList<ApplicationInfo> apps, PackageManager pm, AutofillPreferenceActivity activity) {
         this.apps = apps;
         this.pm = pm;
         this.activity = activity;
-- 
cgit v1.2.3


From 7c41795ded9aff01c46cc798687e62736d2233e7 Mon Sep 17 00:00:00 2001
From: Matthew Wong <wongma@protonmail.ch>
Date: Mon, 10 Aug 2015 16:58:28 -0400
Subject: Open settings from password fill dialog

---
 .../zeapo/pwdstore/autofill/AutofillActivity.java  |  5 ++-
 .../autofill/AutofillPreferenceActivity.java       | 40 ++++++++++++++--------
 .../pwdstore/autofill/AutofillRecyclerAdapter.java | 26 ++++++--------
 .../zeapo/pwdstore/autofill/AutofillService.java   |  8 +++--
 app/src/main/res/layout/app_list_item.xml          |  9 ++---
 5 files changed, 49 insertions(+), 39 deletions(-)

(limited to 'app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java')

diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillActivity.java b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillActivity.java
index 5a097d07..d8e50ebd 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillActivity.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillActivity.java
@@ -14,12 +14,11 @@ public class AutofillActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        Intent intent = getIntent();
-        Bundle extras = intent.getExtras();
+        Bundle extras = getIntent().getExtras();
 
         if (extras != null) {
             try {
-                PendingIntent pi = intent.getExtras().getParcelable("pending_intent");
+                PendingIntent pi = extras.getParcelable("pending_intent");
                 if (pi == null) {
                     return;
                 }
diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java
index 9dac9a07..89d3474e 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java
@@ -8,7 +8,6 @@ import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.os.Bundle;
-import android.os.PersistableBundle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -22,6 +21,8 @@ import android.widget.TextView;
 import com.zeapo.pwdstore.R;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 
@@ -57,6 +58,12 @@ public class AutofillPreferenceActivity extends AppCompatActivity {
                 editor.remove(packageName).apply();
             }
         }
+        Collections.sort(apps, new Comparator<ApplicationInfo>() {
+            @Override
+            public int compare(ApplicationInfo lhs, ApplicationInfo rhs) {
+                return lhs.loadLabel(pm).toString().compareTo(rhs.loadLabel(pm).toString());
+            }
+        });
         recyclerAdapter = new AutofillRecyclerAdapter(apps, pm, this);
         recyclerView.setAdapter(recyclerAdapter);
 
@@ -95,9 +102,7 @@ public class AutofillPreferenceActivity extends AppCompatActivity {
                 // should be a better/faster way to do this?
                 MatrixCursor matrixCursor = new MatrixCursor(new String[]{"_id", "package", "label"});
                 for (ApplicationInfo applicationInfo : allApps) {
-                    // exclude apps that already have settings; the search is just for adding
-                    if (applicationInfo.loadLabel(pm).toString().toLowerCase().contains(newText.toLowerCase())
-                            && !recyclerAdapter.contains(applicationInfo.packageName)) {
+                    if (applicationInfo.loadLabel(pm).toString().toLowerCase().contains(newText.toLowerCase())) {
                         matrixCursor.addRow(new Object[]{0, applicationInfo.packageName, applicationInfo.loadLabel(pm)});
                     }
                 }
@@ -121,19 +126,26 @@ public class AutofillPreferenceActivity extends AppCompatActivity {
                 Cursor cursor = searchView.getSuggestionsAdapter().getCursor();
                 String packageName = cursor.getString(1);
                 String appName = cursor.getString(2);
-
-                // similar to what happens in ViewHolder.onClick but position -1
-                DialogFragment df = new AutofillFragment();
-                Bundle args = new Bundle();
-                args.putString("packageName", packageName);
-                args.putString("appName", appName);
-                args.putInt("position", -1);
-                df.setArguments(args);
-                df.show(getFragmentManager(), "autofill_dialog");
-                return false;
+                showDialog(packageName, appName);
+                return true;
             }
         });
 
         setTitle("Autofill Apps");
+
+        Bundle extras = getIntent().getExtras();
+        if (extras != null) {
+            showDialog(extras.getString("packageName"), extras.getString("appName"));
+        }
+    }
+
+    public void showDialog(String packageName, String appName) {
+        DialogFragment df = new AutofillFragment();
+        Bundle args = new Bundle();
+        args.putString("packageName", packageName);
+        args.putString("appName", appName);
+        args.putInt("position", recyclerAdapter.getPosition(packageName));
+        df.setArguments(args);
+        df.show(getFragmentManager(), "autofill_dialog");
     }
 }
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 b43f5d6e..26680152 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
@@ -40,13 +40,7 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecycl
 
         @Override
         public void onClick(View v) {
-            DialogFragment df = new AutofillFragment();
-            Bundle args = new Bundle();
-            args.putString("packageName", packageName);
-            args.putString("appName", name.getText().toString());
-            args.putInt("position", getAdapterPosition());
-            df.setArguments(args);
-            df.show(activity.getFragmentManager(), "autofill_dialog");
+            activity.showDialog(packageName, name.getText().toString());
         }
     }
 
@@ -90,15 +84,6 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecycl
         return apps.size();
     }
 
-    public boolean contains(String packageName) {
-        for (ApplicationInfo app : apps) {
-            if (app.packageName.equals(packageName)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     public void add(String packageName) {
         try {
             ApplicationInfo app = pm.getApplicationInfo(packageName, 0);
@@ -108,4 +93,13 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecycl
             e.printStackTrace();
         }
     }
+
+    public int getPosition(String packageName) {
+        for (int i = 0; i < apps.size(); i++) {
+            if (apps.get(i).packageName.equals(packageName)) {
+                return i;
+            }
+        }
+        return -1;
+    }
 }
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 b30277ba..37066b8f 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java
@@ -123,7 +123,7 @@ public class AutofillService extends AccessibilityService {
         } catch (PackageManager.NameNotFoundException e) {
             applicationInfo = null;
         }
-        String appName = (applicationInfo != null ? packageManager.getApplicationLabel(applicationInfo) : "").toString();
+        final String appName = (applicationInfo != null ? packageManager.getApplicationLabel(applicationInfo) : "").toString();
         items = recursiveFilter(appName, null);
         if (items.isEmpty()) {
             return;
@@ -141,7 +141,11 @@ public class AutofillService extends AccessibilityService {
             builder.setNeutralButton("Settings", new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
-
+                    Intent intent = new Intent(AutofillService.this, AutofillPreferenceActivity.class);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+                    intent.putExtra("packageName", info.getPackageName());
+                    intent.putExtra("appName", appName);
+                    startActivity(intent);
                 }
             });
             dialog = builder.create();
diff --git a/app/src/main/res/layout/app_list_item.xml b/app/src/main/res/layout/app_list_item.xml
index 7df28cc6..1a6c6e9b 100644
--- a/app/src/main/res/layout/app_list_item.xml
+++ b/app/src/main/res/layout/app_list_item.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
-              android:layout_height="match_parent"
+              android:layout_height="40dp"
               android:orientation="horizontal"
               android:paddingLeft="8dp"
-              android:paddingRight="8dp">
+              android:paddingRight="8dp"
+              android:gravity="center_vertical">
 
     <ImageView
         android:id="@android:id/icon1"
-        android:layout_width="48dp"
-        android:layout_height="48dp"/>
+        android:layout_width="24dp"
+        android:layout_height="24dp"/>
 
     <TextView android:id="@android:id/text1"
               xmlns:android="http://schemas.android.com/apk/res/android"
-- 
cgit v1.2.3


From d42c526b648030ee251d9136b8d924395b74bb9c Mon Sep 17 00:00:00 2001
From: Matthew Wong <wongma@protonmail.ch>
Date: Tue, 11 Aug 2015 13:34:14 -0400
Subject: passwordfragment changes

---
 .../main/java/com/zeapo/pwdstore/PasswordFragment.java    |  6 +++++-
 app/src/main/java/com/zeapo/pwdstore/PasswordStore.java   | 15 +++++++++++++++
 .../com/zeapo/pwdstore/autofill/AutofillFragment.java     | 13 ++++++++++++-
 .../zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java  |  2 --
 app/src/main/res/xml/preference.xml                       |  2 +-
 5 files changed, 33 insertions(+), 5 deletions(-)

(limited to 'app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java')

diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java b/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java
index 72636043..1daa4f90 100644
--- a/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java
+++ b/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java
@@ -112,7 +112,11 @@ public class PasswordFragment extends Fragment{
 
                         ((AppCompatActivity) getActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(true);
                     } else {
-                        ((PasswordStore) getActivity()).decryptPassword(item);
+                        if (getArguments().getBoolean("matchWith", false)) {
+                            ((PasswordStore) getActivity()).matchPasswordWithApp(item);
+                        } else {
+                            ((PasswordStore) getActivity()).decryptPassword(item);
+                        }
                     }
                 }
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
index e51ef201..39d918c8 100644
--- a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
+++ b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
@@ -289,6 +289,12 @@ public class PasswordStore extends AppCompatActivity {
                 Bundle args = new Bundle();
                 args.putString("Path", PasswordRepository.getWorkTree().getAbsolutePath());
 
+                // if the activity was started from the autofill settings, the
+                // intent is to match a clicked pwd with app. pass this to fragment
+                if (getIntent().getBooleanExtra("matchWith", false)) {
+                    args.putBoolean("matchWith", true);
+                }
+
                 plist.setArguments(args);
 
                 fragmentTransaction.addToBackStack("passlist");
@@ -531,4 +537,13 @@ public class PasswordStore extends AppCompatActivity {
                 })
                 .show();
     }
+
+    public void matchPasswordWithApp(PasswordItem item) {
+        String path = item.getFile().getAbsolutePath();
+        path = path.replace(PasswordRepository.getWorkTree() + "/", "").replace(".gpg", "");
+        Intent data = new Intent();
+        data.putExtra("path", path);
+        setResult(RESULT_OK, data);
+        finish();
+    }
 }
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 b85dec6a..3e00edfb 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillFragment.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillFragment.java
@@ -1,5 +1,6 @@
 package com.zeapo.pwdstore.autofill;
 
+import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.support.v7.app.AlertDialog;
@@ -18,6 +19,7 @@ import com.zeapo.pwdstore.PasswordStore;
 import com.zeapo.pwdstore.R;
 
 public class AutofillFragment extends DialogFragment {
+    private static final int MATCH_WITH = 777;
 
     public AutofillFragment() {
     }
@@ -57,7 +59,8 @@ public class AutofillFragment extends DialogFragment {
             public void onClick(View v) {
                 // TODO figure out UI for this
                 Intent intent = new Intent(getActivity(), PasswordStore.class);
-                startActivity(intent);
+                intent.putExtra("matchWith", true);
+                startActivityForResult(intent, MATCH_WITH);
             }
         };
         view.findViewById(R.id.match).setOnClickListener(matchPassword);
@@ -92,4 +95,12 @@ public class AutofillFragment extends DialogFragment {
         builder.setNegativeButton("Cancel", null);
         return builder.create();
     }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (resultCode == Activity.RESULT_OK) {
+            ((EditText) getDialog().findViewById(R.id.matched)).setText(data.getStringExtra("path"));
+        }
+
+    }
 }
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 26680152..1b5e63b7 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
@@ -1,11 +1,9 @@
 package com.zeapo.pwdstore.autofill;
 
-import android.app.DialogFragment;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import android.os.Bundle;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
index 538f0387..9a42bb3e 100644
--- a/app/src/main/res/xml/preference.xml
+++ b/app/src/main/res/xml/preference.xml
@@ -75,7 +75,7 @@
         <Preference
             android:key="autofill_apps"
             android:summary="Customize autofill settings for specific apps."
-            android:title="Autofill Apps"/>
+            android:title="Per-app settings"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="Misc">
-- 
cgit v1.2.3


From b75190fcd7926c3994f8191996661c19b7b12466 Mon Sep 17 00:00:00 2001
From: Matthew Wong <wongma@protonmail.ch>
Date: Tue, 11 Aug 2015 18:32:16 -0400
Subject: Add 'automatically match by default' setting; respect it & per-app
 settings when creating autofill dialog

---
 .../zeapo/pwdstore/autofill/AutofillFragment.java    |  9 +++++++--
 .../autofill/AutofillPreferenceActivity.java         |  4 ++++
 .../pwdstore/autofill/AutofillRecyclerAdapter.java   |  7 ++++++-
 .../com/zeapo/pwdstore/autofill/AutofillService.java | 20 ++++++++++++++++++--
 app/src/main/res/xml/preference.xml                  |  5 +++++
 5 files changed, 40 insertions(+), 5 deletions(-)

(limited to 'app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java')

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 3e00edfb..ea4b0a2f 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillFragment.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillFragment.java
@@ -3,6 +3,7 @@ package com.zeapo.pwdstore.autofill;
 import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.preference.PreferenceManager;
 import android.support.v7.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
@@ -39,9 +40,14 @@ public class AutofillFragment extends DialogFragment {
         String appName = getArguments().getString("appName");
 
         builder.setTitle(appName);
+
+        // when an app is added for the first time, the radio button selection should reflect
+        // the autofill_default setting: hence, defValue
+        SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(callingActivity);
+        String defValue = settings.getBoolean("autofill_default", true) ? "first" : "never";
         SharedPreferences prefs
                 = getActivity().getApplicationContext().getSharedPreferences("autofill", Context.MODE_PRIVATE);
-        String preference = prefs.getString(packageName, "first");
+        String preference = prefs.getString(packageName, defValue);
         switch (preference) {
             case "first":
                 ((RadioButton) view.findViewById(R.id.first)).toggle();
@@ -57,7 +63,6 @@ public class AutofillFragment extends DialogFragment {
         View.OnClickListener matchPassword = new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                // TODO figure out UI for this
                 Intent intent = new Intent(getActivity(), PasswordStore.class);
                 intent.putExtra("matchWith", true);
                 startActivityForResult(intent, MATCH_WITH);
diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java
index 89d3474e..10684f45 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java
@@ -8,6 +8,7 @@ import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -100,6 +101,7 @@ public class AutofillPreferenceActivity extends AppCompatActivity {
             @Override
             public boolean onQueryTextChange(String newText) {
                 // should be a better/faster way to do this?
+                // TODO do this async probably. it lags.
                 MatrixCursor matrixCursor = new MatrixCursor(new String[]{"_id", "package", "label"});
                 for (ApplicationInfo applicationInfo : allApps) {
                     if (applicationInfo.loadLabel(pm).toString().toLowerCase().contains(newText.toLowerCase())) {
@@ -147,5 +149,7 @@ public class AutofillPreferenceActivity extends AppCompatActivity {
         args.putInt("position", recyclerAdapter.getPosition(packageName));
         df.setArguments(args);
         df.show(getFragmentManager(), "autofill_dialog");
+
+        // TODO if called from dialog 'Settings' button, should activity finish at OK?
     }
 }
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 1b5e63b7..bd2835e5 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.preference.PreferenceManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -59,9 +60,13 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecycl
     public void onBindViewHolder(AutofillRecyclerAdapter.ViewHolder holder, int position) {
         ApplicationInfo app = apps.get(position);
         holder.name.setText(pm.getApplicationLabel(app));
+
+        // it shouldn't be possible for prefs.getString to not find the app...use defValue anyway
+        SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(activity);
+        String defValue = settings.getBoolean("autofill_default", true) ? "first" : "never";
         SharedPreferences prefs
                 = activity.getApplicationContext().getSharedPreferences("autofill", Context.MODE_PRIVATE);
-        String preference = prefs.getString(app.packageName, "first");
+        String preference = prefs.getString(app.packageName, defValue);
         switch (preference) {
             case "first":
                 holder.secondary.setText("Automatically match with password");
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 37066b8f..2a80a449 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java
@@ -102,7 +102,7 @@ public class AutofillService extends AccessibilityService {
             dialog.dismiss();
         }
 
-        // ignore the ACTION_FOCUS from decryptAndVerify
+        // ignore the ACTION_FOCUS from decryptAndVerify otherwise dialog will appear after Fill
         if (ignoreActionFocus) {
             ignoreActionFocus = false;
             return;
@@ -124,7 +124,23 @@ public class AutofillService extends AccessibilityService {
             applicationInfo = null;
         }
         final String appName = (applicationInfo != null ? packageManager.getApplicationLabel(applicationInfo) : "").toString();
-        items = recursiveFilter(appName, null);
+
+        // 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";
+        SharedPreferences prefs = getSharedPreferences("autofill", Context.MODE_PRIVATE);
+        String preference = prefs.getString(event.getPackageName().toString(), defValue);
+        switch (preference) {
+            case "first":
+                items = recursiveFilter(appName, null);
+                break;
+            case "never":
+                return;
+            default:
+                String path = PasswordRepository.getWorkTree() + "/" + preference + ".gpg";
+                File file = new File(path);
+                items = new ArrayList<>();
+                items.add(PasswordItem.newPassword(file.getName(), file));
+        }
         if (items.isEmpty()) {
             return;
         }
diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
index 9a42bb3e..44e38916 100644
--- a/app/src/main/res/xml/preference.xml
+++ b/app/src/main/res/xml/preference.xml
@@ -76,6 +76,11 @@
             android:key="autofill_apps"
             android:summary="Customize autofill settings for specific apps."
             android:title="Per-app settings"/>
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="autofill_default"
+            android:summary="Default to 'Automatically match with password' for apps without custom settings."
+            android:title="Automatically match by default"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="Misc">
-- 
cgit v1.2.3


From f4c0ee607e909caaacf52367901652ea89b16581 Mon Sep 17 00:00:00 2001
From: Matthew Wong <wongma@protonmail.ch>
Date: Tue, 11 Aug 2015 19:56:32 -0400
Subject: Multi-select deletion of apps in settings page

---
 .../autofill/AutofillPreferenceActivity.java       |  2 -
 .../pwdstore/autofill/AutofillRecyclerAdapter.java | 92 +++++++++++++++++++++-
 .../main/res/drawable/autofill_row_background.xml  |  5 ++
 app/src/main/res/layout/autofill_row_layout.xml    |  2 +-
 4 files changed, 96 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/drawable/autofill_row_background.xml

(limited to 'app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java')

diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java
index 10684f45..54f0ade4 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java
@@ -8,7 +8,6 @@ import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -149,7 +148,6 @@ public class AutofillPreferenceActivity extends AppCompatActivity {
         args.putInt("position", recyclerAdapter.getPosition(packageName));
         df.setArguments(args);
         df.show(getFragmentManager(), "autofill_dialog");
-
         // TODO if called from dialog 'Settings' button, should activity finish at OK?
     }
 }
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 bd2835e5..14530879 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
@@ -5,8 +5,11 @@ import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.preference.PreferenceManager;
+import android.support.v7.view.ActionMode;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -15,13 +18,19 @@ import android.widget.TextView;
 import com.zeapo.pwdstore.R;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.TreeSet;
 
 public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecyclerAdapter.ViewHolder> {
     private ArrayList<ApplicationInfo> apps;
     private PackageManager pm;
     private AutofillPreferenceActivity activity;
+    private final Set<Integer> selectedItems;
+    private ActionMode actionMode;
 
-    public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+    public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
         public View view;
         public TextView name;
         public TextView secondary;
@@ -35,11 +44,30 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecycl
             secondary = (TextView) view.findViewById(R.id.secondary_text);
             icon = (ImageView) view.findViewById(R.id.app_icon);
             view.setOnClickListener(this);
+            view.setOnLongClickListener(this);
         }
 
         @Override
         public void onClick(View v) {
-            activity.showDialog(packageName, name.getText().toString());
+            if (actionMode != null) {
+                toggleSelection(getAdapterPosition(), view);
+                if (selectedItems.isEmpty()) {
+                    actionMode.finish();
+                }
+            } else {
+                activity.showDialog(packageName, name.getText().toString());
+            }
+        }
+
+        @Override
+        public boolean onLongClick(View v) {
+            if (actionMode != null) {
+                return false;
+            }
+            toggleSelection(getAdapterPosition(), view);
+            // Start the CAB using the ActionMode.Callback
+            actionMode = activity.startSupportActionMode(actionModeCallback);
+            return true;
         }
     }
 
@@ -47,6 +75,7 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecycl
         this.apps = apps;
         this.pm = pm;
         this.activity = activity;
+        this.selectedItems = new TreeSet<>(Collections.reverseOrder());
     }
 
     @Override
@@ -80,6 +109,8 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecycl
         }
         holder.icon.setImageDrawable(pm.getApplicationIcon(app));
         holder.packageName = app.packageName;
+
+        holder.view.setSelected(selectedItems.contains(position));
     }
 
     @Override
@@ -105,4 +136,61 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecycl
         }
         return -1;
     }
+
+    private ActionMode.Callback actionModeCallback = new ActionMode.Callback() {
+        @Override
+        public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+            mode.getMenuInflater().inflate(R.menu.context_pass, menu);
+            return true;
+        }
+
+        @Override
+        public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+            return false;
+        }
+
+        @Override
+        public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+            switch (item.getItemId()) {
+                case R.id.menu_delete_password:
+                    // don't ask for confirmation
+                    for (int position : selectedItems) {
+                        remove(position);
+                    }
+                    mode.finish(); // Action picked, so close the CAB
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
+        @Override
+        public void onDestroyActionMode(ActionMode mode) {
+            for (Iterator it = selectedItems.iterator(); it.hasNext();) {
+                // need the setSelected line in onBind
+                notifyItemChanged((Integer) it.next());
+                it.remove();
+            }
+            actionMode = null;
+        }
+    };
+
+    public void remove(int position) {
+        ApplicationInfo applicationInfo = this.apps.get(position);
+        SharedPreferences prefs
+                = activity.getApplicationContext().getSharedPreferences("autofill", Context.MODE_PRIVATE);
+        prefs.edit().remove(applicationInfo.packageName).apply();
+
+        this.apps.remove(position);
+        this.notifyItemRemoved(position);
+    }
+
+    public void toggleSelection(int position, View view) {
+        if (!selectedItems.remove(position)) {
+            selectedItems.add(position);
+            view.setSelected(true);
+        } else {
+            view.setSelected(false);
+        }
+    }
 }
diff --git a/app/src/main/res/drawable/autofill_row_background.xml b/app/src/main/res/drawable/autofill_row_background.xml
new file mode 100644
index 00000000..05e887ca
--- /dev/null
+++ b/app/src/main/res/drawable/autofill_row_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:drawable="@color/blue_grey_200" />
+    <item android:drawable="@color/grey_white_1000" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/autofill_row_layout.xml b/app/src/main/res/layout/autofill_row_layout.xml
index 3f94a8ad..354f9181 100644
--- a/app/src/main/res/layout/autofill_row_layout.xml
+++ b/app/src/main/res/layout/autofill_row_layout.xml
@@ -3,7 +3,7 @@
               android:orientation="vertical"
               android:layout_width="match_parent"
               android:layout_height="64dp"
-              android:background="@color/grey_white_1000">
+              android:background="@drawable/autofill_row_background">
 
     <LinearLayout
         android:layout_width="match_parent"
-- 
cgit v1.2.3


From ec07e1eea69a69e9579ddfb44fdbee3535bcf6ad Mon Sep 17 00:00:00 2001
From: Matthew Wong <wongma@protonmail.ch>
Date: Thu, 13 Aug 2015 15:18:47 -0400
Subject: Preference activity overhaul

---
 .../zeapo/pwdstore/autofill/AutofillFragment.java  |  31 +++--
 .../autofill/AutofillPreferenceActivity.java       | 122 ++++++-------------
 .../pwdstore/autofill/AutofillRecyclerAdapter.java | 132 ++++-----------------
 .../zeapo/pwdstore/autofill/AutofillService.java   |   3 +-
 app/src/main/res/layout/autofill_recycler_view.xml |  11 +-
 app/src/main/res/layout/autofill_row_layout.xml    |   5 +-
 app/src/main/res/layout/fragment_autofill.xml      |  15 ++-
 app/src/main/res/menu/autofill_preference.xml      |  12 ++
 app/src/main/res/xml/preference.xml                |   2 +-
 9 files changed, 108 insertions(+), 225 deletions(-)
 create mode 100644 app/src/main/res/menu/autofill_preference.xml

(limited to 'app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java')

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 ea4b0a2f..c2a30ffe 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillFragment.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillFragment.java
@@ -3,7 +3,7 @@ package com.zeapo.pwdstore.autofill;
 import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.preference.PreferenceManager;
+import android.content.pm.PackageManager;
 import android.support.v7.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
@@ -40,15 +40,20 @@ public class AutofillFragment extends DialogFragment {
         String appName = getArguments().getString("appName");
 
         builder.setTitle(appName);
+        try {
+            // since we can't (easily?) pass the drawable as an argument
+            builder.setIcon(callingActivity.getPackageManager().getApplicationIcon(packageName));
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
 
-        // when an app is added for the first time, the radio button selection should reflect
-        // the autofill_default setting: hence, defValue
-        SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(callingActivity);
-        String defValue = settings.getBoolean("autofill_default", true) ? "first" : "never";
         SharedPreferences prefs
                 = getActivity().getApplicationContext().getSharedPreferences("autofill", Context.MODE_PRIVATE);
-        String preference = prefs.getString(packageName, defValue);
+        String preference = prefs.getString(packageName, "");
         switch (preference) {
+            case "":
+                ((RadioButton) view.findViewById(R.id.use_default)).toggle();
+                break;
             case "first":
                 ((RadioButton) view.findViewById(R.id.first)).toggle();
                 break;
@@ -77,6 +82,9 @@ public class AutofillFragment extends DialogFragment {
             public void onClick(DialogInterface dialog, int which) {
                 RadioGroup radioGroup = (RadioGroup) view.findViewById(R.id.autofill_radiogroup);
                 switch (radioGroup.getCheckedRadioButtonId()) {
+                    case R.id.use_default:
+                        editor.remove(packageName);
+                        break;
                     case R.id.first:
                         editor.putString(packageName, "first");
                         break;
@@ -90,10 +98,10 @@ public class AutofillFragment extends DialogFragment {
                 }
                 editor.apply();
                 int position = getArguments().getInt("position");
-                if (position == -1) {
-                    callingActivity.recyclerAdapter.add(packageName);
-                } else {
-                    callingActivity.recyclerAdapter.notifyItemChanged(position);
+                callingActivity.recyclerAdapter.notifyItemChanged(position);
+
+                if (getArguments().getBoolean("finish")) {
+                    callingActivity.finish();
                 }
             }
         });
@@ -105,7 +113,8 @@ public class AutofillFragment extends DialogFragment {
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (resultCode == Activity.RESULT_OK) {
             ((EditText) getDialog().findViewById(R.id.matched)).setText(data.getStringExtra("path"));
+        } else {
+            ((RadioButton) getDialog().findViewById(R.id.use_default)).toggle();
         }
-
     }
 }
diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java
index abf1f320..91131956 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java
@@ -1,22 +1,17 @@
 package com.zeapo.pwdstore.autofill;
 
 import android.app.DialogFragment;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.pm.ApplicationInfo;
+import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.database.Cursor;
-import android.database.MatrixCursor;
+import android.content.pm.ResolveInfo;
 import android.os.Bundle;
+import android.support.v4.view.MenuItemCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.ImageView;
-import android.widget.SearchView;
-import android.widget.SimpleCursorAdapter;
-import android.widget.TextView;
+import android.support.v7.widget.SearchView;
+import android.view.Menu;
+import android.view.MenuItem;
 
 import com.zeapo.pwdstore.R;
 
@@ -24,7 +19,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Map;
 
 public class AutofillPreferenceActivity extends AppCompatActivity {
 
@@ -43,102 +37,62 @@ public class AutofillPreferenceActivity extends AppCompatActivity {
         layoutManager = new LinearLayoutManager(this);
         recyclerView.setLayoutManager(layoutManager);
         recyclerView.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL_LIST));
-        
-        // apps for which the user has custom settings should be in the recycler
+
+        Intent intent = new Intent(Intent.ACTION_MAIN);
+        intent.addCategory(Intent.CATEGORY_LAUNCHER);
+        List<ResolveInfo> allApps = getPackageManager().queryIntentActivities(intent, 0);
         final PackageManager pm = getPackageManager();
-        SharedPreferences prefs
-                = getSharedPreferences("autofill", Context.MODE_PRIVATE);
-        Map<String, ?> prefApps = prefs.getAll();
-        ArrayList<ApplicationInfo> apps = new ArrayList<>();
-        for (String packageName : prefApps.keySet()) {
-            try {
-                apps.add(pm.getApplicationInfo(packageName, 0));
-            } catch (PackageManager.NameNotFoundException e) {
-                // remove invalid entries (from uninstalled apps?)
-                SharedPreferences.Editor editor = prefs.edit();
-                editor.remove(packageName).apply();
-            }
-        }
-        Collections.sort(apps, new Comparator<ApplicationInfo>() {
+        Collections.sort(allApps, new Comparator<ResolveInfo>() {
             @Override
-            public int compare(ApplicationInfo lhs, ApplicationInfo rhs) {
+            public int compare(ResolveInfo lhs, ResolveInfo rhs) {
                 return lhs.loadLabel(pm).toString().compareTo(rhs.loadLabel(pm).toString());
             }
         });
-        recyclerAdapter = new AutofillRecyclerAdapter(apps, pm, this);
+        recyclerAdapter = new AutofillRecyclerAdapter(new ArrayList<>(allApps), pm, this);
         recyclerView.setAdapter(recyclerAdapter);
 
-        // show the search bar by default but don't open the keyboard
-        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
-        final SearchView searchView = (SearchView) findViewById(R.id.app_search);
-        searchView.clearFocus();
+        setTitle("Autofill Apps");
 
-        // create search suggestions of apps with icons & names
-        final SimpleCursorAdapter.ViewBinder viewBinder = new SimpleCursorAdapter.ViewBinder() {
-            @Override
-            public boolean setViewValue(View view, Cursor cursor, int columnIndex) {
-                if (view instanceof TextView) {
-                    ((TextView) view).setText(cursor.getString(columnIndex));
-                } else if (view instanceof ImageView) {
-                    try {
-                        ((ImageView) view).setImageDrawable(pm.getApplicationIcon(cursor.getString(columnIndex)));
-                    } catch (PackageManager.NameNotFoundException e) {
-                        e.printStackTrace();
-                        return false;
-                    }
-                }
-                return true;
-            }
-        };
+        Bundle extras = getIntent().getExtras();
+        if (extras != null) {
+            recyclerView.scrollToPosition(recyclerAdapter.getPosition(extras.getString("packageName")));
+            showDialog(extras.getString("packageName"), extras.getString("appName"));
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.autofill_preference, menu);
+        MenuItem searchItem = menu.findItem(R.id.action_search);
+        SearchView searchView = (SearchView) MenuItemCompat.getActionView(searchItem);
 
-        final List<ApplicationInfo> allApps = pm.getInstalledApplications(0);
         searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
-            public boolean onQueryTextSubmit(String query) {
-                return false;
+            public boolean onQueryTextSubmit(String s) {
+                return true;
             }
 
             @Override
-            public boolean onQueryTextChange(String newText) {
-                // should be a better/faster way to do this?
-                // TODO do this async probably. it lags.
-                MatrixCursor matrixCursor = new MatrixCursor(new String[]{"_id", "package", "label"});
-                for (ApplicationInfo applicationInfo : allApps) {
-                    if (applicationInfo.loadLabel(pm).toString().toLowerCase().contains(newText.toLowerCase())) {
-                        matrixCursor.addRow(new Object[]{0, applicationInfo.packageName, applicationInfo.loadLabel(pm)});
-                    }
-                }
-                SimpleCursorAdapter simpleCursorAdapter = new SimpleCursorAdapter(AutofillPreferenceActivity.this
-                        , R.layout.app_list_item, matrixCursor, new String[]{"package", "label"}
-                        , new int[]{android.R.id.icon1, android.R.id.text1}, 0);
-                simpleCursorAdapter.setViewBinder(viewBinder);
-                searchView.setSuggestionsAdapter(simpleCursorAdapter);
-                return false;
+            public boolean onQueryTextChange(String s) {
+                return true;
             }
         });
 
-        searchView.setOnSuggestionListener(new SearchView.OnSuggestionListener() {
+        // When using the support library, the setOnActionExpandListener() method is
+        // static and accepts the MenuItem object as an argument
+        MenuItemCompat.setOnActionExpandListener(searchItem, new MenuItemCompat.OnActionExpandListener() {
             @Override
-            public boolean onSuggestionSelect(int position) {
-                return false;
+            public boolean onMenuItemActionCollapse(MenuItem item) {
+                return true;
             }
 
             @Override
-            public boolean onSuggestionClick(int position) {
-                Cursor cursor = searchView.getSuggestionsAdapter().getCursor();
-                String packageName = cursor.getString(1);
-                String appName = cursor.getString(2);
-                showDialog(packageName, appName);
+            public boolean onMenuItemActionExpand(MenuItem item) {
                 return true;
             }
         });
-
-        setTitle("Autofill Apps");
-
-        Bundle extras = getIntent().getExtras();
-        if (extras != null) {
-            showDialog(extras.getString("packageName"), extras.getString("appName"));
-        }
+        return super.onCreateOptionsMenu(menu);
     }
 
     public void showDialog(String packageName, String appName) {
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 14530879..7c735f18 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
@@ -2,14 +2,11 @@ package com.zeapo.pwdstore.autofill;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import android.preference.PreferenceManager;
+import android.content.pm.ResolveInfo;
 import android.support.v7.view.ActionMode;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -18,19 +15,14 @@ import android.widget.TextView;
 import com.zeapo.pwdstore.R;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.TreeSet;
 
 public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecyclerAdapter.ViewHolder> {
-    private ArrayList<ApplicationInfo> apps;
+    private ArrayList<ResolveInfo> apps;
     private PackageManager pm;
     private AutofillPreferenceActivity activity;
-    private final Set<Integer> selectedItems;
     private ActionMode actionMode;
 
-    public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
+    public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
         public View view;
         public TextView name;
         public TextView secondary;
@@ -44,38 +36,19 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecycl
             secondary = (TextView) view.findViewById(R.id.secondary_text);
             icon = (ImageView) view.findViewById(R.id.app_icon);
             view.setOnClickListener(this);
-            view.setOnLongClickListener(this);
         }
 
         @Override
         public void onClick(View v) {
-            if (actionMode != null) {
-                toggleSelection(getAdapterPosition(), view);
-                if (selectedItems.isEmpty()) {
-                    actionMode.finish();
-                }
-            } else {
-                activity.showDialog(packageName, name.getText().toString());
-            }
+            activity.showDialog(packageName, name.getText().toString());
         }
 
-        @Override
-        public boolean onLongClick(View v) {
-            if (actionMode != null) {
-                return false;
-            }
-            toggleSelection(getAdapterPosition(), view);
-            // Start the CAB using the ActionMode.Callback
-            actionMode = activity.startSupportActionMode(actionModeCallback);
-            return true;
-        }
     }
 
-    public AutofillRecyclerAdapter(ArrayList<ApplicationInfo> apps, PackageManager pm, AutofillPreferenceActivity activity) {
+    public AutofillRecyclerAdapter(ArrayList<ResolveInfo> apps, PackageManager pm, AutofillPreferenceActivity activity) {
         this.apps = apps;
         this.pm = pm;
         this.activity = activity;
-        this.selectedItems = new TreeSet<>(Collections.reverseOrder());
     }
 
     @Override
@@ -87,30 +60,33 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecycl
 
     @Override
     public void onBindViewHolder(AutofillRecyclerAdapter.ViewHolder holder, int position) {
-        ApplicationInfo app = apps.get(position);
-        holder.name.setText(pm.getApplicationLabel(app));
+        ResolveInfo app = apps.get(position);
+        holder.name.setText(app.loadLabel(pm));
+        holder.icon.setImageDrawable(app.loadIcon(pm));
+        holder.packageName = app.activityInfo.packageName;
+
+        holder.secondary.setVisibility(View.VISIBLE);
+        holder.view.setBackgroundResource(R.color.grey_white_1000);
 
-        // it shouldn't be possible for prefs.getString to not find the app...use defValue anyway
-        SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(activity);
-        String defValue = settings.getBoolean("autofill_default", true) ? "first" : "never";
         SharedPreferences prefs
                 = activity.getApplicationContext().getSharedPreferences("autofill", Context.MODE_PRIVATE);
-        String preference = prefs.getString(app.packageName, defValue);
+        String preference = prefs.getString(holder.packageName, "");
         switch (preference) {
+            case "":
+                holder.secondary.setVisibility(View.GONE);
+                // "android:windowBackground"
+                holder.view.setBackgroundResource(R.color.indigo_50);
+                break;
             case "first":
-                holder.secondary.setText("Automatically match with password");
+                holder.secondary.setText("Automatically match");
                 break;
             case "never":
-                holder.secondary.setText("Never autofill");
+                holder.secondary.setText("Never match");
                 break;
             default:
                 holder.secondary.setText("Match with " + preference);
                 break;
         }
-        holder.icon.setImageDrawable(pm.getApplicationIcon(app));
-        holder.packageName = app.packageName;
-
-        holder.view.setSelected(selectedItems.contains(position));
     }
 
     @Override
@@ -118,79 +94,13 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecycl
         return apps.size();
     }
 
-    public void add(String packageName) {
-        try {
-            ApplicationInfo app = pm.getApplicationInfo(packageName, 0);
-            this.apps.add(app);
-            notifyItemInserted(apps.size());
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
-
     public int getPosition(String packageName) {
         for (int i = 0; i < apps.size(); i++) {
-            if (apps.get(i).packageName.equals(packageName)) {
+            if (apps.get(i).activityInfo.packageName.equals(packageName)) {
                 return i;
             }
         }
         return -1;
     }
 
-    private ActionMode.Callback actionModeCallback = new ActionMode.Callback() {
-        @Override
-        public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-            mode.getMenuInflater().inflate(R.menu.context_pass, menu);
-            return true;
-        }
-
-        @Override
-        public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
-            return false;
-        }
-
-        @Override
-        public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-            switch (item.getItemId()) {
-                case R.id.menu_delete_password:
-                    // don't ask for confirmation
-                    for (int position : selectedItems) {
-                        remove(position);
-                    }
-                    mode.finish(); // Action picked, so close the CAB
-                    return true;
-                default:
-                    return false;
-            }
-        }
-
-        @Override
-        public void onDestroyActionMode(ActionMode mode) {
-            for (Iterator it = selectedItems.iterator(); it.hasNext();) {
-                // need the setSelected line in onBind
-                notifyItemChanged((Integer) it.next());
-                it.remove();
-            }
-            actionMode = null;
-        }
-    };
-
-    public void remove(int position) {
-        ApplicationInfo applicationInfo = this.apps.get(position);
-        SharedPreferences prefs
-                = activity.getApplicationContext().getSharedPreferences("autofill", Context.MODE_PRIVATE);
-        prefs.edit().remove(applicationInfo.packageName).apply();
-
-        this.apps.remove(position);
-        this.notifyItemRemoved(position);
-    }
-
-    public void toggleSelection(int position, View view) {
-        if (!selectedItems.remove(position)) {
-            selectedItems.add(position);
-            view.setSelected(true);
-        } else {
-            view.setSelected(false);
-        }
-    }
 }
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 bb3b17f2..1b8ff740 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java
@@ -156,8 +156,9 @@ public class AutofillService extends AccessibilityService {
             builder.setNeutralButton("Settings", new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
+                    // the user will have to return to the app themselves.
                     Intent intent = new Intent(AutofillService.this, AutofillPreferenceActivity.class);
-                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                     intent.putExtra("packageName", info.getPackageName());
                     intent.putExtra("appName", appName);
                     startActivity(intent);
diff --git a/app/src/main/res/layout/autofill_recycler_view.xml b/app/src/main/res/layout/autofill_recycler_view.xml
index 836cbcf5..27afa77d 100644
--- a/app/src/main/res/layout/autofill_recycler_view.xml
+++ b/app/src/main/res/layout/autofill_recycler_view.xml
@@ -2,16 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:orientation="vertical"
               android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:focusable="true"
-              android:focusableInTouchMode="true">
-
-    <SearchView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/app_search"
-        android:queryHint="Add an app to change its setting"
-        android:iconifiedByDefault="false"/>
+              android:layout_height="match_parent">
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/autofill_recycler"
diff --git a/app/src/main/res/layout/autofill_row_layout.xml b/app/src/main/res/layout/autofill_row_layout.xml
index 354f9181..190c651f 100644
--- a/app/src/main/res/layout/autofill_row_layout.xml
+++ b/app/src/main/res/layout/autofill_row_layout.xml
@@ -31,15 +31,14 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="App"
                 android:id="@+id/app_name"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceSmall"
-                android:text="The matched file.gpg/Don't ask"
-                android:id="@+id/secondary_text"/>
+                android:id="@+id/secondary_text"
+                android:textColor="@color/grey_600"/>
         </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/fragment_autofill.xml b/app/src/main/res/layout/fragment_autofill.xml
index 6ad44a0d..e5534f41 100644
--- a/app/src/main/res/layout/fragment_autofill.xml
+++ b/app/src/main/res/layout/fragment_autofill.xml
@@ -13,11 +13,18 @@
         android:layout_height="wrap_content"
         android:id="@+id/autofill_radiogroup"
         >
+        <RadioButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Use default setting"
+            android:id="@+id/use_default"
+            android:layout_gravity="center_vertical"
+            android:checked="false"/>
 
         <RadioButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Automatically match with password"
+            android:text="Automatically match"
             android:id="@+id/first"
             android:layout_gravity="center_vertical"
             android:checked="false"/>
@@ -29,7 +36,7 @@
             android:id="@+id/match"
             android:layout_gravity="center_vertical"
             android:checked="false"
-            android:layout_marginTop="8dp"/>
+            />
 
         <EditText
             android:layout_width="match_parent"
@@ -41,11 +48,11 @@
         <RadioButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Never autofill"
+            android:text="Never match"
             android:id="@+id/never"
             android:layout_gravity="center_vertical"
             android:checked="false"
-            android:layout_marginTop="8dp"/>
+            />
 
     </RadioGroup>
 
diff --git a/app/src/main/res/menu/autofill_preference.xml b/app/src/main/res/menu/autofill_preference.xml
new file mode 100644
index 00000000..77ce95f4
--- /dev/null
+++ b/app/src/main/res/menu/autofill_preference.xml
@@ -0,0 +1,12 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:pwstore="http://schemas.android.com/apk/res-auto"
+      xmlns:tools="http://schemas.android.com/tools"
+      tools:context=".pwdstore.autofill.AutofillPreferenceActivity">
+    <item
+        android:id="@+id/action_search"
+        android:icon="@drawable/ic_action_search"
+        android:title="@string/action_search"
+        pwstore:actionViewClass="android.support.v7.widget.SearchView"
+        pwstore:showAsAction="ifRoom|collapseActionView"/>
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
index 44e38916..e8ba80cc 100644
--- a/app/src/main/res/xml/preference.xml
+++ b/app/src/main/res/xml/preference.xml
@@ -79,7 +79,7 @@
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="autofill_default"
-            android:summary="Default to 'Automatically match with password' for apps without custom settings."
+            android:summary="Default to 'Automatically match' for apps without custom settings. Otherwise, 'Never match.'"
             android:title="Automatically match by default"/>
     </PreferenceCategory>
 
-- 
cgit v1.2.3


From ca45e739dadbacfe76ccce3e2c79b308d292061a Mon Sep 17 00:00:00 2001
From: Matthew Wong <wongma@protonmail.ch>
Date: Fri, 14 Aug 2015 00:35:00 -0400
Subject: Async populate the app list

---
 .../autofill/AutofillPreferenceActivity.java       | 64 +++++++++++++++-------
 .../pwdstore/autofill/AutofillRecyclerAdapter.java |  7 ++-
 app/src/main/res/layout/autofill_recycler_view.xml | 18 ++++--
 3 files changed, 62 insertions(+), 27 deletions(-)

(limited to 'app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java')

diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java
index 6f507fa5..788442a0 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java
@@ -4,6 +4,7 @@ import android.app.DialogFragment;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v4.app.NavUtils;
 import android.support.v4.app.TaskStackBuilder;
@@ -14,6 +15,7 @@ import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.SearchView;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 
 import com.zeapo.pwdstore.R;
 
@@ -28,6 +30,8 @@ public class AutofillPreferenceActivity extends AppCompatActivity {
     AutofillRecyclerAdapter recyclerAdapter; // let fragment have access
     private RecyclerView.LayoutManager layoutManager;
 
+    private PackageManager pm;
+
     private boolean recreate;
 
     @Override
@@ -41,27 +45,47 @@ public class AutofillPreferenceActivity extends AppCompatActivity {
         recyclerView.setLayoutManager(layoutManager);
         recyclerView.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL_LIST));
 
-        Intent intent = new Intent(Intent.ACTION_MAIN);
-        intent.addCategory(Intent.CATEGORY_LAUNCHER);
-        List<ResolveInfo> allApps = getPackageManager().queryIntentActivities(intent, 0);
-        final PackageManager pm = getPackageManager();
-        Collections.sort(allApps, new Comparator<ResolveInfo>() {
-            @Override
-            public int compare(ResolveInfo lhs, ResolveInfo rhs) {
-                return lhs.loadLabel(pm).toString().compareTo(rhs.loadLabel(pm).toString());
-            }
-        });
-        recyclerAdapter = new AutofillRecyclerAdapter(new ArrayList<>(allApps), pm, this);
-        recyclerView.setAdapter(recyclerAdapter);
+        pm = getPackageManager();
+
+        new populateTask().execute();
 
         setTitle("Autofill Apps");
+    }
+
+    private class populateTask extends AsyncTask<Void, Void, List<ResolveInfo>> {
+        @Override
+        protected void onPreExecute() {
+            findViewById(R.id.progress_bar).setVisibility(View.VISIBLE);
+        }
 
-        recreate = false;
-        Bundle extras = getIntent().getExtras();
-        if (extras != null) {
-            recreate = true;
-            recyclerView.scrollToPosition(recyclerAdapter.getPosition(extras.getString("packageName")));
-            showDialog(extras.getString("packageName"), extras.getString("appName"));
+        @Override
+        protected List<ResolveInfo> doInBackground(Void... params) {
+            Intent intent = new Intent(Intent.ACTION_MAIN);
+            intent.addCategory(Intent.CATEGORY_LAUNCHER);
+            List<ResolveInfo> allApps = pm.queryIntentActivities(intent, 0);
+            Collections.sort(allApps, new Comparator<ResolveInfo>() {
+                @Override
+                public int compare(ResolveInfo lhs, ResolveInfo rhs) {
+                    return lhs.loadLabel(pm).toString().compareTo(rhs.loadLabel(pm).toString());
+                }
+            });
+            return allApps;
+        }
+
+        @Override
+        protected void onPostExecute(List<ResolveInfo> allApps) {
+            findViewById(R.id.progress_bar).setVisibility(View.GONE);
+
+            recyclerAdapter = new AutofillRecyclerAdapter(new ArrayList<>(allApps), pm, AutofillPreferenceActivity.this);
+            recyclerView.setAdapter(recyclerAdapter);
+
+            recreate = false;
+            Bundle extras = getIntent().getExtras();
+            if (extras != null) {
+                recreate = true;
+                recyclerView.scrollToPosition(recyclerAdapter.getPosition(extras.getString("packageName")));
+                showDialog(extras.getString("packageName"), extras.getString("appName"));
+            }
         }
     }
 
@@ -75,11 +99,12 @@ public class AutofillPreferenceActivity extends AppCompatActivity {
         searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextSubmit(String s) {
-                return true;
+                return false;
             }
 
             @Override
             public boolean onQueryTextChange(String s) {
+                recyclerAdapter.filter(s);
                 return true;
             }
         });
@@ -99,6 +124,7 @@ public class AutofillPreferenceActivity extends AppCompatActivity {
         });
         return super.onCreateOptionsMenu(menu);
     }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
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 7c735f18..485ef288 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
@@ -4,7 +4,6 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.support.v7.view.ActionMode;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -20,7 +19,6 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecycl
     private ArrayList<ResolveInfo> apps;
     private PackageManager pm;
     private AutofillPreferenceActivity activity;
-    private ActionMode actionMode;
 
     public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
         public View view;
@@ -61,7 +59,7 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecycl
     @Override
     public void onBindViewHolder(AutofillRecyclerAdapter.ViewHolder holder, int position) {
         ResolveInfo app = apps.get(position);
-        holder.name.setText(app.loadLabel(pm));
+        holder.name.setText(app.loadLabel(pm)); // 'No package identifier when getting value for resource number 0x00000000' 5+
         holder.icon.setImageDrawable(app.loadIcon(pm));
         holder.packageName = app.activityInfo.packageName;
 
@@ -103,4 +101,7 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecycl
         return -1;
     }
 
+    public void filter(String s) {
+
+    }
 }
diff --git a/app/src/main/res/layout/autofill_recycler_view.xml b/app/src/main/res/layout/autofill_recycler_view.xml
index 27afa77d..4b4bcf26 100644
--- a/app/src/main/res/layout/autofill_recycler_view.xml
+++ b/app/src/main/res/layout/autofill_recycler_view.xml
@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/autofill_recycler"
         android:scrollbars="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
-</LinearLayout>
\ No newline at end of file
+
+    <ProgressBar
+        style="?android:attr/progressBarStyleLarge"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/progress_bar"
+        android:indeterminate="true"
+        android:layout_centerInParent="true"
+        android:visibility="gone"/>
+</RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From b260a19be7172ad34487669a02c3002bc234b3b2 Mon Sep 17 00:00:00 2001
From: Matthew Wong <wongma@protonmail.ch>
Date: Fri, 14 Aug 2015 01:43:40 -0400
Subject: App filtering

---
 .../autofill/AutofillPreferenceActivity.java       | 36 +++++--------------
 .../pwdstore/autofill/AutofillRecyclerAdapter.java | 42 +++++++++++++++++++---
 2 files changed, 46 insertions(+), 32 deletions(-)

(limited to 'app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java')

diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java
index 788442a0..1170d7b7 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java
@@ -19,9 +19,6 @@ import android.view.View;
 
 import com.zeapo.pwdstore.R;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 
 public class AutofillPreferenceActivity extends AppCompatActivity {
@@ -52,31 +49,25 @@ public class AutofillPreferenceActivity extends AppCompatActivity {
         setTitle("Autofill Apps");
     }
 
-    private class populateTask extends AsyncTask<Void, Void, List<ResolveInfo>> {
+    private class populateTask extends AsyncTask<Void, Void, Void> {
         @Override
         protected void onPreExecute() {
             findViewById(R.id.progress_bar).setVisibility(View.VISIBLE);
         }
 
         @Override
-        protected List<ResolveInfo> doInBackground(Void... params) {
+        protected Void doInBackground(Void... params) {
             Intent intent = new Intent(Intent.ACTION_MAIN);
             intent.addCategory(Intent.CATEGORY_LAUNCHER);
             List<ResolveInfo> allApps = pm.queryIntentActivities(intent, 0);
-            Collections.sort(allApps, new Comparator<ResolveInfo>() {
-                @Override
-                public int compare(ResolveInfo lhs, ResolveInfo rhs) {
-                    return lhs.loadLabel(pm).toString().compareTo(rhs.loadLabel(pm).toString());
-                }
-            });
-            return allApps;
+            recyclerAdapter = new AutofillRecyclerAdapter(allApps, pm, AutofillPreferenceActivity.this);
+            return null;
         }
 
         @Override
-        protected void onPostExecute(List<ResolveInfo> allApps) {
+        protected void onPostExecute(Void aVoid) {
             findViewById(R.id.progress_bar).setVisibility(View.GONE);
 
-            recyclerAdapter = new AutofillRecyclerAdapter(new ArrayList<>(allApps), pm, AutofillPreferenceActivity.this);
             recyclerView.setAdapter(recyclerAdapter);
 
             recreate = false;
@@ -104,24 +95,13 @@ public class AutofillPreferenceActivity extends AppCompatActivity {
 
             @Override
             public boolean onQueryTextChange(String s) {
-                recyclerAdapter.filter(s);
+                if (recyclerAdapter != null) {
+                    recyclerAdapter.filter(s);
+                }
                 return true;
             }
         });
 
-        // When using the support library, the setOnActionExpandListener() method is
-        // static and accepts the MenuItem object as an argument
-        MenuItemCompat.setOnActionExpandListener(searchItem, new MenuItemCompat.OnActionExpandListener() {
-            @Override
-            public boolean onMenuItemActionCollapse(MenuItem item) {
-                return true;
-            }
-
-            @Override
-            public boolean onMenuItemActionExpand(MenuItem item) {
-                return true;
-            }
-        });
         return super.onCreateOptionsMenu(menu);
     }
 
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 485ef288..2162b53d 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
@@ -4,7 +4,9 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.support.v7.util.SortedList;
 import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.util.SortedListAdapterCallback;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,9 +16,11 @@ import android.widget.TextView;
 import com.zeapo.pwdstore.R;
 
 import java.util.ArrayList;
+import java.util.List;
 
 public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecyclerAdapter.ViewHolder> {
-    private ArrayList<ResolveInfo> apps;
+    private SortedList<ResolveInfo> apps;
+    private ArrayList<ResolveInfo> allApps;
     private PackageManager pm;
     private AutofillPreferenceActivity activity;
 
@@ -43,8 +47,26 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecycl
 
     }
 
-    public AutofillRecyclerAdapter(ArrayList<ResolveInfo> apps, PackageManager pm, AutofillPreferenceActivity activity) {
-        this.apps = apps;
+    public AutofillRecyclerAdapter(List<ResolveInfo> allApps, final PackageManager pm, AutofillPreferenceActivity activity) {
+         SortedList.Callback<ResolveInfo> callback = new SortedListAdapterCallback<ResolveInfo>(this) {
+            @Override
+            public int compare(ResolveInfo o1, ResolveInfo o2) {
+                return o1.loadLabel(pm).toString().compareTo(o2.loadLabel(pm).toString());
+            }
+
+            @Override
+            public boolean areContentsTheSame(ResolveInfo oldItem, ResolveInfo newItem) {
+                return oldItem.loadLabel(pm).toString().equals(newItem.loadLabel(pm).toString());
+            }
+
+            @Override
+            public boolean areItemsTheSame(ResolveInfo item1, ResolveInfo item2) {
+                return item1.loadLabel(pm).toString().equals(item2.loadLabel(pm).toString());
+            }
+        };
+        this.apps = new SortedList<>(ResolveInfo.class, callback);
+        this.apps.addAll(allApps);
+        this.allApps = new ArrayList<>(allApps);
         this.pm = pm;
         this.activity = activity;
     }
@@ -102,6 +124,18 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecycl
     }
 
     public void filter(String s) {
-
+        if (s.isEmpty()) {
+            apps.addAll(allApps);
+            return;
+        }
+        apps.beginBatchedUpdates();
+        for (ResolveInfo app : allApps) {
+            if (app.loadLabel(pm).toString().toLowerCase().contains(s.toLowerCase())) {
+                apps.add(app);
+            } else {
+                apps.remove(app);
+            }
+        }
+        apps.endBatchedUpdates();
     }
 }
-- 
cgit v1.2.3


From 8388d8530a63d1484607aa83faa27a99adb40f8e Mon Sep 17 00:00:00 2001
From: Matthew Wong <wongma@protonmail.ch>
Date: Fri, 14 Aug 2015 13:31:23 -0400
Subject: Load icons & labels async beforehand as well

---
 .../pwdstore/autofill/AutofillPreferenceActivity.java     | 12 +++++++++++-
 .../zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java  | 15 +++++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

(limited to 'app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java')

diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java
index 1170d7b7..16867bcd 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.java
@@ -4,6 +4,7 @@ import android.app.DialogFragment;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v4.app.NavUtils;
@@ -13,12 +14,14 @@ import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.SearchView;
+import android.util.Pair;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
 import com.zeapo.pwdstore.R;
 
+import java.util.HashMap;
 import java.util.List;
 
 public class AutofillPreferenceActivity extends AppCompatActivity {
@@ -60,7 +63,14 @@ public class AutofillPreferenceActivity extends AppCompatActivity {
             Intent intent = new Intent(Intent.ACTION_MAIN);
             intent.addCategory(Intent.CATEGORY_LAUNCHER);
             List<ResolveInfo> allApps = pm.queryIntentActivities(intent, 0);
-            recyclerAdapter = new AutofillRecyclerAdapter(allApps, pm, AutofillPreferenceActivity.this);
+
+            HashMap<String, Pair<Drawable, String>> iconMap = new HashMap<>(allApps.size());
+            for (ResolveInfo app : allApps) {
+                iconMap.put(app.activityInfo.packageName
+                        , Pair.create(app.loadIcon(pm), app.loadLabel(pm).toString()));
+            }
+
+            recyclerAdapter = new AutofillRecyclerAdapter(allApps, iconMap, pm, AutofillPreferenceActivity.this);
             return null;
         }
 
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 2162b53d..01916650 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
@@ -4,9 +4,11 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.graphics.drawable.Drawable;
 import android.support.v7.util.SortedList;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.util.SortedListAdapterCallback;
+import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -16,11 +18,13 @@ import android.widget.TextView;
 import com.zeapo.pwdstore.R;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecyclerAdapter.ViewHolder> {
     private SortedList<ResolveInfo> apps;
     private ArrayList<ResolveInfo> allApps;
+    private HashMap<String, Pair<Drawable, String>> iconMap;
     private PackageManager pm;
     private AutofillPreferenceActivity activity;
 
@@ -47,11 +51,12 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecycl
 
     }
 
-    public AutofillRecyclerAdapter(List<ResolveInfo> allApps, final PackageManager pm, AutofillPreferenceActivity activity) {
+    public AutofillRecyclerAdapter(List<ResolveInfo> allApps, HashMap<String, Pair<Drawable, String>> iconMap
+            , final PackageManager pm, AutofillPreferenceActivity activity) {
          SortedList.Callback<ResolveInfo> callback = new SortedListAdapterCallback<ResolveInfo>(this) {
             @Override
             public int compare(ResolveInfo o1, ResolveInfo o2) {
-                return o1.loadLabel(pm).toString().compareTo(o2.loadLabel(pm).toString());
+                return o1.loadLabel(pm).toString().toLowerCase().compareTo(o2.loadLabel(pm).toString().toLowerCase());
             }
 
             @Override
@@ -67,6 +72,7 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecycl
         this.apps = new SortedList<>(ResolveInfo.class, callback);
         this.apps.addAll(allApps);
         this.allApps = new ArrayList<>(allApps);
+        this.iconMap = new HashMap<>(iconMap);
         this.pm = pm;
         this.activity = activity;
     }
@@ -81,10 +87,11 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecycl
     @Override
     public void onBindViewHolder(AutofillRecyclerAdapter.ViewHolder holder, int position) {
         ResolveInfo app = apps.get(position);
-        holder.name.setText(app.loadLabel(pm)); // 'No package identifier when getting value for resource number 0x00000000' 5+
-        holder.icon.setImageDrawable(app.loadIcon(pm));
         holder.packageName = app.activityInfo.packageName;
 
+        holder.icon.setImageDrawable(iconMap.get(holder.packageName).first);
+        holder.name.setText(iconMap.get(holder.packageName).second);
+
         holder.secondary.setVisibility(View.VISIBLE);
         holder.view.setBackgroundResource(R.color.grey_white_1000);
 
-- 
cgit v1.2.3


From ebe1f831e7659b63b76c2b39498b68d1fec61673 Mon Sep 17 00:00:00 2001
From: Matthew Wong <wongma@protonmail.ch>
Date: Fri, 14 Aug 2015 16:51:39 -0400
Subject: strings & enable service preference

---
 .../java/com/zeapo/pwdstore/UserPreference.java    | 51 +++++++++++++++++++++-
 .../zeapo/pwdstore/autofill/AutofillFragment.java  |  5 ++-
 .../pwdstore/autofill/AutofillRecyclerAdapter.java |  4 +-
 .../zeapo/pwdstore/autofill/AutofillService.java   |  6 +--
 app/src/main/res/layout/autofill_row_layout.xml    |  2 -
 app/src/main/res/layout/fragment_autofill.xml      |  8 ++--
 app/src/main/res/values-cs/strings.xml             |  2 +-
 app/src/main/res/values/strings.xml                | 15 ++++++-
 app/src/main/res/xml/preference.xml                | 14 +++---
 9 files changed, 85 insertions(+), 22 deletions(-)

(limited to 'app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java')

diff --git a/app/src/main/java/com/zeapo/pwdstore/UserPreference.java b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java
index cb2d2881..283d5f47 100644
--- a/app/src/main/java/com/zeapo/pwdstore/UserPreference.java
+++ b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java
@@ -1,17 +1,22 @@
 package com.zeapo.pwdstore;
 
-import android.app.AlertDialog;
+import android.accessibilityservice.AccessibilityServiceInfo;
 import android.app.DialogFragment;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
+import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
+import android.provider.Settings;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
+import android.view.accessibility.AccessibilityManager;
 import android.widget.Toast;
 
 import com.google.common.base.Function;
@@ -33,6 +38,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 public class UserPreference extends AppCompatActivity {
@@ -192,6 +198,30 @@ public class UserPreference extends AppCompatActivity {
                     return true;
                 }
             });
+
+            findPreference("autofill_enable").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+                @Override
+                public boolean onPreferenceClick(Preference preference) {
+                    new AlertDialog.Builder(callingActivity).
+                            setTitle(R.string.pref_autofill_enable_title).
+                            setMessage(R.string.pref_autofill_enable_msg).
+                            setPositiveButton(R.string.dialog_ok, new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    Intent intent = new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS);
+                                    startActivity(intent);
+                                }
+                            }).
+                            setNegativeButton(R.string.dialog_cancel,new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    ((CheckBoxPreference) findPreference("autofill_enable"))
+                                            .setChecked(((UserPreference) getActivity()).isServiceEnabled());
+                                }
+                            }).show();
+                    return false;
+                }
+            });
         }
 
         @Override
@@ -199,6 +229,10 @@ public class UserPreference extends AppCompatActivity {
             super.onStart();
             final SharedPreferences sharedPreferences = getPreferenceManager().getSharedPreferences();
             findPreference("ssh_see_key").setEnabled(sharedPreferences.getBoolean("use_generated_key", false));
+
+            // see if the autofill service is enabled and check the preference accordingly
+            ((CheckBoxPreference) findPreference("autofill_enable"))
+                    .setChecked(((UserPreference) getActivity()).isServiceEnabled());
         }
     }
 
@@ -278,6 +312,21 @@ public class UserPreference extends AppCompatActivity {
         sshKey.close();
     }
 
+    // Returns whether the autofill service is enabled
+    private boolean isServiceEnabled() {
+        AccessibilityManager am = (AccessibilityManager) this
+                .getSystemService(Context.ACCESSIBILITY_SERVICE);
+        List<AccessibilityServiceInfo> runningServices = am
+                .getEnabledAccessibilityServiceList(AccessibilityServiceInfo.FEEDBACK_GENERIC);
+        for (AccessibilityServiceInfo service : runningServices) {
+            if ("com.zeapo.pwdstore/.autofill.AutofillService".equals(service.getId())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
     protected void onActivityResult(int requestCode, int resultCode,
                                     Intent data) {
         if (resultCode == RESULT_OK) {
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 c2a30ffe..8cf58206 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillFragment.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillFragment.java
@@ -68,6 +68,7 @@ public class AutofillFragment extends DialogFragment {
         View.OnClickListener matchPassword = new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                ((RadioButton) view.findViewById(R.id.match)).toggle();
                 Intent intent = new Intent(getActivity(), PasswordStore.class);
                 intent.putExtra("matchWith", true);
                 startActivityForResult(intent, MATCH_WITH);
@@ -77,7 +78,7 @@ public class AutofillFragment extends DialogFragment {
         view.findViewById(R.id.matched).setOnClickListener(matchPassword);
 
         final SharedPreferences.Editor editor = prefs.edit();
-        builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
+        builder.setPositiveButton(R.string.dialog_ok, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 RadioGroup radioGroup = (RadioGroup) view.findViewById(R.id.autofill_radiogroup);
@@ -105,7 +106,7 @@ public class AutofillFragment extends DialogFragment {
                 }
             }
         });
-        builder.setNegativeButton("Cancel", null);
+        builder.setNegativeButton(R.string.dialog_cancel, null);
         return builder.create();
     }
 
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 01916650..8971c0af 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java
@@ -105,10 +105,10 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecycl
                 holder.view.setBackgroundResource(R.color.indigo_50);
                 break;
             case "first":
-                holder.secondary.setText("Automatically match");
+                holder.secondary.setText(R.string.autofill_apps_first);
                 break;
             case "never":
-                holder.secondary.setText("Never match");
+                holder.secondary.setText(R.string.autofill_apps_never);
                 break;
             default:
                 holder.secondary.setText("Match with " + preference);
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 1e64e8c8..cd318394 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java
@@ -152,8 +152,8 @@ public class AutofillService extends AccessibilityService {
 
         if (dialog == null) {
             AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.Theme_AppCompat_Dialog);
-            builder.setNegativeButton("Cancel", null);
-            builder.setPositiveButton("Fill", new DialogInterface.OnClickListener() {
+            builder.setNegativeButton(R.string.dialog_cancel, null);
+            builder.setPositiveButton(R.string.autofill_fill, new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
                     decryptAndVerify();
@@ -161,7 +161,7 @@ public class AutofillService extends AccessibilityService {
             });
             builder.setNeutralButton("Settings", new DialogInterface.OnClickListener() {
                 @Override
-                public void onClick(DialogInterface dialog, int which) {
+                public void onClick(DialogInterface dialog, int which) {    //TODO make icon? gear?
                     // the user will have to return to the app themselves.
                     Intent intent = new Intent(AutofillService.this, AutofillPreferenceActivity.class);
                     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
diff --git a/app/src/main/res/layout/autofill_row_layout.xml b/app/src/main/res/layout/autofill_row_layout.xml
index 190c651f..6e51fab3 100644
--- a/app/src/main/res/layout/autofill_row_layout.xml
+++ b/app/src/main/res/layout/autofill_row_layout.xml
@@ -20,7 +20,6 @@
             android:id="@+id/app_icon"
             />
 
-
         <LinearLayout
             android:orientation="vertical"
             android:layout_width="wrap_content"
@@ -41,7 +40,6 @@
                 android:textColor="@color/grey_600"/>
         </LinearLayout>
 
-
     </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/fragment_autofill.xml b/app/src/main/res/layout/fragment_autofill.xml
index e5534f41..af2b7017 100644
--- a/app/src/main/res/layout/fragment_autofill.xml
+++ b/app/src/main/res/layout/fragment_autofill.xml
@@ -16,7 +16,7 @@
         <RadioButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Use default setting"
+            android:text="@string/autofill_apps_default"
             android:id="@+id/use_default"
             android:layout_gravity="center_vertical"
             android:checked="false"/>
@@ -24,7 +24,7 @@
         <RadioButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Automatically match"
+            android:text="@string/autofill_apps_first"
             android:id="@+id/first"
             android:layout_gravity="center_vertical"
             android:checked="false"/>
@@ -32,7 +32,7 @@
         <RadioButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Match with..."
+            android:text="@string/autofill_apps_match_ellipsis"
             android:id="@+id/match"
             android:layout_gravity="center_vertical"
             android:checked="false"
@@ -48,7 +48,7 @@
         <RadioButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Never match"
+            android:text="@string/autofill_apps_never"
             android:id="@+id/never"
             android:layout_gravity="center_vertical"
             android:checked="false"
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 309ff2d6..8d97f2ef 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -116,8 +116,8 @@
     <string name="ssh_key_error_dialog_text">Zpráva : \n</string>
     <string name="pref_recursive_filter">Rekurzivní filtrování</string>
     <string name="pref_recursive_filter_hint">Rekurzivní hledání hesel v aktuálním adresáři.</string>
+    <string name="pref_clear_clipboard_title">Zaplnit schránku 20krát</string>
     <string name="pref_clear_clipboard_hint">Uložit dvacet náhodných textů do schránky namísto pouze jednoho. Užitečné pro telefony Samsug, které nabízejí funkci historie schránky.</string>
-    <string name="pref_clear_clipboard">Zaplnit schránku 20krát</string>
 
     <!-- pwgen fragment -->
     <string name="pwgen_generate">Generovat</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fa5358e2..447139fb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -117,8 +117,14 @@
     <string name="ssh_key_error_dialog_text">Message : \n</string>
     <string name="pref_recursive_filter">Recursive filtering</string>
     <string name="pref_recursive_filter_hint">Recursively find passwords of the current directory.</string>
+    <string name="pref_autofill_enable_title">Enable autofill</string>
+    <string name="pref_autofill_enable_msg">Tap OK to go to Accessibility settings. Once there, tap Password Store under Services then tap the switch in the top right to turn it on or off.</string>
+    <string name="pref_autofill_apps_title">Per-app settings</string>
+    <string name="pref_autofill_apps_hint">Customize autofill settings for specific apps.</string>
+    <string name="pref_autofill_default_title">Automatically match by default</string>
+    <string name="pref_autofill_default_hint">Default to \'Automatically match\' for apps without custom settings. Otherwise, \'Never match.\'</string>
+    <string name="pref_clear_clipboard_title">Clear clipboard 20 times</string>
     <string name="pref_clear_clipboard_hint">Store nonsense in the clipboard 20 times instead of just once. Useful on Samsung phones that feature clipboard history.</string>
-    <string name="pref_clear_clipboard">Clear clipboard 20 times</string>
 
     <!-- pwgen fragment -->
     <string name="pwgen_generate">Generate</string>
@@ -155,5 +161,10 @@
     <string name="category_string">"Category: "</string>
 
     <!-- Autofill -->
-    <string name="autofill_description">Auto-fills password fields in apps. Only works for Android versions 4.3 and up. Does not rely on the clipboard for Android versions 5.0 and up.</string>
+    <string name="autofill_description">Autofills password fields in apps. Only works for Android versions 4.3 and up. Does not rely on the clipboard for Android versions 5.0 and up.</string>
+    <string name="autofill_fill">Fill</string>
+    <string name="autofill_apps_default">Use default setting</string>
+    <string name="autofill_apps_first">Automatically match</string>
+    <string name="autofill_apps_match_ellipsis">Match with…</string>
+    <string name="autofill_apps_never">Never match</string>
 </resources>
diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
index e8ba80cc..1c977992 100644
--- a/app/src/main/res/xml/preference.xml
+++ b/app/src/main/res/xml/preference.xml
@@ -72,15 +72,19 @@
     </PreferenceCategory>
 
     <PreferenceCategory android:title="Autofill">
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="autofill_enable"
+            android:title="@string/pref_autofill_enable_title"/>
         <Preference
             android:key="autofill_apps"
-            android:summary="Customize autofill settings for specific apps."
-            android:title="Per-app settings"/>
+            android:summary="@string/pref_autofill_apps_hint"
+            android:title="@string/pref_autofill_apps_title"/>
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="autofill_default"
-            android:summary="Default to 'Automatically match' for apps without custom settings. Otherwise, 'Never match.'"
-            android:title="Automatically match by default"/>
+            android:summary="@string/pref_autofill_default_hint"
+            android:title="@string/pref_autofill_default_title"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="Misc">
@@ -88,6 +92,6 @@
             android:defaultValue="false"
             android:key="clear_clipboard_20x"
             android:summary="@string/pref_clear_clipboard_hint"
-            android:title="@string/pref_clear_clipboard" />
+            android:title="@string/pref_clear_clipboard_title" />
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
-- 
cgit v1.2.3


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/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java')

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