autofill fixes

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;
             }
 

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);