From 4a6901b30928291ed0a09359a3506dce68633aeb Mon Sep 17 00:00:00 2001
From: Matthew Wong <wongma7@outlook.com>
Date: Thu, 5 Nov 2015 22:59:17 -0500
Subject: Separate service & main process since service should be always
 running by itself

---
 app/src/main/AndroidManifest.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/src/main/AndroidManifest.xml')

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0789fd33..bc15eb08 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,7 +46,8 @@
 		</activity>
 
 		<service android:name=".autofill.AutofillService"
-				 android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+			android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
+			android:process=":background">
 			<intent-filter>
 				<action android:name="android.accessibilityservice.AccessibilityService" />
 			</intent-filter>
-- 
cgit v1.2.3


From 72e32c95f6fffca62ebb4312e2730042e552ed92 Mon Sep 17 00:00:00 2001
From: Matthew Wong <wongma@protonmail.ch>
Date: Sat, 7 Nov 2015 10:50:42 -0500
Subject: undo process change. (not a simple change, sharedpreferences don't
 work)

---
 app/src/main/AndroidManifest.xml                                  | 3 +--
 .../main/java/com/zeapo/pwdstore/autofill/AutofillService.java    | 8 +++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'app/src/main/AndroidManifest.xml')

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bc15eb08..67502faa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,8 +46,7 @@
 		</activity>
 
 		<service android:name=".autofill.AutofillService"
-			android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
-			android:process=":background">
+			android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
 			<intent-filter>
 				<action android:name="android.accessibilityservice.AccessibilityService" />
 			</intent-filter>
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 e694dfa4..365c48df 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java
@@ -230,7 +230,13 @@ public class AutofillService extends AccessibilityService {
 
     private void showDialog(final String appName) {
         AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.Theme_AppCompat_Dialog);
-        builder.setNegativeButton(R.string.dialog_cancel, null);
+        builder.setNegativeButton(R.string.dialog_cancel, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface d, int which) {
+                dialog.dismiss();
+                dialog = null;
+            }
+        });
         builder.setPositiveButton(R.string.autofill_fill, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
-- 
cgit v1.2.3