From d067de086d31480578c88fd8675a1a22dd4808e1 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 2 Feb 2017 23:36:40 -0500
Subject: [PATCH] autofill fixes

---
 src/Android/AutofillActivity.cs | 13 +++++++++++++
 src/Android/AutofillService.cs  |  8 +++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/Android/AutofillActivity.cs b/src/Android/AutofillActivity.cs
index 5bea00240..e9688df02 100644
--- a/src/Android/AutofillActivity.cs
+++ b/src/Android/AutofillActivity.cs
@@ -33,6 +33,18 @@ namespace Bit.Android
             base.OnDestroy();
         }
 
+        protected override void OnResume()
+        {
+            base.OnResume();
+            if(!Intent.HasExtra("uri"))
+            {
+                Finish();
+                return;
+            }
+
+            Intent.RemoveExtra("uri");
+        }
+
         protected override void OnActivityResult(int requestCode, [GeneratedEnum] Result resultCode, Intent data)
         {
             base.OnActivityResult(requestCode, resultCode, data);
@@ -79,6 +91,7 @@ namespace Bit.Android
             _lastQueriedUri = callingIntent?.GetStringExtra("uri");
             if(_lastQueriedUri == null)
             {
+                Finish();
                 return;
             }
 
diff --git a/src/Android/AutofillService.cs b/src/Android/AutofillService.cs
index a047e2e70..99e1d870b 100644
--- a/src/Android/AutofillService.cs
+++ b/src/Android/AutofillService.cs
@@ -55,7 +55,7 @@ namespace Bit.Android
             var eventType = e.EventType;
             var packageName = e.PackageName;
 
-            if(packageName == SystemUiPackage || packageName == BitwardenPackage)
+            if(packageName == SystemUiPackage)
             {
                 return;
             }
@@ -64,6 +64,12 @@ namespace Bit.Android
             {
                 case EventTypes.WindowContentChanged:
                 case EventTypes.WindowStateChanged:
+                    if(packageName == BitwardenPackage)
+                    {
+                        CancelNotification();
+                        break;
+                    }
+
                     var cancelNotification = true;
                     var root = RootInActiveWindow;
                     var passwordNodes = GetWindowNodes(root, e, n => n.Password);