Enforce Passphrase Policy (#772)

* Enforce passphrase policy

* Update multi-line conditional formatting

* Updated formatting round 2

Co-authored-by: Vincent Salucci <vsalucci@bitwarden.com>

.editorconfig

@@ -1,3 +1,112 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Don't use tabs for indentation.
+[*]
+indent_style = space
+# (Please don't specify an indent_size here; that has too many unintended consequences.)
+
+# Code files
+[*.{cs,csx,vb,vbx}]
+indent_size = 4
+insert_final_newline = true
+charset = utf-8-bom
+
+# Xml project files
+[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
+indent_size = 2
+
+# Xml config files
+[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
+indent_size = 2
+
+# JSON files
+[*.json]
+indent_size = 2
+
+# Dotnet code style settings:
+[*.{cs,vb}]
+# Sort using and Import directives with System.* appearing first
+dotnet_sort_system_directives_first = true
+# Avoid "this." and "Me." if not necessary
+dotnet_style_qualification_for_field = false:suggestion
+dotnet_style_qualification_for_property = false:suggestion
+dotnet_style_qualification_for_method = false:suggestion
+dotnet_style_qualification_for_event = false:suggestion
+
+# Use language keywords instead of framework type names for type references
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+dotnet_style_predefined_type_for_member_access = true:suggestion
+
+# Suggest more modern language features when available
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_explicit_tuple_names = true:suggestion
+
+# Prefix private members with underscore
+dotnet_naming_rule.private_members_with_underscore.symbols = private_members
+dotnet_naming_rule.private_members_with_underscore.style = underscore_prefix
+dotnet_naming_rule.private_members_with_underscore.severity = suggestion
+
+dotnet_naming_symbols.private_members.applicable_kinds = field
+dotnet_naming_symbols.private_members.applicable_accessibilities = private
+dotnet_naming_symbols.private_members.required_modifiers = readonly
+
+dotnet_naming_style.underscore_prefix.capitalization = camel_case
+dotnet_naming_style.underscore_prefix.required_prefix = _
+dotnet_naming_style.underscore_prefix.required_suffix = 
+dotnet_naming_style.underscore_prefix.word_separator = 
+
+# Async methods should have "Async" suffix
+dotnet_naming_rule.async_methods_end_in_async.symbols = any_async_methods
+dotnet_naming_rule.async_methods_end_in_async.style = end_in_async
+dotnet_naming_rule.async_methods_end_in_async.severity = suggestion
+
+dotnet_naming_symbols.any_async_methods.applicable_kinds = method
+dotnet_naming_symbols.any_async_methods.applicable_accessibilities = *
+dotnet_naming_symbols.any_async_methods.required_modifiers = async
+
+dotnet_naming_style.end_in_async.required_prefix = 
+dotnet_naming_style.end_in_async.required_suffix = Async
+dotnet_naming_style.end_in_async.capitalization = pascal_case
+dotnet_naming_style.end_in_async.word_separator = 
+
+# CSharp code style settings:
+[*.cs]
+# Prefer "var" everywhere
+csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_when_type_is_apparent = true:suggestion
+csharp_style_var_elsewhere = true:suggestion
+
+# Prefer method-like constructs to have a expression-body
+csharp_style_expression_bodied_methods = true:none
+csharp_style_expression_bodied_constructors = true:none
+csharp_style_expression_bodied_operators = true:none
+
+# Prefer property-like constructs to have an expression-body
+csharp_style_expression_bodied_properties = true:none
+csharp_style_expression_bodied_indexers = true:none
+csharp_style_expression_bodied_accessors = true:none
+
+# Suggest more modern language features when available
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+csharp_style_throw_expression = true:suggestion
+csharp_style_conditional_delegate_call = true:suggestion
+
+# Newline settings
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
+
 # All files
 [*]
-guidelines = 120
+guidelines = 120

ISSUE_TEMPLATE.md

@@ -1,5 +1,53 @@
-<!--
+<!-- Comment:
 Please do not submit feature requests. The [Community Forums][1] has a
 section for submitting, voting for, and discussing product feature requests.
 [1]: https://community.bitwarden.com
 -->
+
+## Describe the Bug
+
+<!-- Comment:
+A clear and concise description of what the bug is.
+-->
+
+## Steps To Reproduce
+
+<!-- Comment:
+How can we reproduce the behavior:
+-->
+
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. Click on '...'
+
+## Expected Result
+
+<!-- Comment:
+A clear and concise description of what you expected to happen.
+-->
+
+## Actual Result
+
+<!-- Comment:
+A clear and concise description of what is happening.
+-->
+
+## Screenshots or Videos
+
+<!-- Comment:
+If applicable, add screenshots and/or a short video to help explain your problem.
+-->
+
+## Environment
+
+- Device: [e.g. iPhone6]
+- Operating system: [e.g. iOS 8.1]
+- Build Version (go to "Settings" → "About" in the app): [e.g. 2.3.0 (2221)]
+- Is this a Beta release? [Y/N]
+
+## Additional Context
+
+<!-- Comment:
+Add any other context about the problem here.
+-->

appveyor.yml

@@ -1,5 +1,5 @@
 image:
-- Visual Studio 2017
+- Visual Studio 2019 Preview
 - Ubuntu1804
 
 branches:
@@ -95,7 +95,9 @@ build_script:
       msbuild bitwarden-mobile.sln `
         "/logger:C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" `
         "/p:Configuration=Release"
+      if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
       .\src\Android\ci-build-apks.ps1
+      if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
       Push-AppveyorArtifact .\com.x8bit.bitwarden.apk
       Push-AppveyorArtifact .\com.x8bit.bitwarden-fdroid.apk
     }

bitwarden-mobile.sln

@@ -21,6 +21,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "google", "google", "{2E3996
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{76690DFB-B7F4-4781-83E4-113FDC450AFE}"
 	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
 		.gitignore = .gitignore
 		appveyor.yml = appveyor.yml
 		CONTRIBUTING.md = CONTRIBUTING.md

package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "bitwarden-fdroid",
+  "name": "bitwarden-mobile",
   "version": "0.0.0",
   "lockfileVersion": 1,
   "requires": true,
@@ -196,9 +196,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.11",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
       "dev": true
     },
     "minimatch": {

src/Android/Accessibility/AccessibilityHelpers.cs

@@ -1,9 +1,17 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Android.Content;
+using Android.Content.Res;
+using Android.Graphics;
 using Android.OS;
+using Android.Provider;
+using Android.Views;
 using Android.Views.Accessibility;
+using Android.Widget;
+using Bit.App.Resources;
 using Bit.Core;
+using Plugin.CurrentActivity;
 
 namespace Bit.Droid.Accessibility
 {
@@ -32,7 +40,7 @@ namespace Bit.Droid.Accessibility
             new Browser("org.iron.srware", "url_bar"),
             new Browser("com.sec.android.app.sbrowser", "location_bar_edit_text"),
             new Browser("com.sec.android.app.sbrowser.beta", "location_bar_edit_text"),
-            new Browser("com.yandex.browser", "bro_omnibar_address_title_text",
+            new Browser("com.yandex.browser", "bro_omnibar_address_title_text,bro_omnibox_collapsed_title",
                 (s) => s.Split(new char[]{' ', ' '}).FirstOrDefault()), // 0 = Regular Space, 1 = No-break space (00A0)
             new Browser("org.mozilla.firefox", "url_bar_title"),
             new Browser("org.mozilla.firefox_beta", "url_bar_title"),
@@ -63,6 +71,11 @@ namespace Bit.Droid.Accessibility
             new Browser("com.kiwibrowser.browser", "url_bar"),
             new Browser("com.ecosia.android", "url_bar"),
             new Browser("com.qwant.liberty", "url_bar_title"),
+            new Browser("jp.co.fenrir.android.sleipnir", "url_text"),
+            new Browser("jp.co.fenrir.android.sleipnir_black", "url_text"),
+            new Browser("jp.co.fenrir.android.sleipnir_test", "url_text"),
+            new Browser("com.vivaldi.browser", "url_bar"),
+            new Browser("com.feedback.browser.wjbrowser", "addressbar_url"),
         }.ToDictionary(n => n.PackageName);
 
         // Known packages to skip
@@ -82,13 +95,18 @@ namespace Bit.Droid.Accessibility
             "com.teslacoilsw.launcher.prime",
             "is.shortcut",
             "me.craftsapp.nlauncher",
-            "com.ss.squarehome2"
+            "com.ss.squarehome2",
+            "com.treydev.pns"
         };
 
         public static void PrintTestData(AccessibilityNodeInfo root, AccessibilityEvent e)
         {
             var testNodes = GetWindowNodes(root, e, n => n.ViewIdResourceName != null && n.Text != null, false);
             var testNodesData = testNodes.Select(n => new { id = n.ViewIdResourceName, text = n.Text });
+            foreach(var node in testNodesData)
+            {
+                System.Diagnostics.Debug.WriteLine("Node: {0} = {1}", node.id, node.text);
+            }
         }
 
         public static string GetUri(AccessibilityNodeInfo root)
@@ -97,12 +115,27 @@ namespace Bit.Droid.Accessibility
             if(SupportedBrowsers.ContainsKey(root.PackageName))
             {
                 var browser = SupportedBrowsers[root.PackageName];
-                var addressNode = root.FindAccessibilityNodeInfosByViewId(
-                    $"{root.PackageName}:id/{browser.UriViewId}").FirstOrDefault();
+                AccessibilityNodeInfo addressNode = null;
+                foreach(var uriViewId in browser.UriViewId.Split(","))
+                {
+                    addressNode = root.FindAccessibilityNodeInfosByViewId(
+                        $"{root.PackageName}:id/{uriViewId}").FirstOrDefault();
+                    if(addressNode != null)
+                    {
+                        break;
+                    }
+                }
+
                 if(addressNode != null)
                 {
                     uri = ExtractUri(uri, addressNode, browser);
-                    addressNode.Dispose();
+                    addressNode.Recycle();
+                }
+                else
+                {
+                    // Return null to prevent overwriting notification pendingIntent uri with browser packageName
+                    // (we login to pages, not browsers)
+                    return null;
                 }
             }
             return uri;
@@ -163,7 +196,6 @@ namespace Bit.Droid.Accessibility
             return n?.ClassName?.Contains("EditText") ?? false;
         }
 
-
         public static void FillCredentials(AccessibilityNodeInfo usernameNode,
             IEnumerable<AccessibilityNodeInfo> passwordNodes)
         {
@@ -194,7 +226,7 @@ namespace Bit.Droid.Accessibility
                 nodes = new NodeList();
             }
             var dispose = disposeIfUnused;
-            if(n != null && recursionDepth < 50)
+            if(n != null && recursionDepth < 100)
             {
                 var add = n.WindowId == e.WindowId &&
                     !(n.ViewIdResourceName?.StartsWith(SystemUiPackage) ?? false) &&
@@ -208,7 +240,11 @@ namespace Bit.Droid.Accessibility
                 for(var i = 0; i < n.ChildCount; i++)
                 {
                     var childNode = n.GetChild(i);
-                    if(i > 100)
+                    if(childNode == null)
+                    {
+                        continue;
+                    }
+                    else if(i > 100)
                     {
                         Android.Util.Log.Info(BitwardenTag, "Too many child iterations.");
                         break;
@@ -225,6 +261,7 @@ namespace Bit.Droid.Accessibility
             }
             if(dispose)
             {
+                n?.Recycle();
                 n?.Dispose();
             }
             return nodes;
@@ -234,15 +271,274 @@ namespace Bit.Droid.Accessibility
             IEnumerable<AccessibilityNodeInfo> passwordNodes)
         {
             var allEditTexts = GetWindowNodes(root, e, n => EditText(n), false);
-            var usernameEditText = GetUsernameEditText(allEditTexts);
+            var usernameEditText = GetUsernameEditTextIfPasswordExists(allEditTexts);
             FillCredentials(usernameEditText, passwordNodes);
             allEditTexts.Dispose();
             usernameEditText = null;
         }
 
-        public static AccessibilityNodeInfo GetUsernameEditText(IEnumerable<AccessibilityNodeInfo> allEditTexts)
+        public static AccessibilityNodeInfo GetUsernameEditTextIfPasswordExists(
+            IEnumerable<AccessibilityNodeInfo> allEditTexts)
         {
-            return allEditTexts.TakeWhile(n => !n.Password).LastOrDefault();
+            AccessibilityNodeInfo previousEditText = null;
+            foreach(var editText in allEditTexts)
+            {
+                if(editText.Password)
+                {
+                    return previousEditText;
+                }
+                previousEditText = editText;
+            }
+            return null;
+        }
+
+        public static bool IsUsernameEditText(AccessibilityNodeInfo root, AccessibilityEvent e)
+        {
+            var allEditTexts = GetWindowNodes(root, e, n => EditText(n), false);
+            var usernameEditText = GetUsernameEditTextIfPasswordExists(allEditTexts);
+
+            var isUsernameEditText = false;
+            if(usernameEditText != null)
+            {
+                isUsernameEditText = IsSameNode(usernameEditText, e.Source);
+            }
+            allEditTexts.Dispose();
+
+            return isUsernameEditText;
+        }
+
+        public static bool IsSameNode(AccessibilityNodeInfo node1, AccessibilityNodeInfo node2)
+        {
+            if(node1 != null && node2 != null)
+            {
+                return node1.Equals(node2) || node1.GetHashCode() == node2.GetHashCode();
+            }
+            return false;
+        }
+
+        public static bool OverlayPermitted()
+        {
+            if(Build.VERSION.SdkInt >= BuildVersionCodes.M)
+            {
+                return Settings.CanDrawOverlays(Android.App.Application.Context);
+            }
+            else
+            {
+                // TODO do older android versions require a check?
+                return true;
+            }
+        }
+
+        public static LinearLayout GetOverlayView(Context context)
+        {
+            var inflater = (LayoutInflater)context.GetSystemService(Context.LayoutInflaterService);
+            var view = (LinearLayout)inflater.Inflate(Resource.Layout.autofill_listitem, null);
+            var text1 = (TextView)view.FindViewById(Resource.Id.text1);
+            var text2 = (TextView)view.FindViewById(Resource.Id.text2);
+            var icon = (ImageView)view.FindViewById(Resource.Id.icon);
+            text1.Text = AppResources.AutofillWithBitwarden;
+            text2.Text = AppResources.GoToMyVault;
+            icon.SetImageResource(Resource.Drawable.icon);
+            return view;
+        }
+
+        public static WindowManagerLayoutParams GetOverlayLayoutParams()
+        {
+            WindowManagerTypes windowManagerType;
+            if(Build.VERSION.SdkInt >= BuildVersionCodes.O)
+            {
+                windowManagerType = WindowManagerTypes.ApplicationOverlay;
+            }
+            else
+            {
+                windowManagerType = WindowManagerTypes.Phone;
+            }
+
+            var layoutParams = new WindowManagerLayoutParams(
+                ViewGroup.LayoutParams.WrapContent,
+                ViewGroup.LayoutParams.WrapContent,
+                windowManagerType,
+                WindowManagerFlags.NotFocusable | WindowManagerFlags.NotTouchModal,
+                Format.Transparent);
+            layoutParams.Gravity = GravityFlags.Top | GravityFlags.Left;
+
+            return layoutParams;
+        }
+
+        public static Point GetOverlayAnchorPosition(AccessibilityNodeInfo anchorView, int overlayViewHeight, 
+            bool isOverlayAboveAnchor)
+        {
+            var anchorViewRect = new Rect();
+            anchorView.GetBoundsInScreen(anchorViewRect);
+            var anchorViewX = anchorViewRect.Left;
+            var anchorViewY = isOverlayAboveAnchor ? anchorViewRect.Top : anchorViewRect.Bottom;
+            anchorViewRect.Dispose();
+            
+            if(isOverlayAboveAnchor)
+            {
+                anchorViewY -= overlayViewHeight;
+            }
+            anchorViewY -= GetStatusBarHeight();
+
+            return new Point(anchorViewX, anchorViewY);
+        }
+
+        public static Point GetOverlayAnchorPosition(AccessibilityNodeInfo anchorNode, AccessibilityNodeInfo root,
+            IEnumerable<AccessibilityWindowInfo> windows, int overlayViewHeight, bool isOverlayAboveAnchor)
+        {
+            Point point = null;
+            if(anchorNode != null)
+            {
+                // Update node's info since this is still a reference from an older event
+                anchorNode.Refresh();
+                if(!anchorNode.VisibleToUser)
+                {
+                    return new Point(-1, -1);
+                }
+                if(!anchorNode.Focused)
+                {
+                    return null;
+                }
+
+                // node.VisibleToUser doesn't always give us exactly what we want, so attempt to tighten up the range
+                // of visibility
+                var minY = 0;
+                int maxY;
+                if(windows != null)
+                {
+                    if(IsStatusBarExpanded(windows))
+                    {
+                        return new Point(-1, -1);
+                    }
+                    maxY = GetApplicationVisibleHeight(windows);
+                }
+                else
+                {
+                    var rootNodeHeight = GetNodeHeight(root);
+                    if(rootNodeHeight == -1)
+                    {
+                        return null;
+                    }
+                    maxY = rootNodeHeight - GetNavigationBarHeight();
+                }
+
+                point = GetOverlayAnchorPosition(anchorNode, overlayViewHeight, isOverlayAboveAnchor);
+                if(point.Y < minY)
+                {
+                    if(isOverlayAboveAnchor)
+                    {
+                        // view nearing bounds, anchor to bottom
+                        point.X = -1;
+                        point.Y = 0;
+                    }
+                    else
+                    {
+                        // view out of bounds, hide overlay
+                        point.X = -1;
+                        point.Y = -1;
+                    }
+                } 
+                else if(point.Y > maxY)
+                {
+                    if(isOverlayAboveAnchor)
+                    {
+                        // view out of bounds, hide overlay
+                        point.X = -1;
+                        point.Y = -1;
+                    }
+                    else
+                    {
+                        // view nearing bounds, anchor to top
+                        point.X = 0;
+                        point.Y = -1;
+                    }
+                } 
+                else if(isOverlayAboveAnchor && point.Y < (maxY - overlayViewHeight - GetNodeHeight(anchorNode)))
+                {
+                    // This else block forces the overlay to return to bottom alignment as soon as space is available
+                    // below the anchor view. Removing this will change the behavior to wait until there isn't enough
+                    // space above the anchor view before returning to bottom alignment.
+                    point.X = -1;
+                    point.Y = 0;
+                }
+            }
+            return point;
+        }
+
+        public static bool IsStatusBarExpanded(IEnumerable<AccessibilityWindowInfo> windows)
+        {
+            if(windows != null && windows.Any())
+            {
+                var isSystemWindowsOnly = true;
+                foreach(var window in windows)
+                {
+                    if(window.Type != AccessibilityWindowType.System)
+                    {
+                        isSystemWindowsOnly = false;
+                        break;
+                    }
+                }
+                return isSystemWindowsOnly;
+            }
+            return false;
+        }
+
+        public static int GetApplicationVisibleHeight(IEnumerable<AccessibilityWindowInfo> windows)
+        {
+            var appWindowHeight = 0;
+            var nonAppWindowHeight = 0;
+            if(windows != null)
+            {
+                foreach(var window in windows)
+                {
+                    var windowRect = new Rect();
+                    window.GetBoundsInScreen(windowRect);
+                    if(window.Type == AccessibilityWindowType.Application)
+                    {
+                        appWindowHeight += windowRect.Height();
+                    }
+                    else
+                    {
+                        nonAppWindowHeight += windowRect.Height();
+                    }
+                }
+            }
+            return appWindowHeight - nonAppWindowHeight;
+        }
+
+        public static int GetNodeHeight(AccessibilityNodeInfo node)
+        {
+            if(node == null)
+            {
+                return -1;
+            }
+            var nodeRect = new Rect();
+            node.GetBoundsInScreen(nodeRect);
+            var nodeRectHeight = nodeRect.Height();
+            nodeRect.Dispose();
+            return nodeRectHeight;
+        }
+
+        private static int GetStatusBarHeight()
+        {
+            return GetSystemResourceDimenPx("status_bar_height");
+        }
+
+        private static int GetNavigationBarHeight()
+        {
+            return GetSystemResourceDimenPx("navigation_bar_height");
+        }
+
+        private static int GetSystemResourceDimenPx(string resName)
+        {
+            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
+            var barHeight = 0;
+            var resourceId = activity.Resources.GetIdentifier(resName, "dimen", "android");
+            if(resourceId > 0)
+            {
+                barHeight = activity.Resources.GetDimensionPixelSize(resourceId);
+            }
+            return barHeight;
         }
     }
 }

src/Android/Accessibility/AccessibilityService.cs

@@ -1,16 +1,21 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Android.App;
 using Android.Content;
+using Android.Graphics;
 using Android.OS;
+using Android.Provider;
 using Android.Runtime;
+using Android.Views;
 using Android.Views.Accessibility;
+using Android.Widget;
 using Bit.App.Resources;
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
+using Java.Util;
 
 namespace Bit.Droid.Accessibility
 {
@@ -20,19 +25,25 @@ namespace Bit.Droid.Accessibility
     [Register("com.x8bit.bitwarden.Accessibility.AccessibilityService")]
     public class AccessibilityService : Android.AccessibilityServices.AccessibilityService
     {
-        private NotificationChannel _notificationChannel;
-
-        private const int AutoFillNotificationId = 34573;
         private const string BitwardenPackage = "com.x8bit.bitwarden";
         private const string BitwardenWebsite = "vault.bitwarden.com";
 
         private IStorageService _storageService;
-        private bool _settingAutofillPasswordField;
-        private bool _settingAutofillPersistNotification;
         private DateTime? _lastSettingsReload = null;
         private TimeSpan _settingsReloadSpan = TimeSpan.FromMinutes(1);
-        private long _lastNotificationTime = 0;
-        private string _lastNotificationUri = null;
+        private HashSet<string> _blacklistedUris;
+        private AccessibilityNodeInfo _anchorNode = null;
+        private int _lastAnchorX = 0;
+        private int _lastAnchorY = 0;
+        private bool _isOverlayAboveAnchor = false;
+        private static bool _overlayAnchorObserverRunning = false;
+        private IWindowManager _windowManager = null;
+        private LinearLayout _overlayView = null;
+        private int _overlayViewHeight = 0;
+        private long _lastAutoFillTime = 0;
+        private Java.Lang.Runnable _overlayAnchorObserverRunnable = null;
+        private Handler _handler = new Handler(Looper.MainLooper);
+
         private HashSet<string> _launcherPackageNames = null;
         private DateTime? _lastLauncherSetBuilt = null;
         private TimeSpan _rebuildLauncherSpan = TimeSpan.FromHours(1);
@@ -53,116 +64,80 @@ namespace Bit.Droid.Accessibility
 
                 if(SkipPackage(e?.PackageName))
                 {
+                    if(e?.PackageName != "com.android.systemui")
+                    {
+                        CancelOverlayPrompt();
+                    }
                     return;
                 }
 
-                var root = RootInActiveWindow;
-                if(root == null || root.PackageName != e.PackageName)
-                {
-                    return;
-                }
+                // AccessibilityHelpers.PrintTestData(RootInActiveWindow, e);
 
-                // AccessibilityHelpers.PrintTestData(root, e);
                 LoadServices();
                 var settingsTask = LoadSettingsAsync();
-
-                var notificationManager = GetSystemService(NotificationService) as NotificationManager;
-                var cancelNotification = true;
+                AccessibilityNodeInfo root = null;
 
                 switch(e.EventType)
                 {
                     case EventTypes.ViewFocused:
-                        if(e.Source == null || !e.Source.Password || !_settingAutofillPasswordField)
+                    case EventTypes.ViewClicked:
+                        if(e.Source == null || e.PackageName == BitwardenPackage)
+                        {
+                            CancelOverlayPrompt();
+                            break;
+                        }
+
+                        root = RootInActiveWindow;
+                        if(root == null || root.PackageName != e.PackageName)
                         {
                             break;
                         }
-                        if(e.PackageName == BitwardenPackage)
+
+                        if(!(e.Source?.Password ?? false) && !AccessibilityHelpers.IsUsernameEditText(root, e))
                         {
-                            CancelNotification(notificationManager);
+                            CancelOverlayPrompt();
                             break;
                         }
-                        if(ScanAndAutofill(root, e, notificationManager, cancelNotification))
+                        if(ScanAndAutofill(root, e))
                         {
-                            CancelNotification(notificationManager);
+                            CancelOverlayPrompt();
+                        }
+                        else
+                        {
+                            OverlayPromptToAutofill(root, e);
                         }
                         break;
                     case EventTypes.WindowContentChanged:
                     case EventTypes.WindowStateChanged:
-                        if(_settingAutofillPasswordField && e.Source.Password)
+                        if(AccessibilityHelpers.LastCredentials == null)
                         {
                             break;
                         }
-                        else if(_settingAutofillPasswordField && AccessibilityHelpers.LastCredentials == null)
-                        {
-                            if(string.IsNullOrWhiteSpace(_lastNotificationUri))
-                            {
-                                CancelNotification(notificationManager);
-                                break;
-                            }
-                            var uri = AccessibilityHelpers.GetUri(root);
-                            if(uri != _lastNotificationUri)
-                            {
-                                CancelNotification(notificationManager);
-                            }
-                            else if(uri.StartsWith(Constants.AndroidAppProtocol))
-                            {
-                                CancelNotification(notificationManager, 30000);
-                            }
-                            break;
-                        }
-
                         if(e.PackageName == BitwardenPackage)
                         {
-                            CancelNotification(notificationManager);
+                            CancelOverlayPrompt();
                             break;
                         }
 
-                        if(_settingAutofillPersistNotification)
+                        root = RootInActiveWindow;
+                        if(root == null || root.PackageName != e.PackageName)
                         {
-                            var uri = AccessibilityHelpers.GetUri(root);
-                            if(uri != null && !uri.Contains(BitwardenWebsite))
-                            {
-                                var needToFill = AccessibilityHelpers.NeedToAutofill(
-                                    AccessibilityHelpers.LastCredentials, uri);
-                                if(needToFill)
-                                {
-                                    var passwordNodes = AccessibilityHelpers.GetWindowNodes(root, e,
-                                        n => n.Password, false);
-                                    needToFill = passwordNodes.Any();
-                                    if(needToFill)
-                                    {
-                                        AccessibilityHelpers.GetNodesAndFill(root, e, passwordNodes);
-                                    }
-                                    passwordNodes.Dispose();
-                                }
-                                if(!needToFill)
-                                {
-                                    NotifyToAutofill(uri, notificationManager);
-                                    cancelNotification = false;
-                                }
-                            }
-                            AccessibilityHelpers.LastCredentials = null;
+                            break;
                         }
-                        else
+                        if(ScanAndAutofill(root, e))
                         {
-                            cancelNotification = ScanAndAutofill(root, e, notificationManager, cancelNotification);
-                        }
-
-                        if(cancelNotification)
-                        {
-                            CancelNotification(notificationManager);
+                            CancelOverlayPrompt();
                         }
                         break;
                     default:
                         break;
                 }
-
-                notificationManager?.Dispose();
-                root.Dispose();
-                e.Dispose();
             }
             // Suppress exceptions so that service doesn't crash.
-            catch { }
+            catch(Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine(">>> {0}: {1}", ex.GetType(), ex.StackTrace);
+            }
         }
 
         public override void OnInterrupt()
@@ -170,9 +145,9 @@ namespace Bit.Droid.Accessibility
             // Do nothing.
         }
 
-        public bool ScanAndAutofill(AccessibilityNodeInfo root, AccessibilityEvent e,
-            NotificationManager notificationManager, bool cancelNotification)
+        public bool ScanAndAutofill(AccessibilityNodeInfo root, AccessibilityEvent e)
         {
+            var filled = false;
             var passwordNodes = AccessibilityHelpers.GetWindowNodes(root, e, n => n.Password, false);
             if(passwordNodes.Count > 0)
             {
@@ -182,11 +157,8 @@ namespace Bit.Droid.Accessibility
                     if(AccessibilityHelpers.NeedToAutofill(AccessibilityHelpers.LastCredentials, uri))
                     {
                         AccessibilityHelpers.GetNodesAndFill(root, e, passwordNodes);
-                    }
-                    else
-                    {
-                        NotifyToAutofill(uri, notificationManager);
-                        cancelNotification = false;
+                        filled = true;
+                        _lastAutoFillTime = Java.Lang.JavaSystem.CurrentTimeMillis();
                     }
                 }
                 AccessibilityHelpers.LastCredentials = null;
@@ -200,69 +172,197 @@ namespace Bit.Droid.Accessibility
                 });
             }
             passwordNodes.Dispose();
-            return cancelNotification;
+            return filled;
         }
 
-        public void CancelNotification(NotificationManager notificationManager, long limit = 250)
+        private void CancelOverlayPrompt()
         {
-            if(Java.Lang.JavaSystem.CurrentTimeMillis() - _lastNotificationTime < limit)
+            _overlayAnchorObserverRunning = false;
+
+            if(_windowManager != null && _overlayView != null)
             {
+                _windowManager.RemoveViewImmediate(_overlayView);
+                System.Diagnostics.Debug.WriteLine(">>> Accessibility Overlay View Removed");
+            }
+
+            _overlayView = null;
+            _lastAnchorX = 0;
+            _lastAnchorY = 0;
+            _isOverlayAboveAnchor = false;
+
+            if(_anchorNode != null)
+            {
+                _anchorNode.Recycle();
+                _anchorNode = null;
+            }
+        }
+
+        private void OverlayPromptToAutofill(AccessibilityNodeInfo root, AccessibilityEvent e)
+        {
+            if(!AccessibilityHelpers.OverlayPermitted())
+            {
+                System.Diagnostics.Debug.WriteLine(">>> Overlay Permission not granted");
+                Toast.MakeText(this, AppResources.AccessibilityOverlayPermissionAlert, ToastLength.Long).Show();
                 return;
             }
-            _lastNotificationUri = null;
-            notificationManager?.Cancel(AutoFillNotificationId);
-        }
 
-        private void NotifyToAutofill(string uri, NotificationManager notificationManager)
-        {
-            if(notificationManager == null || string.IsNullOrWhiteSpace(uri))
+            if(_overlayView != null || _anchorNode != null || _overlayAnchorObserverRunning)
+            {
+                CancelOverlayPrompt();
+            }
+
+            if(Java.Lang.JavaSystem.CurrentTimeMillis() - _lastAutoFillTime < 1000)
+            {
+                return;
+            }
+
+            var uri = AccessibilityHelpers.GetUri(root);
+            var fillable = !string.IsNullOrWhiteSpace(uri);
+            if(fillable)
+            {
+                if(_blacklistedUris != null && _blacklistedUris.Any())
+                {
+                    if(Uri.TryCreate(uri, UriKind.Absolute, out var parsedUri) && parsedUri.Scheme.StartsWith("http"))
+                    {
+                        fillable = !_blacklistedUris.Contains(
+                            string.Format("{0}://{1}", parsedUri.Scheme, parsedUri.Host));
+                    }
+                    else
+                    {
+                        fillable = !_blacklistedUris.Contains(uri);
+                    }
+                }
+            }
+            if(!fillable)
             {
                 return;
             }
 
-            var now = Java.Lang.JavaSystem.CurrentTimeMillis();
             var intent = new Intent(this, typeof(AccessibilityActivity));
             intent.PutExtra("uri", uri);
             intent.SetFlags(ActivityFlags.NewTask | ActivityFlags.SingleTop | ActivityFlags.ClearTop);
-            var pendingIntent = PendingIntent.GetActivity(this, 0, intent, PendingIntentFlags.UpdateCurrent);
 
-            var notificationContent = Build.VERSION.SdkInt > BuildVersionCodes.KitkatWatch ?
-                AppResources.BitwardenAutofillServiceNotificationContent :
-                AppResources.BitwardenAutofillServiceNotificationContentOld;
-
-            var builder = new Notification.Builder(this);
-            builder.SetSmallIcon(Resource.Drawable.shield)
-                   .SetContentTitle(AppResources.BitwardenAutofillService)
-                   .SetContentText(notificationContent)
-                   .SetTicker(notificationContent)
-                   .SetWhen(now)
-                   .SetContentIntent(pendingIntent);
-
-            if(Build.VERSION.SdkInt > BuildVersionCodes.KitkatWatch)
+            _overlayView = AccessibilityHelpers.GetOverlayView(this);
+            _overlayView.Measure(View.MeasureSpec.MakeMeasureSpec(0, 0),
+                View.MeasureSpec.MakeMeasureSpec(0, 0));
+            _overlayViewHeight = _overlayView.MeasuredHeight;
+            _overlayView.Click += (sender, eventArgs) =>
             {
-                builder.SetVisibility(NotificationVisibility.Secret)
-                    .SetColor(Android.Support.V4.Content.ContextCompat.GetColor(ApplicationContext,
-                        Resource.Color.primary));
+                CancelOverlayPrompt();
+                StartActivity(intent);
+            };
+
+            var layoutParams = AccessibilityHelpers.GetOverlayLayoutParams();
+            var anchorPosition = AccessibilityHelpers.GetOverlayAnchorPosition(e.Source, _overlayViewHeight,
+                _isOverlayAboveAnchor);
+            layoutParams.X = anchorPosition.X;
+            layoutParams.Y = anchorPosition.Y;
+
+            if(_windowManager == null)
+            {
+                _windowManager = GetSystemService(WindowService).JavaCast<IWindowManager>();
             }
-            if(Build.VERSION.SdkInt >= BuildVersionCodes.O)
+
+            _anchorNode = e.Source;
+            _lastAnchorX = anchorPosition.X;
+            _lastAnchorY = anchorPosition.Y;
+
+            _windowManager.AddView(_overlayView, layoutParams);
+
+            System.Diagnostics.Debug.WriteLine(">>> Accessibility Overlay View Added at X:{0} Y:{1}",
+                layoutParams.X, layoutParams.Y);
+
+            StartOverlayAnchorObserver();
+        }
+
+        private void StartOverlayAnchorObserver()
+        {
+            if(_overlayAnchorObserverRunning)
             {
-                if(_notificationChannel == null)
+                return;
+            }
+
+            _overlayAnchorObserverRunning = true;
+            _overlayAnchorObserverRunnable = new Java.Lang.Runnable(() =>
+            {
+                if(_overlayAnchorObserverRunning)
                 {
-                    _notificationChannel = new NotificationChannel("bitwarden_autofill_service",
-                        AppResources.AutofillService, NotificationImportance.Low);
-                    notificationManager.CreateNotificationChannel(_notificationChannel);
+                    AdjustOverlayForScroll();
+                    _handler.PostDelayed(_overlayAnchorObserverRunnable, 250);
                 }
-                builder.SetChannelId(_notificationChannel.Id);
-            }
-            if(/*Build.VERSION.SdkInt <= BuildVersionCodes.N && */_settingAutofillPersistNotification)
+            });
+
+            _handler.PostDelayed(_overlayAnchorObserverRunnable, 250);
+        }
+
+        private void AdjustOverlayForScroll()
+        {
+            if(_overlayView == null || _anchorNode == null)
             {
-                builder.SetPriority(-2);
+                CancelOverlayPrompt();
+                return;
             }
 
-            _lastNotificationTime = now;
-            _lastNotificationUri = uri;
-            notificationManager.Notify(AutoFillNotificationId, builder.Build());
-            builder.Dispose();
+            var root = RootInActiveWindow;
+            IEnumerable<AccessibilityWindowInfo> windows = null;
+            if(Build.VERSION.SdkInt > BuildVersionCodes.Kitkat)
+            {
+                windows = Windows;
+            }
+
+            var anchorPosition = AccessibilityHelpers.GetOverlayAnchorPosition(_anchorNode, root, windows,
+                _overlayViewHeight, _isOverlayAboveAnchor);
+            if(anchorPosition == null)
+            {
+                CancelOverlayPrompt();
+                return;
+            }
+            else if(anchorPosition.X == -1 && anchorPosition.Y == -1)
+            {
+                if(_overlayView.Visibility != ViewStates.Gone)
+                {
+                    _overlayView.Visibility = ViewStates.Gone;
+                    System.Diagnostics.Debug.WriteLine(">>> Accessibility Overlay View Hidden");
+                }
+                return;
+            }
+            else if(anchorPosition.X == -1)
+            {
+                _isOverlayAboveAnchor = false;
+                System.Diagnostics.Debug.WriteLine(">>> Accessibility Overlay View Below Anchor");
+                return;
+            }
+            else if(anchorPosition.Y == -1)
+            {
+                _isOverlayAboveAnchor = true;
+                System.Diagnostics.Debug.WriteLine(">>> Accessibility Overlay View Above Anchor");
+                return;
+            }
+            else if(anchorPosition.X == _lastAnchorX && anchorPosition.Y == _lastAnchorY)
+            {
+                if(_overlayView.Visibility != ViewStates.Visible)
+                {
+                    _overlayView.Visibility = ViewStates.Visible;
+                }
+                return;
+            }
+
+            var layoutParams = AccessibilityHelpers.GetOverlayLayoutParams();
+            layoutParams.X = anchorPosition.X;
+            layoutParams.Y = anchorPosition.Y;
+
+            _lastAnchorX = anchorPosition.X;
+            _lastAnchorY = anchorPosition.Y;
+
+            _windowManager.UpdateViewLayout(_overlayView, layoutParams);
+
+            if(_overlayView.Visibility != ViewStates.Visible)
+            {
+                _overlayView.Visibility = ViewStates.Visible;
+            }
+
+            System.Diagnostics.Debug.WriteLine(">>> Accessibility Overlay View Updated to X:{0} Y:{1}",
+                    layoutParams.X, layoutParams.Y);
         }
 
         private bool SkipPackage(string eventPackageName)
@@ -300,10 +400,11 @@ namespace Bit.Droid.Accessibility
             if(_lastSettingsReload == null || (now - _lastSettingsReload.Value) > _settingsReloadSpan)
             {
                 _lastSettingsReload = now;
-                _settingAutofillPasswordField = await _storageService.GetAsync<bool>(
-                    Constants.AccessibilityAutofillPasswordFieldKey);
-                _settingAutofillPersistNotification = await _storageService.GetAsync<bool>(
-                    Constants.AccessibilityAutofillPersistNotificationKey);
+                var uris = await _storageService.GetAsync<List<string>>(Constants.AutofillBlacklistedUrisKey);
+                if(uris != null)
+                {
+                    _blacklistedUris = new HashSet<string>(uris);
+                }
             }
         }
     }

src/Android/Accessibility/NodeList.cs

@@ -10,8 +10,9 @@ namespace Bit.Droid.Accessibility
         {
             foreach(var item in this)
             {
+                item.Recycle();
                 item.Dispose();
             }
         }
     }
-}
+}

src/Android/Android.csproj

@@ -16,7 +16,7 @@
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
     <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -33,7 +33,7 @@
     <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
     <AndroidSupportedAbis />
     <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
-    <AndroidLinkSkip>Xamarin.GooglePlayServices.Base;Xamarin.GooglePlayServices.Basement;Xamarin.GooglePlayServices.Measurement;Xamarin.GooglePlayServices.Gcm;BitwardenAndroid;BitwardenApp;BitwardenCore;Xamarin.Android.Net</AndroidLinkSkip>
+    <AndroidLinkSkip>Xamarin.GooglePlayServices.Base;Xamarin.GooglePlayServices.Basement;Xamarin.GooglePlayServices.Measurement;Xamarin.GooglePlayServices.Gcm;BitwardenAndroid;BitwardenApp;BitwardenCore;Xamarin.Android.Net;Xamarin.Android.Net.OldAndroidSSLSocketFactory</AndroidLinkSkip>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>false</DebugSymbols>
@@ -47,7 +47,7 @@
     <AndroidSupportedAbis>armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
     <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
     <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
-    <AndroidLinkSkip>Xamarin.GooglePlayServices.Base;Xamarin.GooglePlayServices.Basement;Xamarin.GooglePlayServices.Measurement;Xamarin.GooglePlayServices.Gcm;BitwardenAndroid;BitwardenApp;BitwardenCore;Xamarin.Android.Net</AndroidLinkSkip>
+    <AndroidLinkSkip>Xamarin.GooglePlayServices.Base;Xamarin.GooglePlayServices.Basement;Xamarin.GooglePlayServices.Measurement;Xamarin.GooglePlayServices.Gcm;BitwardenAndroid;BitwardenApp;BitwardenCore;Xamarin.Android.Net;Xamarin.Android.Net.OldAndroidSSLSocketFactory</AndroidLinkSkip>
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
     <AndroidLinkMode>Full</AndroidLinkMode>
   </PropertyGroup>
@@ -66,7 +66,7 @@
     <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
     <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
-    <AndroidLinkSkip>Xamarin.GooglePlayServices.Base;Xamarin.GooglePlayServices.Basement;Xamarin.GooglePlayServices.Measurement;Xamarin.GooglePlayServices.Gcm;BitwardenAndroid;BitwardenApp;BitwardenCore;Xamarin.Android.Net</AndroidLinkSkip>
+    <AndroidLinkSkip>Xamarin.GooglePlayServices.Base;Xamarin.GooglePlayServices.Basement;Xamarin.GooglePlayServices.Measurement;Xamarin.GooglePlayServices.Gcm;BitwardenAndroid;BitwardenApp;BitwardenCore;Xamarin.Android.Net;Xamarin.Android.Net.OldAndroidSSLSocketFactory</AndroidLinkSkip>
     <AndroidLinkMode>Full</AndroidLinkMode>
   </PropertyGroup>
   <ItemGroup>
@@ -82,19 +82,19 @@
       <Version>2.1.0.4</Version>
     </PackageReference>
     <PackageReference Include="Portable.BouncyCastle">
-      <Version>1.8.5</Version>
+      <Version>1.8.5.2</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Essentials">
-      <Version>1.1.0</Version>
+      <Version>1.3.1</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Firebase.Messaging">
       <Version>60.1142.1</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.1" />
-    <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.1" />
-    <PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.1" />
-    <PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="28.0.0.1" />
-    <PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="28.0.0.1" />
+    <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
+    <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.3" />
+    <PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.3" />
+    <PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="28.0.0.3" />
+    <PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="28.0.0.3" />
     <PackageReference Include="Xamarin.GooglePlayServices.SafetyNet">
       <Version>60.1142.1</Version>
     </PackageReference>
@@ -116,10 +116,11 @@
     <Compile Include="Effects\FixedSizeEffect.cs" />
     <Compile Include="Effects\SelectableLabelEffect.cs" />
     <Compile Include="Effects\TabBarEffect.cs" />
-    <Compile Include="Migration\AndroidKeyStoreStorageService.cs" />
     <Compile Include="Push\FirebaseInstanceIdService.cs" />
     <Compile Include="Push\FirebaseMessagingService.cs" />
     <Compile Include="Receivers\ClearClipboardAlarmReceiver.cs" />
+    <Compile Include="Receivers\RestrictionsChangedReceiver.cs" />
+    <Compile Include="Receivers\EventUploadReceiver.cs" />
     <Compile Include="Receivers\LockAlarmReceiver.cs" />
     <Compile Include="Receivers\PackageReplacedReceiver.cs" />
     <Compile Include="Renderers\CipherViewCellRenderer.cs" />
@@ -144,6 +145,7 @@
     <Compile Include="Utilities\AndroidHelpers.cs" />
     <Compile Include="Utilities\CustomFingerprintDialogFragment.cs" />
     <Compile Include="Utilities\HockeyAppCrashManagerListener.cs" />
+    <Compile Include="Utilities\StaticStore.cs" />
   </ItemGroup>
   <ItemGroup>
     <AndroidAsset Include="Assets\FontAwesome.ttf" />
@@ -306,12 +308,6 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-hdpi\autofill_use.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\accessibility_notification.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\accessibility_notification_icon.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-hdpi\accessibility_step1.png" />
   </ItemGroup>
@@ -324,12 +320,6 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xhdpi\yubikey.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\accessibility_notification.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\accessibility_notification_icon.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xhdpi\accessibility_step1.png" />
   </ItemGroup>
@@ -351,12 +341,6 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xxhdpi\yubikey.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\accessibility_notification.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\accessibility_notification_icon.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xxhdpi\accessibility_step1.png" />
   </ItemGroup>
@@ -552,5 +536,29 @@
       <SubType>Designer</SubType>
     </AndroidResource>
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-hdpi\accessibility_overlay.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\accessibility_overlay.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xxhdpi\accessibility_overlay.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-hdpi\accessibility_permission.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\accessibility_permission.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xxhdpi\accessibility_permission.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\xml\app_restrictions.xml">
+      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>

src/Android/Autofill/AutofillHelpers.cs

@@ -60,12 +60,15 @@ namespace Bit.Droid.Autofill
             "org.mozilla.fenix.nightly",
             "org.mozilla.reference.browser",
             "org.mozilla.rocket",
+            "org.torproject.torbrowser",
+            "com.vivaldi.browser",
         };
 
         // The URLs are blacklisted from autofilling
         public static HashSet<string> BlacklistedUris = new HashSet<string>
         {
             "androidapp://android",
+            "androidapp://com.android.settings",
             "androidapp://com.x8bit.bitwarden",
             "androidapp://com.oneplus.applocker",
         };

src/Android/Autofill/Parser.cs

@@ -97,11 +97,20 @@ namespace Bit.Droid.Autofill
 
         public void Parse()
         {
+            string titlePackageId = null;
             for(var i = 0; i < _structure.WindowNodeCount; i++)
             {
                 var node = _structure.GetWindowNodeAt(i);
+                if(i == 0)
+                {
+                    titlePackageId = GetTitlePackageId(node);
+                }
                 ParseNode(node.RootViewNode);
             }
+            if(string.IsNullOrWhiteSpace(PackageName) && string.IsNullOrWhiteSpace(Website))
+            {
+                PackageName = titlePackageId;
+            }
             if(!AutofillHelpers.TrustedBrowsers.Contains(PackageName) &&
                 !AutofillHelpers.CompatBrowsers.Contains(PackageName))
             {
@@ -146,5 +155,22 @@ namespace Bit.Droid.Autofill
                 Website = string.Format("{0}://{1}", scheme, node.WebDomain);
             }
         }
+
+        private string GetTitlePackageId(WindowNode node)
+        {
+            if(node != null && !string.IsNullOrWhiteSpace(node.Title))
+            {
+                var slashPosition = node.Title.IndexOf('/');
+                if(slashPosition > -1)
+                {
+                    var packageId = node.Title.Substring(0, slashPosition);
+                    if(packageId.Contains("."))
+                    {
+                        return packageId;
+                    }
+                }
+            }
+            return null;
+        }
     }
 }

src/Android/MainActivity.cs

@@ -30,17 +30,16 @@ namespace Bit.Droid
     [Register("com.x8bit.bitwarden.MainActivity")]
     public class MainActivity : Xamarin.Forms.Platform.Android.FormsAppCompatActivity
     {
-        private const string HockeyAppId = "d3834185b4a643479047b86c65293d42";
-
         private IDeviceActionService _deviceActionService;
         private IMessagingService _messagingService;
         private IBroadcasterService _broadcasterService;
         private IUserService _userService;
         private IAppIdService _appIdService;
         private IStorageService _storageService;
-        private IStateService _stateService;
+        private IEventService _eventService;
         private PendingIntent _lockAlarmPendingIntent;
         private PendingIntent _clearClipboardPendingIntent;
+        private PendingIntent _eventUploadPendingIntent;
         private AppOptions _appOptions;
         private string _activityKey = $"{nameof(MainActivity)}_{Java.Lang.JavaSystem.CurrentTimeMillis().ToString()}";
         private Java.Util.Regex.Pattern _otpPattern =
@@ -48,6 +47,9 @@ namespace Bit.Droid
 
         protected override void OnCreate(Bundle savedInstanceState)
         {
+            var eventUploadIntent = new Intent(this, typeof(EventUploadReceiver));
+            _eventUploadPendingIntent = PendingIntent.GetBroadcast(this, 0, eventUploadIntent,
+                PendingIntentFlags.UpdateCurrent);
             var alarmIntent = new Intent(this, typeof(LockAlarmReceiver));
             _lockAlarmPendingIntent = PendingIntent.GetBroadcast(this, 0, alarmIntent,
                 PendingIntentFlags.UpdateCurrent);
@@ -64,7 +66,7 @@ namespace Bit.Droid
             _userService = ServiceContainer.Resolve<IUserService>("userService");
             _appIdService = ServiceContainer.Resolve<IAppIdService>("appIdService");
             _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _eventService = ServiceContainer.Resolve<IEventService>("eventService");
 
             TabLayoutResource = Resource.Layout.Tabbar;
             ToolbarResource = Resource.Layout.Toolbar;
@@ -78,8 +80,7 @@ namespace Bit.Droid
 
 #if !FDROID
             var hockeyAppListener = new HockeyAppCrashManagerListener(_appIdService, _userService);
-            var hockeyAppTask = hockeyAppListener.InitAsync();
-            HockeyApp.Android.CrashManager.Register(this, HockeyAppId, hockeyAppListener);
+            var hockeyAppTask = hockeyAppListener.InitAsync(this);
 #endif
 
             Xamarin.Essentials.Platform.Init(this, savedInstanceState);
@@ -91,10 +92,10 @@ namespace Bit.Droid
             {
                 if(message.Command == "scheduleLockTimer")
                 {
+                    var alarmManager = GetSystemService(AlarmService) as AlarmManager;
                     var lockOptionMinutes = (int)message.Data;
                     var lockOptionMs = lockOptionMinutes * 60000;
                     var triggerMs = Java.Lang.JavaSystem.CurrentTimeMillis() + lockOptionMs + 10;
-                    var alarmManager = GetSystemService(AlarmService) as AlarmManager;
                     alarmManager.Set(AlarmType.RtcWakeup, triggerMs, _lockAlarmPendingIntent);
                 }
                 else if(message.Command == "cancelLockTimer")
@@ -102,6 +103,14 @@ namespace Bit.Droid
                     var alarmManager = GetSystemService(AlarmService) as AlarmManager;
                     alarmManager.Cancel(_lockAlarmPendingIntent);
                 }
+                else if(message.Command == "startEventTimer")
+                {
+                    StartEventAlarm();
+                }
+                else if(message.Command == "stopEventTimer")
+                {
+                    var task = StopEventAlarmAsync();
+                }
                 else if(message.Command == "finishMainActivity")
                 {
                     Xamarin.Forms.Device.BeginInvokeOnMainThread(() => Finish());
@@ -142,6 +151,7 @@ namespace Bit.Droid
                 }
                 catch { }
             }
+            var setRestrictions = AndroidHelpers.SetPreconfiguredRestrictionSettingsAsync(this);
         }
 
         protected override void OnNewIntent(Intent intent)
@@ -191,7 +201,8 @@ namespace Bit.Droid
 
         protected override void OnActivityResult(int requestCode, Result resultCode, Intent data)
         {
-            if(requestCode == Constants.SelectFileRequestCode && resultCode == Result.Ok)
+            if(resultCode == Result.Ok &&
+               (requestCode == Constants.SelectFileRequestCode || requestCode == Constants.SaveFileRequestCode))
             {
                 Android.Net.Uri uri = null;
                 string fileName = null;
@@ -212,6 +223,14 @@ namespace Bit.Droid
                 {
                     return;
                 }
+
+                if(requestCode == Constants.SaveFileRequestCode)
+                {
+                    _messagingService.Send("selectSaveFileResult",
+                        new Tuple<string, string>(uri.ToString(), fileName));
+                    return;
+                }
+                
                 try
                 {
                     using(var stream = ContentResolver.OpenInputStream(uri))
@@ -367,10 +386,23 @@ namespace Bit.Droid
             {
                 return;
             }
-            await _stateService.SaveAsync(Constants.LastClipboardValueKey, data.Item1);
+            StaticStore.LastClipboardValue = data.Item1;
             var triggerMs = Java.Lang.JavaSystem.CurrentTimeMillis() + clearMs.Value;
             var alarmManager = GetSystemService(AlarmService) as AlarmManager;
             alarmManager.Set(AlarmType.Rtc, triggerMs, _clearClipboardPendingIntent);
         }
+
+        private void StartEventAlarm()
+        {
+            var alarmManager = GetSystemService(AlarmService) as AlarmManager;
+            alarmManager.SetInexactRepeating(AlarmType.ElapsedRealtime, 120000, 300000, _eventUploadPendingIntent);
+        }
+
+        private async Task StopEventAlarmAsync()
+        {
+            var alarmManager = GetSystemService(AlarmService) as AlarmManager;
+            alarmManager.Cancel(_eventUploadPendingIntent);
+            await _eventService.UploadEventsAsync();
+        }
     }
 }

src/Android/MainApplication.cs

@@ -40,12 +40,8 @@ namespace Bit.Droid
             if(ServiceContainer.RegisteredServices.Count == 0)
             {
                 RegisterLocalServices();
-                ServiceContainer.Init();
-                if(App.Migration.MigrationHelpers.NeedsMigration())
-                {
-                    var task = App.Migration.MigrationHelpers.PerformMigrationAsync();
-                    Task.Delay(2000).Wait();
-                }
+                var deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+                ServiceContainer.Init(deviceActionService.DeviceUserAgent);
             }
 #if !FDROID
             if(Build.VERSION.SdkInt <= BuildVersionCodes.Kitkat)
@@ -73,12 +69,6 @@ namespace Bit.Droid
         private void RegisterLocalServices()
         {
             ServiceContainer.Register<ILogService>("logService", new AndroidLogService());
-            ServiceContainer.Register("settingsShim", new App.Migration.SettingsShim());
-            if(App.Migration.MigrationHelpers.NeedsMigration())
-            {
-                ServiceContainer.Register<App.Migration.Abstractions.IOldSecureStorageService>(
-                    "oldSecureStorageService", new Migration.AndroidKeyStoreStorageService());
-            }
 
             Refractored.FabControl.Droid.FloatingActionButtonViewRenderer.Init();
             // Note: This might cause a race condition. Investigate more.
@@ -107,7 +97,7 @@ namespace Bit.Droid
             var cryptoPrimitiveService = new CryptoPrimitiveService();
             var mobileStorageService = new MobileStorageService(preferencesStorage, liteDbStorage);
             var deviceActionService = new DeviceActionService(mobileStorageService, messagingService,
-                broadcasterService);
+                broadcasterService, () => ServiceContainer.Resolve<IEventService>("eventService"));
             var platformUtilsService = new MobilePlatformUtilsService(deviceActionService, messagingService,
                 broadcasterService);
 
@@ -155,4 +145,4 @@ namespace Bit.Droid
             await ServiceContainer.Resolve<IEnvironmentService>("environmentService").SetUrlsFromStorageAsync();
         }
     }
-}
+}

src/Android/Migration/AndroidKeyStoreStorageService.cs

@@ -1,373 +0,0 @@
-using Java.Security;
-using Javax.Crypto;
-using Android.OS;
-using Bit.App.Abstractions;
-using System;
-using Android.Security;
-using Javax.Security.Auth.X500;
-using Java.Math;
-using Android.Security.Keystore;
-using Android.App;
-using Java.Util;
-using Javax.Crypto.Spec;
-using Android.Preferences;
-using Bit.App.Migration;
-using Bit.Core.Utilities;
-using Bit.App.Migration.Abstractions;
-
-namespace Bit.Droid.Migration
-{
-    public class AndroidKeyStoreStorageService : IOldSecureStorageService
-    {
-        private const string AndroidKeyStore = "AndroidKeyStore";
-        private const string AesMode = "AES/GCM/NoPadding";
-
-        private const string KeyAlias = "bitwardenKey2";
-        private const string KeyAliasV1 = "bitwardenKey";
-
-        private const string SettingsFormat = "ksSecured2:{0}";
-        private const string SettingsFormatV1 = "ksSecured:{0}";
-
-        private const string AesKey = "ksSecured2:aesKeyForService";
-        private const string AesKeyV1 = "ksSecured:aesKeyForService";
-
-        private readonly string _rsaMode;
-        private readonly bool _oldAndroid;
-        private readonly SettingsShim _settings;
-        private readonly KeyStore _keyStore;
-
-        public AndroidKeyStoreStorageService()
-        {
-            _oldAndroid = Build.VERSION.SdkInt < BuildVersionCodes.M;
-            _rsaMode = _oldAndroid ? "RSA/ECB/PKCS1Padding" : "RSA/ECB/OAEPWithSHA-1AndMGF1Padding";
-
-            _settings = ServiceContainer.Resolve<SettingsShim>("settingsShim");
-
-            _keyStore = KeyStore.GetInstance(AndroidKeyStore);
-            _keyStore.Load(null);
-
-            /*
-            try
-            {
-                GenerateStoreKey(true);
-            }
-            catch
-            {
-                GenerateStoreKey(false);
-            }
-
-            GenerateAesKey();
-            */
-        }
-
-        public bool Contains(string key)
-        {
-            return _settings.Contains(string.Format(SettingsFormat, key)) ||
-                _settings.Contains(string.Format(SettingsFormatV1, key));
-        }
-
-        public void Delete(string key)
-        {
-            CleanupOld(key);
-
-            var formattedKey = string.Format(SettingsFormat, key);
-            if(_settings.Contains(formattedKey))
-            {
-                _settings.Remove(formattedKey);
-            }
-        }
-
-        public byte[] Retrieve(string key)
-        {
-            var formattedKey = string.Format(SettingsFormat, key);
-            if(!_settings.Contains(formattedKey))
-            {
-                return TryGetAndMigrate(key);
-            }
-
-            var cs = _settings.GetValueOrDefault(formattedKey, null);
-            if(string.IsNullOrWhiteSpace(cs))
-            {
-                return null;
-            }
-
-            var aesKey = GetAesKey();
-            if(aesKey == null)
-            {
-                return null;
-            }
-
-            try
-            {
-                return App.Migration.Crypto.AesCbcDecrypt(new App.Migration.Models.CipherString(cs), aesKey);
-            }
-            catch
-            {
-                Console.WriteLine("Failed to decrypt from secure storage.");
-                _settings.Remove(formattedKey);
-                //Utilities.SendCrashEmail(e);
-                //Utilities.SaveCrashFile(e);
-                return null;
-            }
-        }
-
-        public void Store(string key, byte[] dataBytes)
-        {
-            var formattedKey = string.Format(SettingsFormat, key);
-            CleanupOld(key);
-            if(dataBytes == null)
-            {
-                _settings.Remove(formattedKey);
-                return;
-            }
-
-            var aesKey = GetAesKey();
-            if(aesKey == null)
-            {
-                return;
-            }
-
-            try
-            {
-                var cipherString = App.Migration.Crypto.AesCbcEncrypt(dataBytes, aesKey);
-                _settings.AddOrUpdateValue(formattedKey, cipherString.EncryptedString);
-            }
-            catch
-            {
-                Console.WriteLine("Failed to encrypt to secure storage.");
-                //Utilities.SendCrashEmail(e);
-                //Utilities.SaveCrashFile(e);
-            }
-        }
-
-        private void GenerateStoreKey(bool withDate)
-        {
-            if(_keyStore.ContainsAlias(KeyAlias))
-            {
-                return;
-            }
-
-            ClearSettings();
-
-            var end = Calendar.Instance;
-            end.Add(CalendarField.Year, 99);
-
-            if(_oldAndroid)
-            {
-                var subject = new X500Principal($"CN={KeyAlias}");
-
-                var builder = new KeyPairGeneratorSpec.Builder(Application.Context)
-                    .SetAlias(KeyAlias)
-                    .SetSubject(subject)
-                    .SetSerialNumber(BigInteger.Ten);
-
-                if(withDate)
-                {
-                    builder.SetStartDate(new Date(0)).SetEndDate(end.Time);
-                }
-
-                var spec = builder.Build();
-                var gen = KeyPairGenerator.GetInstance(KeyProperties.KeyAlgorithmRsa, AndroidKeyStore);
-                gen.Initialize(spec);
-                gen.GenerateKeyPair();
-            }
-            else
-            {
-                var builder = new KeyGenParameterSpec.Builder(KeyAlias, KeyStorePurpose.Decrypt | KeyStorePurpose.Encrypt)
-                    .SetBlockModes(KeyProperties.BlockModeGcm)
-                    .SetEncryptionPaddings(KeyProperties.EncryptionPaddingNone);
-
-                if(withDate)
-                {
-                    builder.SetKeyValidityStart(new Date(0)).SetKeyValidityEnd(end.Time);
-                }
-
-                var spec = builder.Build();
-                var gen = KeyGenerator.GetInstance(KeyProperties.KeyAlgorithmAes, AndroidKeyStore);
-                gen.Init(spec);
-                gen.GenerateKey();
-            }
-        }
-
-        private KeyStore.PrivateKeyEntry GetRsaKeyEntry(string alias)
-        {
-            return _keyStore.GetEntry(alias, null) as KeyStore.PrivateKeyEntry;
-        }
-
-        private void GenerateAesKey()
-        {
-            if(_settings.Contains(AesKey))
-            {
-                return;
-            }
-
-            var key = App.Migration.Crypto.RandomBytes(512 / 8);
-            var encKey = _oldAndroid ? RsaEncrypt(key) : AesEncrypt(key);
-            _settings.AddOrUpdateValue(AesKey, encKey);
-        }
-
-        private App.Migration.Models.SymmetricCryptoKey GetAesKey(bool v1 = false)
-        {
-            try
-            {
-                var aesKey = v1 ? AesKeyV1 : AesKey;
-                if(!_settings.Contains(aesKey))
-                {
-                    return null;
-                }
-
-                var encKey = _settings.GetValueOrDefault(aesKey, null);
-                if(string.IsNullOrWhiteSpace(encKey))
-                {
-                    return null;
-                }
-
-                if(_oldAndroid || v1)
-                {
-                    var encKeyBytes = Convert.FromBase64String(encKey);
-                    var key = RsaDecrypt(encKeyBytes, v1);
-                    return new App.Migration.Models.SymmetricCryptoKey(key);
-                }
-                else
-                {
-                    var parts = encKey.Split('|');
-                    if(parts.Length < 2)
-                    {
-                        return null;
-                    }
-
-                    var ivBytes = Convert.FromBase64String(parts[0]);
-                    var encKeyBytes = Convert.FromBase64String(parts[1]);
-                    var key = AesDecrypt(ivBytes, encKeyBytes);
-                    return new App.Migration.Models.SymmetricCryptoKey(key);
-                }
-            }
-            catch
-            {
-                Console.WriteLine("Cannot get AesKey.");
-                _keyStore.DeleteEntry(KeyAlias);
-                _settings.Remove(AesKey);
-                if(!v1)
-                {
-                    //Utilities.SendCrashEmail(e);
-                    //Utilities.SaveCrashFile(e);
-                }
-                return null;
-            }
-        }
-
-        private string AesEncrypt(byte[] input)
-        {
-            using(var entry = _keyStore.GetKey(KeyAlias, null))
-            using(var cipher = Cipher.GetInstance(AesMode))
-            {
-                cipher.Init(CipherMode.EncryptMode, entry);
-                var encBytes = cipher.DoFinal(input);
-                var ivBytes = cipher.GetIV();
-                return $"{Convert.ToBase64String(ivBytes)}|{Convert.ToBase64String(encBytes)}";
-            }
-        }
-
-        private byte[] AesDecrypt(byte[] iv, byte[] encData)
-        {
-            using(var entry = _keyStore.GetKey(KeyAlias, null))
-            using(var cipher = Cipher.GetInstance(AesMode))
-            {
-                var spec = new GCMParameterSpec(128, iv);
-                cipher.Init(CipherMode.DecryptMode, entry, spec);
-                var decBytes = cipher.DoFinal(encData);
-                return decBytes;
-            }
-        }
-
-        private string RsaEncrypt(byte[] data)
-        {
-            using(var entry = GetRsaKeyEntry(KeyAlias))
-            using(var cipher = Cipher.GetInstance(_rsaMode))
-            {
-                cipher.Init(CipherMode.EncryptMode, entry.Certificate.PublicKey);
-                var cipherText = cipher.DoFinal(data);
-                return Convert.ToBase64String(cipherText);
-            }
-        }
-
-        private byte[] RsaDecrypt(byte[] encData, bool v1)
-        {
-            using(var entry = GetRsaKeyEntry(v1 ? KeyAliasV1 : KeyAlias))
-            using(var cipher = Cipher.GetInstance(_rsaMode))
-            {
-                if(_oldAndroid)
-                {
-                    cipher.Init(CipherMode.DecryptMode, entry.PrivateKey);
-                }
-                else
-                {
-                    cipher.Init(CipherMode.DecryptMode, entry.PrivateKey, OAEPParameterSpec.Default);
-                }
-
-                var plainText = cipher.DoFinal(encData);
-                return plainText;
-            }
-        }
-
-        private byte[] TryGetAndMigrate(string key)
-        {
-            var formattedKeyV1 = string.Format(SettingsFormatV1, key);
-            if(_settings.Contains(formattedKeyV1))
-            {
-                var aesKeyV1 = GetAesKey(true);
-                if(aesKeyV1 != null)
-                {
-                    try
-                    {
-                        var cs = _settings.GetValueOrDefault(formattedKeyV1, null);
-                        var value = App.Migration.Crypto.AesCbcDecrypt(new App.Migration.Models.CipherString(cs), aesKeyV1);
-                        Store(key, value);
-                        return value;
-                    }
-                    catch
-                    {
-                        Console.WriteLine("Failed to decrypt v1 from secure storage.");
-                    }
-                }
-
-                _settings.Remove(formattedKeyV1);
-            }
-
-            return null;
-        }
-
-        private void CleanupOld(string key)
-        {
-            var formattedKeyV1 = string.Format(SettingsFormatV1, key);
-            if(_settings.Contains(formattedKeyV1))
-            {
-                _settings.Remove(formattedKeyV1);
-            }
-        }
-
-        private void ClearSettings(string format = SettingsFormat)
-        {
-            var prefix = string.Format(format, string.Empty);
-
-            using(var sharedPreferences = PreferenceManager.GetDefaultSharedPreferences(Application.Context))
-            using(var sharedPreferencesEditor = sharedPreferences.Edit())
-            {
-                var removed = false;
-                foreach(var pref in sharedPreferences.All)
-                {
-                    if(pref.Key.StartsWith(prefix))
-                    {
-                        removed = true;
-                        sharedPreferencesEditor.Remove(pref.Key);
-                    }
-                }
-
-                if(removed)
-                {
-                    sharedPreferencesEditor.Commit();
-                }
-            }
-        }
-    }
-}

src/Android/Properties/AndroidManifest.xml

@@ -3,17 +3,19 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:versionCode="1"
-  android:versionName="2.1.0"
+  android:versionName="2.3.0"
   package="com.x8bit.bitwarden">
 
-  <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
+  <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="29" />
 
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.NFC" />
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.CAMERA" />
   <uses-permission android:name="android.permission.USE_FINGERPRINT" />
+  <uses-permission android:name="android.permission.USE_BIOMETRIC" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+  <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
   <uses-permission android:name="com.samsung.android.providers.context.permission.WRITE_USE_APP_FEATURE_SURVEY" />
 
   <uses-feature android:name="android.hardware.camera" android:required="false" />
@@ -52,5 +54,6 @@
     </receiver>
 
     <meta-data android:name="android.max_aspect" android:value="2.1" />
+    <meta-data android:name="android.content.APP_RESTRICTIONS" android:resource="@xml/app_restrictions" />
   </application>
 </manifest>

src/Android/Properties/AssemblyInfo.cs

@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("BitwardenAndroid")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("8bit Solutions LLC")]
+[assembly: AssemblyCompany("Bitwarden Inc.")]
 [assembly: AssemblyProduct("Bitwarden")]
 [assembly: AssemblyCopyright("Copyright ©  2016")]
 [assembly: AssemblyTrademark("")]

src/Android/Receivers/ClearClipboardAlarmReceiver.cs

@@ -2,22 +2,21 @@
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
+using Bit.Droid.Utilities;
 
 namespace Bit.Droid.Receivers
 {
     [BroadcastReceiver(Name = "com.x8bit.bitwarden.ClearClipboardAlarmReceiver", Exported = false)]
     public class ClearClipboardAlarmReceiver : BroadcastReceiver
     {
-        public async override void OnReceive(Context context, Intent intent)
+        public override void OnReceive(Context context, Intent intent)
         {
-            var stateService = ServiceContainer.Resolve<IStateService>("stateService");
             var clipboardManager = context.GetSystemService(Context.ClipboardService) as ClipboardManager;
-            var lastClipboardValue = await stateService.GetAsync<string>(Constants.LastClipboardValueKey);
-            await stateService.RemoveAsync(Constants.LastClipboardValueKey);
-            if(lastClipboardValue == clipboardManager.Text)
+            if(StaticStore.LastClipboardValue != null && StaticStore.LastClipboardValue == clipboardManager.Text)
             {
                 clipboardManager.Text = string.Empty;
             }
+            StaticStore.LastClipboardValue = null;
         }
     }
 }

src/Android/Receivers/EventUploadReceiver.cs

@@ -0,0 +1,16 @@
+using Android.Content;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+
+namespace Bit.Droid.Receivers
+{
+    [BroadcastReceiver(Name = "com.x8bit.bitwarden.EventUploadReceiver", Exported = false)]
+    public class EventUploadReceiver : BroadcastReceiver
+    {
+        public async override void OnReceive(Context context, Intent intent)
+        {
+            var eventService = ServiceContainer.Resolve<IEventService>("eventService");
+            await eventService.UploadEventsAsync();
+        }
+    }
+}

src/Android/Receivers/RestrictionsChangedReceiver.cs

@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using Android.App;
+using Android.Content;
+using Bit.App.Utilities;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+using Bit.Droid.Utilities;
+
+namespace Bit.Droid.Receivers
+{
+    [BroadcastReceiver(Name = "com.x8bit.bitwarden.RestrictionsChangedReceiver", Exported = false)]
+    [IntentFilter(new[] { Intent.ActionApplicationRestrictionsChanged })]
+    public class RestrictionsChangedReceiver : BroadcastReceiver
+    {
+        public async override void OnReceive(Context context, Intent intent)
+        {
+            if(intent.Action == Intent.ActionApplicationRestrictionsChanged)
+            {
+                await AndroidHelpers.SetPreconfiguredRestrictionSettingsAsync(context);
+            }
+        }
+    }
+}

src/Android/Resources/values/strings.xml

@@ -16,4 +16,10 @@
   <string name="PasswordGenerator">
     Password Generator
   </string>
+  <string name="SelfHostedServerUrl">
+    Self-hosted server URL
+  </string>
+  <string name="ServerUrl">
+    Server URL
+  </string>
 </resources>

src/Android/Resources/xml/accessibilityservice.xml

@@ -2,8 +2,8 @@
 <accessibility-service xmlns:android="http://schemas.android.com/apk/res/android"
     android:summary="@string/AutoFillServiceSummary"
     android:description="@string/AutoFillServiceDescription"
-    android:accessibilityEventTypes="typeWindowStateChanged|typeWindowContentChanged|typeViewFocused"
+    android:accessibilityEventTypes="typeWindowStateChanged|typeWindowContentChanged|typeViewFocused|typeViewClicked"
     android:accessibilityFeedbackType="feedbackGeneric"
-    android:accessibilityFlags="flagReportViewIds"
+    android:accessibilityFlags="flagReportViewIds|flagRetrieveInteractiveWindows"
     android:notificationTimeout="100"
     android:canRetrieveWindowContent="true"/>

src/Android/Resources/xml/app_restrictions.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<restrictions xmlns:android="http://schemas.android.com/apk/res/android">
+  <restriction
+    android:key="baseEnvironmentUrl"
+    android:title="@string/SelfHostedServerUrl"
+    android:restrictionType="string"
+    android:description="@string/ServerUrl"
+    android:defaultValue="" />
+</restrictions>

src/Android/Resources/xml/autofillservice.xml

@@ -90,4 +90,7 @@
   <compatibility-package
     android:name="com.ecosia.android"
     android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.vivaldi.browser"
+    android:maxLongVersionCode="10000000000"/>
 </autofill-service>

src/Android/Services/DeviceActionService.cs

@@ -8,9 +8,12 @@ using Android.App;
 using Android.App.Assist;
 using Android.Content;
 using Android.Content.PM;
+using Android.Hardware.Biometrics;
+using Android.Hardware.Fingerprints;
 using Android.Nfc;
 using Android.OS;
 using Android.Provider;
+using Android.Runtime;
 using Android.Support.V4.App;
 using Android.Support.V4.Content;
 using Android.Text;
@@ -28,6 +31,7 @@ using Bit.Core.Models.View;
 using Bit.Core.Utilities;
 using Bit.Droid.Autofill;
 using Plugin.CurrentActivity;
+using Plugin.Fingerprint;
 
 namespace Bit.Droid.Services
 {
@@ -36,18 +40,22 @@ namespace Bit.Droid.Services
         private readonly IStorageService _storageService;
         private readonly IMessagingService _messagingService;
         private readonly IBroadcasterService _broadcasterService;
+        private readonly Func<IEventService> _eventServiceFunc;
         private ProgressDialog _progressDialog;
         private bool _cameraPermissionsDenied;
         private Toast _toast;
+        private string _userAgent;
 
         public DeviceActionService(
             IStorageService storageService,
             IMessagingService messagingService,
-            IBroadcasterService broadcasterService)
+            IBroadcasterService broadcasterService,
+            Func<IEventService> eventServiceFunc)
         {
             _storageService = storageService;
             _messagingService = messagingService;
             _broadcasterService = broadcasterService;
+            _eventServiceFunc = eventServiceFunc;
 
             _broadcasterService.Subscribe(nameof(DeviceActionService), (message) =>
             {
@@ -58,6 +66,19 @@ namespace Bit.Droid.Services
             });
         }
 
+        public string DeviceUserAgent
+        {
+            get
+            {
+                if(string.IsNullOrWhiteSpace(_userAgent))
+                {
+                    _userAgent = $"Bitwarden_Mobile/{Xamarin.Essentials.AppInfo.VersionString} " +
+                        $"(Android {Build.VERSION.Release}; SDK {Build.VERSION.Sdk}; Model {Build.Model})";
+                }
+                return _userAgent;
+            }
+        }
+
         public DeviceType DeviceType => DeviceType.Android;
 
         public void Toast(string text, bool longDuration = false)
@@ -111,38 +132,14 @@ namespace Bit.Droid.Services
 
         public bool OpenFile(byte[] fileData, string id, string fileName)
         {
-            if(!CanOpenFile(fileName))
-            {
-                return false;
-            }
-            var extension = MimeTypeMap.GetFileExtensionFromUrl(fileName.Replace(' ', '_').ToLower());
-            if(extension == null)
-            {
-                return false;
-            }
-            var mimeType = MimeTypeMap.Singleton.GetMimeTypeFromExtension(extension);
-            if(mimeType == null)
-            {
-                return false;
-            }
-
-            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-            var cachePath = activity.CacheDir;
-            var filePath = Path.Combine(cachePath.Path, fileName);
-            File.WriteAllBytes(filePath, fileData);
-            var file = new Java.IO.File(cachePath, fileName);
-            if(!file.IsFile)
-            {
-                return false;
-            }
-
             try
             {
-                var intent = new Intent(Intent.ActionView);
-                var uri = FileProvider.GetUriForFile(activity.ApplicationContext,
-                    "com.x8bit.bitwarden.fileprovider", file);
-                intent.SetDataAndType(uri, mimeType);
-                intent.SetFlags(ActivityFlags.GrantReadUriPermission);
+                var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
+                var intent = BuildOpenFileIntent(fileData, fileName);
+                if(intent == null)
+                {
+                    return false;
+                }
                 activity.StartActivity(intent);
                 return true;
             }
@@ -151,22 +148,105 @@ namespace Bit.Droid.Services
         }
 
         public bool CanOpenFile(string fileName)
+        {
+            try
+            {
+                var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
+                var intent = BuildOpenFileIntent(new byte[0], string.Concat("opentest_", fileName));
+                if(intent == null)
+                {
+                    return false;
+                }
+                var activities = activity.PackageManager.QueryIntentActivities(intent,
+                    PackageInfoFlags.MatchDefaultOnly);
+                return (activities?.Count ?? 0) > 0;
+            }
+            catch { }
+            return false;
+        }
+
+        private Intent BuildOpenFileIntent(byte[] fileData, string fileName)
         {
             var extension = MimeTypeMap.GetFileExtensionFromUrl(fileName.Replace(' ', '_').ToLower());
             if(extension == null)
             {
-                return false;
+                return null;
             }
             var mimeType = MimeTypeMap.Singleton.GetMimeTypeFromExtension(extension);
             if(mimeType == null)
             {
-                return false;
+                return null;
             }
+
             var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-            var intent = new Intent(Intent.ActionView);
-            intent.SetType(mimeType);
-            var activities = activity.PackageManager.QueryIntentActivities(intent, PackageInfoFlags.MatchDefaultOnly);
-            return (activities?.Count ?? 0) > 0;
+            var cachePath = activity.CacheDir;
+            var filePath = Path.Combine(cachePath.Path, fileName);
+            File.WriteAllBytes(filePath, fileData);
+            var file = new Java.IO.File(cachePath, fileName);
+            if(!file.IsFile)
+            {
+                return null;
+            }
+
+            try
+            {
+                var intent = new Intent(Intent.ActionView);
+                var uri = FileProvider.GetUriForFile(activity.ApplicationContext,
+                    "com.x8bit.bitwarden.fileprovider", file);
+                intent.SetDataAndType(uri, mimeType);
+                intent.SetFlags(ActivityFlags.GrantReadUriPermission);
+                return intent;
+            }
+            catch { }
+            return null;
+        }
+        
+        public bool SaveFile(byte[] fileData, string id, string fileName, string contentUri)
+        {
+            try
+            {
+                var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
+                
+                if(contentUri != null)
+                {
+                    var uri = Android.Net.Uri.Parse(contentUri);
+                    var stream = activity.ContentResolver.OpenOutputStream(uri);
+                    // Using java bufferedOutputStream due to this issue:
+                    // https://github.com/xamarin/xamarin-android/issues/3498
+                    var javaStream = new Java.IO.BufferedOutputStream(stream);
+                    javaStream.Write(fileData);
+                    javaStream.Flush();
+                    javaStream.Close();
+                    return true;
+                }
+                
+                // Prompt for location to save file
+                var extension = MimeTypeMap.GetFileExtensionFromUrl(fileName.Replace(' ', '_').ToLower());
+                if(extension == null)
+                {
+                    return false;
+                }
+
+                string mimeType = MimeTypeMap.Singleton.GetMimeTypeFromExtension(extension);
+                if(mimeType == null)
+                {
+                    // Unable to identify so fall back to generic "any" type
+                    mimeType = "*/*";
+                }
+
+                var intent = new Intent(Intent.ActionCreateDocument);
+                intent.SetType(mimeType);
+                intent.AddCategory(Intent.CategoryOpenable);
+                intent.PutExtra(Intent.ExtraTitle, fileName);
+                
+                activity.StartActivityForResult(intent, Constants.SaveFileRequestCode);
+                return true;
+            }
+            catch(Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine(">>> {0}: {1}", ex.GetType(), ex.StackTrace);
+            }
+            return false;
         }
 
         public async Task ClearCacheAsync()
@@ -182,7 +262,8 @@ namespace Bit.Droid.Services
         public Task SelectFileAsync()
         {
             var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-            var hasStorageWritePermission = !_cameraPermissionsDenied && HasPermission(Manifest.Permission.WriteExternalStorage);
+            var hasStorageWritePermission = !_cameraPermissionsDenied &&
+                HasPermission(Manifest.Permission.WriteExternalStorage);
             var additionalIntents = new List<IParcelable>();
             if(activity.PackageManager.HasSystemFeature(PackageManager.FeatureCamera))
             {
@@ -306,11 +387,72 @@ namespace Bit.Droid.Services
                 Application.Context.PackageName, 0).VersionCode.ToString();
         }
 
-        public bool SupportsFaceId()
+        public bool SupportsFaceBiometric()
         {
             return false;
         }
 
+        public Task<bool> SupportsFaceBiometricAsync()
+        {
+            return Task.FromResult(SupportsFaceBiometric());
+        }
+
+        public async Task<bool> BiometricAvailableAsync()
+        {
+            if(UseNativeBiometric())
+            {
+                var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
+                var manager = activity.GetSystemService(Context.BiometricService) as BiometricManager;
+                return manager.CanAuthenticate() == BiometricCode.Success;
+            }
+            else
+            {
+                try
+                {
+                    return await CrossFingerprint.Current.IsAvailableAsync();
+                }
+                catch
+                {
+                    return false;
+                }
+            }
+        }
+
+        public bool UseNativeBiometric()
+        {
+            return (int)Build.VERSION.SdkInt >= 29;
+        }
+
+        public Task<bool> AuthenticateBiometricAsync(string text = null)
+        {
+            if(string.IsNullOrWhiteSpace(text))
+            {
+                text = AppResources.BiometricsDirection;
+            }
+
+            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
+            using(var builder = new BiometricPrompt.Builder(activity))
+            {
+                builder.SetTitle(text);
+                builder.SetConfirmationRequired(false);
+                builder.SetNegativeButton(AppResources.Cancel, activity.MainExecutor,
+                    new DialogInterfaceOnClickListener
+                    {
+                        Clicked = () => { }
+                    });
+                var prompt = builder.Build();
+                var result = new TaskCompletionSource<bool>();
+                prompt.Authenticate(new CancellationSignal(), activity.MainExecutor,
+                    new BiometricAuthenticationCallback
+                    {
+                        Success = authResult => result.TrySetResult(true),
+                        Failed = () => result.TrySetResult(false),
+                        Help = (helpCode, helpString) => { }
+                    });
+                return result.Task;
+            }
+        }
+
         public bool SupportsNfc()
         {
             var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
@@ -463,6 +605,7 @@ namespace Bit.Droid.Services
                 replyIntent.PutExtra(AutofillManager.ExtraAuthenticationResult, dataset);
                 activity.SetResult(Result.Ok, replyIntent);
                 activity.Finish();
+                var eventTask = _eventServiceFunc().CollectAsync(EventType.Cipher_ClientAutofilled, cipher.Id);
             }
             else
             {
@@ -488,6 +631,10 @@ namespace Bit.Droid.Services
                 }
                 activity.Finish();
                 _messagingService.Send("finishMainActivity");
+                if(cipher != null)
+                {
+                    var eventTask = _eventServiceFunc().CollectAsync(EventType.Cipher_ClientAutofilled, cipher.Id);
+                }
             }
         }
 
@@ -526,6 +673,40 @@ namespace Bit.Droid.Services
             }
         }
 
+        public bool AutofillAccessibilityOverlayPermitted()
+        {
+            return Accessibility.AccessibilityHelpers.OverlayPermitted();
+        }
+
+        public void OpenAccessibilityOverlayPermissionSettings()
+        {
+            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
+            try
+            {
+                var intent = new Intent(Settings.ActionManageOverlayPermission);
+                intent.SetData(Android.Net.Uri.Parse("package:com.x8bit.bitwarden"));
+                activity.StartActivity(intent);
+            }
+            catch(ActivityNotFoundException)
+            {
+                // can't open overlay permission management, fall back to app settings
+                var intent = new Intent(Settings.ActionApplicationDetailsSettings);
+                intent.SetData(Android.Net.Uri.Parse("package:com.x8bit.bitwarden"));
+                activity.StartActivity(intent);
+            }
+            catch
+            {
+                var alertBuilder = new AlertDialog.Builder(activity);
+                alertBuilder.SetMessage(AppResources.BitwardenAutofillGoToSettings);
+                alertBuilder.SetCancelable(true);
+                alertBuilder.SetPositiveButton(AppResources.Ok, (sender, args) =>
+                {
+                    (sender as AlertDialog)?.Cancel();
+                });
+                alertBuilder.Create().Show();
+            }
+        }
+
         public bool AutofillServiceEnabled()
         {
             if(Build.VERSION.SdkInt < BuildVersionCodes.O)
@@ -535,7 +716,8 @@ namespace Bit.Droid.Services
             try
             {
                 var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-                var afm = (AutofillManager)activity.GetSystemService(Java.Lang.Class.FromType(typeof(AutofillManager)));
+                var afm = (AutofillManager)activity.GetSystemService(
+                    Java.Lang.Class.FromType(typeof(AutofillManager)));
                 return afm.IsEnabled && afm.HasEnabledAutofillServices;
             }
             catch
@@ -577,6 +759,11 @@ namespace Bit.Droid.Services
             }
         }
 
+        public bool UsingDarkTheme()
+        {
+            return false;
+        }
+
         private bool DeleteDir(Java.IO.File dir)
         {
             if(dir != null && dir.IsDirectory)
@@ -675,5 +862,41 @@ namespace Bit.Droid.Services
                 Context.ClipboardService) as Android.Content.ClipboardManager;
             clipboardManager.Text = text;
         }
+
+        private class BiometricAuthenticationCallback : BiometricPrompt.AuthenticationCallback
+        {
+            public Action<BiometricPrompt.AuthenticationResult> Success { get; set; }
+            public Action Failed { get; set; }
+            public Action<BiometricAcquiredStatus, Java.Lang.ICharSequence> Help { get; set; }
+
+            public override void OnAuthenticationSucceeded(BiometricPrompt.AuthenticationResult authResult)
+            {
+                base.OnAuthenticationSucceeded(authResult);
+                Success?.Invoke(authResult);
+            }
+
+            public override void OnAuthenticationFailed()
+            {
+                base.OnAuthenticationFailed();
+                Failed?.Invoke();
+            }
+
+            public override void OnAuthenticationHelp([GeneratedEnum] BiometricAcquiredStatus helpCode,
+                Java.Lang.ICharSequence helpString)
+            {
+                base.OnAuthenticationHelp(helpCode, helpString);
+                Help?.Invoke(helpCode, helpString);
+            }
+        }
+
+        private class DialogInterfaceOnClickListener : Java.Lang.Object, IDialogInterfaceOnClickListener
+        {
+            public Action Clicked { get; set; }
+
+            public void OnClick(IDialogInterface dialog, int which)
+            {
+                Clicked?.Invoke();
+            }
+        }
     }
-}
+}

src/Android/Utilities/AndroidHelpers.cs

@@ -1,10 +1,15 @@
-using Android.Content;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Android.Content;
 using Android.Provider;
+using Bit.App.Utilities;
 
 namespace Bit.Droid.Utilities
 {
     public static class AndroidHelpers
     {
+        private static string BaseEnvironmentUrlRestrictionKey = "baseEnvironmentUrl";
+
         public static string GetFileName(Context context, Android.Net.Uri uri)
         {
             string name = null;
@@ -26,5 +31,21 @@ namespace Bit.Droid.Utilities
             }
             return name;
         }
+
+        public static async Task SetPreconfiguredRestrictionSettingsAsync(Context context)
+        {
+            var restrictionsManager = (RestrictionsManager)context.GetSystemService(Context.RestrictionsService);
+            var restrictions = restrictionsManager.ApplicationRestrictions;
+            var dict = new Dictionary<string, string>();
+            if(restrictions.ContainsKey(BaseEnvironmentUrlRestrictionKey))
+            {
+                dict.Add(BaseEnvironmentUrlRestrictionKey, restrictions.GetString(BaseEnvironmentUrlRestrictionKey));
+            }
+
+            if(dict.Count > 0)
+            {
+                await AppHelpers.SetPreconfiguredSettingsAsync(dict);
+            }
+        }
     }
 }

src/Android/Utilities/HockeyAppCrashManagerListener.cs

@@ -5,11 +5,14 @@ using Newtonsoft.Json;
 using Android.Runtime;
 using Bit.Core.Abstractions;
 using System.Threading.Tasks;
+using Android.Content;
 
 namespace Bit.Droid.Utilities
 {
     public class HockeyAppCrashManagerListener : CrashManagerListener
     {
+        private const string HockeyAppId = "d3834185b4a643479047b86c65293d42";
+
         private readonly IAppIdService _appIdService;
         private readonly IUserService _userService;
 
@@ -31,10 +34,11 @@ namespace Bit.Droid.Utilities
             _userService = userService;
         }
 
-        public async Task InitAsync()
+        public async Task InitAsync(Context context)
         {
             _userId = await _userService.GetUserIdAsync();
             _appId = await _appIdService.GetAppIdAsync();
+            CrashManager.Register(context, HockeyAppId, this);
         }
 
         public override string Description

src/Android/Utilities/StaticStore.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Android.Runtime;
+using Android.Views;
+using Android.Widget;
+
+namespace Bit.Droid.Utilities
+{
+    public static class StaticStore
+    {
+        public static string LastClipboardValue { get; set; }
+    }
+}

src/App/Abstractions/IDeviceActionService.cs

@@ -6,12 +6,14 @@ namespace Bit.App.Abstractions
 {
     public interface IDeviceActionService
     {
+        string DeviceUserAgent { get; }
         DeviceType DeviceType { get; }
         void Toast(string text, bool longDuration = false);
         bool LaunchApp(string appName);
         Task ShowLoadingAsync(string text);
         Task HideLoadingAsync();
         bool OpenFile(byte[] fileData, string id, string fileName);
+        bool SaveFile(byte[] fileData, string id, string fileName, string contentUri);
         bool CanOpenFile(string fileName);
         Task ClearCacheAsync();
         Task SelectFileAsync();
@@ -19,7 +21,11 @@ namespace Bit.App.Abstractions
             string okButtonText = null, string cancelButtonText = null, bool numericKeyboard = false,
             bool autofocus = true);
         void RateApp();
-        bool SupportsFaceId();
+        bool SupportsFaceBiometric();
+        Task<bool> SupportsFaceBiometricAsync();
+        Task<bool> BiometricAvailableAsync();
+        bool UseNativeBiometric();
+        Task<bool> AuthenticateBiometricAsync(string text = null);
         bool SupportsNfc();
         bool SupportsCamera();
         bool SupportsAutofillService();
@@ -30,9 +36,12 @@ namespace Bit.App.Abstractions
         void CloseAutofill();
         void Background();
         bool AutofillAccessibilityServiceRunning();
+        bool AutofillAccessibilityOverlayPermitted();
         bool AutofillServiceEnabled();
         string GetBuildNumber();
         void OpenAccessibilitySettings();
+        void OpenAccessibilityOverlayPermissionSettings();
         void OpenAutofillSettings();
+        bool UsingDarkTheme();
     }
 }

src/App/App.csproj

@@ -16,9 +16,9 @@
     <PackageReference Include="HockeySDK.Xamarin" Version="5.2.0" />
     <PackageReference Include="Plugin.Fingerprint" Version="1.4.9" />
     <PackageReference Include="Refractored.FloatingActionButtonForms" Version="2.1.0" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.1.0" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
     <PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.11.982" />
-    <PackageReference Include="Xamarin.Forms" Version="3.6.0.344457" />
+    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991265" />
     <PackageReference Include="ZXing.Net.Mobile.Forms" Version="2.1.47" />
   </ItemGroup>
 
@@ -66,6 +66,9 @@
     <Compile Update="Pages\Settings\FoldersPage.xaml.cs">
       <DependentUpon>FoldersPage.xaml</DependentUpon>
     </Compile>
+    <Compile Update="Pages\Settings\ExportVaultPage.xaml.cs">
+      <DependentUpon>ExportVaultPage.xaml</DependentUpon>
+    </Compile>
     <Compile Update="Pages\Settings\OptionsPage.xaml.cs">
       <DependentUpon>OptionsPage.xaml</DependentUpon>
     </Compile>

src/App/App.xaml.cs

@@ -39,6 +39,8 @@ namespace Bit.App
         private readonly IDeviceActionService _deviceActionService;
         private readonly AppOptions _appOptions;
 
+        private static bool _isResumed;
+
         public App(AppOptions appOptions)
         {
             _appOptions = appOptions ?? new AppOptions();
@@ -89,18 +91,7 @@ namespace Bit.App
                 }
                 else if(message.Command == "locked")
                 {
-                    await _stateService.PurgeAsync();
-                    var autoPromptFingerprint = !(message.Data as bool?).GetValueOrDefault();
-                    if(autoPromptFingerprint && Device.RuntimePlatform == Device.iOS)
-                    {
-                        var lockOptions = await _storageService.GetAsync<int?>(Constants.LockOptionKey);
-                        if(lockOptions == 0)
-                        {
-                            autoPromptFingerprint = false;
-                        }
-                    }
-                    var lockPage = new LockPage(_appOptions, autoPromptFingerprint);
-                    Device.BeginInvokeOnMainThread(() => Current.MainPage = new NavigationPage(lockPage));
+                    await LockedAsync(!(message.Data as bool?).GetValueOrDefault());
                 }
                 else if(message.Command == "lockVault")
                 {
@@ -108,11 +99,8 @@ namespace Bit.App
                 }
                 else if(message.Command == "logout")
                 {
-                    if(Migration.MigrationHelpers.Migrating)
-                    {
-                        return;
-                    }
-                    Device.BeginInvokeOnMainThread(async () => await LogOutAsync(false));
+                    Device.BeginInvokeOnMainThread(async () =>
+                        await LogOutAsync((message.Data as bool?).GetValueOrDefault()));
                 }
                 else if(message.Command == "loggedOut")
                 {
@@ -126,6 +114,13 @@ namespace Bit.App
                         ResumedAsync();
                     }
                 }
+                else if(message.Command == "slept")
+                {
+                    if(Device.RuntimePlatform == Device.iOS)
+                    {
+                        await SleptAsync();
+                    }
+                }
                 else if(message.Command == "migrated")
                 {
                     await Task.Delay(1000);
@@ -157,6 +152,27 @@ namespace Bit.App
                 }
             });
         }
+        
+        // Workaround for https://github.com/xamarin/Xamarin.Forms/issues/7478
+        // Fixed in last Xamarin.Forms 4.4.0.x - remove this hack after updating
+        public static void WaitForResume()
+        {
+            var checkFrequencyInMillis = 100;
+            var maxTimeInMillis = 5000;
+            
+            var count = 0;
+            while(!_isResumed)
+            {
+                Task.Delay(checkFrequencyInMillis).Wait();
+                count += checkFrequencyInMillis;
+                
+                // don't let this run forever
+                if(count >= maxTimeInMillis)
+                {
+                    break;
+                }
+            }
+        }
 
         protected async override void OnStart()
         {
@@ -173,37 +189,58 @@ namespace Bit.App
                     SyncIfNeeded();
                 }
             }
+            _messagingService.Send("startEventTimer");
         }
 
         protected async override void OnSleep()
         {
             System.Diagnostics.Debug.WriteLine("XF App: OnSleep");
+            _isResumed = false;
             if(Device.RuntimePlatform == Device.Android)
             {
-                await _storageService.SaveAsync(Constants.LastActiveKey, DateTime.UtcNow);
+                var isLocked = await _lockService.IsLockedAsync();
+                if(!isLocked)
+                {
+                    await _storageService.SaveAsync(Constants.LastActiveKey, DateTime.UtcNow);
+                }
+                SetTabsPageFromAutofill(isLocked);
+                await SleptAsync();
             }
-            SetTabsPageFromAutofill();
-            await HandleLockingAsync();
         }
 
         protected override void OnResume()
         {
             System.Diagnostics.Debug.WriteLine("XF App: OnResume");
+            _isResumed = true;
             if(Device.RuntimePlatform == Device.Android)
             {
                 ResumedAsync();
             }
         }
 
+        private async Task SleptAsync()
+        {
+            await HandleLockingAsync();
+            _messagingService.Send("stopEventTimer");
+        }
+
         private async void ResumedAsync()
         {
             _messagingService.Send("cancelLockTimer");
+            _messagingService.Send("startEventTimer");
             await ClearCacheIfNeededAsync();
             await TryClearCiphersCacheAsync();
             Prime();
             SyncIfNeeded();
             if(Current.MainPage is NavigationPage navPage && navPage.CurrentPage is LockPage lockPage)
             {
+                if(Device.RuntimePlatform == Device.Android)
+                {
+                    // Workaround for https://github.com/xamarin/Xamarin.Forms/issues/7478
+                    await Task.Delay(100);
+                    Current.MainPage = new NavigationPage(lockPage);
+                    // End workaround
+                }
                 await lockPage.PromptFingerprintAfterResumeAsync();
             }
         }
@@ -231,12 +268,15 @@ namespace Bit.App
                 _passwordGenerationService.ClearAsync(),
                 _lockService.ClearAsync(),
                 _stateService.PurgeAsync());
-            _lockService.PinLocked = false;
             _lockService.FingerprintLocked = true;
             _searchService.ClearIndex();
             _authService.LogOut(() =>
             {
                 Current.MainPage = new HomePage();
+                if(expired)
+                {
+                    _platformUtilsService.ShowToast("warning", null, AppResources.LoginExpired);
+                }
             });
         }
 
@@ -304,7 +344,7 @@ namespace Bit.App
             }
         }
 
-        private void SetTabsPageFromAutofill()
+        private void SetTabsPageFromAutofill(bool isLocked)
         {
             if(Device.RuntimePlatform == Device.Android && !string.IsNullOrWhiteSpace(_appOptions.Uri) &&
                 !_appOptions.FromAutofillFramework)
@@ -313,8 +353,15 @@ namespace Bit.App
                 {
                     Device.BeginInvokeOnMainThread(() =>
                     {
-                        Current.MainPage = new TabsPage();
                         _appOptions.Uri = null;
+                        if(isLocked)
+                        {
+                            Current.MainPage = new NavigationPage(new LockPage());
+                        }
+                        else
+                        {
+                            Current.MainPage = new TabsPage();
+                        }
                     });
                 });
             }
@@ -341,10 +388,6 @@ namespace Bit.App
 
         private void SyncIfNeeded()
         {
-            if(Migration.MigrationHelpers.Migrating)
-            {
-                return;
-            }
             if(Xamarin.Essentials.Connectivity.NetworkAccess == Xamarin.Essentials.NetworkAccess.None)
             {
                 return;
@@ -352,8 +395,9 @@ namespace Bit.App
             Task.Run(async () =>
             {
                 var lastSync = await _syncService.GetLastSyncAsync();
-                if(DateTime.UtcNow - lastSync > TimeSpan.FromMinutes(30))
+                if(lastSync == null || ((DateTime.UtcNow - lastSync) > TimeSpan.FromMinutes(30)))
                 {
+                    await Task.Delay(1000);
                     await _syncService.FullSyncAsync(false);
                 }
             });
@@ -372,5 +416,50 @@ namespace Bit.App
                 await _storageService.RemoveAsync(Constants.ClearCiphersCacheKey);
             }
         }
+
+        private async Task LockedAsync(bool autoPromptFingerprint)
+        {
+            await _stateService.PurgeAsync();
+            if(autoPromptFingerprint && Device.RuntimePlatform == Device.iOS)
+            {
+                var lockOptions = await _storageService.GetAsync<int?>(Constants.LockOptionKey);
+                if(lockOptions == 0)
+                {
+                    autoPromptFingerprint = false;
+                }
+            }
+            else if(autoPromptFingerprint && Device.RuntimePlatform == Device.Android &&
+                _deviceActionService.UseNativeBiometric())
+            {
+                autoPromptFingerprint = false;
+            }
+            PreviousPageInfo lastPageBeforeLock = null;
+            if(Current.MainPage is TabbedPage tabbedPage && tabbedPage.Navigation.ModalStack.Count > 0)
+            {
+                var topPage = tabbedPage.Navigation.ModalStack[tabbedPage.Navigation.ModalStack.Count - 1];
+                if(topPage is NavigationPage navPage)
+                {
+                    if(navPage.CurrentPage is ViewPage viewPage)
+                    {
+                        lastPageBeforeLock = new PreviousPageInfo
+                        {
+                            Page = "view",
+                            CipherId = viewPage.ViewModel.CipherId
+                        };
+                    }
+                    else if(navPage.CurrentPage is AddEditPage addEditPage && addEditPage.ViewModel.EditMode)
+                    {
+                        lastPageBeforeLock = new PreviousPageInfo
+                        {
+                            Page = "edit",
+                            CipherId = addEditPage.ViewModel.CipherId
+                        };
+                    }
+                }
+            }
+            await _storageService.SaveAsync(Constants.PreviousPageKey, lastPageBeforeLock);
+            var lockPage = new LockPage(_appOptions, autoPromptFingerprint);
+            Device.BeginInvokeOnMainThread(() => Current.MainPage = new NavigationPage(lockPage));
+        }
     }
 }

src/App/Controls/CipherViewCell/CipherViewCell.xaml

@@ -3,6 +3,7 @@
           xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
           x:Class="Bit.App.Controls.CipherViewCell"
           xmlns:controls="clr-namespace:Bit.App.Controls"
+          xmlns:u="clr-namespace:Bit.App.Utilities"
           xmlns:ff="clr-namespace:FFImageLoading.Forms;assembly=FFImageLoading.Forms">
 
     <Grid 
@@ -32,7 +33,8 @@
             Grid.Column="0"
             HorizontalOptions="Center"
             VerticalOptions="Center"
-            StyleClass="list-icon, list-icon-platform" />
+            StyleClass="list-icon, list-icon-platform"
+            AutomationProperties.IsInAccessibleTree="False" />
 
         <ff:CachedImage
             x:Name="_image"
@@ -44,7 +46,8 @@
             VerticalOptions="Center"
             WidthRequest="22"
             HeightRequest="22"
-            IsVisible="False"/>
+            IsVisible="False"
+            AutomationProperties.IsInAccessibleTree="False" />
 
         <Grid RowSpacing="0" ColumnSpacing="0" Grid.Row="0" Grid.Column="1" VerticalOptions="Center">
             <Grid.RowDefinitions>
@@ -79,7 +82,9 @@
                 StyleClass="list-title-icon"
                 Margin="5, 0, 0, 0"
                 Text="&#xf1e0;"
-                IsVisible="{Binding Cipher.Shared, Mode=OneWay}" />
+                IsVisible="{Binding Cipher.Shared, Mode=OneWay}"
+                AutomationProperties.IsInAccessibleTree="True"
+                AutomationProperties.Name="{u:I18n Shared}" />
             <controls:FaLabel
                 Grid.Column="2"
                 Grid.Row="0"
@@ -88,7 +93,9 @@
                 StyleClass="list-title-icon"
                 Margin="5, 0, 0, 0"
                 Text="&#xf0c6;"
-                IsVisible="{Binding Cipher.HasAttachments, Mode=OneWay}" />
+                IsVisible="{Binding Cipher.HasAttachments, Mode=OneWay}"
+                AutomationProperties.IsInAccessibleTree="True"
+                AutomationProperties.Name="{u:I18n Attachments}" />
         </Grid>
 
         <controls:MiButton
@@ -98,7 +105,9 @@
             StyleClass="list-row-button, list-row-button-platform, btn-disabled"
             Clicked="MoreButton_Clicked"
             VerticalOptions="CenterAndExpand"
-            HorizontalOptions="EndAndExpand" />
+            HorizontalOptions="EndAndExpand"
+            AutomationProperties.IsInAccessibleTree="True"
+            AutomationProperties.Name="{u:I18n Options}" />
 
     </Grid>
 

src/App/Controls/ExtendedSearchBar.cs

@@ -0,0 +1,21 @@
+using Bit.App.Abstractions;
+using Bit.Core.Utilities;
+using Xamarin.Forms;
+
+namespace Bit.App.Controls
+{
+    public class ExtendedSearchBar : SearchBar
+    {
+        public ExtendedSearchBar()
+        {
+            if(Device.RuntimePlatform == Device.iOS)
+            {
+                var deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService", true);
+                if(!deviceActionService?.UsingDarkTheme() ?? false)
+                {
+                    TextColor = Color.Black;
+                }
+            }
+        }
+    }
+}

src/App/Migration/Abstractions/IOldSecureStorageService.cs

@@ -1,10 +0,0 @@
-namespace Bit.App.Migration.Abstractions
-{
-    public interface IOldSecureStorageService
-    {
-        bool Contains(string key);
-        void Delete(string key);
-        byte[] Retrieve(string key);
-        void Store(string key, byte[] dataBytes);
-    }
-}

src/App/Migration/Crypto.cs

@@ -1,199 +0,0 @@
-using Bit.App.Migration.Models;
-using Bit.Core.Enums;
-using PCLCrypto;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Bit.App.Migration
-{
-    public static class Crypto
-    {
-        public static CipherString AesCbcEncrypt(byte[] plainBytes, SymmetricCryptoKey key)
-        {
-            var parts = AesCbcEncryptToParts(plainBytes, key);
-            return new CipherString(parts.Item1, Convert.ToBase64String(parts.Item2),
-                Convert.ToBase64String(parts.Item4), parts.Item3 != null ? Convert.ToBase64String(parts.Item3) : null);
-        }
-
-        public static byte[] AesCbcEncryptToBytes(byte[] plainBytes, SymmetricCryptoKey key)
-        {
-            var parts = AesCbcEncryptToParts(plainBytes, key);
-            var macLength = parts.Item3?.Length ?? 0;
-
-            var encBytes = new byte[1 + parts.Item2.Length + macLength + parts.Item4.Length];
-            encBytes[0] = (byte)parts.Item1;
-            parts.Item2.CopyTo(encBytes, 1);
-            if(parts.Item3 != null)
-            {
-                parts.Item3.CopyTo(encBytes, 1 + parts.Item2.Length);
-            }
-            parts.Item4.CopyTo(encBytes, 1 + parts.Item2.Length + macLength);
-            return encBytes;
-        }
-
-        private static Tuple<EncryptionType, byte[], byte[], byte[]> AesCbcEncryptToParts(byte[] plainBytes,
-            SymmetricCryptoKey key)
-        {
-            if(key == null)
-            {
-                throw new ArgumentNullException(nameof(key));
-            }
-
-            if(plainBytes == null)
-            {
-                throw new ArgumentNullException(nameof(plainBytes));
-            }
-
-            var provider = WinRTCrypto.SymmetricKeyAlgorithmProvider.OpenAlgorithm(SymmetricAlgorithm.AesCbcPkcs7);
-            var cryptoKey = provider.CreateSymmetricKey(key.EncKey);
-            var iv = RandomBytes(provider.BlockLength);
-            var ct = WinRTCrypto.CryptographicEngine.Encrypt(cryptoKey, plainBytes, iv);
-            var mac = key.MacKey != null ? ComputeMac(ct, iv, key.MacKey) : null;
-
-            return new Tuple<EncryptionType, byte[], byte[], byte[]>(key.EncryptionType, iv, mac, ct);
-        }
-
-        public static byte[] AesCbcDecrypt(CipherString encyptedValue, SymmetricCryptoKey key)
-        {
-            if(encyptedValue == null)
-            {
-                throw new ArgumentNullException(nameof(encyptedValue));
-            }
-
-            return AesCbcDecrypt(encyptedValue.EncryptionType, encyptedValue.CipherTextBytes,
-                encyptedValue.InitializationVectorBytes, encyptedValue.MacBytes, key);
-        }
-
-        public static byte[] AesCbcDecrypt(EncryptionType type, byte[] ct, byte[] iv, byte[] mac,
-            SymmetricCryptoKey key)
-        {
-            if(key == null)
-            {
-                throw new ArgumentNullException(nameof(key));
-            }
-
-            if(ct == null)
-            {
-                throw new ArgumentNullException(nameof(ct));
-            }
-
-            if(iv == null)
-            {
-                throw new ArgumentNullException(nameof(iv));
-            }
-
-            if(key.MacKey != null && mac == null)
-            {
-                throw new ArgumentNullException(nameof(mac));
-            }
-
-            if(key.EncryptionType != type)
-            {
-                throw new InvalidOperationException(nameof(type));
-            }
-
-            if(key.MacKey != null && mac != null)
-            {
-                var computedMacBytes = ComputeMac(ct, iv, key.MacKey);
-                if(!MacsEqual(computedMacBytes, mac))
-                {
-                    throw new InvalidOperationException("MAC failed.");
-                }
-            }
-
-            var provider = WinRTCrypto.SymmetricKeyAlgorithmProvider.OpenAlgorithm(SymmetricAlgorithm.AesCbcPkcs7);
-            var cryptoKey = provider.CreateSymmetricKey(key.EncKey);
-            var decryptedBytes = WinRTCrypto.CryptographicEngine.Decrypt(cryptoKey, ct, iv);
-            return decryptedBytes;
-        }
-
-        public static byte[] RandomBytes(int length)
-        {
-            return WinRTCrypto.CryptographicBuffer.GenerateRandom(length);
-        }
-
-        public static byte[] ComputeMac(byte[] ctBytes, byte[] ivBytes, byte[] macKey)
-        {
-            if(ctBytes == null)
-            {
-                throw new ArgumentNullException(nameof(ctBytes));
-            }
-
-            if(ivBytes == null)
-            {
-                throw new ArgumentNullException(nameof(ivBytes));
-            }
-
-            return ComputeMac(ivBytes.Concat(ctBytes), macKey);
-        }
-
-        public static byte[] ComputeMac(IEnumerable<byte> dataBytes, byte[] macKey)
-        {
-            if(macKey == null)
-            {
-                throw new ArgumentNullException(nameof(macKey));
-            }
-
-            if(dataBytes == null)
-            {
-                throw new ArgumentNullException(nameof(dataBytes));
-            }
-
-            var algorithm = WinRTCrypto.MacAlgorithmProvider.OpenAlgorithm(MacAlgorithm.HmacSha256);
-            var hasher = algorithm.CreateHash(macKey);
-            hasher.Append(dataBytes.ToArray());
-            var mac = hasher.GetValueAndReset();
-            return mac;
-        }
-
-        // Safely compare two MACs in a way that protects against timing attacks (Double HMAC Verification).
-        // ref: https://www.nccgroup.trust/us/about-us/newsroom-and-events/blog/2011/february/double-hmac-verification/
-        // ref: https://paragonie.com/blog/2015/11/preventing-timing-attacks-on-string-comparison-with-double-hmac-strategy
-        public static bool MacsEqual(byte[] mac1, byte[] mac2)
-        {
-            var algorithm = WinRTCrypto.MacAlgorithmProvider.OpenAlgorithm(MacAlgorithm.HmacSha256);
-            var hasher = algorithm.CreateHash(RandomBytes(32));
-
-            hasher.Append(mac1);
-            mac1 = hasher.GetValueAndReset();
-
-            hasher.Append(mac2);
-            mac2 = hasher.GetValueAndReset();
-
-            if(mac1.Length != mac2.Length)
-            {
-                return false;
-            }
-
-            for(int i = 0; i < mac2.Length; i++)
-            {
-                if(mac1[i] != mac2[i])
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        // ref: https://tools.ietf.org/html/rfc5869
-        public static byte[] HkdfExpand(byte[] prk, byte[] info, int size)
-        {
-            var hashLen = 32; // sha256
-            var okm = new byte[size];
-            var previousT = new byte[0];
-            var n = (int)Math.Ceiling((double)size / hashLen);
-            for(int i = 0; i < n; i++)
-            {
-                var t = new byte[previousT.Length + info.Length + 1];
-                previousT.CopyTo(t, 0);
-                info.CopyTo(t, previousT.Length);
-                t[t.Length - 1] = (byte)(i + 1);
-                previousT = ComputeMac(t, prk);
-                previousT.CopyTo(okm, i * hashLen);
-            }
-            return okm;
-        }
-    }
-}

src/App/Migration/MigrationHelpers.cs

@@ -1,200 +0,0 @@
-using Bit.Core;
-using Bit.Core.Abstractions;
-using Bit.Core.Enums;
-using Bit.Core.Utilities;
-using System;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Bit.App.Migration
-{
-    public static class MigrationHelpers
-    {
-        public static bool Migrating = false;
-
-        public static bool NeedsMigration()
-        {
-            return ServiceContainer.Resolve<SettingsShim>("settingsShim")
-                .GetValueOrDefault(Constants.OldUserIdKey, null) != null; ;
-        }
-
-        public static async Task<bool> PerformMigrationAsync()
-        {
-            if(!NeedsMigration() || Migrating)
-            {
-                return false;
-            }
-
-            Migrating = true;
-            var settingsShim = ServiceContainer.Resolve<SettingsShim>("settingsShim");
-            var oldSecureStorageService = ServiceContainer.Resolve<Abstractions.IOldSecureStorageService>(
-                "oldSecureStorageService");
-
-            var messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
-            var storageService = ServiceContainer.Resolve<IStorageService>("storageService");
-            var secureStorageService = ServiceContainer.Resolve<IStorageService>("secureStorageService");
-            var cryptoService = ServiceContainer.Resolve<ICryptoService>("cryptoService");
-            var tokenService = ServiceContainer.Resolve<ITokenService>("tokenService");
-            var userService = ServiceContainer.Resolve<IUserService>("userService");
-            var environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
-            var passwordGenerationService = ServiceContainer.Resolve<IPasswordGenerationService>(
-                "passwordGenerationService");
-            var syncService = ServiceContainer.Resolve<ISyncService>("syncService");
-            var lockService = ServiceContainer.Resolve<ILockService>("lockService");
-
-            // Get old data
-
-            var oldTokenBytes = oldSecureStorageService.Retrieve("accessToken");
-            var oldToken = oldTokenBytes == null ? null : Encoding.UTF8.GetString(
-                oldTokenBytes, 0, oldTokenBytes.Length);
-            var oldKeyBytes = oldSecureStorageService.Retrieve("key");
-            var oldKey = oldKeyBytes == null ? null : new Models.SymmetricCryptoKey(oldKeyBytes);
-            var oldUserId = settingsShim.GetValueOrDefault("userId", null);
-
-            var isAuthenticated = oldKey != null && !string.IsNullOrWhiteSpace(oldToken) &&
-                !string.IsNullOrWhiteSpace(oldUserId);
-            if(!isAuthenticated)
-            {
-                Migrating = false;
-                return false;
-            }
-
-            var oldRefreshTokenBytes = oldSecureStorageService.Retrieve("refreshToken");
-            var oldRefreshToken = oldRefreshTokenBytes == null ? null : Encoding.UTF8.GetString(
-                oldRefreshTokenBytes, 0, oldRefreshTokenBytes.Length);
-            var oldPinBytes = oldSecureStorageService.Retrieve("pin");
-            var oldPin = oldPinBytes == null ? null : Encoding.UTF8.GetString(
-                oldPinBytes, 0, oldPinBytes.Length);
-
-            var oldEncKey = settingsShim.GetValueOrDefault("encKey", null);
-            var oldEncPrivateKey = settingsShim.GetValueOrDefault("encPrivateKey", null);
-            var oldEmail = settingsShim.GetValueOrDefault("email", null);
-            var oldKdf = (KdfType)settingsShim.GetValueOrDefault("kdf", (int)KdfType.PBKDF2_SHA256);
-            var oldKdfIterations = settingsShim.GetValueOrDefault("kdfIterations", 5000);
-
-            var oldTwoFactorTokenBytes = oldSecureStorageService.Retrieve(
-                string.Format("twoFactorToken_{0}", Convert.ToBase64String(Encoding.UTF8.GetBytes(oldEmail))));
-            var oldTwoFactorToken = oldTwoFactorTokenBytes == null ? null : Encoding.UTF8.GetString(
-                oldTwoFactorTokenBytes, 0, oldTwoFactorTokenBytes.Length);
-
-            var oldAppIdBytes = oldSecureStorageService.Retrieve("appId");
-            var oldAppId = oldAppIdBytes == null ? null : new Guid(oldAppIdBytes).ToString();
-            var oldAnonAppIdBytes = oldSecureStorageService.Retrieve("anonymousAppId");
-            var oldAnonAppId = oldAnonAppIdBytes == null ? null : new Guid(oldAnonAppIdBytes).ToString();
-            var oldFingerprint = settingsShim.GetValueOrDefault("setting:fingerprintUnlockOn", false);
-
-            // Save settings
-
-            await storageService.SaveAsync(Constants.AccessibilityAutofillPersistNotificationKey,
-                settingsShim.GetValueOrDefault("setting:persistNotification", false));
-            await storageService.SaveAsync(Constants.AccessibilityAutofillPasswordFieldKey,
-                settingsShim.GetValueOrDefault("setting:autofillPasswordField", false));
-            await storageService.SaveAsync(Constants.DisableAutoTotpCopyKey,
-                settingsShim.GetValueOrDefault("setting:disableAutoCopyTotp", false));
-            await storageService.SaveAsync(Constants.DisableFaviconKey,
-                settingsShim.GetValueOrDefault("setting:disableWebsiteIcons", false));
-            await storageService.SaveAsync(Constants.AddSitePromptShownKey,
-                settingsShim.GetValueOrDefault("addedSiteAlert", false));
-            await storageService.SaveAsync(Constants.PushInitialPromptShownKey,
-                settingsShim.GetValueOrDefault("push:initialPromptShown", false));
-            await storageService.SaveAsync(Constants.PushCurrentTokenKey,
-                settingsShim.GetValueOrDefault("push:currentToken", null));
-            await storageService.SaveAsync(Constants.PushRegisteredTokenKey,
-                settingsShim.GetValueOrDefault("push:registeredToken", null));
-            // For some reason "push:lastRegistrationDate" isn't getting pulled from settingsShim correctly.
-            // We don't really need it anyways.
-            // var lastReg = settingsShim.GetValueOrDefault("push:lastRegistrationDate", DateTime.MinValue);
-            // await storageService.SaveAsync(Constants.PushLastRegistrationDateKey, lastReg);
-            await storageService.SaveAsync("rememberedEmail",
-                settingsShim.GetValueOrDefault("other:lastLoginEmail", null));
-            await storageService.SaveAsync("appExtensionStarted",
-                settingsShim.GetValueOrDefault("extension:started", false));
-            await storageService.SaveAsync("appExtensionActivated",
-                settingsShim.GetValueOrDefault("extension:activated", false));
-
-            await environmentService.SetUrlsAsync(new Core.Models.Data.EnvironmentUrlData
-            {
-                Base = settingsShim.GetValueOrDefault("other:baseUrl", null),
-                Api = settingsShim.GetValueOrDefault("other:apiUrl", null),
-                WebVault = settingsShim.GetValueOrDefault("other:webVaultUrl", null),
-                Identity = settingsShim.GetValueOrDefault("other:identityUrl", null),
-                Icons = settingsShim.GetValueOrDefault("other:iconsUrl", null)
-            });
-
-            await passwordGenerationService.SaveOptionsAsync(new Core.Models.Domain.PasswordGenerationOptions
-            {
-                Ambiguous = settingsShim.GetValueOrDefault("pwGenerator:ambiguous", false),
-                Length = settingsShim.GetValueOrDefault("pwGenerator:length", 15),
-                Uppercase = settingsShim.GetValueOrDefault("pwGenerator:uppercase", true),
-                Lowercase = settingsShim.GetValueOrDefault("pwGenerator:lowercase", true),
-                Number = settingsShim.GetValueOrDefault("pwGenerator:numbers", true),
-                MinNumber = settingsShim.GetValueOrDefault("pwGenerator:minNumbers", 0),
-                Special = settingsShim.GetValueOrDefault("pwGenerator:special", true),
-                MinSpecial = settingsShim.GetValueOrDefault("pwGenerator:minSpecial", 0),
-                WordSeparator = "-",
-                NumWords = 3
-            });
-
-            // Save lock options
-
-            int? lockOptionsSeconds = settingsShim.GetValueOrDefault("setting:lockSeconds", -10);
-            if(lockOptionsSeconds == -10)
-            {
-                lockOptionsSeconds = 60 * 15;
-            }
-            else if(lockOptionsSeconds == -1)
-            {
-                lockOptionsSeconds = null;
-            }
-            await storageService.SaveAsync(Constants.LockOptionKey,
-                lockOptionsSeconds == null ? (int?)null : lockOptionsSeconds.Value / 60);
-
-            // Save app ids
-
-            await storageService.SaveAsync("appId", oldAppId);
-            await storageService.SaveAsync("anonymousAppId", oldAnonAppId);
-
-            // Save new authed data
-
-            await tokenService.SetTwoFactorTokenAsync(oldTwoFactorToken, oldEmail);
-            await tokenService.SetTokensAsync(oldToken, oldRefreshToken);
-            await userService.SetInformationAsync(oldUserId, oldEmail, oldKdf, oldKdfIterations);
-
-            var newKey = new Core.Models.Domain.SymmetricCryptoKey(oldKey.Key);
-            await cryptoService.SetKeyAsync(newKey);
-            // Key hash is unavailable in old version, store old key until we can move it to key hash
-            await secureStorageService.SaveAsync("oldKey", newKey.KeyB64);
-            await cryptoService.SetEncKeyAsync(oldEncKey);
-            await cryptoService.SetEncPrivateKeyAsync(oldEncPrivateKey);
-
-            // Save fingerprint/pin
-
-            if(oldFingerprint)
-            {
-                await storageService.SaveAsync(Constants.FingerprintUnlockKey, true);
-            }
-            else if(!string.IsNullOrWhiteSpace(oldPin))
-            {
-                var pinKey = await cryptoService.MakePinKeyAysnc(oldPin, oldEmail, oldKdf, oldKdfIterations);
-                var pinProtectedKey = await cryptoService.EncryptAsync(oldKeyBytes, pinKey);
-                await storageService.SaveAsync(Constants.PinProtectedKey, pinProtectedKey.EncryptedString);
-            }
-
-            // Post migration tasks
-            await cryptoService.ToggleKeyAsync();
-            await storageService.SaveAsync(Constants.LastActiveKey, DateTime.UtcNow.AddYears(-1));
-            await lockService.CheckLockAsync();
-
-            // Remove "needs migration" flag
-            settingsShim.Remove(Constants.OldUserIdKey);
-            await storageService.SaveAsync(Constants.MigratedFromV1, true);
-            Migrating = false;
-            messagingService.Send("migrated");
-            if(Xamarin.Essentials.Connectivity.NetworkAccess != Xamarin.Essentials.NetworkAccess.None)
-            {
-                var task = Task.Run(() => syncService.FullSyncAsync(true));
-            }
-            return true;
-        }
-    }
-}

src/App/Migration/Models/CipherString.cs

@@ -1,117 +0,0 @@
-using System;
-using Bit.Core.Enums;
-
-namespace Bit.App.Migration.Models
-{
-    public class CipherString
-    {
-        private string _decryptedValue;
-
-        public CipherString(string encryptedString)
-        {
-            if(string.IsNullOrWhiteSpace(encryptedString))
-            {
-                throw new ArgumentException(nameof(encryptedString));
-            }
-
-            var headerPieces = encryptedString.Split('.');
-            string[] encPieces;
-
-            EncryptionType encType;
-            if(headerPieces.Length == 2 && Enum.TryParse(headerPieces[0], out encType))
-            {
-                EncryptionType = encType;
-                encPieces = headerPieces[1].Split('|');
-            }
-            else if(headerPieces.Length == 1)
-            {
-                encPieces = headerPieces[0].Split('|');
-                EncryptionType = encPieces.Length == 3 ? EncryptionType.AesCbc128_HmacSha256_B64 :
-                    EncryptionType.AesCbc256_B64;
-            }
-            else
-            {
-                throw new ArgumentException("Malformed header.");
-            }
-
-            switch(EncryptionType)
-            {
-                case EncryptionType.AesCbc256_B64:
-                    if(encPieces.Length != 2)
-                    {
-                        throw new ArgumentException("Malformed encPieces.");
-                    }
-                    InitializationVector = encPieces[0];
-                    CipherText = encPieces[1];
-                    break;
-                case EncryptionType.AesCbc128_HmacSha256_B64:
-                case EncryptionType.AesCbc256_HmacSha256_B64:
-                    if(encPieces.Length != 3)
-                    {
-                        throw new ArgumentException("Malformed encPieces.");
-                    }
-                    InitializationVector = encPieces[0];
-                    CipherText = encPieces[1];
-                    Mac = encPieces[2];
-                    break;
-                case EncryptionType.Rsa2048_OaepSha256_B64:
-                case EncryptionType.Rsa2048_OaepSha1_B64:
-                    if(encPieces.Length != 1)
-                    {
-                        throw new ArgumentException("Malformed encPieces.");
-                    }
-                    CipherText = encPieces[0];
-                    break;
-                case EncryptionType.Rsa2048_OaepSha1_HmacSha256_B64:
-                case EncryptionType.Rsa2048_OaepSha256_HmacSha256_B64:
-                    if(encPieces.Length != 2)
-                    {
-                        throw new ArgumentException("Malformed encPieces.");
-                    }
-                    CipherText = encPieces[0];
-                    Mac = encPieces[1];
-                    break;
-                default:
-                    throw new ArgumentException("Unknown encType.");
-            }
-
-            EncryptedString = encryptedString;
-        }
-
-        public CipherString(EncryptionType encryptionType, string initializationVector, string cipherText,
-            string mac = null)
-        {
-            if(string.IsNullOrWhiteSpace(initializationVector))
-            {
-                throw new ArgumentNullException(nameof(initializationVector));
-            }
-
-            if(string.IsNullOrWhiteSpace(cipherText))
-            {
-                throw new ArgumentNullException(nameof(cipherText));
-            }
-
-            EncryptionType = encryptionType;
-            EncryptedString = string.Format("{0}.{1}|{2}", (byte)EncryptionType, initializationVector, cipherText);
-
-            if(!string.IsNullOrWhiteSpace(mac))
-            {
-                EncryptedString = string.Format("{0}|{1}", EncryptedString, mac);
-            }
-
-            CipherText = cipherText;
-            InitializationVector = initializationVector;
-            Mac = mac;
-        }
-
-        public EncryptionType EncryptionType { get; private set; }
-        public string EncryptedString { get; private set; }
-        public string InitializationVector { get; private set; }
-        public string CipherText { get; private set; }
-        public string Mac { get; private set; }
-        public byte[] InitializationVectorBytes => string.IsNullOrWhiteSpace(InitializationVector) ?
-            null : Convert.FromBase64String(InitializationVector);
-        public byte[] CipherTextBytes => Convert.FromBase64String(CipherText);
-        public byte[] MacBytes => Mac == null ? null : Convert.FromBase64String(Mac);
-    }
-}

src/App/Migration/Models/SymmetricCryptoKey.cs

@@ -1,62 +0,0 @@
-using Bit.Core.Enums;
-using System;
-using System.Linq;
-
-namespace Bit.App.Migration.Models
-{
-    public class SymmetricCryptoKey
-    {
-        public SymmetricCryptoKey(byte[] rawBytes, EncryptionType? encType = null)
-        {
-            if(rawBytes == null || rawBytes.Length == 0)
-            {
-                throw new Exception("Must provide keyBytes.");
-            }
-
-            if(encType == null)
-            {
-                if(rawBytes.Length == 32)
-                {
-                    encType = EncryptionType.AesCbc256_B64;
-                }
-                else if(rawBytes.Length == 64)
-                {
-                    encType = EncryptionType.AesCbc256_HmacSha256_B64;
-                }
-                else
-                {
-                    throw new Exception("Unable to determine encType.");
-                }
-            }
-
-            EncryptionType = encType.Value;
-            Key = rawBytes;
-
-            if(EncryptionType == EncryptionType.AesCbc256_B64 && Key.Length == 32)
-            {
-                EncKey = Key;
-                MacKey = null;
-            }
-            else if(EncryptionType == EncryptionType.AesCbc128_HmacSha256_B64 && Key.Length == 32)
-            {
-                EncKey = Key.Take(16).ToArray();
-                MacKey = Key.Skip(16).Take(16).ToArray();
-            }
-            else if(EncryptionType == EncryptionType.AesCbc256_HmacSha256_B64 && Key.Length == 64)
-            {
-                EncKey = Key.Take(32).ToArray();
-                MacKey = Key.Skip(32).Take(32).ToArray();
-            }
-            else
-            {
-                throw new Exception("Unsupported encType/key length.");
-            }
-        }
-
-        public byte[] Key { get; set; }
-        public string B64Key => Convert.ToBase64String(Key);
-        public byte[] EncKey { get; set; }
-        public byte[] MacKey { get; set; }
-        public EncryptionType EncryptionType { get; set; }
-    }
-}

src/App/Migration/SettingsShim.cs

@@ -1,122 +0,0 @@
-using System;
-
-namespace Bit.App.Migration
-{
-    public class SettingsShim
-    {
-        private readonly string _sharedName;
-
-        public SettingsShim(string sharedName = null)
-        {
-            _sharedName = sharedName;
-        }
-
-        public bool Contains(string key)
-        {
-            return _sharedName != null ? Xamarin.Essentials.Preferences.ContainsKey(key, _sharedName) :
-                Xamarin.Essentials.Preferences.ContainsKey(key);
-        }
-
-        public string GetValueOrDefault(string key, string defaultValue)
-        {
-            return _sharedName != null ? Xamarin.Essentials.Preferences.Get(key, defaultValue, _sharedName) :
-                Xamarin.Essentials.Preferences.Get(key, defaultValue);
-        }
-
-        public DateTime GetValueOrDefault(string key, DateTime defaultValue)
-        {
-            return _sharedName != null ? Xamarin.Essentials.Preferences.Get(key, defaultValue, _sharedName) :
-                Xamarin.Essentials.Preferences.Get(key, defaultValue);
-        }
-
-        public bool GetValueOrDefault(string key, bool defaultValue)
-        {
-            return _sharedName != null ? Xamarin.Essentials.Preferences.Get(key, defaultValue, _sharedName) :
-                Xamarin.Essentials.Preferences.Get(key, defaultValue);
-        }
-
-        public int GetValueOrDefault(string key, int defaultValue)
-        {
-            return _sharedName != null ? Xamarin.Essentials.Preferences.Get(key, defaultValue, _sharedName) :
-                Xamarin.Essentials.Preferences.Get(key, defaultValue);
-        }
-
-        public long GetValueOrDefault(string key, long defaultValue)
-        {
-            return _sharedName != null ? Xamarin.Essentials.Preferences.Get(key, defaultValue, _sharedName) :
-                Xamarin.Essentials.Preferences.Get(key, defaultValue);
-        }
-
-        public void AddOrUpdateValue(string key, string value)
-        {
-            if(_sharedName != null)
-            {
-                Xamarin.Essentials.Preferences.Set(key, value, _sharedName);
-            }
-            else
-            {
-                Xamarin.Essentials.Preferences.Set(key, value);
-            }
-        }
-
-        public void AddOrUpdateValue(string key, DateTime value)
-        {
-            if(_sharedName != null)
-            {
-                Xamarin.Essentials.Preferences.Set(key, value, _sharedName);
-            }
-            else
-            {
-                Xamarin.Essentials.Preferences.Set(key, value);
-            }
-        }
-
-        public void AddOrUpdateValue(string key, bool value)
-        {
-            if(_sharedName != null)
-            {
-                Xamarin.Essentials.Preferences.Set(key, value, _sharedName);
-            }
-            else
-            {
-                Xamarin.Essentials.Preferences.Set(key, value);
-            }
-        }
-
-        public void AddOrUpdateValue(string key, long value)
-        {
-            if(_sharedName != null)
-            {
-                Xamarin.Essentials.Preferences.Set(key, value, _sharedName);
-            }
-            else
-            {
-                Xamarin.Essentials.Preferences.Set(key, value);
-            }
-        }
-
-        public void AddOrUpdateValue(string key, int value)
-        {
-            if(_sharedName != null)
-            {
-                Xamarin.Essentials.Preferences.Set(key, value, _sharedName);
-            }
-            else
-            {
-                Xamarin.Essentials.Preferences.Set(key, value);
-            }
-        }
-
-        public void Remove(string key)
-        {
-            if(_sharedName != null)
-            {
-                Xamarin.Essentials.Preferences.Remove(key, _sharedName);
-            }
-            else
-            {
-                Xamarin.Essentials.Preferences.Remove(key);
-            }
-        }
-    }
-}

src/App/Models/PreviousPageInfo.cs

@@ -0,0 +1,9 @@
+namespace Bit.App.Models
+{
+    public class PreviousPageInfo
+    {
+        public string Page { get; set; }
+        public string CipherId { get; set; }
+        public string SearchText { get; set; }
+    }
+}

src/App/Pages/Accounts/HintPageViewModel.cs

@@ -60,7 +60,11 @@ namespace Bit.App.Pages
             catch(ApiException e)
             {
                 await _deviceActionService.HideLoadingAsync();
-                await Page.DisplayAlert(AppResources.AnErrorHasOccurred, e.Error.GetSingleMessage(), AppResources.Ok);
+                if(e?.Error != null)
+                {
+                    await _platformUtilsService.ShowDialogAsync(e.Error.GetSingleMessage(),
+                        AppResources.AnErrorHasOccurred);
+                }
             }
         }
     }

src/App/Pages/Accounts/HomePage.xaml

@@ -16,7 +16,9 @@
         <controls:FaButton Text="&#xf013;"
                            StyleClass="btn-muted, btn-icon, btn-icon-platform"
                            HorizontalOptions="Start"
-                           Clicked="Settings_Clicked">
+                           Clicked="Settings_Clicked"
+                           AutomationProperties.IsInAccessibleTree="True"
+                           AutomationProperties.Name="{u:I18n Options}">
             <controls:FaButton.Margin>
                 <OnPlatform x:TypeArguments="Thickness">
                     <On Platform="iOS" Value="0, 10, 0, 0" />

src/App/Pages/Accounts/HomePage.xaml.cs

@@ -16,9 +16,7 @@ namespace Bit.App.Pages
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
             _messagingService.Send("showStatusBar", false);
             InitializeComponent();
-            var theme = ThemeManager.GetTheme(Device.RuntimePlatform == Device.Android);
-            var darkbasedTheme = theme == "dark" || theme == "black" || theme == "nord";
-            _logo.Source = darkbasedTheme ? "logo_white.png" : "logo.png";
+            _logo.Source = !ThemeManager.UsingLightTheme ? "logo_white.png" : "logo.png";
         }
 
         public async Task DismissRegisterPageAndLogInAsync(string email)

src/App/Pages/Accounts/LockPage.xaml

@@ -58,7 +58,9 @@
                         Command="{Binding TogglePasswordCommand}"
                         Grid.Row="0"
                         Grid.Column="1"
-                        Grid.RowSpan="2" />
+                        Grid.RowSpan="2"
+                        AutomationProperties.IsInAccessibleTree="True"
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                 </Grid>
                 <Grid StyleClass="box-row" IsVisible="{Binding PinLock, Converter={StaticResource inverseBool}}">
                     <Grid.RowDefinitions>
@@ -91,7 +93,9 @@
                         Command="{Binding TogglePasswordCommand}"
                         Grid.Row="0"
                         Grid.Column="1"
-                        Grid.RowSpan="2" />
+                        Grid.RowSpan="2"
+                        AutomationProperties.IsInAccessibleTree="True"
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                 </Grid>
                 <Label
                     Text="{Binding LockedVerifyText}"

src/App/Pages/Accounts/LockPage.xaml.cs

@@ -1,4 +1,7 @@
 using Bit.App.Models;
+using Bit.Core;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
 using System;
 using System.Threading.Tasks;
 using Xamarin.Forms;
@@ -7,6 +10,7 @@ namespace Bit.App.Pages
 {
     public partial class LockPage : BaseContentPage
     {
+        private readonly IStorageService _storageService;
         private readonly AppOptions _appOptions;
         private readonly bool _autoPromptFingerprint;
         private readonly LockPageViewModel _vm;
@@ -16,28 +20,13 @@ namespace Bit.App.Pages
 
         public LockPage(AppOptions appOptions = null, bool autoPromptFingerprint = true)
         {
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
             _appOptions = appOptions;
             _autoPromptFingerprint = autoPromptFingerprint;
             InitializeComponent();
             _vm = BindingContext as LockPageViewModel;
             _vm.Page = this;
-            _vm.UnlockedAction = () => Device.BeginInvokeOnMainThread(() =>
-            {
-                if(_appOptions != null)
-                {
-                    if(_appOptions.FromAutofillFramework && _appOptions.SaveType.HasValue)
-                    {
-                        Application.Current.MainPage = new NavigationPage(new AddEditPage(appOptions: _appOptions));
-                        return;
-                    }
-                    else if(_appOptions.Uri != null)
-                    {
-                        Application.Current.MainPage = new NavigationPage(new AutofillCiphersPage(_appOptions));
-                        return;
-                    }
-                }
-                Application.Current.MainPage = new TabsPage(_appOptions);
-            });
+            _vm.UnlockedAction = () => Device.BeginInvokeOnMainThread(async () => await UnlockedAsync());
             MasterPasswordEntry = _masterPassword;
             PinEntry = _pin;
         }
@@ -107,5 +96,28 @@ namespace Bit.App.Pages
                 await _vm.PromptFingerprintAsync();
             }
         }
+
+        private async Task UnlockedAsync()
+        {
+            if(_appOptions != null)
+            {
+                if(_appOptions.FromAutofillFramework && _appOptions.SaveType.HasValue)
+                {
+                    Application.Current.MainPage = new NavigationPage(new AddEditPage(appOptions: _appOptions));
+                    return;
+                }
+                else if(_appOptions.Uri != null)
+                {
+                    Application.Current.MainPage = new NavigationPage(new AutofillCiphersPage(_appOptions));
+                    return;
+                }
+            }
+            var previousPage = await _storageService.GetAsync<PreviousPageInfo>(Constants.PreviousPageKey);
+            if(previousPage != null)
+            {
+                await _storageService.RemoveAsync(Constants.PreviousPageKey);
+            }
+            Application.Current.MainPage = new TabsPage(_appOptions, previousPage);
+        }
     }
 }

src/App/Pages/Accounts/LockPageViewModel.cs

@@ -25,7 +25,6 @@ namespace Bit.App.Pages
         private readonly IEnvironmentService _environmentService;
         private readonly IStateService _stateService;
 
-        private bool _hasKey;
         private string _email;
         private bool _showPassword;
         private bool _pinLock;
@@ -104,8 +103,7 @@ namespace Bit.App.Pages
         public async Task InitAsync(bool autoPromptFingerprint)
         {
             _pinSet = await _lockService.IsPinLockSetAsync();
-            _hasKey = await _cryptoService.HasKeyAsync();
-            PinLock = (_pinSet.Item1 && _hasKey) || _pinSet.Item2;
+            PinLock = (_pinSet.Item1 && _lockService.PinProtectedKey != null) || _pinSet.Item2;
             FingerprintLock = await _lockService.IsFingerprintLockSetAsync();
             _email = await _userService.GetEmailAsync();
             var webVault = _environmentService.GetWebVaultUrl();
@@ -128,8 +126,19 @@ namespace Bit.App.Pages
 
             if(FingerprintLock)
             {
-                FingerprintButtonText = _deviceActionService.SupportsFaceId() ? AppResources.UseFaceIDToUnlock :
-                    AppResources.UseFingerprintToUnlock;
+                var supportsFace = await _deviceActionService.SupportsFaceBiometricAsync();
+                if(Device.RuntimePlatform == Device.iOS && supportsFace)
+                {
+                    FingerprintButtonText = AppResources.UseFaceIDToUnlock;
+                }
+                else if(Device.RuntimePlatform == Device.Android && _deviceActionService.UseNativeBiometric())
+                {
+                    FingerprintButtonText = AppResources.UseBiometricsToUnlock;
+                }
+                else
+                {
+                    FingerprintButtonText = AppResources.UseFingerprintToUnlock;
+                }
                 if(autoPromptFingerprint)
                 {
                     var tasks = Task.Run(async () =>
@@ -169,14 +178,17 @@ namespace Bit.App.Pages
                 {
                     if(_pinSet.Item1)
                     {
+                        var key = await _cryptoService.MakeKeyFromPinAsync(Pin, _email,
+                            kdf.GetValueOrDefault(KdfType.PBKDF2_SHA256), kdfIterations.GetValueOrDefault(5000),
+                            _lockService.PinProtectedKey);
+                        var encKey = await _cryptoService.GetEncKeyAsync(key);
                         var protectedPin = await _storageService.GetAsync<string>(Constants.ProtectedPin);
-                        var decPin = await _cryptoService.DecryptToUtf8Async(new CipherString(protectedPin));
+                        var decPin = await _cryptoService.DecryptToUtf8Async(new CipherString(protectedPin), encKey);
                         failed = decPin != Pin;
-                        _lockService.PinLocked = failed;
                         if(!failed)
                         {
                             Pin = string.Empty;
-                            await DoContinueAsync();
+                            await SetKeyAndContinueAsync(key);
                         }
                     }
                     else
@@ -221,6 +233,15 @@ namespace Bit.App.Pages
                 }
                 if(storedKeyHash != null && keyHash != null && storedKeyHash == keyHash)
                 {
+                    if(_pinSet.Item1)
+                    {
+                        var protectedPin = await _storageService.GetAsync<string>(Constants.ProtectedPin);
+                        var encKey = await _cryptoService.GetEncKeyAsync(key);
+                        var decPin = await _cryptoService.DecryptToUtf8Async(new CipherString(protectedPin), encKey);
+                        var pinKey = await _cryptoService.MakePinKeyAysnc(decPin, _email,
+                            kdf.GetValueOrDefault(KdfType.PBKDF2_SHA256), kdfIterations.GetValueOrDefault(5000));
+                        _lockService.PinProtectedKey = await _cryptoService.EncryptAsync(key.Key, pinKey);
+                    }
                     MasterPassword = string.Empty;
                     await SetKeyAndContinueAsync(key);
                 }
@@ -256,7 +277,7 @@ namespace Bit.App.Pages
             {
                 return;
             }
-            var success = await _platformUtilsService.AuthenticateFingerprintAsync(null,
+            var success = await _platformUtilsService.AuthenticateBiometricAsync(null,
             PinLock ? AppResources.PIN : AppResources.MasterPassword, () =>
             {
                 var page = Page as LockPage;
@@ -278,7 +299,8 @@ namespace Bit.App.Pages
 
         private async Task SetKeyAndContinueAsync(SymmetricCryptoKey key)
         {
-            if(!_hasKey)
+            var hasKey = await _cryptoService.HasKeyAsync();
+            if(!hasKey)
             {
                 await _cryptoService.SetKeyAsync(key);
             }
@@ -287,6 +309,7 @@ namespace Bit.App.Pages
 
         private async Task DoContinueAsync()
         {
+            _lockService.FingerprintLocked = false;
             var disableFavicon = await _storageService.GetAsync<bool?>(Constants.DisableFaviconKey);
             await _stateService.SaveAsync(Constants.DisableFaviconKey, disableFavicon.GetValueOrDefault());
             _messagingService.Send("unlocked");

src/App/Pages/Accounts/LoginPage.xaml

@@ -68,7 +68,9 @@
                         Command="{Binding TogglePasswordCommand}"
                         Grid.Row="0"
                         Grid.Column="1"
-                        Grid.RowSpan="2" />
+                        Grid.RowSpan="2"
+                        AutomationProperties.IsInAccessibleTree="True"
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                 </Grid>
             </StackLayout>
             <StackLayout Padding="10, 0">

src/App/Pages/Accounts/LoginPageViewModel.cs

@@ -135,7 +135,11 @@ namespace Bit.App.Pages
             catch(ApiException e)
             {
                 await _deviceActionService.HideLoadingAsync();
-                await Page.DisplayAlert(AppResources.AnErrorHasOccurred, e.Error.GetSingleMessage(), AppResources.Ok);
+                if(e?.Error != null)
+                {
+                    await _platformUtilsService.ShowDialogAsync(e.Error.GetSingleMessage(),
+                        AppResources.AnErrorHasOccurred);
+                }
             }
         }
 

src/App/Pages/Accounts/RegisterPage.xaml

@@ -66,7 +66,9 @@
                         Command="{Binding TogglePasswordCommand}"
                         Grid.Row="0"
                         Grid.Column="1"
-                        Grid.RowSpan="2" />
+                        Grid.RowSpan="2"
+                        AutomationProperties.IsInAccessibleTree="True"
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                 </Grid>
                 <Label
                     Text="{u:I18n MasterPasswordDescription}"
@@ -102,7 +104,9 @@
                         Command="{Binding ToggleConfirmPasswordCommand}"
                         Grid.Row="0"
                         Grid.Column="1"
-                        Grid.RowSpan="2" />
+                        Grid.RowSpan="2"
+                        AutomationProperties.IsInAccessibleTree="True"
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                 </Grid>
                 <StackLayout StyleClass="box-row">
                     <Label

src/App/Pages/Accounts/RegisterPageViewModel.cs

@@ -135,7 +135,11 @@ namespace Bit.App.Pages
             catch(ApiException e)
             {
                 await _deviceActionService.HideLoadingAsync();
-                await Page.DisplayAlert(AppResources.AnErrorHasOccurred, e.Error.GetSingleMessage(), AppResources.Ok);
+                if(e?.Error != null)
+                {
+                    await _platformUtilsService.ShowDialogAsync(e.Error.GetSingleMessage(),
+                        AppResources.AnErrorHasOccurred);
+                }
             }
         }
 

src/App/Pages/Accounts/TwoFactorPage.xaml

@@ -76,6 +76,9 @@
                             x:Name="_yubikeyTokenEntry"
                             Text="{Binding Token}"
                             StyleClass="box-value"
+                            IsPassword="True"
+                            IsSpellCheckEnabled="False"
+                            IsTextPredictionEnabled="False"
                             ReturnType="Go"
                             ReturnCommand="{Binding SubmitCommand}" />
                     </StackLayout>

src/App/Pages/Accounts/TwoFactorPage.xaml.cs

@@ -57,7 +57,7 @@ namespace Bit.App.Pages
                 {
                     var token = (string)message.Data;
                     if(_vm.YubikeyMethod && !string.IsNullOrWhiteSpace(token) &&
-                        token.Length > 40 && !token.Contains(" "))
+                        token.Length == 44 && !token.Contains(" "))
                     {
                         Device.BeginInvokeOnMainThread(async () =>
                         {

src/App/Pages/Accounts/TwoFactorPageViewModel.cs

@@ -138,10 +138,11 @@ namespace Bit.App.Pages
                     var host = WebUtility.UrlEncode(providerData["Host"] as string);
                     var req = WebUtility.UrlEncode(providerData["Signature"] as string);
                     page.DuoWebView.Uri = $"{_webVaultUrl}/duo-connector.html?host={host}&request={req}";
-                    page.DuoWebView.RegisterAction(async sig =>
+                    page.DuoWebView.RegisterAction(sig =>
                     {
                         Token = sig;
-                        await SubmitAsync();
+                        App.WaitForResume();
+                        Device.BeginInvokeOnMainThread(async () => await SubmitAsync());
                     });
                     break;
                 case TwoFactorProviderType.Email:
@@ -213,8 +214,11 @@ namespace Bit.App.Pages
             catch(ApiException e)
             {
                 await _deviceActionService.HideLoadingAsync();
-                await _platformUtilsService.ShowDialogAsync(e.Error.GetSingleMessage(),
-                    AppResources.AnErrorHasOccurred);
+                if(e?.Error != null)
+                {
+                    await _platformUtilsService.ShowDialogAsync(e.Error.GetSingleMessage(),
+                        AppResources.AnErrorHasOccurred);
+                }
             }
         }
 

src/App/Pages/BaseContentPage.cs

@@ -4,6 +4,8 @@ using Bit.Core.Utilities;
 using System;
 using System.Threading.Tasks;
 using Xamarin.Forms;
+using Xamarin.Forms.PlatformConfiguration;
+using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
 
 namespace Bit.App.Pages
 {
@@ -14,6 +16,14 @@ namespace Bit.App.Pages
         protected int ShowModalAnimationDelay = 400;
         protected int ShowPageAnimationDelay = 100;
 
+        public BaseContentPage()
+        {
+            if (Device.RuntimePlatform == Device.iOS)
+            {
+                On<iOS>().SetModalPresentationStyle(UIModalPresentationStyle.FullScreen);
+            }
+        }
+
         public DateTime? LastPageAction { get; set; }
 
         protected override void OnAppearing()

src/App/Pages/Generator/GeneratorHistoryPage.xaml

@@ -19,6 +19,7 @@
         <ResourceDictionary>
             <u:InverseBoolConverter x:Key="inverseBool" />
             <u:DateTimeConverter x:Key="dateTime" />
+            <u:ColoredPasswordConverter x:Key="coloredPassword" />
             <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1"
                          x:Name="_closeItem" x:Key="closeItem" />
             <ToolbarItem Text="{u:I18n Clear}"
@@ -71,7 +72,8 @@
                                 Grid.Column="0"
                                 Grid.Row="0"
                                 StyleClass="list-title, list-title-platform"
-                                Text="{Binding Password, Mode=OneWay}" />
+                                TextType="Html"
+                                Text="{Binding Password, Mode=OneWay, Converter={StaticResource coloredPassword}}" />
                             <Label LineBreakMode="TailTruncation"
                                 Grid.Column="0"
                                 Grid.Row="1"
@@ -84,7 +86,9 @@
                                 CommandParameter="{Binding .}"
                                 Grid.Row="0"
                                 Grid.Column="1"
-                                Grid.RowSpan="2" />
+                                Grid.RowSpan="2"
+                                AutomationProperties.IsInAccessibleTree="True"
+                                AutomationProperties.Name="{u:I18n CopyPassword}" />
                         </Grid>
                     </ViewCell>
                 </DataTemplate>

src/App/Pages/Generator/GeneratorPage.xaml

@@ -39,11 +39,36 @@
     <ScrollView Padding="0, 0, 0, 20">
         <StackLayout Spacing="0" Padding="0">
             <StackLayout StyleClass="box">
+                <Grid IsVisible="{Binding IsPolicyInEffect}"
+                      Margin="0, 12, 0, 0"
+                      RowSpacing="0"
+                      ColumnSpacing="0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Frame Padding="10"
+                           Margin="0"
+                           HasShadow="False"
+                           BackgroundColor="Transparent"
+                           BorderColor="Accent">
+                        <Label
+                            Text="{u:I18n PasswordGeneratorPolicyInEffect}"
+                            StyleClass="text-muted, text-sm, text-bold"
+                            HorizontalTextAlignment="Center" />
+                    </Frame>
+                </Grid>
                 <controls:MonoLabel
-                    Text="{Binding Password}"
+                    Text="{Binding ColoredPassword, Mode=OneWay}"
+                    TextType="Html"
                     Margin="0, 20"
                     StyleClass="text-lg"
                     HorizontalTextAlignment="Center"
+                    HorizontalOptions="CenterAndExpand"
                     LineBreakMode="CharacterWrap" />
                 <Button Text="{u:I18n RegeneratePassword}"
                         HorizontalOptions="FillAndExpand"
@@ -107,6 +132,8 @@
                             HorizontalOptions="StartAndExpand" />
                         <Switch
                             IsToggled="{Binding Capitalize}"
+                            IsEnabled="{Binding EnforcedPolicyOptions.Capitalize,
+                                Converter={StaticResource inverseBool}}"
                             StyleClass="box-value"
                             HorizontalOptions="End" />
                     </StackLayout>
@@ -118,6 +145,8 @@
                             HorizontalOptions="StartAndExpand" />
                         <Switch
                             IsToggled="{Binding IncludeNumber}"
+                            IsEnabled="{Binding EnforcedPolicyOptions.IncludeNumber,
+                                Converter={StaticResource inverseBool}}"
                             StyleClass="box-value"
                             HorizontalOptions="End" />
                     </StackLayout>
@@ -151,6 +180,8 @@
                             HorizontalOptions="StartAndExpand" />
                         <Switch
                             IsToggled="{Binding Uppercase}"
+                            IsEnabled="{Binding EnforcedPolicyOptions.UseUppercase,
+                                Converter={StaticResource inverseBool}}"
                             StyleClass="box-value"
                             HorizontalOptions="End" />
                     </StackLayout>
@@ -162,6 +193,8 @@
                             HorizontalOptions="StartAndExpand" />
                         <Switch
                             IsToggled="{Binding Lowercase}"
+                            IsEnabled="{Binding EnforcedPolicyOptions.UseLowercase,
+                                Converter={StaticResource inverseBool}}"
                             StyleClass="box-value"
                             HorizontalOptions="End" />
                     </StackLayout>
@@ -173,6 +206,8 @@
                             HorizontalOptions="StartAndExpand" />
                         <Switch
                             IsToggled="{Binding Number}"
+                            IsEnabled="{Binding EnforcedPolicyOptions.UseNumbers,
+                                Converter={StaticResource inverseBool}}"
                             StyleClass="box-value"
                             HorizontalOptions="End" />
                     </StackLayout>
@@ -184,6 +219,8 @@
                             HorizontalOptions="StartAndExpand" />
                         <Switch
                             IsToggled="{Binding Special}"
+                            IsEnabled="{Binding EnforcedPolicyOptions.UseSpecial,
+                                Converter={StaticResource inverseBool}}"
                             StyleClass="box-value"
                             HorizontalOptions="End" />
                     </StackLayout>

src/App/Pages/Generator/GeneratorPageViewModel.cs

@@ -15,6 +15,7 @@ namespace Bit.App.Pages
         private readonly IPlatformUtilsService _platformUtilsService;
 
         private PasswordGenerationOptions _options;
+        private PasswordGeneratorPolicyOptions _enforcedPolicyOptions;
         private string _password;
         private bool _isPassword;
         private bool _uppercase;
@@ -53,7 +54,7 @@ namespace Bit.App.Pages
                 });
         }
 
-        public FormattedString ColoredPassword => PasswordFormatter.FormatPassword(Password);
+        public string ColoredPassword => PasswordFormatter.FormatPassword(Password);
 
         public bool IsPassword
         {
@@ -221,6 +222,18 @@ namespace Bit.App.Pages
                 }
             }
         }
+        
+        public PasswordGeneratorPolicyOptions EnforcedPolicyOptions
+        {
+            get => _enforcedPolicyOptions;
+            set => SetProperty(ref _enforcedPolicyOptions, value,
+                additionalPropertyNames: new[]
+                {
+                    nameof(IsPolicyInEffect)
+                });
+        }
+
+        public bool IsPolicyInEffect => _enforcedPolicyOptions.InEffect();
 
         public int TypeSelectedIndex
         {
@@ -237,7 +250,7 @@ namespace Bit.App.Pages
 
         public async Task InitAsync()
         {
-            _options = await _passwordGenerationService.GetOptionsAsync();
+            (_options, EnforcedPolicyOptions) = await _passwordGenerationService.GetOptionsAsync();
             LoadFromOptions();
             await RegenerateAsync();
             _doneIniting = true;
@@ -256,7 +269,7 @@ namespace Bit.App.Pages
                 return;
             }
             SetOptions();
-            _passwordGenerationService.NormalizeOptions(_options);
+            _passwordGenerationService.NormalizeOptions(_options, _enforcedPolicyOptions);
             await _passwordGenerationService.SaveOptionsAsync(_options);
             LoadFromOptions();
             if(regenerate)
@@ -274,7 +287,7 @@ namespace Bit.App.Pages
         public async Task SliderInputAsync()
         {
             SetOptions();
-            _passwordGenerationService.NormalizeOptions(_options);
+            _passwordGenerationService.NormalizeOptions(_options, _enforcedPolicyOptions);
             Password = await _passwordGenerationService.GeneratePasswordAsync(_options);
         }
 

src/App/Pages/Settings/AccessibilityServicePage.xaml

@@ -25,18 +25,40 @@
                    VerticalOptions="Start"
                    HorizontalTextAlignment="Center"
                    LineBreakMode="WordWrap" />
-            <StackLayout IsVisible="{Binding Enabled, Converter={StaticResource inverseBool}}"
-                         VerticalOptions="CenterAndExpand"
+            <StackLayout VerticalOptions="CenterAndExpand"
                          HorizontalOptions="Center"
-                         Spacing="20">
-                <StackLayout Orientation="Horizontal" HorizontalOptions="CenterAndExpand">
+                         Spacing="10">
+                <StackLayout IsVisible="{Binding Enabled, Converter={StaticResource inverseBool}}"
+                             Orientation="Horizontal" HorizontalOptions="Center">
                     <Label Text="{u:I18n Status}" />
                     <Label Text="{u:I18n Disabled}"
                            StyleClass="text-danger, text-bold" />
                 </StackLayout>
+                <StackLayout IsVisible="{Binding Enabled}"
+                             Orientation="Horizontal" HorizontalOptions="Center">
+                    <Label Text="{u:I18n Status}" />
+                    <Label Text="{u:I18n Enabled}"
+                           StyleClass="text-success, text-bold" />
+                </StackLayout>
+                <StackLayout IsVisible="{Binding Permitted, Converter={StaticResource inverseBool}}"
+                             Orientation="Horizontal" HorizontalOptions="Center">
+                    <Label Text="{u:I18n OverlayPermission}" />
+                    <Label Text="{u:I18n Denied}"
+                           StyleClass="text-danger, text-bold" />
+                </StackLayout>
+                <StackLayout IsVisible="{Binding Permitted}"
+                             Orientation="Horizontal" HorizontalOptions="Center">
+                    <Label Text="{u:I18n OverlayPermission}" />
+                    <Label Text="{u:I18n Granted}"
+                           StyleClass="text-success, text-bold" />
+                </StackLayout>
+            </StackLayout>
+            <StackLayout IsVisible="{Binding Enabled, Converter={StaticResource inverseBool}}"
+                         VerticalOptions="CenterAndExpand"
+                         HorizontalOptions="Center"
+                         Spacing="10">
                 <Image Source="accessibility_step1.png"
                        HorizontalOptions="Center"
-                       Margin="0, 20, 0, 0"
                        WidthRequest="300"
                        HeightRequest="98" />
                 <Label Text="{u:I18n BitwardenAutofillServiceStep1}"
@@ -45,7 +67,7 @@
                        StyleClass="text-sm" />
                 <Image Source="accessibility_step2.png"
                        HorizontalOptions="Center"
-                       Margin="0, 20, 0, 0"
+                       Margin="0, 10, 0, 0"
                        WidthRequest="300"
                        HeightRequest="67" />
                 <Label Text="{u:I18n BitwardenAutofillServiceStep2}"
@@ -53,34 +75,42 @@
                        LineBreakMode="WordWrap"
                        StyleClass="text-sm" />
             </StackLayout>
-            <StackLayout IsVisible="{Binding Enabled}"
+            <StackLayout IsVisible="{Binding EnabledWithoutPermission}"
                          VerticalOptions="CenterAndExpand"
                          HorizontalOptions="Center"
-                         Spacing="20">
-                <StackLayout Orientation="Horizontal" HorizontalOptions="Center">
-                    <Label Text="{u:I18n Status}" />
-                    <Label Text="{u:I18n Enabled}"
-                           StyleClass="text-success, text-bold" />
-                </StackLayout>
-                <Image Source="accessibility_notification_icon.png"
+                         Spacing="10">
+                <Image Source="accessibility_permission.png"
                        HorizontalOptions="Center"
-                       Margin="0, 20, 0, 0"
                        WidthRequest="300"
-                       HeightRequest="54" />
-                <Image Source="accessibility_notification.png"
-                       HorizontalOptions="Center"
-                       Margin="0, 20, 0, 0"
-                       WidthRequest="300"
-                       HeightRequest="74" />
-                <Label Text="{u:I18n BitwardenAutofillServiceNotification}"
+                       HeightRequest="142" />
+                <Label Text="{u:I18n BitwardenAutofillServiceStep3}"
                        HorizontalTextAlignment="Center"
                        LineBreakMode="WordWrap"
                        StyleClass="text-sm" />
             </StackLayout>
-            <Button Text="{u:I18n BitwardenAutofillServiceOpenAccessibilitySettings}"
+            <StackLayout IsVisible="{Binding EnabledAndPermitted}"
+                         VerticalOptions="CenterAndExpand"
+                         HorizontalOptions="Center"
+                         Spacing="10">
+                <Image Source="accessibility_overlay.png"
+                       HorizontalOptions="Center"
+                       WidthRequest="300"
+                       HeightRequest="172" />
+                <Label Text="{u:I18n BitwardenAutofillServiceOverlay}"
+                       HorizontalTextAlignment="Center"
+                       LineBreakMode="WordWrap"
+                       StyleClass="text-sm" />
+            </StackLayout>
+            <StackLayout Spacing="10">
+                <Button Text="{u:I18n BitwardenAutofillServiceOpenAccessibilitySettings}"
                     Clicked="Settings_Clicked"
                     HorizontalOptions="Fill"
                     VerticalOptions="End"></Button>
+                <Button Text="{u:I18n BitwardenAutofillServiceOpenOverlayPermissionSettings}"
+                    Clicked="OverlayPermissionSettings_Clicked"
+                    HorizontalOptions="Fill"
+                    VerticalOptions="End"></Button>
+            </StackLayout>
         </StackLayout>
     </ScrollView>
 

src/App/Pages/Settings/AccessibilityServicePage.xaml.cs

@@ -21,6 +21,7 @@ namespace Bit.App.Pages
         protected override void OnAppearing()
         {
             _vm.UpdateEnabled();
+            _vm.UpdatePermitted();
             _timerStarted = DateTime.UtcNow;
             Device.StartTimer(new TimeSpan(0, 0, 3), () =>
             {
@@ -29,6 +30,7 @@ namespace Bit.App.Pages
                     return false;
                 }
                 _vm.UpdateEnabled();
+                _vm.UpdatePermitted();
                 return true;
             });
             base.OnAppearing();
@@ -48,5 +50,13 @@ namespace Bit.App.Pages
                 _vm.OpenSettings();
             }
         }
+
+        private void OverlayPermissionSettings_Clicked(object sender, EventArgs e)
+        {
+            if(DoOnce())
+            {
+                _vm.OpenOverlayPermissionSettings();
+            }
+        }
     }
 }

src/App/Pages/Settings/AccessibilityServicePageViewModel.cs

@@ -9,6 +9,7 @@ namespace Bit.App.Pages
         private readonly IDeviceActionService _deviceActionService;
 
         private bool _enabled;
+        private bool _permitted;
 
         public AccessibilityServicePageViewModel()
         {
@@ -19,17 +20,47 @@ namespace Bit.App.Pages
         public bool Enabled
         {
             get => _enabled;
-            set => SetProperty(ref _enabled, value);
+            set => SetProperty(ref _enabled, value,
+                additionalPropertyNames: new string[]
+                {
+                    nameof(EnabledWithoutPermission),
+                    nameof(EnabledAndPermitted)
+                });
         }
 
+        public bool Permitted
+        {
+            get => _permitted;
+            set => SetProperty(ref _permitted, value,
+                additionalPropertyNames: new string[]
+                {
+                    nameof(EnabledWithoutPermission),
+                    nameof(EnabledAndPermitted)
+                });
+        }
+
+        public bool EnabledWithoutPermission => Enabled && !Permitted;
+
+        public bool EnabledAndPermitted => Enabled && Permitted;
+
         public void OpenSettings()
         {
             _deviceActionService.OpenAccessibilitySettings();
         }
 
+        public void OpenOverlayPermissionSettings()
+        {
+            _deviceActionService.OpenAccessibilityOverlayPermissionSettings();
+        }
+
         public void UpdateEnabled()
         {
             Enabled = _deviceActionService.AutofillAccessibilityServiceRunning();
         }
+
+        public void UpdatePermitted()
+        {
+            Permitted = _deviceActionService.AutofillAccessibilityOverlayPermitted();
+        }
     }
 }

src/App/Pages/Settings/ExportVaultPage.xaml

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<pages:BaseContentPage
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="Bit.App.Pages.ExportVaultPage"
+    xmlns:pages="clr-namespace:Bit.App.Pages"
+    xmlns:controls="clr-namespace:Bit.App.Controls"
+    xmlns:u="clr-namespace:Bit.App.Utilities"
+    x:DataType="pages:ExportVaultPageViewModel"
+    Title="{Binding PageTitle}">
+
+    <ContentPage.BindingContext>
+        <pages:ExportVaultPageViewModel />
+    </ContentPage.BindingContext>
+
+    <ContentPage.Resources>
+        <ResourceDictionary>
+            <u:InverseBoolConverter x:Key="inverseBool" />
+            <u:UpperCaseConverter x:Key="toUpper" />
+        </ResourceDictionary>
+    </ContentPage.Resources>
+
+    <ContentPage.ToolbarItems>
+        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" />
+    </ContentPage.ToolbarItems>
+
+    <ScrollView>
+        <StackLayout Spacing="20">
+            <StackLayout StyleClass="box">
+                <StackLayout StyleClass="box-row, box-row-input, box-row-input-options-platform">
+                    <Label
+                        Text="{u:I18n FileFormat}"
+                        StyleClass="box-label" />
+                    <Picker
+                        x:Name="_fileFormatPicker"
+                        ItemsSource="{Binding FileFormatOptions, Mode=OneTime}"
+                        SelectedIndex="{Binding FileFormatSelectedIndex}"
+                        StyleClass="box-value" />
+                </StackLayout>
+                <Grid StyleClass="box-row">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Label
+                        Text="{u:I18n MasterPassword}"
+                        StyleClass="box-label"
+                        Grid.Row="0"
+                        Grid.Column="0" />
+                    <controls:MonoEntry
+                        x:Name="_masterPassword"
+                        Text="{Binding MasterPassword}"
+                        StyleClass="box-value"
+                        IsSpellCheckEnabled="False"
+                        IsTextPredictionEnabled="False"
+                        IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        ReturnType="Go"
+                        ReturnCommand="{Binding ExportVaultCommand}" />
+                    <controls:FaButton
+                        StyleClass="box-row-button, box-row-button-platform"
+                        Text="{Binding ShowPasswordIcon}"
+                        Command="{Binding TogglePasswordCommand}"
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        Grid.RowSpan="2"
+                        AutomationProperties.IsInAccessibleTree="True"
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
+                </Grid>
+                <Label
+                    Text="{u:I18n ExportVaultMasterPasswordDescription}"
+                    StyleClass="box-footer-label, box-footer-label-switch" />
+                <Label
+                    StyleClass="box-footer-label, box-footer-label-switch"
+                    Margin="0, 20">
+                    <Label.FormattedText>
+                        <FormattedString>
+                            <Span
+                                Text="{Binding Converter={StaticResource toUpper}, ConverterParameter={u:I18n Warning}}"
+                                FontAttributes="Bold" />
+                            <Span Text=": " FontAttributes="Bold" />
+                            <Span Text="{u:I18n ExportVaultWarning}" />
+                        </FormattedString>
+                    </Label.FormattedText>
+                </Label>
+                <StackLayout Spacing="20">
+                    <Button Text="{u:I18n ExportVault}"
+                            Clicked="ExportVault_Clicked"
+                            HorizontalOptions="Fill"
+                            VerticalOptions="End" />
+                </StackLayout>
+            </StackLayout>
+        </StackLayout>
+    </ScrollView>
+
+</pages:BaseContentPage>

src/App/Pages/Settings/ExportVaultPage.xaml.cs

@@ -0,0 +1,69 @@
+using System;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+using Xamarin.Forms;
+
+namespace Bit.App.Pages
+{
+    public partial class ExportVaultPage : BaseContentPage
+    {
+        private readonly ExportVaultPageViewModel _vm;
+        private readonly IBroadcasterService _broadcasterService;
+
+        public ExportVaultPage()
+        {
+            InitializeComponent();
+            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
+            _vm = BindingContext as ExportVaultPageViewModel;
+            _vm.Page = this;
+            _fileFormatPicker.ItemDisplayBinding = new Binding("Value");
+            MasterPasswordEntry = _masterPassword;
+        }
+
+        protected async override void OnAppearing()
+        {
+            base.OnAppearing();
+            await _vm.InitAsync();
+            _broadcasterService.Subscribe(nameof(ExportVaultPage), (message) =>
+            {
+                if(message.Command == "selectSaveFileResult")
+                {
+                    Device.BeginInvokeOnMainThread(() =>
+                    {
+                        var data = message.Data as Tuple<string, string>;
+                        if(data == null)
+                        {
+                            return;
+                        }
+                        _vm.SaveFileSelected(data.Item1, data.Item2);
+                    });
+                }
+            });
+            RequestFocus(_masterPassword);
+        }
+
+        protected async override void OnDisappearing()
+        {
+            base.OnDisappearing();
+            _broadcasterService.Unsubscribe(nameof(ExportVaultPage));
+        }
+
+        public Entry MasterPasswordEntry { get; set; }
+
+        private async void Close_Clicked(object sender, System.EventArgs e)
+        {
+            if(DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
+
+        private async void ExportVault_Clicked(object sender, EventArgs e)
+        {
+            if(DoOnce())
+            {
+                await _vm.ExportVaultAsync();
+            }
+        }
+    }
+}

src/App/Pages/Settings/ExportVaultPageViewModel.cs

@@ -0,0 +1,143 @@
+using System;
+using Bit.App.Abstractions;
+using Bit.App.Resources;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using Xamarin.Forms;
+
+namespace Bit.App.Pages
+{
+    public class ExportVaultPageViewModel : BaseViewModel
+    {
+        private readonly IDeviceActionService _deviceActionService;
+        private readonly IPlatformUtilsService _platformUtilsService;
+        private readonly II18nService _i18nService;
+        private readonly ICryptoService _cryptoService;
+        private readonly IExportService _exportService;
+
+        private int _fileFormatSelectedIndex;
+        private bool _showPassword;
+        private string _masterPassword;
+        private byte[] _exportResult;
+        private string _defaultFilename;
+
+        public ExportVaultPageViewModel()
+        {
+            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
+            _i18nService = ServiceContainer.Resolve<II18nService>("i18nService");
+            _cryptoService = ServiceContainer.Resolve<ICryptoService>("cryptoService");
+            _exportService = ServiceContainer.Resolve<IExportService>("exportService");
+
+            PageTitle = AppResources.ExportVault;
+            TogglePasswordCommand = new Command(TogglePassword);
+            ExportVaultCommand = new Command(async () => await ExportVaultAsync());
+
+            FileFormatOptions = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string, string>("json", ".json"),
+                new KeyValuePair<string, string>("csv", ".csv")
+            };
+        }
+
+        public async Task InitAsync()
+        {
+            FileFormatSelectedIndex = FileFormatOptions.FindIndex(k => k.Key == "json");
+        }
+
+        public List<KeyValuePair<string, string>> FileFormatOptions { get; set; }
+
+        public int FileFormatSelectedIndex
+        {
+            get => _fileFormatSelectedIndex;
+            set { SetProperty(ref _fileFormatSelectedIndex, value); }
+        }
+
+        public bool ShowPassword
+        {
+            get => _showPassword;
+            set => SetProperty(ref _showPassword, value,
+                additionalPropertyNames: new string[] {nameof(ShowPasswordIcon)});
+        }
+
+        public string MasterPassword
+        {
+            get => _masterPassword;
+            set => SetProperty(ref _masterPassword, value);
+        }
+
+        public Command TogglePasswordCommand { get; }
+
+        public string ShowPasswordIcon => ShowPassword ? "" : "";
+
+        public void TogglePassword()
+        {
+            ShowPassword = !ShowPassword;
+            (Page as ExportVaultPage).MasterPasswordEntry.Focus();
+        }
+
+        public Command ExportVaultCommand { get; }
+
+        public async Task ExportVaultAsync()
+        {
+            if(string.IsNullOrEmpty(_masterPassword))
+            {
+                await _platformUtilsService.ShowDialogAsync(_i18nService.T("InvalidMasterPassword"));
+                return;
+            }
+
+            var keyHash = await _cryptoService.HashPasswordAsync(_masterPassword, null);
+            MasterPassword = string.Empty;
+            
+            var storedKeyHash = await _cryptoService.GetKeyHashAsync();
+            if(storedKeyHash != null && keyHash != null && storedKeyHash == keyHash)
+            {
+                try
+                {
+                    var data = _exportService.GetExport(FileFormatOptions[FileFormatSelectedIndex].Key);
+                    var fileFormat = FileFormatOptions[FileFormatSelectedIndex].Key;
+                    _defaultFilename = _exportService.GetFileName(null, fileFormat);
+                    _exportResult = Encoding.ASCII.GetBytes(data.Result);
+
+                    if(!_deviceActionService.SaveFile(_exportResult, null, _defaultFilename, null))
+                    {
+                        ClearResult();
+                        await _platformUtilsService.ShowDialogAsync(_i18nService.T("ExportVaultFailure"));
+                    }
+                }
+                catch(Exception ex)
+                {
+                    ClearResult();
+                    await _platformUtilsService.ShowDialogAsync(_i18nService.T("ExportVaultFailure"));
+                    System.Diagnostics.Debug.WriteLine(">>> {0}: {1}", ex.GetType(), ex.StackTrace);
+                }
+            }
+            else
+            {
+                await _platformUtilsService.ShowDialogAsync(_i18nService.T("InvalidMasterPassword"));
+            }
+        }
+
+        public async void SaveFileSelected(string contentUri, string filename)
+        {
+            if(_deviceActionService.SaveFile(_exportResult, null, filename ?? _defaultFilename, contentUri))
+            {
+                ClearResult();
+                _platformUtilsService.ShowToast("success", null, _i18nService.T("ExportVaultSuccess"));
+                return;
+            }
+
+            ClearResult();
+            await _platformUtilsService.ShowDialogAsync(_i18nService.T("ExportVaultFailure"));
+        }
+
+        private void ClearResult()
+        {
+            _defaultFilename = null;
+            _exportResult = null;
+        }
+    }
+}

src/App/Pages/Settings/FolderAddEditPage.xaml

@@ -21,6 +21,15 @@
                      IsDestructive="True"
                      x:Name="_deleteItem" />
     </ContentPage.ToolbarItems>
+    
+    <ContentPage.Resources>
+        <ResourceDictionary>
+            <ToolbarItem Icon="more_vert.png" Clicked="More_Clicked" Order="Primary" x:Name="_moreItem"
+                         x:Key="moreItem"
+                         AutomationProperties.IsInAccessibleTree="True"
+                         AutomationProperties.Name="{u:I18n Options}" />
+        </ResourceDictionary>
+    </ContentPage.Resources>
 
     <ScrollView x:Name="_scrollView">
         <StackLayout Spacing="20">

src/App/Pages/Settings/FolderAddEditPage.xaml.cs

@@ -1,4 +1,6 @@
-using Xamarin.Forms;
+using Bit.App.Resources;
+using System.Collections.Generic;
+using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
@@ -19,6 +21,10 @@ namespace Bit.App.Pages
             {
                 ToolbarItems.Remove(_deleteItem);
             }
+            if(_vm.EditMode && Device.RuntimePlatform == Device.iOS)
+            {
+                ToolbarItems.Add(_moreItem);
+            }
             if(Device.RuntimePlatform == Device.Android)
             {
                 ToolbarItems.RemoveAt(0);
@@ -61,5 +67,20 @@ namespace Bit.App.Pages
                 await Navigation.PopModalAsync();
             }
         }
+
+        private async void More_Clicked(object sender, System.EventArgs e)
+        {
+            if(!DoOnce())
+            {
+                return;
+            }
+            var options = new List<string> { };
+            var selection = await DisplayActionSheet(AppResources.Options, AppResources.Cancel,
+                _vm.EditMode ? AppResources.Delete : null, options.ToArray());
+            if(selection == AppResources.Delete)
+            {
+                await _vm.DeleteAsync();
+            }
+        }
     }
 }

src/App/Pages/Settings/FolderAddEditPageViewModel.cs

@@ -93,7 +93,11 @@ namespace Bit.App.Pages
             catch(ApiException e)
             {
                 await _deviceActionService.HideLoadingAsync();
-                await Page.DisplayAlert(AppResources.AnErrorHasOccurred, e.Error.GetSingleMessage(), AppResources.Ok);
+                if(e?.Error != null)
+                {
+                    await _platformUtilsService.ShowDialogAsync(e.Error.GetSingleMessage(),
+                        AppResources.AnErrorHasOccurred);
+                }
             }
             return false;
         }
@@ -128,7 +132,11 @@ namespace Bit.App.Pages
             catch(ApiException e)
             {
                 await _deviceActionService.HideLoadingAsync();
-                await Page.DisplayAlert(AppResources.AnErrorHasOccurred, e.Error.GetSingleMessage(), AppResources.Ok);
+                if(e?.Error != null)
+                {
+                    await _platformUtilsService.ShowDialogAsync(e.Error.GetSingleMessage(),
+                        AppResources.AnErrorHasOccurred);
+                }
             }
             return false;
         }

src/App/Pages/Settings/FoldersPageViewModel.cs

@@ -10,14 +10,12 @@ namespace Bit.App.Pages
 {
     public class FoldersPageViewModel : BaseViewModel
     {
-        private readonly IPlatformUtilsService _platformUtilsService;
         private readonly IFolderService _folderService;
 
         private bool _showNoData;
 
         public FoldersPageViewModel()
         {
-            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
             _folderService = ServiceContainer.Resolve<IFolderService>("folderService");
 
             PageTitle = AppResources.Folders;

src/App/Pages/Settings/OptionsPage.xaml

@@ -132,55 +132,6 @@
                     Text="{u:I18n BlacklistedUrisDescription}"
                     StyleClass="box-footer-label" />
             </StackLayout>
-            <StackLayout StyleClass="box" IsVisible="{Binding ShowAndroidAccessibilitySettings}">
-                <StackLayout StyleClass="box-row-header">
-                    <Label Text="{u:I18n AutofillAccessibilityService, Header=True}"
-                            StyleClass="box-header, box-header-platform" />
-                </StackLayout>
-                <StackLayout StyleClass="box-row, box-row-switch">
-                    <Label
-                        Text="{u:I18n AutofillAlways}"
-                        StyleClass="box-label, box-label-regular"
-                        HorizontalOptions="StartAndExpand" />
-                    <Switch
-                        IsToggled="{Binding AutofillAlwaysScan}"
-                        StyleClass="box-value"
-                        HorizontalOptions="End" />
-                </StackLayout>
-                <Label
-                    Text="{u:I18n AutofillAlwaysDescription}"
-                    StyleClass="box-footer-label, box-footer-label-switch" />
-            </StackLayout>
-            <StackLayout StyleClass="box" IsVisible="{Binding ShowAndroidAccessibilitySettings}">
-                <StackLayout StyleClass="box-row, box-row-switch">
-                    <Label
-                        Text="{u:I18n AutofillPersistNotification}"
-                        StyleClass="box-label, box-label-regular"
-                        HorizontalOptions="StartAndExpand" />
-                    <Switch
-                        IsToggled="{Binding AutofillPersistNotification}"
-                        StyleClass="box-value"
-                        HorizontalOptions="End" />
-                </StackLayout>
-                <Label
-                    Text="{u:I18n AutofillPersistNotificationDescription}"
-                    StyleClass="box-footer-label, box-footer-label-switch" />
-            </StackLayout>
-            <StackLayout StyleClass="box" IsVisible="{Binding ShowAndroidAccessibilitySettings}">
-                <StackLayout StyleClass="box-row, box-row-switch">
-                    <Label
-                        Text="{u:I18n AutofillPasswordField}"
-                        StyleClass="box-label, box-label-regular"
-                        HorizontalOptions="StartAndExpand" />
-                    <Switch
-                        IsToggled="{Binding AutofillPasswordField}"
-                        StyleClass="box-value"
-                        HorizontalOptions="End" />
-                </StackLayout>
-                <Label
-                    Text="{u:I18n AutofillPasswordFieldDescription}"
-                    StyleClass="box-footer-label, box-footer-label-switch" />
-            </StackLayout>
         </StackLayout>
     </ScrollView>
 

src/App/Pages/Settings/OptionsPage.xaml.cs

@@ -24,7 +24,6 @@ namespace Bit.App.Pages
             if(Device.RuntimePlatform == Device.Android)
             {
                 ToolbarItems.RemoveAt(0);
-                _vm.ShowAndroidAccessibilitySettings = true;
                 _vm.ShowAndroidAutofillSettings = _deviceActionService.SupportsAutofillService();
                 _themeDescriptionLabel.Text = string.Concat(_themeDescriptionLabel.Text, " ",
                     AppResources.RestartIsRequired);

src/App/Pages/Settings/OptionsPageViewModel.cs

@@ -21,9 +21,6 @@ namespace Bit.App.Pages
         private readonly IMessagingService _messagingService;
 
 
-        private bool _autofillAlwaysScan;
-        private bool _autofillPersistNotification;
-        private bool _autofillPasswordField;
         private bool _autofillDisableSavePrompt;
         private string _autofillBlacklistedUris;
         private bool _disableFavicon;
@@ -33,7 +30,6 @@ namespace Bit.App.Pages
         private int _uriMatchSelectedIndex;
         private bool _inited;
         private bool _updatingAutofill;
-        private bool _showAndroidAccessibilitySettings;
         private bool _showAndroidAutofillSettings;
 
         public OptionsPageViewModel()
@@ -144,42 +140,6 @@ namespace Bit.App.Pages
             }
         }
 
-        public bool AutofillAlwaysScan
-        {
-            get => _autofillAlwaysScan;
-            set
-            {
-                if(SetProperty(ref _autofillAlwaysScan, value))
-                {
-                    var task = UpdateAutofillAsync(false, false);
-                }
-            }
-        }
-
-        public bool AutofillPersistNotification
-        {
-            get => _autofillPersistNotification;
-            set
-            {
-                if(SetProperty(ref _autofillPersistNotification, value))
-                {
-                    var task = UpdateAutofillAsync(value, false);
-                }
-            }
-        }
-
-        public bool AutofillPasswordField
-        {
-            get => _autofillPasswordField;
-            set
-            {
-                if(SetProperty(ref _autofillPasswordField, value))
-                {
-                    var task = UpdateAutofillAsync(false, value);
-                }
-            }
-        }
-
         public bool AutofillDisableSavePrompt
         {
             get => _autofillDisableSavePrompt;
@@ -198,12 +158,6 @@ namespace Bit.App.Pages
             set => SetProperty(ref _autofillBlacklistedUris, value);
         }
 
-        public bool ShowAndroidAccessibilitySettings
-        {
-            get => _showAndroidAccessibilitySettings;
-            set => SetProperty(ref _showAndroidAccessibilitySettings, value);
-        }
-
         public bool ShowAndroidAutofillSettings
         {
             get => _showAndroidAutofillSettings;
@@ -217,11 +171,6 @@ namespace Bit.App.Pages
             var blacklistedUrisList = await _storageService.GetAsync<List<string>>(
                 Constants.AutofillBlacklistedUrisKey);
             AutofillBlacklistedUris = blacklistedUrisList != null ? string.Join(", ", blacklistedUrisList) : null;
-            AutofillPersistNotification = (await _storageService.GetAsync<bool?>(
-                Constants.AccessibilityAutofillPersistNotificationKey)).GetValueOrDefault();
-            AutofillPasswordField = (await _storageService.GetAsync<bool?>(
-                Constants.AccessibilityAutofillPasswordFieldKey)).GetValueOrDefault();
-            AutofillAlwaysScan = !AutofillPersistNotification && !AutofillPasswordField;
             DisableAutoTotpCopy = !(await _totpService.IsAutoCopyEnabledAsync());
             DisableFavicon = (await _storageService.GetAsync<bool?>(Constants.DisableFaviconKey)).GetValueOrDefault();
             var theme = await _storageService.GetAsync<string>(Constants.ThemeKey);
@@ -234,35 +183,6 @@ namespace Bit.App.Pages
             _inited = true;
         }
 
-        private async Task UpdateAutofillAsync(bool persistNotification, bool passwordField)
-        {
-            if(_inited && !_updatingAutofill)
-            {
-                _updatingAutofill = true;
-                if(persistNotification)
-                {
-                    AutofillAlwaysScan = false;
-                    AutofillPasswordField = false;
-                }
-                else if(passwordField)
-                {
-                    AutofillAlwaysScan = false;
-                    AutofillPersistNotification = false;
-                }
-                else
-                {
-                    AutofillAlwaysScan = true;
-                    AutofillPersistNotification = false;
-                    AutofillPasswordField = false;
-                }
-                await _storageService.SaveAsync(Constants.AccessibilityAutofillPersistNotificationKey,
-                    AutofillPersistNotification);
-                await _storageService.SaveAsync(Constants.AccessibilityAutofillPasswordFieldKey,
-                    AutofillPasswordField);
-                _updatingAutofill = false;
-            }
-        }
-
         private async Task UpdateAutoTotpCopyAsync()
         {
             if(_inited)

src/App/Pages/Settings/SettingsPage/SettingsPage.xaml.cs

@@ -103,7 +103,7 @@ namespace Bit.App.Pages
             }
             else if(item.Name == AppResources.ExportVault)
             {
-                _vm.Export();
+                await Navigation.PushModalAsync(new NavigationPage(new ExportVaultPage()));
             }
             else if(item.Name == AppResources.ShareVault)
             {
@@ -137,10 +137,22 @@ namespace Bit.App.Pages
             {
                 await _vm.UpdatePinAsync();
             }
-            else if(item.Name.Contains(AppResources.Fingerprint) || item.Name.Contains(AppResources.TouchID) ||
-                item.Name.Contains(AppResources.FaceID))
+            else
             {
-                await _vm.UpdateFingerprintAsync();
+                var fingerprintName = AppResources.Fingerprint;
+                if(Device.RuntimePlatform == Device.iOS)
+                {
+                    var supportsFace = await _deviceActionService.SupportsFaceBiometricAsync();
+                    fingerprintName = supportsFace ? AppResources.FaceID : AppResources.TouchID;
+                }
+                else if(Device.RuntimePlatform == Device.Android && _deviceActionService.UseNativeBiometric())
+                {
+                    fingerprintName = AppResources.Biometrics;
+                }
+                if(item.Name == string.Format(AppResources.UnlockWith, fingerprintName))
+                {
+                    await _vm.UpdateFingerprintAsync();
+                }
             }
         }
     }

src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs

@@ -62,7 +62,7 @@ namespace Bit.App.Pages
 
         public async Task InitAsync()
         {
-            _supportsFingerprint = await _platformUtilsService.SupportsFingerprintAsync();
+            _supportsFingerprint = await _platformUtilsService.SupportsBiometricAsync();
             var lastSync = await _syncService.GetLastSyncAsync();
             if(lastSync != null)
             {
@@ -82,7 +82,7 @@ namespace Bit.App.Pages
         {
             var debugText = string.Format("{0}: {1} ({2})", AppResources.Version,
                 _platformUtilsService.GetApplicationVersion(), _deviceActionService.GetBuildNumber());
-            var text = string.Format("© 8bit Solutions LLC 2015-{0}\n\n{1}", DateTime.Now.Year, debugText);
+            var text = string.Format("© Bitwarden Inc. 2015-{0}\n\n{1}", DateTime.Now.Year, debugText);
             var copy = await _platformUtilsService.ShowDialogAsync(text, AppResources.Bitwarden, AppResources.Copy,
                 AppResources.Close);
             if(copy)
@@ -127,11 +127,6 @@ namespace Bit.App.Pages
             _platformUtilsService.LaunchUri("https://help.bitwarden.com/article/import-data/");
         }
 
-        public void Export()
-        {
-            _platformUtilsService.LaunchUri("https://help.bitwarden.com/article/export-your-data/");
-        }
-
         public void WebVault()
         {
             var url = _environmentService.GetWebVaultUrl();
@@ -214,21 +209,24 @@ namespace Bit.App.Pages
                     var masterPassOnRestart = await _platformUtilsService.ShowDialogAsync(
                        AppResources.PINRequireMasterPasswordRestart, AppResources.UnlockWithPIN,
                        AppResources.Yes, AppResources.No);
+
+                    var kdf = await _userService.GetKdfAsync();
+                    var kdfIterations = await _userService.GetKdfIterationsAsync();
+                    var email = await _userService.GetEmailAsync();
+                    var pinKey = await _cryptoService.MakePinKeyAysnc(pin, email,
+                        kdf.GetValueOrDefault(Core.Enums.KdfType.PBKDF2_SHA256),
+                        kdfIterations.GetValueOrDefault(5000));
+                    var key = await _cryptoService.GetKeyAsync();
+                    var pinProtectedKey = await _cryptoService.EncryptAsync(key.Key, pinKey);
+
                     if(masterPassOnRestart)
                     {
                         var encPin = await _cryptoService.EncryptAsync(pin);
                         await _storageService.SaveAsync(Constants.ProtectedPin, encPin.EncryptedString);
+                        _lockService.PinProtectedKey = pinProtectedKey;
                     }
                     else
                     {
-                        var kdf = await _userService.GetKdfAsync();
-                        var kdfIterations = await _userService.GetKdfIterationsAsync();
-                        var email = await _userService.GetEmailAsync();
-                        var pinKey = await _cryptoService.MakePinKeyAysnc(pin, email,
-                            kdf.GetValueOrDefault(Core.Enums.KdfType.PBKDF2_SHA256),
-                            kdfIterations.GetValueOrDefault(5000));
-                        var key = await _cryptoService.GetKeyAsync();
-                        var pinProtectedKey = await _cryptoService.EncryptAsync(key.Key, pinKey);
                         await _storageService.SaveAsync(Constants.PinProtectedKey, pinProtectedKey.EncryptedString);
                     }
                 }
@@ -239,8 +237,8 @@ namespace Bit.App.Pages
             }
             if(!_pin)
             {
-                await _storageService.RemoveAsync(Constants.PinProtectedKey);
-                await _storageService.RemoveAsync(Constants.ProtectedPin);
+                await _cryptoService.ClearPinProtectedKeyAsync();
+                await _lockService.ClearAsync();
             }
             BuildList();
         }
@@ -252,9 +250,9 @@ namespace Bit.App.Pages
             {
                 _fingerprint = false;
             }
-            else if(await _platformUtilsService.SupportsFingerprintAsync())
+            else if(await _platformUtilsService.SupportsBiometricAsync())
             {
-                _fingerprint = await _platformUtilsService.AuthenticateFingerprintAsync(null,
+                _fingerprint = await _platformUtilsService.AuthenticateBiometricAsync(null,
                     _deviceActionService.DeviceType == Core.Enums.DeviceType.Android ? "." : null);
             }
             if(_fingerprint == current)
@@ -289,10 +287,13 @@ namespace Bit.App.Pages
                             AppResources.Enabled : AppResources.Disabled
                     });
                 }
+
+                var accessibilityEnabled = _deviceActionService.AutofillAccessibilityServiceRunning() &&
+                    _deviceActionService.AutofillAccessibilityOverlayPermitted();
                 autofillItems.Add(new SettingsPageListItem
                 {
                     Name = AppResources.AutofillAccessibilityService,
-                    SubLabel = _deviceActionService.AutofillAccessibilityServiceRunning() ?
+                    SubLabel = accessibilityEnabled ?
                         AppResources.Enabled : AppResources.Disabled
                 });
             }
@@ -320,13 +321,17 @@ namespace Bit.App.Pages
                 new SettingsPageListItem { Name = AppResources.LockNow },
                 new SettingsPageListItem { Name = AppResources.TwoStepLogin }
             };
-            if(_supportsFingerprint)
+            if(_supportsFingerprint || _fingerprint)
             {
                 var fingerprintName = AppResources.Fingerprint;
                 if(Device.RuntimePlatform == Device.iOS)
                 {
-                    fingerprintName = _deviceActionService.SupportsFaceId() ?
-                        AppResources.FaceID : AppResources.TouchID;
+                    fingerprintName = _deviceActionService.SupportsFaceBiometric() ? AppResources.FaceID :
+                        AppResources.TouchID;
+                }
+                else if(Device.RuntimePlatform == Device.Android && _deviceActionService.UseNativeBiometric())
+                {
+                    fingerprintName = AppResources.Biometrics;
                 }
                 var item = new SettingsPageListItem
                 {

src/App/Pages/Settings/SyncPageViewModel.cs

@@ -70,7 +70,11 @@ namespace Bit.App.Pages
             catch(ApiException e)
             {
                 await _deviceActionService.HideLoadingAsync();
-                await Page.DisplayAlert(AppResources.AnErrorHasOccurred, e.Error.GetSingleMessage(), AppResources.Ok);
+                if(e?.Error != null)
+                {
+                    await _platformUtilsService.ShowDialogAsync(e.Error.GetSingleMessage(),
+                        AppResources.AnErrorHasOccurred);
+                }
             }
         }
     }

src/App/Pages/TabsPage.cs

@@ -10,26 +10,26 @@ namespace Bit.App.Pages
         private NavigationPage _groupingsPage;
         private NavigationPage _generatorPage;
 
-        public TabsPage(AppOptions appOptions = null)
+        public TabsPage(AppOptions appOptions = null, PreviousPageInfo previousPage = null)
         {
-            _groupingsPage = new NavigationPage(new GroupingsPage(true))
+            _groupingsPage = new NavigationPage(new GroupingsPage(true, previousPage: previousPage))
             {
                 Title = AppResources.MyVault,
-                Icon = "lock.png"
+                IconImageSource = "lock.png"
             };
             Children.Add(_groupingsPage);
 
             _generatorPage = new NavigationPage(new GeneratorPage(true, null, this))
             {
                 Title = AppResources.Generator,
-                Icon = "refresh.png"
+                IconImageSource = "refresh.png"
             };
             Children.Add(_generatorPage);
 
             var settingsPage = new NavigationPage(new SettingsPage(this))
             {
                 Title = AppResources.Settings,
-                Icon = "cog.png"
+                IconImageSource = "cog.png"
             };
             Children.Add(settingsPage);
 
@@ -41,10 +41,6 @@ namespace Bit.App.Pages
                     Xamarin.Forms.PlatformConfiguration.AndroidSpecific.ToolbarPlacement.Bottom);
                 Xamarin.Forms.PlatformConfiguration.AndroidSpecific.TabbedPage.SetIsSwipePagingEnabled(this, false);
                 Xamarin.Forms.PlatformConfiguration.AndroidSpecific.TabbedPage.SetIsSmoothScrollEnabled(this, false);
-                Xamarin.Forms.PlatformConfiguration.AndroidSpecific.TabbedPage.SetBarSelectedItemColor(this,
-                    (Color)Application.Current.Resources["TabBarSelectedItemColor"]);
-                Xamarin.Forms.PlatformConfiguration.AndroidSpecific.TabbedPage.SetBarItemColor(this,
-                    (Color)Application.Current.Resources["TabBarItemColor"]);
             }
 
             if(appOptions?.GeneratorTile ?? false)

src/App/Pages/Vault/AddEditPage.xaml

@@ -121,21 +121,27 @@
                             Command="{Binding CheckPasswordCommand}"
                             Grid.Row="0"
                             Grid.Column="1"
-                            Grid.RowSpan="2" />
+                            Grid.RowSpan="2"
+                            AutomationProperties.IsInAccessibleTree="True"
+                            AutomationProperties.Name="{u:I18n CheckPassword}" />
                         <controls:FaButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="{Binding ShowPasswordIcon}"
                             Command="{Binding TogglePasswordCommand}"
                             Grid.Row="0"
                             Grid.Column="2"
-                            Grid.RowSpan="2" />
+                            Grid.RowSpan="2"
+                            AutomationProperties.IsInAccessibleTree="True"
+                            AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                         <controls:FaButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="&#xf021;"
                             Command="{Binding GeneratePasswordCommand}"
                             Grid.Row="0"
                             Grid.Column="3"
-                            Grid.RowSpan="2" />
+                            Grid.RowSpan="2"
+                            AutomationProperties.IsInAccessibleTree="True"
+                            AutomationProperties.Name="{u:I18n GeneratePassword}" />
                     </Grid>
 
                     <Grid StyleClass="box-row, box-row-input">
@@ -166,7 +172,9 @@
                             Clicked="ScanTotp_Clicked"
                             Grid.Row="0"
                             Grid.Column="1"
-                            Grid.RowSpan="2" />
+                            Grid.RowSpan="2"
+                            AutomationProperties.IsInAccessibleTree="True"
+                            AutomationProperties.Name="{u:I18n ScanQrTitle}" />
                     </Grid>
                 </StackLayout>
                 <StackLayout IsVisible="{Binding IsCard}" Spacing="0" Padding="0">
@@ -249,7 +257,9 @@
                             Command="{Binding ToggleCardCodeCommand}"
                             Grid.Row="0"
                             Grid.Column="1"
-                            Grid.RowSpan="2" />
+                            Grid.RowSpan="2"
+                            AutomationProperties.IsInAccessibleTree="True"
+                            AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                     </Grid>
                 </StackLayout>
                 <StackLayout IsVisible="{Binding IsIdentity}" Spacing="0" Padding="0">
@@ -454,7 +464,9 @@
                                     CommandParameter="{Binding .}"
                                     Grid.Row="0"
                                     Grid.Column="1"
-                                    Grid.RowSpan="2" />
+                                    Grid.RowSpan="2"
+                                    AutomationProperties.IsInAccessibleTree="True"
+                                    AutomationProperties.Name="{u:I18n Options}" />
                             </Grid>
                         </DataTemplate>
                     </controls:RepeaterView.ItemTemplate>
@@ -551,7 +563,15 @@
                                         IsVisible="{Binding IsHiddenType}"
                                         IsPassword="{Binding ShowHiddenValue, Converter={StaticResource inverseBool}}"
                                         IsSpellCheckEnabled="False"
-                                        IsTextPredictionEnabled="False" />
+                                        IsTextPredictionEnabled="False">
+                                        <Entry.Keyboard>
+                                            <Keyboard x:FactoryMethod="Create">
+                                                <x:Arguments>
+                                                    <KeyboardFlags>None</KeyboardFlags>
+                                                </x:Arguments>
+                                            </Keyboard>
+                                        </Entry.Keyboard>
+                                    </controls:MonoEntry>
                                     <Switch
                                         IsToggled="{Binding BooleanValue}"
                                         Grid.Row="0"
@@ -565,7 +585,9 @@
                                         IsVisible="{Binding IsHiddenType}"
                                         Grid.Row="0"
                                         Grid.Column="1"
-                                        Grid.RowSpan="2" />
+                                        Grid.RowSpan="2"
+                                        AutomationProperties.IsInAccessibleTree="True"
+                                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                                     <controls:FaButton 
                                         StyleClass="box-row-button, box-row-button-platform"
                                         Text="&#xf013;"
@@ -573,7 +595,9 @@
                                         CommandParameter="{Binding .}"
                                         Grid.Row="0"
                                         Grid.Column="2"
-                                        Grid.RowSpan="2" />
+                                        Grid.RowSpan="2"
+                                        AutomationProperties.IsInAccessibleTree="True"
+                                        AutomationProperties.Name="{u:I18n Options}" />
                                 </Grid>
                                 <BoxView StyleClass="box-row-separator" IsVisible="{Binding IsBooleanType}" />
                             </StackLayout>
@@ -583,7 +607,7 @@
                 <Button Text="{u:I18n NewCustomField}" StyleClass="box-button-row"
                         Clicked="NewField_Clicked"></Button>
             </StackLayout>
-            <StackLayout StyleClass="box" IsVisible="{Binding EditMode, Converter={StaticResource inverseBool}}">
+            <StackLayout StyleClass="box" IsVisible="{Binding ShowOwnershipOptions}">
                 <StackLayout StyleClass="box-row-header">
                     <Label Text="{u:I18n Ownership, Header=True}"
                            StyleClass="box-header, box-header-platform" />
@@ -634,4 +658,4 @@
         </StackLayout>
     </ScrollView>
 
-</pages:BaseContentPage>
+</pages:BaseContentPage>

src/App/Pages/Vault/AddEditPage.xaml.cs

@@ -30,7 +30,9 @@ namespace Bit.App.Pages
             string name = null,
             string uri = null,
             bool fromAutofill = false,
-            AppOptions appOptions = null)
+            AppOptions appOptions = null,
+            bool cloneMode = false,
+            ViewPage viewPage = null)
         {
             _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
@@ -41,14 +43,16 @@ namespace Bit.App.Pages
             _vm = BindingContext as AddEditPageViewModel;
             _vm.Page = this;
             _vm.CipherId = cipherId;
-            _vm.FolderId = folderId;
+            _vm.FolderId = folderId == "none" ? null : folderId;
             _vm.CollectionIds = collectionId != null ? new HashSet<string>(new List<string> { collectionId }) : null;
             _vm.Type = type;
             _vm.DefaultName = name ?? appOptions?.SaveName;
             _vm.DefaultUri = uri ?? appOptions?.Uri;
+            _vm.CloneMode = cloneMode;
+            _vm.ViewPage = viewPage;
             _vm.Init();
             SetActivityIndicator();
-            if(_vm.EditMode && Device.RuntimePlatform == Device.Android)
+            if(_vm.EditMode && !_vm.CloneMode && Device.RuntimePlatform == Device.Android)
             {
                 ToolbarItems.Add(_attachmentsItem);
                 ToolbarItems.Add(_deleteItem);
@@ -56,7 +60,7 @@ namespace Bit.App.Pages
             if(Device.RuntimePlatform == Device.iOS)
             {
                 ToolbarItems.Add(_closeItem);
-                if(_vm.EditMode)
+                if(_vm.EditMode && !_vm.CloneMode)
                 {
                     ToolbarItems.Add(_moreItem);
                 }
@@ -73,6 +77,8 @@ namespace Bit.App.Pages
             _folderPicker.ItemDisplayBinding = new Binding("Key");
             _ownershipPicker.ItemDisplayBinding = new Binding("Key");
 
+            _loginPasswordEntry.Keyboard = Keyboard.Create(KeyboardFlags.None);
+
             _nameEntry.ReturnType = ReturnType.Next;
             _nameEntry.ReturnCommand = new Command(() =>
             {
@@ -131,6 +137,7 @@ namespace Bit.App.Pages
         }
 
         public bool FromAutofillFramework { get; set; }
+        public AddEditPageViewModel ViewModel => _vm;
 
         protected override async void OnAppearing()
         {
@@ -260,7 +267,7 @@ namespace Bit.App.Pages
                 options.Add(_vm.Cipher.OrganizationId == null ? AppResources.Share : AppResources.Collections);
             }
             var selection = await DisplayActionSheet(AppResources.Options, AppResources.Cancel,
-                _vm.EditMode ? AppResources.Delete : null, options.ToArray());
+                (_vm.EditMode && !_vm.CloneMode) ? AppResources.Delete : null, options.ToArray());
             if(selection == AppResources.Delete)
             {
                 if(await _vm.DeleteAsync())
@@ -331,7 +338,7 @@ namespace Bit.App.Pages
 
         private void AdjustToolbar()
         {
-            if(_vm.EditMode && Device.RuntimePlatform == Device.Android)
+            if((_vm.EditMode || _vm.CloneMode) && Device.RuntimePlatform == Device.Android)
             {
                 if(_vm.Cipher == null)
                 {
@@ -343,7 +350,7 @@ namespace Bit.App.Pages
                     {
                         ToolbarItems.Remove(_collectionsItem);
                     }
-                    if(!ToolbarItems.Contains(_shareItem))
+                    if(!ToolbarItems.Contains(_shareItem) && !_vm.CloneMode)
                     {
                         ToolbarItems.Insert(2, _shareItem);
                     }

src/App/Pages/Vault/AddEditPageViewModel.cs

@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Xamarin.Forms;
+using View = Xamarin.Forms.View;
 
 namespace Bit.App.Pages
 {
@@ -23,6 +24,7 @@ namespace Bit.App.Pages
         private readonly IPlatformUtilsService _platformUtilsService;
         private readonly IAuditService _auditService;
         private readonly IMessagingService _messagingService;
+        private readonly IEventService _eventService;
         private CipherView _cipher;
         private bool _showNotesSeparator;
         private bool _showPassword;
@@ -34,6 +36,7 @@ namespace Bit.App.Pages
         private int _folderSelectedIndex;
         private int _ownershipSelectedIndex;
         private bool _hasCollections;
+        private string _previousCipherId;
         private List<Core.Models.View.CollectionView> _writeableCollections;
         private string[] _additionalCipherProperties = new string[]
         {
@@ -74,6 +77,7 @@ namespace Bit.App.Pages
             _auditService = ServiceContainer.Resolve<IAuditService>("auditService");
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
             _collectionService = ServiceContainer.Resolve<ICollectionService>("collectionService");
+            _eventService = ServiceContainer.Resolve<IEventService>("eventService");
             GeneratePasswordCommand = new Command(GeneratePassword);
             TogglePasswordCommand = new Command(TogglePassword);
             ToggleCardCodeCommand = new Command(ToggleCardCode);
@@ -257,8 +261,11 @@ namespace Bit.App.Pages
                     nameof(ShowCollections)
                 });
         }
-        public bool ShowCollections => !EditMode && Cipher.OrganizationId != null;
+        public bool ShowCollections => (!EditMode || CloneMode) && Cipher.OrganizationId != null;
         public bool EditMode => !string.IsNullOrWhiteSpace(CipherId);
+        public bool ShowOwnershipOptions => !EditMode || CloneMode;
+        public bool CloneMode { get; set; }
+        public ViewPage ViewPage { get; set; }
         public bool IsLogin => Cipher?.Type == CipherType.Login;
         public bool IsIdentity => Cipher?.Type == CipherType.Identity;
         public bool IsCard => Cipher?.Type == CipherType.Card;
@@ -270,7 +277,7 @@ namespace Bit.App.Pages
 
         public void Init()
         {
-            PageTitle = EditMode ? AppResources.EditItem : AppResources.AddItem;
+            PageTitle = EditMode && !CloneMode ? AppResources.EditItem : AppResources.AddItem;
         }
 
         public async Task<bool> LoadAsync(AppOptions appOptions = null)
@@ -307,6 +314,10 @@ namespace Bit.App.Pages
                         return false;
                     }
                     Cipher = await cipher.DecryptAsync();
+                    if(CloneMode)
+                    {
+                        Cipher.Name += " - " + AppResources.Clone;
+                    }
                 }
                 else
                 {
@@ -352,7 +363,7 @@ namespace Bit.App.Pages
                 OwnershipSelectedIndex = string.IsNullOrWhiteSpace(Cipher.OrganizationId) ? 0 :
                     OwnershipOptions.FindIndex(k => k.Value == Cipher.OrganizationId);
 
-                if(!EditMode && (CollectionIds?.Any() ?? false))
+                if((!EditMode || CloneMode) && (CollectionIds?.Any() ?? false))
                 {
                     foreach(var col in Collections)
                     {
@@ -365,9 +376,16 @@ namespace Bit.App.Pages
                 }
                 if(Cipher.Fields != null)
                 {
-                    Fields.ResetWithRange(Cipher.Fields?.Select(f => new AddEditPageFieldViewModel(f)));
+                    Fields.ResetWithRange(Cipher.Fields?.Select(f => new AddEditPageFieldViewModel(Cipher, f)));
                 }
             }
+
+            if(EditMode && _previousCipherId != CipherId)
+            {
+                var task = _eventService.CollectAsync(EventType.Cipher_ClientViewed, CipherId);
+            }
+            _previousCipherId = CipherId;
+
             return true;
         }
 
@@ -391,20 +409,21 @@ namespace Bit.App.Pages
                 return false;
             }
 
-            Cipher.Fields = Fields != null && Fields.Any() ? Fields.Select(f => f.Field).ToList() : null;
+            Cipher.Fields = Fields != null && Fields.Any() ?
+                Fields.Where(f => f != null).Select(f => f.Field).ToList() : null;
             if(Cipher.Login != null)
             {
                 Cipher.Login.Uris = Uris?.ToList();
-                if(!EditMode && Cipher.Type == CipherType.Login && (Cipher.Login.Uris?.Count ?? 0) == 1 &&
-                    string.IsNullOrWhiteSpace(Cipher.Login.Uris.First().Uri))
+                if((!EditMode || CloneMode) && Cipher.Type == CipherType.Login && Cipher.Login.Uris != null &&
+                   Cipher.Login.Uris.Count == 1 && string.IsNullOrWhiteSpace(Cipher.Login.Uris[0].Uri))
                 {
                     Cipher.Login.Uris = null;
                 }
             }
 
-            if(!EditMode && Cipher.OrganizationId != null)
+            if((!EditMode || CloneMode) && Cipher.OrganizationId != null)
             {
-                if(!Collections?.Any(c => c.Checked) ?? true)
+                if(Collections == null || !Collections.Any(c => c != null && c.Checked))
                 {
                     await Page.DisplayAlert(AppResources.AnErrorHasOccurred, AppResources.SelectOneCollection,
                         AppResources.Ok);
@@ -412,9 +431,14 @@ namespace Bit.App.Pages
                 }
 
                 Cipher.CollectionIds = Collections.Any() ?
-                    new HashSet<string>(Collections.Where(c => c.Checked).Select(c => c.Collection.Id)) : null;
+                    new HashSet<string>(Collections.Where(c => c != null && c.Checked && c.Collection?.Id != null)
+                        .Select(c => c.Collection.Id)) : null;
             }
 
+            if(CloneMode)
+            {
+                Cipher.Id = null;
+            }
             var cipher = await _cipherService.EncryptAsync(Cipher);
             if(cipher == null)
             {
@@ -427,16 +451,20 @@ namespace Bit.App.Pages
                 Cipher.Id = cipher.Id;
                 await _deviceActionService.HideLoadingAsync();
                 _platformUtilsService.ShowToast("success", null,
-                    EditMode ? AppResources.ItemUpdated : AppResources.NewItemCreated);
-                _messagingService.Send(EditMode ? "editedCipher" : "addedCipher", Cipher.Id);
+                    EditMode && !CloneMode ? AppResources.ItemUpdated : AppResources.NewItemCreated);
+                _messagingService.Send(EditMode && !CloneMode ? "editedCipher" : "addedCipher", Cipher.Id);
 
-                if((Page as AddEditPage).FromAutofillFramework)
+                if(Page is AddEditPage page && page.FromAutofillFramework)
                 {
                     // Close and go back to app
                     _deviceActionService.CloseAutofill();
                 }
                 else
                 {
+                    if(CloneMode)
+                    {
+                        ViewPage?.UpdateCipherId(this.Cipher.Id);
+                    }
                     await Page.Navigation.PopModalAsync();
                 }
                 return true;
@@ -444,7 +472,11 @@ namespace Bit.App.Pages
             catch(ApiException e)
             {
                 await _deviceActionService.HideLoadingAsync();
-                await Page.DisplayAlert(AppResources.AnErrorHasOccurred, e.Error.GetSingleMessage(), AppResources.Ok);
+                if(e?.Error != null)
+                {
+                    await _platformUtilsService.ShowDialogAsync(e.Error.GetSingleMessage(),
+                        AppResources.AnErrorHasOccurred);
+                }
             }
             return false;
         }
@@ -475,7 +507,11 @@ namespace Bit.App.Pages
             catch(ApiException e)
             {
                 await _deviceActionService.HideLoadingAsync();
-                await Page.DisplayAlert(AppResources.AnErrorHasOccurred, e.Error.GetSingleMessage(), AppResources.Ok);
+                if(e?.Error != null)
+                {
+                    await _platformUtilsService.ShowDialogAsync(e.Error.GetSingleMessage(),
+                        AppResources.AnErrorHasOccurred);
+                }
             }
             return false;
         }
@@ -591,7 +627,7 @@ namespace Bit.App.Pages
                     Fields = new ExtendedObservableCollection<AddEditPageFieldViewModel>();
                 }
                 var type = _fieldTypeOptions.FirstOrDefault(f => f.Value == typeSelection).Key;
-                Fields.Add(new AddEditPageFieldViewModel(new FieldView
+                Fields.Add(new AddEditPageFieldViewModel(Cipher, new FieldView
                 {
                     Type = type,
                     Name = string.IsNullOrWhiteSpace(name) ? null : name
@@ -602,11 +638,19 @@ namespace Bit.App.Pages
         public void TogglePassword()
         {
             ShowPassword = !ShowPassword;
+            if(EditMode && ShowPassword)
+            {
+                var task = _eventService.CollectAsync(EventType.Cipher_ClientToggledPasswordVisible, CipherId);
+            }
         }
 
         public void ToggleCardCode()
         {
             ShowCardCode = !ShowCardCode;
+            if(EditMode && ShowCardCode)
+            {
+                var task = _eventService.CollectAsync(EventType.Cipher_ClientToggledCardCodeVisible, CipherId);
+            }
         }
 
         public async Task UpdateTotpKeyAsync(string key)
@@ -720,6 +764,7 @@ namespace Bit.App.Pages
     public class AddEditPageFieldViewModel : ExtendedViewModel
     {
         private FieldView _field;
+        private CipherView _cipher;
         private bool _showHiddenValue;
         private bool _booleanValue;
         private string[] _additionalFieldProperties = new string[]
@@ -729,8 +774,9 @@ namespace Bit.App.Pages
             nameof(IsTextType),
         };
 
-        public AddEditPageFieldViewModel(FieldView field)
+        public AddEditPageFieldViewModel(CipherView cipher, FieldView field)
         {
+            _cipher = cipher;
             Field = field;
             ToggleHiddenValueCommand = new Command(ToggleHiddenValue);
             BooleanValue = IsBooleanType && field.Value == "true";
@@ -775,6 +821,11 @@ namespace Bit.App.Pages
         public void ToggleHiddenValue()
         {
             ShowHiddenValue = !ShowHiddenValue;
+            if(ShowHiddenValue && _cipher?.Id != null)
+            {
+                var eventService = ServiceContainer.Resolve<IEventService>("eventService");
+                var task = eventService.CollectAsync(EventType.Cipher_ClientToggledHiddenFieldVisible, _cipher.Id);
+            }
         }
 
         public void TriggerFieldChanged()

src/App/Pages/Vault/AttachmentsPage.xaml

@@ -54,7 +54,9 @@
                                         Text=""
                                         Command="{Binding BindingContext.DeleteAttachmentCommand, Source={x:Reference _page}}"
                                         CommandParameter="{Binding .}"
-                                        VerticalOptions="Center" />
+                                        VerticalOptions="Center"
+                                        AutomationProperties.IsInAccessibleTree="True"
+                                        AutomationProperties.Name="{u:I18n Delete}" />
                                 </StackLayout>
                                 <BoxView StyleClass="box-row-separator" />
                             </StackLayout>

src/App/Pages/Vault/AttachmentsPageViewModel.cs

@@ -124,7 +124,11 @@ namespace Bit.App.Pages
             catch(ApiException e)
             {
                 await _deviceActionService.HideLoadingAsync();
-                await Page.DisplayAlert(AppResources.AnErrorHasOccurred, e.Error.GetSingleMessage(), AppResources.Ok);
+                if(e?.Error != null)
+                {
+                    await _platformUtilsService.ShowDialogAsync(e.Error.GetSingleMessage(),
+                        AppResources.AnErrorHasOccurred);
+                }
             }
             return false;
         }
@@ -164,7 +168,11 @@ namespace Bit.App.Pages
             catch(ApiException e)
             {
                 await _deviceActionService.HideLoadingAsync();
-                await Page.DisplayAlert(AppResources.AnErrorHasOccurred, e.Error.GetSingleMessage(), AppResources.Ok);
+                if(e?.Error != null)
+                {
+                    await _platformUtilsService.ShowDialogAsync(e.Error.GetSingleMessage(),
+                        AppResources.AnErrorHasOccurred);
+                }
             }
         }
 

src/App/Pages/Vault/AutofillCiphersPage.xaml.cs

@@ -39,7 +39,7 @@ namespace Bit.App.Pages
                 }
                 catch(Exception e) when(e.Message.Contains("No key."))
                 {
-                    await Task.Delay(5000);
+                    await Task.Delay(1000);
                     await _vm.LoadAsync();
                 }
             }, _mainContent);

src/App/Pages/Vault/AutofillCiphersPageViewModel.cs

@@ -157,8 +157,11 @@ namespace Bit.App.Pages
                     catch(ApiException e)
                     {
                         await _deviceActionService.HideLoadingAsync();
-                        await Page.DisplayAlert(AppResources.AnErrorHasOccurred, e.Error.GetSingleMessage(),
-                            AppResources.Ok);
+                        if(e?.Error != null)
+                        {
+                            await _platformUtilsService.ShowDialogAsync(e.Error.GetSingleMessage(),
+                                AppResources.AnErrorHasOccurred);
+                        }
                     }
                 }
                 if(autofillResponse == AppResources.Yes || autofillResponse == AppResources.YesAndSave)

src/App/Pages/Vault/CiphersPage.xaml

@@ -34,7 +34,7 @@
                     VerticalOptions="CenterAndExpand"
                     Clicked="BackButton_Clicked"
                     x:Name="_backButton" />
-                <SearchBar
+                <controls:ExtendedSearchBar
                     x:Name="_searchBar"
                     HorizontalOptions="FillAndExpand"
                     TextChanged="SearchBar_TextChanged"

src/App/Pages/Vault/CiphersPage.xaml.cs

@@ -75,7 +75,7 @@ namespace Bit.App.Pages
             {
                 return;
             }
-            _vm.Search(e.NewTextValue, 500);
+            _vm.Search(e.NewTextValue, 200);
         }
 
         private void SearchBar_SearchButtonPressed(object sender, EventArgs e)

src/App/Pages/Vault/CiphersPageViewModel.cs

@@ -77,7 +77,7 @@ namespace Bit.App.Pages
                 .GetValueOrDefault();
             if(!string.IsNullOrWhiteSpace((Page as CiphersPage).SearchBar.Text))
             {
-                Search((Page as CiphersPage).SearchBar.Text, 500);
+                Search((Page as CiphersPage).SearchBar.Text, 200);
             }
         }
 
@@ -110,16 +110,19 @@ namespace Bit.App.Pages
                     }
                     catch(OperationCanceledException)
                     {
-                        ciphers = new List<CipherView>();
+                        return;
                     }
                 }
                 if(ciphers == null)
                 {
                     ciphers = new List<CipherView>();
                 }
-                Ciphers.ResetWithRange(ciphers);
-                ShowNoData = searchable && Ciphers.Count == 0;
-                ShowList = searchable && !ShowNoData;
+                Device.BeginInvokeOnMainThread(() =>
+                {
+                    Ciphers.ResetWithRange(ciphers);
+                    ShowNoData = searchable && Ciphers.Count == 0;
+                    ShowList = searchable && !ShowNoData;
+                });
             }, cts.Token);
             _searchCancellationTokenSource = cts;
         }
@@ -168,8 +171,11 @@ namespace Bit.App.Pages
                     catch(ApiException e)
                     {
                         await _deviceActionService.HideLoadingAsync();
-                        await Page.DisplayAlert(AppResources.AnErrorHasOccurred, e.Error.GetSingleMessage(),
-                            AppResources.Ok);
+                        if(e?.Error != null)
+                        {
+                            await _platformUtilsService.ShowDialogAsync(e.Error.GetSingleMessage(),
+                                AppResources.AnErrorHasOccurred);
+                        }
                     }
                 }
                 if(_deviceActionService.SystemMajorVersion() < 21)

src/App/Pages/Vault/CollectionsPageViewModel.cs

@@ -85,7 +85,11 @@ namespace Bit.App.Pages
             catch(ApiException e)
             {
                 await _deviceActionService.HideLoadingAsync();
-                await Page.DisplayAlert(AppResources.AnErrorHasOccurred, e.Error.GetSingleMessage(), AppResources.Ok);
+                if(e?.Error != null)
+                {
+                    await _platformUtilsService.ShowDialogAsync(e.Error.GetSingleMessage(),
+                        AppResources.AnErrorHasOccurred);
+                }
             }
             return false;
         }

src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml

@@ -59,7 +59,7 @@
                         </controls:FaLabel>
                         <Label Text="{Binding Name, Mode=OneWay}"
                                LineBreakMode="TailTruncation"
-                               HorizontalOptions="StartAndExpand"
+                               HorizontalOptions="FillAndExpand"
                                VerticalOptions="CenterAndExpand"
                                StyleClass="list-title"/>
                         <Label Text="{Binding ItemCount, Mode=OneWay}"

src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs

@@ -1,11 +1,13 @@
 using Bit.App.Abstractions;
 using Bit.App.Controls;
+using Bit.App.Models;
 using Bit.App.Resources;
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using Xamarin.Forms;
 
@@ -18,12 +20,15 @@ namespace Bit.App.Pages
         private readonly IPushNotificationService _pushNotificationService;
         private readonly IStorageService _storageService;
         private readonly ILockService _lockService;
+        private readonly ICipherService _cipherService;
         private readonly IDeviceActionService _deviceActionService;
         private readonly GroupingsPageViewModel _vm;
         private readonly string _pageName;
 
+        private PreviousPageInfo _previousPage;
+
         public GroupingsPage(bool mainPage, CipherType? type = null, string folderId = null,
-            string collectionId = null, string pageTitle = null)
+            string collectionId = null, string pageTitle = null, PreviousPageInfo previousPage = null)
         {
             _pageName = string.Concat(nameof(GroupingsPage), "_", DateTime.UtcNow.Ticks);
             InitializeComponent();
@@ -34,6 +39,7 @@ namespace Bit.App.Pages
             _pushNotificationService = ServiceContainer.Resolve<IPushNotificationService>("pushNotificationService");
             _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
             _lockService = ServiceContainer.Resolve<ILockService>("lockService");
+            _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
             _vm = BindingContext as GroupingsPageViewModel;
             _vm.Page = this;
@@ -41,6 +47,7 @@ namespace Bit.App.Pages
             _vm.Type = type;
             _vm.FolderId = folderId;
             _vm.CollectionId = collectionId;
+            _previousPage = previousPage;
             if(pageTitle != null)
             {
                 _vm.PageTitle = pageTitle;
@@ -93,7 +100,7 @@ namespace Bit.App.Pages
             var migratedFromV1 = await _storageService.GetAsync<bool?>(Constants.MigratedFromV1);
             await LoadOnAppearedAsync(_mainLayout, false, async () =>
             {
-                if(!_syncService.SyncInProgress)
+                if(!_syncService.SyncInProgress || (await _cipherService.GetAllAsync()).Any())
                 {
                     try
                     {
@@ -101,7 +108,7 @@ namespace Bit.App.Pages
                     }
                     catch(Exception e) when(e.Message.Contains("No key."))
                     {
-                        await Task.Delay(5000);
+                        await Task.Delay(1000);
                         await _vm.LoadAsync();
                     }
                 }
@@ -125,6 +132,7 @@ namespace Bit.App.Pages
                         await _syncService.FullSyncAsync(true);
                     }
                 }
+                await ShowPreviousPageAsync();
             }, _mainContent);
 
             if(!_vm.MainPage)
@@ -244,5 +252,22 @@ namespace Bit.App.Pages
                 await Navigation.PushModalAsync(new NavigationPage(page));
             }
         }
+
+        private async Task ShowPreviousPageAsync()
+        {
+            if(_previousPage == null)
+            {
+                return;
+            }
+            if(_previousPage.Page == "view" && !string.IsNullOrWhiteSpace(_previousPage.CipherId))
+            {
+                await Navigation.PushModalAsync(new NavigationPage(new ViewPage(_previousPage.CipherId)));
+            }
+            else if(_previousPage.Page == "edit" && !string.IsNullOrWhiteSpace(_previousPage.CipherId))
+            {
+                await Navigation.PushModalAsync(new NavigationPage(new AddEditPage(_previousPage.CipherId)));
+            }
+            _previousPage = null;
+        }
     }
 }

src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs

@@ -37,6 +37,8 @@ namespace Bit.App.Pages
         private readonly IFolderService _folderService;
         private readonly ICollectionService _collectionService;
         private readonly ISyncService _syncService;
+        private readonly IUserService _userService;
+        private readonly ILockService _lockService;
         private readonly IDeviceActionService _deviceActionService;
         private readonly IPlatformUtilsService _platformUtilsService;
         private readonly IMessagingService _messagingService;
@@ -48,6 +50,8 @@ namespace Bit.App.Pages
             _folderService = ServiceContainer.Resolve<IFolderService>("folderService");
             _collectionService = ServiceContainer.Resolve<ICollectionService>("collectionService");
             _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
+            _userService = ServiceContainer.Resolve<IUserService>("userService");
+            _lockService = ServiceContainer.Resolve<ILockService>("lockService");
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
@@ -134,6 +138,15 @@ namespace Bit.App.Pages
             {
                 return;
             }
+            var authed = await _userService.IsAuthenticatedAsync();
+            if(!authed)
+            {
+                return;
+            }
+            if(await _lockService.IsLockedAsync())
+            {
+                return;
+            }
             _doingLoad = true;
             LoadedOnce = true;
             ShowNoData = false;
@@ -305,9 +318,17 @@ namespace Bit.App.Pages
                 return;
             }
             await _deviceActionService.ShowLoadingAsync(AppResources.Syncing);
-            await _syncService.FullSyncAsync(false);
-            await _deviceActionService.HideLoadingAsync();
-            _platformUtilsService.ShowToast("success", null, AppResources.SyncingComplete);
+            try
+            {
+                await _syncService.FullSyncAsync(false, true);
+                await _deviceActionService.HideLoadingAsync();
+                _platformUtilsService.ShowToast("success", null, AppResources.SyncingComplete);
+            }
+            catch
+            {
+                await _deviceActionService.HideLoadingAsync();
+                _platformUtilsService.ShowToast("error", null, AppResources.SyncingFailed);
+            }
         }
 
         private async Task LoadDataAsync()