Fix settings and add "pick and match" option

1 files changed, 50 insertions, 4 deletions

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 0f184bb7..2ddcfa02 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillActivity.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillActivity.java
@@ -1,18 +1,27 @@
 package com.zeapo.pwdstore.autofill;
 
 import android.app.PendingIntent;
+import android.content.Context;
 import android.content.Intent;
 import android.content.IntentSender;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 
 import com.zeapo.pwdstore.PasswordStore;
 
+import org.eclipse.jgit.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 // blank activity started by service for calling startIntentSenderForResult
 public class AutofillActivity extends AppCompatActivity {
     public static final int REQUEST_CODE_DECRYPT_AND_VERIFY = 9913;
-    public static final int REQUEST_CODE_MATCH_WITH = 777;
+    public static final int REQUEST_CODE_PICK = 777;
+    public static final int REQUEST_CODE_PICK_MATCH_WITH = 778;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -30,10 +39,14 @@ public class AutofillActivity extends AppCompatActivity {
             } catch (IntentSender.SendIntentException e) {
                 Log.e(AutofillService.Constants.TAG, "SendIntentException", e);
             }
-        } else if (extras != null && extras.containsKey("matchWith")) {
+        } else if (extras != null && extras.containsKey("pick")) {
+            Intent intent = new Intent(getApplicationContext(), PasswordStore.class);
+            intent.putExtra("matchWith", true);
+            startActivityForResult(intent, REQUEST_CODE_PICK);
+        } else if (extras != null && extras.containsKey("pickMatchWith")) {
             Intent intent = new Intent(getApplicationContext(), PasswordStore.class);
             intent.putExtra("matchWith", true);
-            startActivityForResult(intent, REQUEST_CODE_MATCH_WITH);
+            startActivityForResult(intent, REQUEST_CODE_PICK_MATCH_WITH);
         }
     }
 
@@ -46,10 +59,43 @@ public class AutofillActivity extends AppCompatActivity {
                     AutofillService.getInstance().setResultData(data);    // report the result to service
                 }
                 break;
-            case REQUEST_CODE_MATCH_WITH:
+            case REQUEST_CODE_PICK:
                 if (resultCode == RESULT_OK) {
                     AutofillService.getInstance().setPickedPassword(data.getStringExtra("path"));
                 }
+                break;
+            case REQUEST_CODE_PICK_MATCH_WITH:
+                if (resultCode == RESULT_OK) {
+                    Bundle extras = getIntent().getExtras();
+                    String packageName = extras.getString("packageName");
+                    boolean isWeb = extras.getBoolean("isWeb");
+
+                    String path = data.getStringExtra("path");
+                    AutofillService.getInstance().setPickedPassword(data.getStringExtra("path"));
+
+                    SharedPreferences prefs;
+                    if (!isWeb) {
+                        prefs = getApplicationContext().getSharedPreferences("autofill", Context.MODE_PRIVATE);
+                    } else {
+                        prefs = getApplicationContext().getSharedPreferences("autofill_web", Context.MODE_PRIVATE);
+                    }
+                    SharedPreferences.Editor editor = prefs.edit();
+                    String preference = prefs.getString(packageName, "");
+                    switch (preference) {
+                        case "":
+                        case "/first":
+                        case "/never":
+                            editor.putString(packageName, path);
+                            break;
+                        default:
+                            List<String> matches = new ArrayList<>(Arrays.asList(preference.trim().split("\n")));
+                            matches.add(path);
+                            String paths = StringUtils.join(matches, "\n");
+                            editor.putString(packageName, paths);
+                    }
+                    editor.apply();
+                }
+                break;
         }
     }
 }