[EC-304] Fix contribution mobile docs link

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

.github/PULL_REQUEST_TEMPLATE.md

@@ -22,6 +22,7 @@
 
 
 ## Before you submit
+- [ ] I have checked for formatting errors (`dotnet tool run dotnet-format --check`) (required)
 - [ ] I have added **unit tests** where it makes sense to do so (encouraged but not required)
 - [ ] This change requires a **documentation update** (notify the documentation team)
 - [ ] This change has particular **deployment requirements** (notify the DevOps team)

.github/workflows/automatic-issue-responses.yml

@@ -0,0 +1,64 @@
+---
+name: Automatic responses
+on:
+  issues:
+    types:
+      - labeled
+jobs:
+  close-issue:
+    name: 'Close issue with automatic response'
+    runs-on: ubuntu-20.04
+    permissions:
+      issues: write
+    steps:
+      # Feature request
+      - if: github.event.label.name == 'feature-request'
+        name: Feature request
+        uses: peter-evans/close-issue@849549ba7c3a595a064c4b2c56f206ee78f93515  # v2.0.0
+        with:
+          comment: |
+            We use GitHub issues as a place to track bugs and other development related issues. The [Bitwarden Community Forums](https://community.bitwarden.com/) has a [Feature Requests](https://community.bitwarden.com/c/feature-requests) section for submitting, voting for, and discussing requests like this one.
+
+            Please [sign up on our forums](https://community.bitwarden.com/signup) and search to see if this request already exists. If so, you can vote for it and contribute to any discussions about it. If not, you can re-create the request there so that it can be properly tracked.
+
+            This issue will now be closed. Thanks!
+      # Intended behavior
+      - if: github.event.label.name == 'intended-behavior'
+        name: Intended behaviour
+        uses: peter-evans/close-issue@849549ba7c3a595a064c4b2c56f206ee78f93515  # v2.0.0
+        with:
+          comment: |
+            Your issue appears to be describing the intended behavior of the software. If you want this to be changed, it would be a feature request.
+
+            We use GitHub issues as a place to track bugs and other development related issues. The [Bitwarden Community Forums](https://community.bitwarden.com/) has a [Feature Requests](https://community.bitwarden.com/c/feature-requests) section for submitting, voting for, and discussing requests like this one.
+
+            Please [sign up on our forums](https://community.bitwarden.com/signup) and search to see if this request already exists. If so, you can vote for it and contribute to any discussions about it. If not, you can re-create the request there so that it can be properly tracked.
+
+            This issue will now be closed. Thanks!
+      # Customer support request
+      - if: github.event.label.name == 'customer-support'
+        name: Customer Support request
+        uses: peter-evans/close-issue@849549ba7c3a595a064c4b2c56f206ee78f93515  # v2.0.0
+        with:
+          comment: |
+            We use GitHub issues as a place to track bugs and other development related issues. Your issue appears to be a support request, or would otherwise be better handled by our dedicated Customer Success team.
+
+            Please contact us using our [Contact page](https://bitwarden.com/contact). You can include a link to this issue in the message content.
+
+            Alternatively, you can also search for an answer in our [help documentation](https://bitwarden.com/help/) or get help from other Bitwarden users on our [community forums](https://community.bitwarden.com/c/support/). The issue here will be closed.
+      # Resolved
+      - if: github.event.label.name == 'resolved'
+        name: Resolved
+        uses: peter-evans/close-issue@849549ba7c3a595a064c4b2c56f206ee78f93515  # v2.0.0
+        with:
+          comment: |
+            We’ve closed this issue, as it appears the original problem has been resolved. If this happens again or continues to be an problem, please respond to this issue with any additional detail to assist with reproduction and root cause analysis.
+      # Stale
+      - if: github.event.label.name == 'stale'
+        name: Stale
+        uses: peter-evans/close-issue@849549ba7c3a595a064c4b2c56f206ee78f93515  # v2.0.0
+        with:
+          comment: |
+            As we haven’t heard from you about this problem in some time, this issue will now be closed.
+
+            If this happens again or continues to be an problem, please respond to this issue with any additional detail to assist with reproduction and root cause analysis.

.github/workflows/build.yml

@@ -60,6 +60,11 @@ jobs:
     runs-on: windows-2019
     needs: setup
     steps:
+      - name: Setup NuGet
+        uses: nuget/setup-nuget@b2bc17b761a1d88cab755a776c7922eb26eefbfa  # v1.0.6
+        with:
+          nuget-version: 5.9.0
+
       - name: Set up MSBuild
         uses: microsoft/setup-msbuild@ab534842b4bdf384b8aaf93765dc6f721d9f5fab
 
@@ -209,6 +214,11 @@ jobs:
     name: F-Droid Build
     runs-on: windows-2019
     steps:
+      - name: Setup NuGet
+        uses: nuget/setup-nuget@b2bc17b761a1d88cab755a776c7922eb26eefbfa  # v1.0.6
+        with:
+          nuget-version: 5.9.0
+
       - name: Set up MSBuild
         uses: microsoft/setup-msbuild@ab534842b4bdf384b8aaf93765dc6f721d9f5fab
 
@@ -368,6 +378,11 @@ jobs:
     runs-on: macos-11
     needs: setup
     steps:
+      - name: Setup NuGet
+        uses: nuget/setup-nuget@b2bc17b761a1d88cab755a776c7922eb26eefbfa  # v1.0.6
+        with:
+          nuget-version: 5.9.0
+
       - name: Print environment
         run: |
           nuget help | grep Version

.github/workflows/release.yml

@@ -34,29 +34,13 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0
 
-      - name: Retrieve Mobile release version
-        id: retrieve-mobile-version
-        run: |
-          ver=$(sed -E -n '/^<manifest/s/^.*[ ]android:versionName="([^"]+)".*$/\1/p' \
-          ./src/Android/Properties/AndroidManifest.xml | tr -d '"')
-          echo "::set-output name=mobile_version::${ver}"
-        shell: bash
-
-      - name: Check to make sure Mobile release version has been bumped
-        if: ${{ github.event.inputs.release_type == 'Initial Release' }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          latest_ver=$(hub release -L 1 -f '%T')
-          latest_ver=${latest_ver:1}
-          echo "Latest version: $latest_ver"
-          ver=${{ steps.retrieve-mobile-version.outputs.mobile_version }}
-          echo "Version: $ver"
-          if [ "$latest_ver" = "$ver" ]; then
-            echo "Version has not been bumped!"
-            exit 1
-          fi
-        shell: bash
+      - name: Check Release Version
+        id: version
+        uses: bitwarden/gh-actions/release-version-check@8f055ef543c7433c967a1b9b04a0f230923233bb
+        with:
+          release-type: ${{ github.event.inputs.release_type }}
+          project-type: xamarin
+          file: src/Android/Properties/AndroidManifest.xml
 
       - name: Get branch name
         id: branch
@@ -83,8 +67,8 @@ jobs:
                       ./com.x8bit.bitwarden-fdroid.apk/com.x8bit.bitwarden-fdroid.apk,
                       ./Bitwarden iOS.zip"
           commit: ${{ github.sha }}
-          tag: v${{ steps.retrieve-mobile-version.outputs.mobile_version }}
-          name: Version ${{ steps.retrieve-mobile-version.outputs.mobile_version }}
+          tag: v${{ steps.version.outputs.version }}
+          name: Version ${{ steps.version.outputs.version }}
           body: "<insert release notes here>"
           token: ${{ secrets.GITHUB_TOKEN }}
           draft: true

.github/workflows/stale-bot.yml

@@ -0,0 +1,30 @@
+---
+name: 'Close stale issues and PRs'
+on:
+  workflow_dispatch:
+  schedule:   # Run once a day at 5.23am (arbitrary but should avoid peak loads on the hour)
+    - cron: '23 5 * * *'
+
+jobs:
+  stale:
+    name: 'Check for stale issues and PRs'
+    runs-on: ubuntu-20.04
+    steps:
+      - name: 'Run stale action'
+        uses: actions/stale@3cc123766321e9f15a6676375c154ccffb12a358  # v5.0.0
+        with:
+          stale-issue-label: 'needs-reply'
+          stale-pr-label: 'needs-changes'
+          days-before-stale: -1   # Do not apply the stale labels automatically, this is a manual process
+          days-before-issue-close: 14   # Close issue if no further activity after X days
+          days-before-pr-close: 21   # Close PR if no further activity after X days
+          close-issue-message: |
+            We need more information before we can help you with your problem. As we haven’t heard from you recently, this issue will be closed.
+
+            If this happens again or continues to be an problem, please respond to this issue with the information we’ve requested and anything else relevant.
+          close-pr-message: |
+            We can’t merge your pull request until you make the changes we’ve requested. As we haven’t heard from you recently, this pull request will be closed.
+
+            If you’re still working on this, please respond here after you’ve made the changes we’ve requested and our team will re-open it for further review.
+
+            Please make sure to resolve any conflicts with the master branch before requesting another review.

CONTRIBUTING.md

@@ -1,40 +1,3 @@
 # How to Contribute
 
-Contributions of all kinds are welcome!
-
-Please visit our [Community Forums](https://community.bitwarden.com/) for general community discussion and the development roadmap.
-
-Here is how you can get involved:
-
-* **Request a new feature:** Go to the [Feature Requests category](https://community.bitwarden.com/c/feature-requests/) of the Community Forums. Please search existing feature requests before making a new one
-  
-* **Write code for a new feature:** Make a new post in the [Github Contributions category](https://community.bitwarden.com/c/github-contributions/) of the Community Forums. Include a description of your proposed contribution, screeshots, and links to any relevant feature requests. This helps get feedback from the community and Bitwarden team members before you start writing code
-  
-* **Report a bug or submit a bugfix:** Use Github issues and pull requests
-  
-* **Write documentation:** Submit a pull request to the [Bitwarden help repository](https://github.com/bitwarden/help)
-  
-* **Help other users:** Go to the [Ask the Bitwarden Community category](https://community.bitwarden.com/c/support/) on the Community Forums
-  
-* **Translate:** See the localization (i10n) section below
-
-## Contributor Agreement
-
-Please sign the [Contributor Agreement](https://cla-assistant.io/bitwarden/mobile) if you intend on contributing to any Github repository. Pull requests cannot be accepted and merged unless the author has signed the Contributor Agreement.
-
-## Pull Request Guidelines
-
-* commit any pull requests against the `master` branch
-* include a link to your Community Forums post
-
-# Localization (l10n)
-
-[![Crowdin](https://d322cqt584bo4o.cloudfront.net/bitwarden-mobile/localized.svg)](https://crowdin.com/project/bitwarden-mobile)
-
-We use a translation tool called [Crowdin](https://crowdin.com) to help manage our localization efforts across many different languages.
-
-If you are interested in helping translate the Bitwarden mobile app into another language (or make a translation correction), please register an account at Crowdin and join our project here: https://crowdin.com/project/bitwarden-mobile
-
-If the language that you are interested in translating is not already listed, create a new account on Crowdin, join the project, and contact the project owner (https://crowdin.com/profile/dwbit).
-
-You can read Crowdin's getting started guide for translators here: https://support.crowdin.com/crowdin-intro/
+Our [Contributing Guidelines](https://contributing.bitwarden.com/contributing/) are located in our [Contributing Documentation](https://contributing.bitwarden.com/). The documentation also includes recommended tooling, code style tips, and lots of other great information to get you started.

README.md

@@ -12,16 +12,7 @@ The Bitwarden mobile application is written in C# with Xamarin Android, Xamarin
 
 # Build/Run
 
-**Requirements**
-
-- [Visual Studio](https://visualstudio.microsoft.com/)
-- [Xamarin](https://docs.microsoft.com/en-us/xamarin/get-started/installation/?pivots=windows)
-
-**Run the app**
-
-- Open the solution file in Visual Studio.
-- Restore the nuget packages.
-- Build and run the app.
+Please refer to the [Mobile section](https://contributing.bitwarden.com/mobile) of the [Contributing Documentation](https://contributing.bitwarden.com/) for build instructions, recommended tooling, code style tips, and lots of other great information to get you started.
 
 # We're Hiring!
 
@@ -29,8 +20,7 @@ Interested in contributing in a big way? Consider joining our team! We're hiring
 
 # Contribute
 
-Code contributions are welcome! Visual Studio with Xamarin is required to work on this project. Please commit any pull requests against the `master` branch.
-Learn more about how to contribute by reading the [`CONTRIBUTING.md`](CONTRIBUTING.md) file.
+Code contributions are welcome! Please commit any pull requests against the `master` branch. Learn more about how to contribute by reading the [Contributing Guidelines](https://contributing.bitwarden.com/contributing/). Check out the [Contributing Documentation](https://contributing.bitwarden.com/) for how to get started with your first contribution.
 
 Security audits and feedback are welcome. Please open an issue or email us privately if the report is sensitive in nature. You can read our security policy in the [`SECURITY.md`](SECURITY.md) file.
 
@@ -45,11 +35,3 @@ We recently migrated to using dotnet-format as code formatter. All previous bran
 5. Commit
 6. Run `git merge -Xours 04539af2a66668b6e85476d5cf318c9150ec4357`
 7. Push
-
-#### Git blame
-
-We also recommend that you configure git to ignore the prettier revision using:
-
-```bash
-git config blame.ignoreRevsFile .git-blame-ignore-revs
-```

src/Android/Android.csproj

@@ -84,7 +84,7 @@
     <PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.2.5.2" />
     <PackageReference Include="Xamarin.AndroidX.Migration" Version="1.0.8" />
     <PackageReference Include="Xamarin.Essentials">
-      <Version>1.7.2</Version>
+      <Version>1.7.3</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Firebase.Messaging">
       <Version>122.0.0</Version>

src/Android/MainApplication.cs

@@ -12,7 +12,6 @@ using Bit.Core.Abstractions;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Bit.Droid.Services;
-using Bit.Droid.Utilities;
 using Plugin.CurrentActivity;
 using Plugin.Fingerprint;
 using Xamarin.Android.Net;
@@ -20,6 +19,7 @@ using System.Net.Http;
 using System.Net;
 using Bit.App.Utilities;
 using Bit.App.Pages;
+using Bit.App.Utilities.AccountManagement;
 #if !FDROID
 using Android.Gms.Security;
 #endif
@@ -62,6 +62,15 @@ namespace Bit.Droid
                     ServiceContainer.Resolve<IPasswordRepromptService>("passwordRepromptService"),
                     ServiceContainer.Resolve<ICryptoService>("cryptoService"));
                 ServiceContainer.Register<IVerificationActionsFlowHelper>("verificationActionsFlowHelper", verificationActionsFlowHelper);
+
+                var accountsManager = new AccountsManager(
+                    ServiceContainer.Resolve<IBroadcasterService>("broadcasterService"),
+                    ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService"),
+                    ServiceContainer.Resolve<IStorageService>("secureStorageService"),
+                    ServiceContainer.Resolve<IStateService>("stateService"),
+                    ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService"),
+                    ServiceContainer.Resolve<IAuthService>("authService"));
+                ServiceContainer.Register<IAccountsManager>("accountsManager", accountsManager);
             }
 #if !FDROID
             if (Build.VERSION.SdkInt <= BuildVersionCodes.Kitkat)
@@ -90,12 +99,13 @@ namespace Bit.Droid
         {
             ServiceContainer.Register<INativeLogService>("nativeLogService", new AndroidLogService());
 #if FDROID
-            ServiceContainer.Register<ILogger>("logger", new StubLogger());
+            var logger = new StubLogger();
 #elif DEBUG
-            ServiceContainer.Register<ILogger>("logger", DebugLogger.Instance);
+            var logger = DebugLogger.Instance;
 #else
-            ServiceContainer.Register<ILogger>("logger", Logger.Instance);
+            var logger = Logger.Instance;
 #endif
+            ServiceContainer.Register("logger", logger);
 
             // Note: This might cause a race condition. Investigate more.
             Task.Run(() =>
@@ -115,19 +125,20 @@ namespace Bit.Droid
             var documentsPath = System.Environment.GetFolderPath(System.Environment.SpecialFolder.Personal);
             var liteDbStorage = new LiteDbStorageService(Path.Combine(documentsPath, "bitwarden.db"));
             var localizeService = new LocalizeService();
-            var broadcasterService = new BroadcasterService();
+            var broadcasterService = new BroadcasterService(logger);
             var messagingService = new MobileBroadcasterMessagingService(broadcasterService);
             var i18nService = new MobileI18nService(localizeService.GetCurrentCultureInfo());
             var secureStorageService = new SecureStorageService();
             var cryptoPrimitiveService = new CryptoPrimitiveService();
             var mobileStorageService = new MobileStorageService(preferencesStorage, liteDbStorage);
-            var stateService = new StateService(mobileStorageService, secureStorageService);
+            var stateService = new StateService(mobileStorageService, secureStorageService, messagingService);
             var stateMigrationService =
                 new StateMigrationService(liteDbStorage, preferencesStorage, secureStorageService);
-            var deviceActionService = new DeviceActionService(stateService, messagingService,
+            var clipboardService = new ClipboardService(stateService);
+            var deviceActionService = new DeviceActionService(clipboardService, stateService, messagingService,
                 broadcasterService, () => ServiceContainer.Resolve<IEventService>("eventService"));
-            var platformUtilsService = new MobilePlatformUtilsService(deviceActionService, messagingService,
-                broadcasterService);
+            var platformUtilsService = new MobilePlatformUtilsService(deviceActionService, clipboardService,
+                messagingService, broadcasterService);
             var biometricService = new BiometricService();
             var cryptoFunctionService = new PclCryptoFunctionService(cryptoPrimitiveService);
             var cryptoService = new CryptoService(stateService, cryptoFunctionService);
@@ -142,7 +153,7 @@ namespace Bit.Droid
             ServiceContainer.Register<IStorageService>("secureStorageService", secureStorageService);
             ServiceContainer.Register<IStateService>("stateService", stateService);
             ServiceContainer.Register<IStateMigrationService>("stateMigrationService", stateMigrationService);
-            ServiceContainer.Register<IClipboardService>("clipboardService", new ClipboardService(stateService));
+            ServiceContainer.Register<IClipboardService>("clipboardService", clipboardService);
             ServiceContainer.Register<IDeviceActionService>("deviceActionService", deviceActionService);
             ServiceContainer.Register<IPlatformUtilsService>("platformUtilsService", platformUtilsService);
             ServiceContainer.Register<IBiometricService>("biometricService", biometricService);

src/Android/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2022.05.1" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2022.6.1" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
 
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30"/>
 

src/Android/Resources/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

src/Android/Resources/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

src/Android/Services/ClipboardService.cs

@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Android.App;
 using Android.Content;
-using Bit.Core;
+using Android.OS;
 using Bit.Core.Abstractions;
 using Bit.Droid.Receivers;
 using Plugin.CurrentActivity;
@@ -26,11 +26,47 @@ namespace Bit.Droid.Services
                                            PendingIntentFlags.UpdateCurrent));
         }
 
-        public async Task CopyTextAsync(string text, int expiresInMs = -1)
+        public async Task CopyTextAsync(string text, int expiresInMs = -1, bool isSensitive = true)
         {
-            await Clipboard.SetTextAsync(text);
+            try
+            {
+                 // Xamarin.Essentials.Clipboard currently doesn't support the IS_SENSITIVE flag for API 33+
+                if ((int)Build.VERSION.SdkInt < 33)
+                {
+                    await Clipboard.SetTextAsync(text);
+                }
+                else
+                {
+                    CopyToClipboard(text, isSensitive);
+                }
 
-            await ClearClipboardAlarmAsync(expiresInMs);
+                await ClearClipboardAlarmAsync(expiresInMs);
+            }
+            catch (Java.Lang.SecurityException ex) when (ex.Message.Contains("does not belong to"))
+            {
+                // #1962 Just ignore, the content is copied either way but there is some app interfiering in the process
+                // that the OS catches and just throws this exception.
+            }
+        }
+
+        public bool IsCopyNotificationHandledByPlatform()
+        {
+            // Android 13+ provides built-in notification when text is copied to the clipboard
+            return (int)Build.VERSION.SdkInt >= 33;
+        }
+
+        private void CopyToClipboard(string text, bool isSensitive = true)
+        {
+            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
+            var clipboardManager = activity.GetSystemService(
+                Context.ClipboardService) as Android.Content.ClipboardManager;
+            var clipData = ClipData.NewPlainText("bitwarden", text);
+            if (isSensitive)
+            {
+                clipData.Description.Extras ??= new PersistableBundle();
+                clipData.Description.Extras.PutBoolean("android.content.extra.IS_SENSITIVE", true);
+            }
+            clipboardManager.PrimaryClip = clipData;
         }
 
         private async Task ClearClipboardAlarmAsync(int expiresInMs = -1)

src/Android/Services/DeviceActionService.cs

@@ -35,6 +35,7 @@ namespace Bit.Droid.Services
 {
     public class DeviceActionService : IDeviceActionService
     {
+        private readonly IClipboardService _clipboardService;
         private readonly IStateService _stateService;
         private readonly IMessagingService _messagingService;
         private readonly IBroadcasterService _broadcasterService;
@@ -47,11 +48,13 @@ namespace Bit.Droid.Services
         private string _userAgent;
 
         public DeviceActionService(
+            IClipboardService clipboardService,
             IStateService stateService,
             IMessagingService messagingService,
             IBroadcasterService broadcasterService,
             Func<IEventService> eventServiceFunc)
         {
+            _clipboardService = clipboardService;
             _stateService = stateService;
             _messagingService = messagingService;
             _broadcasterService = broadcasterService;
@@ -929,20 +932,12 @@ namespace Bit.Droid.Services
                     var totp = await totpService.GetCodeAsync(cipher.Login.Totp);
                     if (totp != null)
                     {
-                        CopyToClipboard(totp);
+                        await _clipboardService.CopyTextAsync(totp);
                     }
                 }
             }
         }
 
-        private void CopyToClipboard(string text)
-        {
-            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-            var clipboardManager = activity.GetSystemService(
-                Context.ClipboardService) as Android.Content.ClipboardManager;
-            clipboardManager.PrimaryClip = ClipData.NewPlainText("bitwarden", text);
-        }
-
         public float GetSystemFontSizeScale()
         {
             var activity = CrossCurrentActivity.Current?.Activity as MainActivity;

src/Android/Utilities/ThemeHelpers.cs

@@ -59,10 +59,10 @@ namespace Bit.Droid.Utilities
         {
             if (string.IsNullOrWhiteSpace(theme) && osDarkModeEnabled)
             {
-                theme = "dark";
+                theme = ThemeManager.Dark;
             }
 
-            if (theme == "dark" || theme == "black" || theme == "nord")
+            if (theme == ThemeManager.Dark || theme == ThemeManager.Black || theme == ThemeManager.Nord)
             {
                 LightTheme = false;
             }

src/App/Abstractions/IAccountsManager.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Threading.Tasks;
+using Bit.App.Models;
+
+namespace Bit.App.Abstractions
+{
+    public interface IAccountsManager
+    {
+        void Init(Func<AppOptions> getOptionsFunc, IAccountsManagerHost accountsManagerHost);
+        Task NavigateOnAccountChangeAsync(bool? isAuthed = null);
+    }
+}

src/App/Abstractions/IAccountsManagerHost.cs

@@ -0,0 +1,14 @@
+using System.Threading.Tasks;
+using Bit.Core.Enums;
+
+namespace Bit.App.Abstractions
+{
+    public interface INavigationParams { }
+
+    public interface IAccountsManagerHost
+    {
+        Task SetPreviousPageInfoAsync();
+        void Navigate(NavigationTarget navTarget, INavigationParams navParams = null);
+        Task UpdateThemeAsync();
+    }
+}

src/App/App.csproj

@@ -13,12 +13,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Plugin.Fingerprint" Version="2.1.4" />
+    <PackageReference Include="Plugin.Fingerprint" Version="2.1.5" />
     <PackageReference Include="SkiaSharp.Views.Forms" Version="2.80.3" />
-    <PackageReference Include="Xamarin.CommunityToolkit" Version="2.0.1" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.7.2" />
+    <PackageReference Include="Xamarin.CommunityToolkit" Version="2.0.2" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
     <PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.11.982" />
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2401" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2478" />
     <PackageReference Include="ZXing.Net.Mobile" Version="2.4.1" />
     <PackageReference Include="ZXing.Net.Mobile.Forms" Version="2.4.1" />
   </ItemGroup>
@@ -127,8 +127,8 @@
   <ItemGroup>
     <Folder Include="Resources\" />
     <Folder Include="Behaviors\" />
-    <Folder Include="Pages\Authenticator\" />
     <Folder Include="Controls\AccountSwitchingOverlay\" />
+    <Folder Include="Utilities\AccountManagement\" />
   </ItemGroup>
 
   <ItemGroup>
@@ -421,5 +421,6 @@
     <None Remove="Behaviors\" />
     <None Remove="Xamarin.CommunityToolkit" />
     <None Remove="Controls\AccountSwitchingOverlay\" />
+    <None Remove="Utilities\AccountManagement\" />
   </ItemGroup>
 </Project>

src/App/App.xaml.cs

@@ -6,9 +6,11 @@ using Bit.App.Pages;
 using Bit.App.Resources;
 using Bit.App.Services;
 using Bit.App.Utilities;
+using Bit.App.Utilities.AccountManagement;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
+using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
@@ -16,7 +18,7 @@ using Xamarin.Forms.Xaml;
 [assembly: XamlCompilation(XamlCompilationOptions.Compile)]
 namespace Bit.App
 {
-    public partial class App : Application
+    public partial class App : Application, IAccountsManagerHost
     {
         private readonly IBroadcasterService _broadcasterService;
         private readonly IMessagingService _messagingService;
@@ -27,6 +29,7 @@ namespace Bit.App
         private readonly IAuthService _authService;
         private readonly IStorageService _secureStorageService;
         private readonly IDeviceActionService _deviceActionService;
+        private readonly IAccountsManager _accountsManager;
 
         private static bool _isResumed;
 
@@ -47,128 +50,101 @@ namespace Bit.App
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
             _secureStorageService = ServiceContainer.Resolve<IStorageService>("secureStorageService");
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _accountsManager = ServiceContainer.Resolve<IAccountsManager>("accountsManager");
+
+            _accountsManager.Init(() => Options, this);
 
             Bootstrap();
             _broadcasterService.Subscribe(nameof(App), async (message) =>
             {
-                if (message.Command == "showDialog")
+                try
                 {
-                    var details = message.Data as DialogDetails;
-                    var confirmed = true;
-                    var confirmText = string.IsNullOrWhiteSpace(details.ConfirmText) ?
-                        AppResources.Ok : details.ConfirmText;
-                    Device.BeginInvokeOnMainThread(async () =>
+                    if (message.Command == "showDialog")
                     {
-                        if (!string.IsNullOrWhiteSpace(details.CancelText))
+                        var details = message.Data as DialogDetails;
+                        var confirmed = true;
+                        var confirmText = string.IsNullOrWhiteSpace(details.ConfirmText) ?
+                            AppResources.Ok : details.ConfirmText;
+                        Device.BeginInvokeOnMainThread(async () =>
                         {
-                            confirmed = await Current.MainPage.DisplayAlert(details.Title, details.Text, confirmText,
-                                details.CancelText);
-                        }
-                        else
-                        {
-                            await Current.MainPage.DisplayAlert(details.Title, details.Text, confirmText);
-                        }
-                        _messagingService.Send("showDialogResolve", new Tuple<int, bool>(details.DialogId, confirmed));
-                    });
-                }
-                else if (message.Command == "locked")
-                {
-                    var extras = message.Data as Tuple<string, bool>;
-                    var userId = extras?.Item1;
-                    var userInitiated = extras?.Item2 ?? false;
-                    Device.BeginInvokeOnMainThread(async () => await LockedAsync(userId, userInitiated));
-                }
-                else if (message.Command == "lockVault")
-                {
-                    await _vaultTimeoutService.LockAsync(true);
-                }
-                else if (message.Command == "logout")
-                {
-                    var extras = message.Data as Tuple<string, bool, bool>;
-                    var userId = extras?.Item1;
-                    var userInitiated = extras?.Item2 ?? true;
-                    var expired = extras?.Item3 ?? false;
-                    Device.BeginInvokeOnMainThread(async () => await LogOutAsync(userId, userInitiated, expired));
-                }
-                else if (message.Command == "loggedOut")
-                {
-                    // Clean up old migrated key if they ever log out.
-                    await _secureStorageService.RemoveAsync("oldKey");
-                }
-                else if (message.Command == "resumed")
-                {
-                    if (Device.RuntimePlatform == Device.iOS)
+                            if (!string.IsNullOrWhiteSpace(details.CancelText))
+                            {
+                                confirmed = await Current.MainPage.DisplayAlert(details.Title, details.Text, confirmText,
+                                    details.CancelText);
+                            }
+                            else
+                            {
+                                await Current.MainPage.DisplayAlert(details.Title, details.Text, confirmText);
+                            }
+                            _messagingService.Send("showDialogResolve", new Tuple<int, bool>(details.DialogId, confirmed));
+                        });
+                    }
+                    else if (message.Command == "resumed")
                     {
-                        ResumedAsync().FireAndForget();
+                        if (Device.RuntimePlatform == Device.iOS)
+                        {
+                            ResumedAsync().FireAndForget();
+                        }
+                    }
+                    else if (message.Command == "slept")
+                    {
+                        if (Device.RuntimePlatform == Device.iOS)
+                        {
+                            await SleptAsync();
+                        }
+                    }
+                    else if (message.Command == "migrated")
+                    {
+                        await Task.Delay(1000);
+                        await _accountsManager.NavigateOnAccountChangeAsync();
+                    }
+                    else if (message.Command == "popAllAndGoToTabGenerator" ||
+                        message.Command == "popAllAndGoToTabMyVault" ||
+                        message.Command == "popAllAndGoToTabSend" ||
+                        message.Command == "popAllAndGoToAutofillCiphers")
+                    {
+                        Device.BeginInvokeOnMainThread(async () =>
+                        {
+                            if (Current.MainPage is TabsPage tabsPage)
+                            {
+                                while (tabsPage.Navigation.ModalStack.Count > 0)
+                                {
+                                    await tabsPage.Navigation.PopModalAsync(false);
+                                }
+                                if (message.Command == "popAllAndGoToAutofillCiphers")
+                                {
+                                    Current.MainPage = new NavigationPage(new AutofillCiphersPage(Options));
+                                }
+                                else if (message.Command == "popAllAndGoToTabMyVault")
+                                {
+                                    Options.MyVaultTile = false;
+                                    tabsPage.ResetToVaultPage();
+                                }
+                                else if (message.Command == "popAllAndGoToTabGenerator")
+                                {
+                                    Options.GeneratorTile = false;
+                                    tabsPage.ResetToGeneratorPage();
+                                }
+                                else if (message.Command == "popAllAndGoToTabSend")
+                                {
+                                    tabsPage.ResetToSendPage();
+                                }
+                            }
+                        });
+                    }
+                    else if (message.Command == "convertAccountToKeyConnector")
+                    {
+                        Device.BeginInvokeOnMainThread(async () =>
+                        {
+                            await Application.Current.MainPage.Navigation.PushModalAsync(
+                                new NavigationPage(new RemoveMasterPasswordPage()));
+                        });
                     }
                 }
-                else if (message.Command == "slept")
+                catch (Exception ex)
                 {
-                    if (Device.RuntimePlatform == Device.iOS)
-                    {
-                        await SleptAsync();
-                    }
+                    LoggerHelper.LogEvenIfCantBeResolved(ex);
                 }
-                else if (message.Command == "addAccount")
-                {
-                    await AddAccount();
-                }
-                else if (message.Command == "accountAdded")
-                {
-                    await UpdateThemeAsync();
-                }
-                else if (message.Command == "switchedAccount")
-                {
-                    await SwitchedAccountAsync();
-                }
-                else if (message.Command == "migrated")
-                {
-                    await Task.Delay(1000);
-                    await SetMainPageAsync();
-                }
-                else if (message.Command == "popAllAndGoToTabGenerator" ||
-                    message.Command == "popAllAndGoToTabMyVault" ||
-                    message.Command == "popAllAndGoToTabSend" ||
-                    message.Command == "popAllAndGoToAutofillCiphers")
-                {
-                    Device.BeginInvokeOnMainThread(async () =>
-                    {
-                        if (Current.MainPage is TabsPage tabsPage)
-                        {
-                            while (tabsPage.Navigation.ModalStack.Count > 0)
-                            {
-                                await tabsPage.Navigation.PopModalAsync(false);
-                            }
-                            if (message.Command == "popAllAndGoToAutofillCiphers")
-                            {
-                                Current.MainPage = new NavigationPage(new AutofillCiphersPage(Options));
-                            }
-                            else if (message.Command == "popAllAndGoToTabMyVault")
-                            {
-                                Options.MyVaultTile = false;
-                                tabsPage.ResetToVaultPage();
-                            }
-                            else if (message.Command == "popAllAndGoToTabGenerator")
-                            {
-                                Options.GeneratorTile = false;
-                                tabsPage.ResetToGeneratorPage();
-                            }
-                            else if (message.Command == "popAllAndGoToTabSend")
-                            {
-                                tabsPage.ResetToSendPage();
-                            }
-                        }
-                    });
-                }
-                else if (message.Command == "convertAccountToKeyConnector")
-                {
-                    Device.BeginInvokeOnMainThread(async () =>
-                    {
-                        await Application.Current.MainPage.Navigation.PushModalAsync(
-                            new NavigationPage(new RemoveMasterPasswordPage()));
-                    });
-                }
-
             });
         }
 
@@ -234,6 +210,7 @@ namespace Bit.App
 
         private async Task ResumedAsync()
         {
+            await _stateService.CheckExtensionActiveUserAndSwitchIfNeededAsync();
             await _vaultTimeoutService.CheckVaultTimeoutAsync();
             _messagingService.Send("startEventTimer");
             await UpdateThemeAsync();
@@ -263,102 +240,6 @@ namespace Bit.App
             new System.Globalization.UmAlQuraCalendar();
         }
 
-        private async Task LogOutAsync(string userId, bool userInitiated, bool expired)
-        {
-            await AppHelpers.LogOutAsync(userId, userInitiated);
-            await SetMainPageAsync();
-            _authService.LogOut(() =>
-            {
-                if (expired)
-                {
-                    _platformUtilsService.ShowToast("warning", null, AppResources.LoginExpired);
-                }
-            });
-        }
-
-        private async Task AddAccount()
-        {
-            Device.BeginInvokeOnMainThread(async () =>
-            {
-                Options.HideAccountSwitcher = false;
-                Current.MainPage = new NavigationPage(new HomePage(Options));
-            });
-        }
-
-        private async Task SwitchedAccountAsync()
-        {
-            await AppHelpers.OnAccountSwitchAsync();
-            Device.BeginInvokeOnMainThread(async () =>
-            {
-                if (await _vaultTimeoutService.ShouldTimeoutAsync())
-                {
-                    await _vaultTimeoutService.ExecuteTimeoutActionAsync();
-                }
-                else
-                {
-                    await SetMainPageAsync();
-                }
-                await Task.Delay(50);
-                await UpdateThemeAsync();
-            });
-        }
-
-        private async Task SetMainPageAsync()
-        {
-            var authed = await _stateService.IsAuthenticatedAsync();
-            if (authed)
-            {
-                if (await _vaultTimeoutService.IsLoggedOutByTimeoutAsync() ||
-                    await _vaultTimeoutService.ShouldLogOutByTimeoutAsync())
-                {
-                    // TODO implement orgIdentifier flow to SSO Login page, same as email flow below
-                    // var orgIdentifier = await _stateService.GetOrgIdentifierAsync();
-
-                    var email = await _stateService.GetEmailAsync();
-                    Options.HideAccountSwitcher = await _stateService.GetActiveUserIdAsync() == null;
-                    Current.MainPage = new NavigationPage(new LoginPage(email, Options));
-                }
-                else if (await _vaultTimeoutService.IsLockedAsync() ||
-                         await _vaultTimeoutService.ShouldLockAsync())
-                {
-                    Current.MainPage = new NavigationPage(new LockPage(Options));
-                }
-                else if (Options.FromAutofillFramework && Options.SaveType.HasValue)
-                {
-                    Current.MainPage = new NavigationPage(new AddEditPage(appOptions: Options));
-                }
-                else if (Options.Uri != null)
-                {
-                    Current.MainPage = new NavigationPage(new AutofillCiphersPage(Options));
-                }
-                else if (Options.CreateSend != null)
-                {
-                    Current.MainPage = new NavigationPage(new SendAddEditPage(Options));
-                }
-                else
-                {
-                    Current.MainPage = new TabsPage(Options);
-                }
-            }
-            else
-            {
-                Options.HideAccountSwitcher = await _stateService.GetActiveUserIdAsync() == null;
-                if (await _vaultTimeoutService.IsLoggedOutByTimeoutAsync() ||
-                    await _vaultTimeoutService.ShouldLogOutByTimeoutAsync())
-                {
-                    // TODO implement orgIdentifier flow to SSO Login page, same as email flow below
-                    // var orgIdentifier = await _stateService.GetOrgIdentifierAsync();
-
-                    var email = await _stateService.GetEmailAsync();
-                    Current.MainPage = new NavigationPage(new LoginPage(email, Options));
-                }
-                else
-                {
-                    Current.MainPage = new NavigationPage(new HomePage(Options));
-                }
-            }
-        }
-
         private async Task ClearCacheIfNeededAsync()
         {
             var lastClear = await _stateService.GetLastFileCacheClearAsync();
@@ -420,7 +301,7 @@ namespace Bit.App
                 UpdateThemeAsync();
             };
             Current.MainPage = new NavigationPage(new HomePage(Options));
-            var mainPageTask = SetMainPageAsync();
+            var mainPageTask = _accountsManager.NavigateOnAccountChangeAsync();
             ServiceContainer.Resolve<MobilePlatformUtilsService>("platformUtilsService").Init();
         }
 
@@ -441,23 +322,8 @@ namespace Bit.App
             });
         }
 
-        private async Task LockedAsync(string userId, bool userInitiated)
+        public async Task SetPreviousPageInfoAsync()
         {
-            if (!await _stateService.IsActiveAccountAsync(userId))
-            {
-                _platformUtilsService.ShowToast("info", null, AppResources.AccountLockedSuccessfully);
-                return;
-            }
-
-            var autoPromptBiometric = !userInitiated;
-            if (autoPromptBiometric && Device.RuntimePlatform == Device.iOS)
-            {
-                var vaultTimeout = await _stateService.GetVaultTimeoutAsync();
-                if (vaultTimeout == 0)
-                {
-                    autoPromptBiometric = false;
-                }
-            }
             PreviousPageInfo lastPageBeforeLock = null;
             if (Current.MainPage is TabbedPage tabbedPage && tabbedPage.Navigation.ModalStack.Count > 0)
             {
@@ -483,8 +349,44 @@ namespace Bit.App
                 }
             }
             await _stateService.SetPreviousPageInfoAsync(lastPageBeforeLock);
-            var lockPage = new LockPage(Options, autoPromptBiometric);
-            Device.BeginInvokeOnMainThread(() => Current.MainPage = new NavigationPage(lockPage));
+        }
+
+        public void Navigate(NavigationTarget navTarget, INavigationParams navParams)
+        {
+            switch (navTarget)
+            {
+                case NavigationTarget.HomeLogin:
+                    Current.MainPage = new NavigationPage(new HomePage(Options));
+                    break;
+                case NavigationTarget.Login:
+                    if (navParams is LoginNavigationParams loginParams)
+                    {
+                        Current.MainPage = new NavigationPage(new LoginPage(loginParams.Email, Options));
+                    }
+                    break;
+                case NavigationTarget.Lock:
+                    if (navParams is LockNavigationParams lockParams)
+                    {
+                        Current.MainPage = new NavigationPage(new LockPage(Options, lockParams.AutoPromptBiometric));
+                    }
+                    else
+                    {
+                        Current.MainPage = new NavigationPage(new LockPage(Options));
+                    }
+                    break;
+                case NavigationTarget.Home:
+                    Current.MainPage = new TabsPage(Options);
+                    break;
+                case NavigationTarget.AddEditCipher:
+                    Current.MainPage = new NavigationPage(new AddEditPage(appOptions: Options));
+                    break;
+                case NavigationTarget.AutofillCiphers:
+                    Current.MainPage = new NavigationPage(new AutofillCiphersPage(Options));
+                    break;
+                case NavigationTarget.SendAddEdit:
+                    Current.MainPage = new NavigationPage(new SendAddEditPage(Options));
+                    break;
+            }
         }
     }
 }

src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayView.xaml.cs

@@ -63,6 +63,10 @@ namespace Bit.App.Controls
 
         public int AccountListRowHeight => Device.RuntimePlatform == Device.Android ? 74 : 70;
 
+        public bool LongPressAccountEnabled { get; set; } = true;
+
+        public Action AfterHide { get; set; }
+
         public async Task ToggleVisibilityAsync()
         {
             if (IsVisible)
@@ -135,6 +139,8 @@ namespace Bit.App.Controls
 
                 // remove overlay
                 IsVisible = false;
+
+                AfterHide?.Invoke();
             });
         }
 
@@ -167,7 +173,7 @@ namespace Bit.App.Controls
 
         private async Task LongPressAccountAsync(AccountViewCellViewModel item)
         {
-            if (!item.IsAccount)
+            if (!LongPressAccountEnabled || !item.IsAccount)
             {
                 return;
             }

src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayViewModel.cs

@@ -45,23 +45,28 @@ namespace Bit.App.Controls
 
         public ICommand LongPressAccountCommand { get; }
 
+        public bool FromIOSExtension { get; set; }
+
         private async Task SelectAccountAsync(AccountViewCellViewModel item)
         {
-            if (item.AccountView.IsAccount)
+            if (!item.AccountView.IsAccount)
             {
-                if (!item.AccountView.IsActive)
+                _messagingService.Send(AccountsManagerMessageCommands.ADD_ACCOUNT);
+                return;
+            }
+
+            if (!item.AccountView.IsActive)
+            {
+                await _stateService.SetActiveUserAsync(item.AccountView.UserId);
+                _messagingService.Send(AccountsManagerMessageCommands.SWITCHED_ACCOUNT);
+                if (FromIOSExtension)
                 {
-                    await _stateService.SetActiveUserAsync(item.AccountView.UserId);
-                    _messagingService.Send("switchedAccount");
-                }
-                else if (AllowActiveAccountSelection)
-                {
-                    _messagingService.Send("switchedAccount");
+                    await _stateService.SaveExtensionActiveUserIdToStorageAsync(item.AccountView.UserId);
                 }
             }
-            else
+            else if (AllowActiveAccountSelection)
             {
-                _messagingService.Send("addAccount");
+                _messagingService.Send(AccountsManagerMessageCommands.SWITCHED_ACCOUNT);
             }
         }
 

src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml

@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<controls:ExtendedGrid xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="Bit.App.Controls.AuthenticatorViewCell"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    xmlns:ff="clr-namespace:FFImageLoading.Forms;assembly=FFImageLoading.Forms"
-    xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
-    StyleClass="list-row, list-row-platform"
-    RowSpacing="0"
-    ColumnSpacing="0"
-    x:DataType="pages:AuthenticatorPageListItem">
-
-    <Grid.Resources>
-          <u:IconGlyphConverter x:Key="iconGlyphConverter"/>
-          <u:IconImageConverter x:Key="iconImageConverter"/>
-          <u:InverseBoolConverter x:Key="inverseBool" />
-          <u:StringHasValueConverter x:Key="stringHasValueConverter" />
-    </Grid.Resources>
-
-    <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-    </Grid.RowDefinitions>
-
-    <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="40" />
-        <ColumnDefinition Width="*" />
-        <ColumnDefinition Width="60" />
-    </Grid.ColumnDefinitions>
-
-    <controls:IconLabel
-        Grid.Column="0"
-        HorizontalOptions="Center"
-        VerticalOptions="Center"
-        StyleClass="list-icon, list-icon-platform"
-        IsVisible="{Binding ShowIconImage, Converter={StaticResource inverseBool}}"
-        Text="{Binding Cipher, Converter={StaticResource iconGlyphConverter}}"
-        AutomationProperties.IsInAccessibleTree="False" />
-
-    <ff:CachedImage
-        Grid.Column="0"
-        BitmapOptimizations="True"
-        ErrorPlaceholder="login.png"
-        LoadingPlaceholder="login.png"
-        HorizontalOptions="Center"
-        VerticalOptions="Center"
-        WidthRequest="22"
-        HeightRequest="22"
-        IsVisible="{Binding ShowIconImage}"
-        Source="{Binding IconImageSource, Mode=OneTime}"
-        AutomationProperties.IsInAccessibleTree="False" />
-
-    <Grid RowSpacing="0" ColumnSpacing="0" Grid.Row="0" Grid.Column="1" VerticalOptions="Center" Padding="0, 7">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="*" />
-        </Grid.ColumnDefinitions>
-
-        <controls:MonoLabel
-            LineBreakMode="TailTruncation"
-            Grid.Column="0"
-            Grid.Row="0"
-            Grid.ColumnSpan="3"
-            StyleClass="list-title, list-title-platform"
-            Text="{Binding TotpCodeFormatted, Mode=OneWay}" />
-        <Label 
-            LineBreakMode="TailTruncation"
-            Grid.Column="0"
-            Grid.Row="1"
-            StyleClass="list-subtitle, list-subtitle-platform"
-            Text="{Binding Cipher.Name}" />
-        <controls:IconLabel
-            Grid.Column="1"
-            Grid.Row="1"
-            HorizontalOptions="Start"
-            VerticalOptions="Center"
-            StyleClass="list-title-icon"
-            Margin="5, 0, 0, 0"
-            Text="{Binding Source={x:Static core:BitwardenIcons.Collection}}"
-            IsVisible="{Binding Cipher.Shared, Mode=OneTime}"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Shared}" />
-    </Grid>
-
-    <Label
-        Text="{Binding TotpSec, Mode=OneWay}"
-        Style="{DynamicResource textTotp}"
-        Margin="0, 0, 10, 0"
-        Grid.Row="0"
-        Grid.Column="1"
-        Grid.RowSpan="2"
-        HorizontalOptions="End"
-        HorizontalTextAlignment="End"
-        VerticalOptions="CenterAndExpand" />
-    <controls:IconButton 
-        StyleClass="box-row-button, box-row-button-platform"
-        Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
-        Command="{Binding CopyCommand}"
-        CommandParameter="LoginTotp"
-        Grid.Row="0"
-        Grid.Column="2"
-        Grid.RowSpan="2"
-        Padding="0,0,1,0"
-        AutomationProperties.IsInAccessibleTree="True"
-        AutomationProperties.Name="{u:I18n CopyTotp}" />
-</controls:ExtendedGrid>

src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml.cs

@@ -1,121 +0,0 @@
-using System;
-using Bit.App.Utilities;
-using Bit.Core.Models.View;
-using Bit.Core.Utilities;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public partial class AuthenticatorViewCell : ExtendedGrid
-    {
-        public static readonly BindableProperty CipherProperty = BindableProperty.Create(
-            nameof(Cipher), typeof(CipherView), typeof(AuthenticatorViewCell), default(CipherView), BindingMode.TwoWay);
-
-        public static readonly BindableProperty WebsiteIconsEnabledProperty = BindableProperty.Create(
-            nameof(WebsiteIconsEnabled), typeof(bool?), typeof(AuthenticatorViewCell));
-
-        public static readonly BindableProperty TotpSecProperty = BindableProperty.Create(
-            nameof(TotpSec), typeof(long), typeof(AuthenticatorViewCell));
-
-        //public static readonly BindableProperty ButtonCommandProperty = BindableProperty.Create(
-        //    nameof(ButtonCommand), typeof(Command<CipherView>), typeof(AuthenticatorViewCell));
-
-        public AuthenticatorViewCell()
-        {
-            InitializeComponent();
-        }
-
-        public Command CopyCommand { get; set; }
-
-        public CipherView Cipher
-        {
-            get => GetValue(CipherProperty) as CipherView;
-            set => SetValue(CipherProperty, value);
-        }
-
-        public bool? WebsiteIconsEnabled
-        {
-            get => (bool)GetValue(WebsiteIconsEnabledProperty);
-            set => SetValue(WebsiteIconsEnabledProperty, value);
-        }
-
-        public long TotpSec
-        {
-            get => (long)GetValue(TotpSecProperty);
-            set => SetValue(TotpSecProperty, value);
-        }
-
-        public bool ShowIconImage
-        {
-            get => WebsiteIconsEnabled ?? false
-                && !string.IsNullOrWhiteSpace(Cipher.Login?.Uri)
-                && IconImageSource != null;
-        }
-
-        private string _iconImageSource = string.Empty;
-        public string IconImageSource
-        {
-            get
-            {
-                if (_iconImageSource == string.Empty) // default value since icon source can return null
-                {
-                    _iconImageSource = IconImageHelper.GetLoginIconImage(Cipher);
-                }
-                return _iconImageSource;
-            }
-
-        }
-
-        private string _totpCodeFormatted = "938 928";
-        public string TotpCodeFormatted
-        {
-            get => _totpCodeFormatted;
-            set => _totpCodeFormatted = value;
-        }
-
-
-        //public Command<CipherView> ButtonCommand
-        //{
-        //    get => GetValue(ButtonCommandProperty) as Command<CipherView>;
-        //    set => SetValue(ButtonCommandProperty, value);
-        //}
-
-        //protected override void OnPropertyChanged(string propertyName = null)
-        //{
-        //    base.OnPropertyChanged(propertyName);
-        //    if (propertyName == CipherProperty.PropertyName)
-        //    {
-        //        if (Cipher == null)
-        //        {
-        //            return;
-        //        }
-        //        _cipherLabel.Text = Cipher.Name;
-        //    }
-        //    else if (propertyName == WebsiteIconsEnabledProperty.PropertyName)
-        //    {
-        //        if (Cipher == null)
-        //        {
-        //            return;
-        //        }
-        //        ((AuthenticatorViewCellViewModel)BindingContext).WebsiteIconsEnabled = WebsiteIconsEnabled ?? false;
-        //    }
-        //    else if (propertyName == TotpSecProperty.PropertyName)
-        //    {
-        //        if (Cipher == null)
-        //        {
-        //            return;
-        //        }
-        //        ((AuthenticatorViewCellViewModel)BindingContext).UpdateTotpSec(TotpSec);
-        //    }
-        //}
-
-        private void MoreButton_Clicked(object sender, EventArgs e)
-        {
-            var cipher = ((sender as MiButton)?.BindingContext as AuthenticatorViewCellViewModel)?.Cipher;
-            if (cipher != null)
-            {
-                //ButtonCommand?.Execute(cipher);
-            }
-        }
-    }
-}

src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCellViewModel.cs

@@ -1,103 +0,0 @@
-using System.Threading.Tasks;
-using Bit.App.Utilities;
-using Bit.Core.Models.View;
-using Bit.Core.Utilities;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public class AuthenticatorViewCellViewModel : ExtendedViewModel
-    {
-        private CipherView _cipher;
-        private string _totpCodeFormatted = "938 928";
-        private string _totpSec;
-        private bool _websiteIconsEnabled;
-        private string _iconImageSource = string.Empty;
-
-        public AuthenticatorViewCellViewModel(CipherView cipherView, bool websiteIconsEnabled)
-        {
-            Cipher = cipherView;
-            WebsiteIconsEnabled = websiteIconsEnabled;
-        }
-
-        public Command CopyCommand { get; set; }
-
-        public CipherView Cipher
-        {
-            get => _cipher;
-            set => SetProperty(ref _cipher, value);
-        }
-
-        public string TotpCodeFormatted
-        {
-            get => _totpCodeFormatted;
-            set => SetProperty(ref _totpCodeFormatted, value);
-        }
-
-        public string TotpSec
-        {
-            get => _totpSec;
-            set => SetProperty(ref _totpSec, value);
-        }
-
-        public bool WebsiteIconsEnabled
-        {
-            get => _websiteIconsEnabled;
-            set => SetProperty(ref _websiteIconsEnabled, value);
-        }
-
-        public bool ShowIconImage
-        {
-            get => WebsiteIconsEnabled
-                && !string.IsNullOrWhiteSpace(Cipher.Login?.Uri)
-                && IconImageSource != null;
-        }
-
-        public string IconImageSource
-        {
-            get
-            {
-                if (_iconImageSource == string.Empty) // default value since icon source can return null
-                {
-                    _iconImageSource = IconImageHelper.GetLoginIconImage(Cipher);
-                }
-                return _iconImageSource;
-            }
-
-        }
-
-        public void UpdateTotpSec(long totpSec)
-        {
-            _totpSec = totpSec.ToString();
-        }
-
-        //private async Task TotpUpdateCodeAsync()
-        //{
-        //    if (Cipher == null || Cipher.Type != Core.Enums.CipherType.Login || Cipher.Login.Totp == null)
-        //    {
-        //        _totpInterval = null;
-        //        return;
-        //    }
-        //    _totpCode = await _totpService.GetCodeAsync(Cipher.Login.Totp);
-        //    if (_totpCode != null)
-        //    {
-        //        if (_totpCode.Length > 4)
-        //        {
-        //            var half = (int)Math.Floor(_totpCode.Length / 2M);
-        //            TotpCodeFormatted = string.Format("{0} {1}", _totpCode.Substring(0, half),
-        //                _totpCode.Substring(half));
-        //        }
-        //        else
-        //        {
-        //            TotpCodeFormatted = _totpCode;
-        //        }
-        //    }
-        //    else
-        //    {
-        //        TotpCodeFormatted = null;
-        //        _totpInterval = null;
-        //    }
-        //}
-    }
-}
-

src/App/Controls/ExtendedCollectionView.cs

@@ -4,5 +4,6 @@ namespace Bit.App.Controls
 {
     public class ExtendedCollectionView : CollectionView
     {
+        public string ExtraDataForLogging { get; set; }
     }
 }

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

@@ -54,7 +54,7 @@ namespace Bit.App.Pages
             {
                 _vm.AvatarImageSource = await GetAvatarImageSourceAsync();
             }
-            _broadcasterService.Subscribe(nameof(HomePage), async (message) =>
+            _broadcasterService.Subscribe(nameof(HomePage), (message) =>
             {
                 if (message.Command == "updatedTheme")
                 {

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

@@ -25,8 +25,6 @@ namespace Bit.App.Pages
             _vm = BindingContext as LockPageViewModel;
             _vm.Page = this;
             _vm.UnlockedAction = () => Device.BeginInvokeOnMainThread(async () => await UnlockedAsync());
-            MasterPasswordEntry = _masterPassword;
-            PinEntry = _pin;
 
             if (Device.RuntimePlatform == Device.iOS)
             {
@@ -38,8 +36,17 @@ namespace Bit.App.Pages
             }
         }
 
-        public Entry MasterPasswordEntry { get; set; }
-        public Entry PinEntry { get; set; }
+        public Entry SecretEntry
+        {
+            get
+            {
+                if (_vm?.PinLock ?? false)
+                {
+                    return _pin;
+                }
+                return _masterPassword;
+            }
+        }
 
         public async Task PromptBiometricAfterResumeAsync()
         {
@@ -70,16 +77,12 @@ namespace Bit.App.Pages
             _vm.AvatarImageSource = await GetAvatarImageSourceAsync();
 
             await _vm.InitAsync();
+
+            _vm.FocusSecretEntry += PerformFocusSecretEntry;
+
             if (!_vm.BiometricLock)
             {
-                if (_vm.PinLock)
-                {
-                    RequestFocus(PinEntry);
-                }
-                else
-                {
-                    RequestFocus(MasterPasswordEntry);
-                }
+                RequestFocus(SecretEntry);
             }
             else
             {
@@ -99,6 +102,18 @@ namespace Bit.App.Pages
             }
         }
 
+        private void PerformFocusSecretEntry(int? cursorPosition)
+        {
+            Device.BeginInvokeOnMainThread(() =>
+            {
+                SecretEntry.Focus();
+                if (cursorPosition.HasValue)
+                {
+                    SecretEntry.CursorPosition = cursorPosition.Value;
+                }
+            });
+        }
+
         protected override bool OnBackButtonPressed()
         {
             if (_accountListOverlay.IsVisible)

src/App/Pages/Accounts/LockPageViewModel.cs

@@ -10,6 +10,7 @@ using Bit.Core.Enums;
 using Bit.Core.Models.Domain;
 using Bit.Core.Models.Request;
 using Bit.Core.Utilities;
+using Xamarin.CommunityToolkit.Helpers;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -27,6 +28,7 @@ namespace Bit.App.Pages
         private readonly IBiometricService _biometricService;
         private readonly IKeyConnectorService _keyConnectorService;
         private readonly ILogger _logger;
+        private readonly WeakEventManager<int?> _secretEntryFocusWeakEventManager = new WeakEventManager<int?>();
 
         private string _email;
         private bool _showPassword;
@@ -133,6 +135,11 @@ namespace Bit.App.Pages
         public string MasterPassword { get; set; }
         public string Pin { get; set; }
         public Action UnlockedAction { get; set; }
+        public event Action<int?> FocusSecretEntry
+        {
+            add => _secretEntryFocusWeakEventManager.AddEventHandler(value);
+            remove => _secretEntryFocusWeakEventManager.RemoveEventHandler(value);
+        }
 
         public async Task InitAsync()
         {
@@ -346,11 +353,8 @@ namespace Bit.App.Pages
         public void TogglePassword()
         {
             ShowPassword = !ShowPassword;
-            var page = (Page as LockPage);
-            var entry = PinLock ? page.PinEntry : page.MasterPasswordEntry;
-            var str = PinLock ? Pin : MasterPassword;
-            entry.Focus();
-            entry.CursorPosition = String.IsNullOrEmpty(str) ? 0 : str.Length;
+            var secret = PinLock ? Pin : MasterPassword;
+            _secretEntryFocusWeakEventManager.RaiseEvent(string.IsNullOrEmpty(secret) ? 0 : secret.Length, nameof(FocusSecretEntry));
         }
 
         public async Task PromptBiometricAsync()
@@ -361,18 +365,8 @@ namespace Bit.App.Pages
                 return;
             }
             var success = await _platformUtilsService.AuthenticateBiometricAsync(null,
-            PinLock ? AppResources.PIN : AppResources.MasterPassword, () =>
-            {
-                var page = Page as LockPage;
-                if (PinLock)
-                {
-                    page.PinEntry.Focus();
-                }
-                else
-                {
-                    page.MasterPasswordEntry.Focus();
-                }
-            });
+                PinLock ? AppResources.PIN : AppResources.MasterPassword,
+                () => _secretEntryFocusWeakEventManager.RaiseEvent((int?)null, nameof(FocusSecretEntry)));
             await _stateService.SetBiometricLockedAsync(!success);
             if (success)
             {

src/App/Pages/Accounts/LoginSsoPageViewModel.cs

@@ -81,10 +81,12 @@ namespace Bit.App.Pages
             }
 
             await _deviceActionService.ShowLoadingAsync(AppResources.LoggingIn);
+            string ssoToken;
 
             try
             {
-                await _apiService.PreValidateSso(OrgIdentifier);
+                var response = await _apiService.PreValidateSso(OrgIdentifier);
+                ssoToken = response.Token;
             }
             catch (ApiException e)
             {
@@ -112,7 +114,8 @@ namespace Bit.App.Pages
                       "response_type=code&scope=api%20offline_access&" +
                       "state=" + state + "&code_challenge=" + codeChallenge + "&" +
                       "code_challenge_method=S256&response_mode=query&" +
-                      "domain_hint=" + Uri.EscapeDataString(OrgIdentifier);
+                      "domain_hint=" + Uri.EscapeDataString(OrgIdentifier) + "&" +
+                      "ssoToken=" + Uri.EscapeDataString(ssoToken);
 
             WebAuthenticatorResult authResult = null;
             try

src/App/Pages/Authenticator/AuthenticatorPage.xaml

@@ -1,97 +0,0 @@
-<?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.AuthenticatorPage"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    xmlns:effects="clr-namespace:Bit.App.Effects"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    x:DataType="pages:AuthenticatorPageViewModel"
-    Title="{Binding PageTitle}"
-    x:Name="_page">
-
-    <ContentPage.BindingContext>
-        <pages:AuthenticatorPageViewModel />
-    </ContentPage.BindingContext>
-
-    <ContentPage.ToolbarItems>
-        <ToolbarItem Icon="search.png" Clicked="Search_Clicked"
-                     AutomationProperties.IsInAccessibleTree="True"
-                     AutomationProperties.Name="{u:I18n Search}" />
-    </ContentPage.ToolbarItems>
-
-    <ContentPage.Resources>
-        <ResourceDictionary>
-            <u:InverseBoolConverter x:Key="inverseBool" />
-
-            <ToolbarItem x:Name="_aboutIconItem" x:Key="aboutIconItem" Icon="info.png"
-                         Clicked="About_Clicked" Order="Primary" Priority="-1"
-                         AutomationProperties.IsInAccessibleTree="True"
-                         AutomationProperties.Name="{u:I18n AboutSend}" />
-            <ToolbarItem x:Name="_syncItem" x:Key="syncItem" Text="{u:I18n Sync}"
-                         Clicked="Sync_Clicked" Order="Secondary" />
-            <ToolbarItem x:Name="_lockItem" x:Key="lockItem" Text="{u:I18n Lock}"
-                         Clicked="Lock_Clicked" Order="Secondary" />
-            <ToolbarItem x:Name="_aboutTextItem" x:Key="aboutTextItem" Text="{u:I18n AboutSend}"
-                         Clicked="About_Clicked" Order="Secondary" />
-            <ToolbarItem x:Name="_addItem" x:Key="addItem" Icon="plus.png"
-                         Clicked="AddButton_Clicked" Order="Primary"
-                         AutomationProperties.IsInAccessibleTree="True"
-                         AutomationProperties.Name="{u:I18n AddItem}" />
-
-            <DataTemplate x:Key="authenticatorTemplate"
-                          x:DataType="pages:AuthenticatorPageListItem">
-                <controls:AuthenticatorViewCell 
-                    Cipher="{Binding Cipher}"
-                    WebsiteIconsEnabled="{Binding BindingContext.WebsiteIconsEnabled, Source={x:Reference _page}}"
-                    TotpSec="{Binding TotpSec}"/>
-            </DataTemplate>
-
-            <StackLayout x:Key="mainLayout" x:Name="_mainLayout">
-                <RefreshView>
-                    <controls:ExtendedCollectionView
-                        ItemsSource="{Binding Items}"
-                        VerticalOptions="FillAndExpand"
-                        SelectionMode="Single"
-                        SelectionChanged="RowSelected"
-                        StyleClass="list, list-platform">
-
-                        <controls:ExtendedCollectionView.ItemTemplate>
-                            <DataTemplate x:DataType="pages:AuthenticatorPageListItem">
-                                <controls:AuthenticatorViewCell />
-                            </DataTemplate>
-                        </controls:ExtendedCollectionView.ItemTemplate>
-
-                    </controls:ExtendedCollectionView>
-                </RefreshView>
-
-            </StackLayout>
-        </ResourceDictionary>
-    </ContentPage.Resources>
-
-
-    <AbsoluteLayout
-        x:Name="_absLayout"
-        VerticalOptions="FillAndExpand"
-        HorizontalOptions="FillAndExpand">
-        <ContentView
-            x:Name="_mainContent"
-            AbsoluteLayout.LayoutFlags="All"
-            AbsoluteLayout.LayoutBounds="0, 0, 1, 1" />
-        <Button
-            x:Name="_fab"
-            Image="plus.png"
-            Clicked="AddButton_Clicked"
-            Style="{StaticResource btn-fab}"
-            AbsoluteLayout.LayoutFlags="PositionProportional"
-            AbsoluteLayout.LayoutBounds="1, 1, AutoSize, AutoSize"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n AddItem}">
-            <Button.Effects>
-                <effects:FabShadowEffect />
-            </Button.Effects>
-        </Button>
-    </AbsoluteLayout>
-
-</pages:BaseContentPage>

src/App/Pages/Authenticator/AuthenticatorPage.xaml.cs

@@ -1,176 +0,0 @@
-using Bit.App.Resources;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using Xamarin.Forms;
-using Xamarin.Forms.PlatformConfiguration;
-using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
-
-namespace Bit.App.Pages
-{
-    public partial class AuthenticatorPage : BaseContentPage
-    {
-        #region Members
-
-        private readonly IBroadcasterService _broadcasterService;
-        private readonly ISyncService _syncService;
-        private readonly ICipherService _cipherService;
-        private AuthenticatorPageViewModel _vm;
-        private readonly bool _fromTabPage;
-        private readonly Action<string> _selectAction;
-        private readonly TabsPage _tabsPage;
-
-        #endregion
-
-        public AuthenticatorPage(bool fromTabPage, Action<string> selectAction = null, TabsPage tabsPage = null)
-        {
-            //_tabsPage = tabsPage;
-            InitializeComponent();
-            //_broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
-            _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
-            _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
-            _vm = BindingContext as AuthenticatorPageViewModel;
-            //_vm.Page = this;
-            //_fromTabPage = fromTabPage;
-            //_selectAction = selectAction;
-
-            if (Device.RuntimePlatform == Device.iOS)
-            {
-                _absLayout.Children.Remove(_fab);
-                ToolbarItems.Add(_aboutIconItem);
-                ToolbarItems.Add(_addItem);
-            }
-            else
-            {
-                ToolbarItems.Add(_syncItem);
-                ToolbarItems.Add(_lockItem);
-                ToolbarItems.Add(_aboutTextItem);
-            }
-        }
-
-        public async Task InitAsync()
-        {
-            await _vm.LoadAsync();
-        }
-
-        protected async override void OnAppearing()
-        {
-            base.OnAppearing();
-            //if (!_fromTabPage)
-            //{
-            //    await InitAsync();
-            //}
-            //_broadcasterService.Subscribe(nameof(GeneratorPage), async (message) =>
-            //{
-            //    if (message.Command == "updatedTheme")
-            //    {
-            //        Device.BeginInvokeOnMainThread(() =>
-            //        {
-            //            //_vm.RedrawPassword();
-            //        });
-            //    }
-            //});
-
-            await LoadOnAppearedAsync(_mainLayout, false, async () =>
-            {
-                if (!_syncService.SyncInProgress || (await _cipherService.GetAllAsync()).Any())
-                {
-                    try
-                    {
-                        await _vm.LoadAsync();
-                    }
-                    catch (Exception e) when (e.Message.Contains("No key."))
-                    {
-                        await Task.Delay(1000);
-                        await _vm.LoadAsync();
-                    }
-                }
-                else
-                {
-                    await Task.Delay(5000);
-                    if (!_vm.Loaded)
-                    {
-                        await _vm.LoadAsync();
-                    }
-                }
-
-                AdjustToolbar();
-                //await CheckAddRequest();
-            }, _mainContent);
-
-        }
-
-        
-
-        private async void Search_Clicked(object sender, EventArgs e)
-        {
-            if (DoOnce())
-            {
-                // var page = new SendsPage(_vm.Filter, _vm.Type != null);
-                // await Navigation.PushModalAsync(new NavigationPage(page));
-            }
-        }
-
-        private async void Sync_Clicked(object sender, EventArgs e)
-        {
-            // await _vm.SyncAsync();
-        }
-
-        private async void Lock_Clicked(object sender, EventArgs e)
-        {
-            // await _vaultTimeoutService.LockAsync(true, true);
-        }
-        
-        private void About_Clicked(object sender, EventArgs e)
-        {
-            // _vm.ShowAbout();
-        }
-
-        private async void AddButton_Clicked(object sender, EventArgs e)
-        {
-            if (DoOnce())
-            {
-                // var page = new SendAddEditPage(null, null, _vm.Type);
-                // await Navigation.PushModalAsync(new NavigationPage(page));
-            }
-        }
-
-        private async void RowSelected(object sender, SelectionChangedEventArgs e)
-        {
-        }
-
-        private async void Copy_Clicked(object sender, EventArgs e)
-        {
-            //await _vm.CopyAsync();
-        }
-
-        private async void More_Clicked(object sender, EventArgs e)
-        {
-            //if (!DoOnce())
-            //{
-            //    return;
-            //}
-            //var selection = await DisplayActionSheet(AppResources.Options, AppResources.Cancel,
-            //    null, AppResources.PasswordHistory);
-            //if (selection == AppResources.PasswordHistory)
-            //{
-            //    var page = new GeneratorHistoryPage();
-            //    await Navigation.PushModalAsync(new Xamarin.Forms.NavigationPage(page));
-            //}
-        }
-
-        protected override void OnDisappearing()
-        {
-            base.OnDisappearing();
-            //_broadcasterService.Unsubscribe(nameof(GeneratorPage));
-        }
-
-        private void AdjustToolbar()
-        {
-            //_addItem.IsEnabled = !_vm.Deleted;
-            //_addItem.IconImageSource = _vm.Deleted ? null : "plus.png";
-        }
-    }
-}

src/App/Pages/Authenticator/AuthenticatorPageListItem.cs

@@ -1,129 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Bit.App.Resources;
-using Bit.App.Utilities;
-using Bit.Core;
-using Bit.Core.Abstractions;
-using Bit.Core.Enums;
-using Bit.Core.Models.View;
-using Bit.Core.Utilities;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public class AuthenticatorPageListItem : ExtendedViewModel
-    {
-        //private string _totpCode;
-        private readonly ITotpService _totpService;
-
-        //public CipherView Cipher { get; set; }
-        //public CipherType? Type { get; set; }
-        //public int interval { get; set; }
-        //public long TotpSec { get; set; }
-        //private DateTime? _totpInterval = null;
-
-        private CipherView _cipher;
-            
-        private bool _websiteIconsEnabled;
-        private string _iconImageSource = string.Empty;
-
-        public int interval { get; set; }
-        private string _totpSec;
-
-        private string _totpCode;
-        private string _totpCodeFormatted = "938 928";
-
-
-        public AuthenticatorPageListItem(CipherView cipherView, bool websiteIconsEnabled)
-        {
-            _totpService = ServiceContainer.Resolve<ITotpService>("totpService");
-
-            Cipher = cipherView;
-            WebsiteIconsEnabled = websiteIconsEnabled;
-            interval = _totpService.GetTimeInterval(Cipher.Login.Totp);
-        }
-
-        
-        public Command CopyCommand { get; set; }
-
-        public CipherView Cipher
-        {
-            get => _cipher;
-            set => SetProperty(ref _cipher, value);
-        }
-
-        public string TotpCodeFormatted
-        {
-            get => _totpCodeFormatted;
-            set => SetProperty(ref _totpCodeFormatted, value);
-        }
-
-        public string TotpSec
-        {
-            get => _totpSec;
-            set => SetProperty(ref _totpSec, value);
-        }
-
-        public bool WebsiteIconsEnabled
-        {
-            get => _websiteIconsEnabled;
-            set => SetProperty(ref _websiteIconsEnabled, value);
-        }
-
-        public bool ShowIconImage
-        {
-            get => WebsiteIconsEnabled
-                && !string.IsNullOrWhiteSpace(Cipher.Login?.Uri)
-                && IconImageSource != null;
-        }
-
-        public string IconImageSource
-        {
-            get
-            {
-                if (_iconImageSource == string.Empty) // default value since icon source can return null
-                {
-                    _iconImageSource = IconImageHelper.GetLoginIconImage(Cipher);
-                }
-                return _iconImageSource;
-            }
-
-        }
-
-        public async Task TotpTickAsync()
-        {
-            var epoc = CoreHelpers.EpocUtcNow() / 1000;
-            var mod = epoc % interval;
-            var totpSec = interval - mod;
-            TotpSec = totpSec.ToString();
-            //TotpLow = totpSec < 7;
-            if (mod == 0)
-            {
-                await TotpUpdateCodeAsync();
-            }
-
-        }
-
-        public async Task TotpUpdateCodeAsync()
-        {
-            _totpCode = await _totpService.GetCodeAsync(Cipher.Login.Totp);
-            if (_totpCode != null)
-            {
-                if (_totpCode.Length > 4)
-                {
-                    var half = (int)Math.Floor(_totpCode.Length / 2M);
-                    TotpCodeFormatted = string.Format("{0} {1}", _totpCode.Substring(0, half),
-                        _totpCode.Substring(half));
-                }
-                else
-                {
-                    TotpCodeFormatted = _totpCode;
-                }
-            }
-            else
-            {
-                TotpCodeFormatted = null;
-            }
-        }
-    }
-}

src/App/Pages/Authenticator/AuthenticatorPageViewModel.cs

@@ -1,153 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using System.Linq;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Models.View;
-using Bit.Core.Utilities;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public class AuthenticatorPageViewModel : BaseViewModel
-    {
-        #region Members
-
-        private readonly IClipboardService _clipboardService;
-        private readonly ITotpService _totpService;
-        private readonly IUserService _userService;
-        private readonly IVaultTimeoutService _vaultTimeoutService;
-        private readonly ICipherService _cipherService;
-
-        private bool _showList = true;
-        private bool _refreshing;
-        private bool _loaded;
-        private bool _websiteIconsEnabled = true;
-        //private long _totpSec;
-        #endregion
-
-        #region Ctor
-
-        public AuthenticatorPageViewModel()
-        {
-            _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
-            _userService = ServiceContainer.Resolve<IUserService>("userService");
-            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
-            _totpService = ServiceContainer.Resolve<ITotpService>("totpService");
-
-            PageTitle = AppResources.Authenticator;
-            Items = new ExtendedObservableCollection<AuthenticatorPageListItem>();
-        }
-
-        #endregion
-
-        #region Methods
-
-        public async Task CopyAsync()
-        {
-            //await _clipboardService.CopyTextAsync(Password);
-            //_platformUtilsService.ShowToast("success", null,
-            //    string.Format(AppResources.ValueHasBeenCopied, AppResources.Password));
-        }
-
-        public async Task LoadAsync()
-        {
-            var authed = await _userService.IsAuthenticatedAsync();
-            if (!authed)
-            {
-                return;
-            }
-            if (await _vaultTimeoutService.IsLockedAsync())
-            {
-                return;
-            }
-
-            try
-            {
-                await LoadDataAsync();
-            }
-            finally
-            {
-                ShowList = true;
-                Refreshing = false;
-            }
-        }
-
-        private async Task LoadDataAsync()
-        {
-            var _allCiphers = await _cipherService.GetAllDecryptedAsync();
-            _allCiphers = _allCiphers.Where(c => c.Type == Core.Enums.CipherType.Login && c.Login.Totp != null).ToList();
-            var filteredCiphers = _allCiphers.Select(c => new AuthenticatorPageListItem(c, WebsiteIconsEnabled)).ToList();
-            Items.ResetWithRange(filteredCiphers);
-
-            foreach (AuthenticatorPageListItem item in Items)
-            {
-                item.TotpUpdateCodeAsync();
-            }
-
-            //await TotpUpdateCodeAsync();
-            //    var interval = _totpService.GetTimeInterval(Cipher.Login.Totp);
-            //    await TotpTickAsync(interval);
-            //    _totpInterval = DateTime.UtcNow;
-            Device.StartTimer(new TimeSpan(0, 0, 1), () =>
-            {
-                foreach(AuthenticatorPageListItem item in Items)
-                {
-                    item.TotpTickAsync();
-                }
-                return true;
-            });
-            //}
-
-            //private async Task TotpTickAsync(int intervalSeconds)
-            //{
-            //    var epoc = CoreHelpers.EpocUtcNow() / 1000;
-            //    var mod = epoc % intervalSeconds;
-            //    var totpSec = intervalSeconds - mod;
-            //    TotpSec = totpSec.ToString();
-            //    TotpLow = totpSec < 7;
-            //    if (mod == 0)
-            //    {
-            //        await TotpUpdateCodeAsync();
-            //    }
-        }
-
-        #endregion
-
-        #region Properties
-
-        public ExtendedObservableCollection<AuthenticatorPageListItem> Items { get; set; }
-        public Command RefreshCommand { get; set; }
-
-        public bool ShowList
-        {
-            get => _showList;
-            set => SetProperty(ref _showList, value);
-        }
-
-        public bool Refreshing
-        {
-            get => _refreshing;
-            set => SetProperty(ref _refreshing, value);
-        }
-
-        public bool WebsiteIconsEnabled
-        {
-            get => _websiteIconsEnabled;
-            set => SetProperty(ref _websiteIconsEnabled, value);
-        }
-
-        public bool Loaded
-        {
-            get => _loaded;
-            set => SetProperty(ref _loaded, value);
-        }
-        //public long TotpSec
-        //{
-        //    get => _totpSec;
-        //    set => SetProperty(ref _totpSec, value);
-        //}
-
-        #endregion
-    }
-}

src/App/Pages/Generator/GeneratorHistoryPage.xaml

@@ -48,7 +48,8 @@
                   IsVisible="{Binding ShowNoData, Converter={StaticResource inverseBool}}"
                   ItemsSource="{Binding History}"
                   VerticalOptions="FillAndExpand"
-                  StyleClass="list, list-platform">
+                  StyleClass="list, list-platform"
+                  ExtraDataForLogging="Generator History Page">
             <CollectionView.ItemTemplate>
                 <DataTemplate x:DataType="domain:GeneratedPasswordHistory">
                     <Grid

src/App/Pages/Generator/GeneratorHistoryPageViewModel.cs

@@ -58,8 +58,7 @@ namespace Bit.App.Pages
         private async void CopyAsync(GeneratedPasswordHistory ph)
         {
             await _clipboardService.CopyTextAsync(ph.Password);
-            _platformUtilsService.ShowToast("info", null,
-                string.Format(AppResources.ValueHasBeenCopied, AppResources.Password));
+            _platformUtilsService.ShowToastForCopiedValue(AppResources.Password);
         }
 
         public async Task UpdateOnThemeChanged()

src/App/Pages/Generator/GeneratorPageViewModel.cs

@@ -5,7 +5,6 @@ using Bit.App.Utilities;
 using Bit.Core.Abstractions;
 using Bit.Core.Models.Domain;
 using Bit.Core.Utilities;
-using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
@@ -319,8 +318,7 @@ namespace Bit.App.Pages
         public async Task CopyAsync()
         {
             await _clipboardService.CopyTextAsync(Password);
-            _platformUtilsService.ShowToast("success", null,
-                string.Format(AppResources.ValueHasBeenCopied, AppResources.Password));
+            _platformUtilsService.ShowToastForCopiedValue(AppResources.Password);
         }
 
         private void LoadFromOptions()

src/App/Pages/Send/SendGroupingsPage/SendGroupingsPage.xaml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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.SendGroupingsPage"
@@ -138,7 +138,8 @@
                         ItemTemplate="{StaticResource sendListItemDataTemplateSelector}"
                         SelectionMode="Single"
                         SelectionChanged="RowSelected"
-                        StyleClass="list, list-platform" />
+                        StyleClass="list, list-platform"
+                        ExtraDataForLogging="Send Groupings Page" />
                 </RefreshView>
             </StackLayout>
         </ResourceDictionary>

src/App/Pages/Send/SendGroupingsPage/SendGroupingsPage.xaml.cs

@@ -5,6 +5,7 @@ using Bit.App.Controls;
 using Bit.App.Models;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
+using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.Forms;
 
@@ -68,21 +69,28 @@ namespace Bit.App.Pages
 
             _broadcasterService.Subscribe(_pageName, async (message) =>
             {
-                if (message.Command == "syncStarted")
+                try
                 {
-                    Device.BeginInvokeOnMainThread(() => IsBusy = true);
-                }
-                else if (message.Command == "syncCompleted" || message.Command == "sendUpdated")
-                {
-                    await Task.Delay(500);
-                    Device.BeginInvokeOnMainThread(() =>
+                    if (message.Command == "syncStarted")
                     {
-                        IsBusy = false;
-                        if (_vm.LoadedOnce)
+                        Device.BeginInvokeOnMainThread(() => IsBusy = true);
+                    }
+                    else if (message.Command == "syncCompleted" || message.Command == "sendUpdated")
+                    {
+                        await Task.Delay(500);
+                        Device.BeginInvokeOnMainThread(() =>
                         {
-                            var task = _vm.LoadAsync();
-                        }
-                    });
+                            IsBusy = false;
+                            if (_vm.LoadedOnce)
+                            {
+                                var task = _vm.LoadAsync();
+                            }
+                        });
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LoggerHelper.LogEvenIfCantBeResolved(ex);
                 }
             });
 

src/App/Pages/Send/SendsPage.xaml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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"
@@ -66,7 +66,8 @@
                VerticalOptions="FillAndExpand"
                SelectionMode="Single"
                SelectionChanged="RowSelected"
-               StyleClass="list, list-platform">
+               StyleClass="list, list-platform"
+               ExtraDataForLogging="Sends Page">
             <CollectionView.ItemTemplate>
                 <DataTemplate x:DataType="views:SendView">
                     <controls:SendViewCell

src/App/Pages/Settings/FoldersPage.xaml

@@ -38,7 +38,8 @@
                           VerticalOptions="FillAndExpand"
                           SelectionMode="Single"
                           SelectionChanged="RowSelected"
-                          StyleClass="list, list-platform">
+                          StyleClass="list, list-platform"
+                          ExtraDataForLogging="Folders Page">
                     <CollectionView.ItemTemplate>
                         <DataTemplate x:DataType="views:FolderView">
                             <controls:ExtendedStackLayout

src/App/Pages/Settings/OptionsPage.xaml

@@ -33,6 +33,23 @@
                     StyleClass="box-footer-label"
                     Text="{u:I18n ThemeDescription}" />
             </StackLayout>
+            <StackLayout
+                StyleClass="box"
+                IsVisible="{Binding ShowAutoDarkThemeOptions}">
+                <StackLayout StyleClass="box-row, box-row-input, box-row-input-options-platform">
+                    <Label
+                        Text="{u:I18n DefaultDarkTheme}"
+                        StyleClass="box-label" />
+                    <Picker
+                        x:Name="_autoDarkThemePicker"
+                        ItemsSource="{Binding AutoDarkThemeOptions, Mode=OneTime}"
+                        SelectedIndex="{Binding AutoDarkThemeSelectedIndex}"
+                        StyleClass="box-value" />
+                </StackLayout>
+                <Label
+                    StyleClass="box-footer-label"
+                    Text="{u:I18n DefaultDarkThemeDescription}" />
+            </StackLayout>
             <StackLayout StyleClass="box">
                 <StackLayout StyleClass="box-row, box-row-input, box-row-input-options-platform">
                     <Label

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

@@ -19,6 +19,7 @@ namespace Bit.App.Pages
             _vm = BindingContext as OptionsPageViewModel;
             _vm.Page = this;
             _themePicker.ItemDisplayBinding = new Binding("Value");
+            _autoDarkThemePicker.ItemDisplayBinding = new Binding("Value");
             _uriMatchPicker.ItemDisplayBinding = new Binding("Value");
             _clearClipboardPicker.ItemDisplayBinding = new Binding("Value");
             if (Device.RuntimePlatform == Device.Android)
@@ -29,6 +30,7 @@ namespace Bit.App.Pages
             else
             {
                 _themePicker.On<iOS>().SetUpdateMode(UpdateMode.WhenFinished);
+                _autoDarkThemePicker.On<iOS>().SetUpdateMode(UpdateMode.WhenFinished);
                 _uriMatchPicker.On<iOS>().SetUpdateMode(UpdateMode.WhenFinished);
                 _clearClipboardPicker.On<iOS>().SetUpdateMode(UpdateMode.WhenFinished);
             }

src/App/Pages/Settings/OptionsPageViewModel.cs

@@ -23,6 +23,7 @@ namespace Bit.App.Pages
         private bool _disableAutoTotpCopy;
         private int _clearClipboardSelectedIndex;
         private int _themeSelectedIndex;
+        private int _autoDarkThemeSelectedIndex;
         private int _uriMatchSelectedIndex;
         private bool _inited;
         private bool _updatingAutofill;
@@ -53,10 +54,16 @@ namespace Bit.App.Pages
             ThemeOptions = new List<KeyValuePair<string, string>>
             {
                 new KeyValuePair<string, string>(null, AppResources.ThemeDefault),
-                new KeyValuePair<string, string>("light", AppResources.Light),
-                new KeyValuePair<string, string>("dark", AppResources.Dark),
-                new KeyValuePair<string, string>("black", AppResources.Black),
-                new KeyValuePair<string, string>("nord", "Nord"),
+                new KeyValuePair<string, string>(ThemeManager.Light, AppResources.Light),
+                new KeyValuePair<string, string>(ThemeManager.Dark, AppResources.Dark),
+                new KeyValuePair<string, string>(ThemeManager.Black, AppResources.Black),
+                new KeyValuePair<string, string>(ThemeManager.Nord, AppResources.Nord),
+            };
+            AutoDarkThemeOptions = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string, string>(ThemeManager.Dark, AppResources.Dark),
+                new KeyValuePair<string, string>(ThemeManager.Black, AppResources.Black),
+                new KeyValuePair<string, string>(ThemeManager.Nord, AppResources.Nord),
             };
             UriMatchOptions = new List<KeyValuePair<UriMatchType?, string>>
             {
@@ -71,6 +78,7 @@ namespace Bit.App.Pages
 
         public List<KeyValuePair<int?, string>> ClearClipboardOptions { get; set; }
         public List<KeyValuePair<string, string>> ThemeOptions { get; set; }
+        public List<KeyValuePair<string, string>> AutoDarkThemeOptions { get; set; }
         public List<KeyValuePair<UriMatchType?, string>> UriMatchOptions { get; set; }
 
         public int ClearClipboardSelectedIndex
@@ -80,7 +88,7 @@ namespace Bit.App.Pages
             {
                 if (SetProperty(ref _clearClipboardSelectedIndex, value))
                 {
-                    var task = SaveClipboardChangedAsync();
+                    SaveClipboardChangedAsync().FireAndForget();
                 }
             }
         }
@@ -90,9 +98,25 @@ namespace Bit.App.Pages
             get => _themeSelectedIndex;
             set
             {
-                if (SetProperty(ref _themeSelectedIndex, value))
+                if (SetProperty(ref _themeSelectedIndex, value,
+                        additionalPropertyNames: new[] { nameof(ShowAutoDarkThemeOptions) })
+                   )
                 {
-                    var task = SaveThemeAsync();
+                    SaveThemeAsync().FireAndForget();
+                }
+            }
+        }
+
+        public bool ShowAutoDarkThemeOptions => ThemeOptions[ThemeSelectedIndex].Key == null;
+
+        public int AutoDarkThemeSelectedIndex
+        {
+            get => _autoDarkThemeSelectedIndex;
+            set
+            {
+                if (SetProperty(ref _autoDarkThemeSelectedIndex, value))
+                {
+                    SaveThemeAsync().FireAndForget();
                 }
             }
         }
@@ -104,7 +128,7 @@ namespace Bit.App.Pages
             {
                 if (SetProperty(ref _uriMatchSelectedIndex, value))
                 {
-                    var task = SaveDefaultUriAsync();
+                    SaveDefaultUriAsync().FireAndForget();
                 }
             }
         }
@@ -116,7 +140,7 @@ namespace Bit.App.Pages
             {
                 if (SetProperty(ref _disableFavicon, value))
                 {
-                    var task = UpdateDisableFaviconAsync();
+                    UpdateDisableFaviconAsync().FireAndForget();
                 }
             }
         }
@@ -128,7 +152,7 @@ namespace Bit.App.Pages
             {
                 if (SetProperty(ref _disableAutoTotpCopy, value))
                 {
-                    var task = UpdateAutoTotpCopyAsync();
+                    UpdateAutoTotpCopyAsync().FireAndForget();
                 }
             }
         }
@@ -140,7 +164,7 @@ namespace Bit.App.Pages
             {
                 if (SetProperty(ref _autofillDisableSavePrompt, value))
                 {
-                    var task = UpdateAutofillDisableSavePromptAsync();
+                    UpdateAutofillDisableSavePromptAsync().FireAndForget();
                 }
             }
         }
@@ -166,6 +190,8 @@ namespace Bit.App.Pages
             DisableFavicon = (await _stateService.GetDisableFaviconAsync()).GetValueOrDefault();
             var theme = await _stateService.GetThemeAsync();
             ThemeSelectedIndex = ThemeOptions.FindIndex(k => k.Key == theme);
+            var autoDarkTheme = await _stateService.GetAutoDarkThemeAsync() ?? "dark";
+            AutoDarkThemeSelectedIndex = AutoDarkThemeOptions.FindIndex(k => k.Key == autoDarkTheme);
             var defaultUriMatch = await _stateService.GetDefaultUriMatchAsync();
             UriMatchSelectedIndex = defaultUriMatch == null ? 0 :
                 UriMatchOptions.FindIndex(k => (int?)k.Key == defaultUriMatch);
@@ -202,8 +228,8 @@ namespace Bit.App.Pages
         {
             if (_inited && ThemeSelectedIndex > -1)
             {
-                var theme = ThemeOptions[ThemeSelectedIndex].Key;
-                await _stateService.SetThemeAsync(theme);
+                await _stateService.SetThemeAsync(ThemeOptions[ThemeSelectedIndex].Key);
+                await _stateService.SetAutoDarkThemeAsync(AutoDarkThemeOptions[AutoDarkThemeSelectedIndex].Key);
                 ThemeManager.SetTheme(Application.Current.Resources);
                 _messagingService.Send("updatedTheme");
             }

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

@@ -113,6 +113,7 @@
         ItemTemplate="{StaticResource listItemDataTemplateSelector}"
         SelectionMode="Single"
         SelectionChanged="RowSelected"
-        StyleClass="list, list-platform" />
+        StyleClass="list, list-platform"
+        ExtraDataForLogging="Settings Page" />
 
 </pages:BaseContentPage>

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

@@ -167,7 +167,7 @@ namespace Bit.App.Pages
             {
                 await _vm.UpdatePinAsync();
             }
-            else if (item.Name == AppResources.ReportCrashLogs)
+            else if (item.Name == AppResources.SubmitCrashLogs)
             {
                 await _vm.LoggerReportingAsync();
             }

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

@@ -296,7 +296,7 @@ namespace Bit.App.Pages
                     CreateSelectableOption(AppResources.No, !_reportLoggingEnabled),
             };
 
-            var selection = await Page.DisplayActionSheet(AppResources.ReportCrashLogsDescription, AppResources.Cancel, null, options);
+            var selection = await Page.DisplayActionSheet(AppResources.SubmitCrashLogsDescription, AppResources.Cancel, null, options);
 
             if (selection == null || selection == AppResources.Cancel)
             {
@@ -525,7 +525,7 @@ namespace Bit.App.Pages
 #if !FDROID 
                 new SettingsPageListItem
                 {
-                    Name = AppResources.ReportCrashLogs,
+                    Name = AppResources.SubmitCrashLogs,
                     SubLabel = _reportLoggingEnabled ? AppResources.Enabled : AppResources.Disabled,
                 },
 #endif

src/App/Pages/TabsPage.cs

@@ -18,7 +18,6 @@ namespace Bit.App.Pages
         private readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
 
         private NavigationPage _groupingsPage;
-        private NavigationPage _authenticatorPage;
         private NavigationPage _sendGroupingsPage;
         private NavigationPage _generatorPage;
 
@@ -33,16 +32,8 @@ namespace Bit.App.Pages
                 Title = AppResources.MyVault,
                 IconImageSource = "lock.png"
             };
-
             Children.Add(_groupingsPage);
 
-            _authenticatorPage = new NavigationPage(new AuthenticatorPage(true, null, this))
-            {
-                Title = AppResources.Authenticator,
-                IconImageSource = "info.png"
-            };
-            Children.Add(_authenticatorPage);
-
             _sendGroupingsPage = new NavigationPage(new SendGroupingsPage(true, null, null, appOptions))
             {
                 Title = AppResources.Send,

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

@@ -30,6 +30,7 @@ namespace Bit.App.Pages
             CipherType? type = null,
             string folderId = null,
             string collectionId = null,
+            string organizationId = null,
             string name = null,
             string uri = null,
             bool fromAutofill = false,
@@ -51,6 +52,7 @@ namespace Bit.App.Pages
             _vm.CipherId = cipherId;
             _vm.FolderId = folderId == "none" ? null : folderId;
             _vm.CollectionIds = collectionId != null ? new HashSet<string>(new List<string> { collectionId }) : null;
+            _vm.OrganizationId = organizationId;
             _vm.Type = type;
             _vm.DefaultName = name ?? appOptions?.SaveName;
             _vm.DefaultUri = uri ?? appOptions?.Uri;

src/App/Pages/Vault/AutofillCiphersPage.xaml

@@ -85,7 +85,8 @@
                     ItemTemplate="{StaticResource listItemDataTemplateSelector}"
                     SelectionMode="Single"
                     SelectionChanged="RowSelected"
-                    StyleClass="list, list-platform" />
+                    StyleClass="list, list-platform"
+                    ExtraDataForLogging="Autofill Ciphers Page" />
             </StackLayout>
         </ResourceDictionary>
     </ContentPage.Resources>

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

@@ -6,6 +6,7 @@ using Bit.App.Models;
 using Bit.App.Utilities;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
+using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.Forms;
 
@@ -55,21 +56,28 @@ namespace Bit.App.Pages
 
             _broadcasterService.Subscribe(nameof(AutofillCiphersPage), async (message) =>
             {
-                if (message.Command == "syncStarted")
+                try
                 {
-                    Device.BeginInvokeOnMainThread(() => IsBusy = true);
-                }
-                else if (message.Command == "syncCompleted")
-                {
-                    await Task.Delay(500);
-                    Device.BeginInvokeOnMainThread(() =>
+                    if (message.Command == "syncStarted")
                     {
-                        IsBusy = false;
-                        if (_vm.LoadedOnce)
+                        Device.BeginInvokeOnMainThread(() => IsBusy = true);
+                    }
+                    else if (message.Command == "syncCompleted")
+                    {
+                        await Task.Delay(500);
+                        Device.BeginInvokeOnMainThread(() =>
                         {
-                            var task = _vm.LoadAsync();
-                        }
-                    });
+                            IsBusy = false;
+                            if (_vm.LoadedOnce)
+                            {
+                                var task = _vm.LoadAsync();
+                            }
+                        });
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LoggerHelper.LogEvenIfCantBeResolved(ex);
                 }
             });
 

src/App/Pages/Vault/CiphersPage.xaml

@@ -49,6 +49,31 @@
     </ContentPage.Resources>
 
     <StackLayout x:Name="_mainLayout" Spacing="0" Padding="0">
+        <StackLayout
+            IsVisible="{Binding ShowVaultFilter}"
+            Orientation="Horizontal"
+            HorizontalOptions="FillAndExpand"
+            Margin="0,5,0,0">
+            <Label
+                Text="{Binding VaultFilterDescription}"
+                LineBreakMode="TailTruncation"
+                Margin="10,0"
+                StyleClass="text-md, text-muted"
+                VerticalOptions="Center"
+                HorizontalOptions="StartAndExpand"
+                AutomationProperties.IsInAccessibleTree="True"
+                AutomationProperties.Name="{u:I18n Filter}" />
+            <controls:MiButton
+                Text="{Binding Source={x:Static core:BitwardenIcons.ViewCellMenu}}"
+                StyleClass="list-row-button-text, list-row-button-platform"
+                Command="{Binding VaultFilterCommand}"
+                VerticalOptions="Center"
+                HorizontalOptions="End"
+                AutomationProperties.IsInAccessibleTree="True"
+                AutomationProperties.Name="{u:I18n Filter}" />
+        </StackLayout>
+        <BoxView StyleClass="box-row-separator" />
+
         <controls:IconLabel IsVisible="{Binding ShowSearchDirection}"
                Text="{Binding Source={x:Static core:BitwardenIcons.Search}}"
                StyleClass="text-muted"
@@ -68,7 +93,8 @@
                 VerticalOptions="FillAndExpand"
                 SelectionMode="Single"
                 SelectionChanged="RowSelected"
-                StyleClass="list, list-platform">
+                StyleClass="list, list-platform"
+                ExtraDataForLogging="Ciphers Page">
             <CollectionView.ItemTemplate>
                 <DataTemplate x:DataType="views:CipherView">
                     <controls:CipherViewCell

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

@@ -17,7 +17,8 @@ namespace Bit.App.Pages
         private CiphersPageViewModel _vm;
         private bool _hasFocused;
 
-        public CiphersPage(Func<CipherView, bool> filter, string pageTitle = null, string autofillUrl = null, bool deleted = false)
+        public CiphersPage(Func<CipherView, bool> filter, string pageTitle = null, string vaultFilterSelection = null,
+            string autofillUrl = null, bool deleted = false)
         {
             InitializeComponent();
             _vm = BindingContext as CiphersPageViewModel;
@@ -33,6 +34,7 @@ namespace Bit.App.Pages
             {
                 _vm.PageTitle = AppResources.SearchVault;
             }
+            _vm.VaultFilterDescription = vaultFilterSelection;
 
             if (Device.RuntimePlatform == Device.iOS)
             {

src/App/Pages/Vault/CiphersPageViewModel.cs

@@ -5,17 +5,17 @@ using System.Threading;
 using System.Threading.Tasks;
 using Bit.App.Abstractions;
 using Bit.App.Resources;
-using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
+using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
-    public class CiphersPageViewModel : BaseViewModel
+    public class CiphersPageViewModel : VaultFilterViewModel
     {
         private readonly IPlatformUtilsService _platformUtilsService;
         private readonly ICipherService _cipherService;
@@ -23,7 +23,10 @@ namespace Bit.App.Pages
         private readonly IDeviceActionService _deviceActionService;
         private readonly IStateService _stateService;
         private readonly IPasswordRepromptService _passwordRepromptService;
+        private readonly IOrganizationService _organizationService;
+        private readonly IPolicyService _policyService;
         private CancellationTokenSource _searchCancellationTokenSource;
+        private readonly ILogger _logger;
 
         private bool _showNoData;
         private bool _showList;
@@ -37,6 +40,9 @@ namespace Bit.App.Pages
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
             _stateService = ServiceContainer.Resolve<IStateService>("stateService");
             _passwordRepromptService = ServiceContainer.Resolve<IPasswordRepromptService>("passwordRepromptService");
+            _organizationService = ServiceContainer.Resolve<IOrganizationService>("organizationService");
+            _policyService = ServiceContainer.Resolve<IPolicyService>("policyService");
+            _logger = ServiceContainer.Resolve<ILogger>("logger");
 
             Ciphers = new ExtendedObservableCollection<CipherView>();
             CipherOptionsCommand = new Command<CipherView>(CipherOptionsAsync);
@@ -48,6 +54,11 @@ namespace Bit.App.Pages
         public string AutofillUrl { get; set; }
         public bool Deleted { get; set; }
 
+        protected override ICipherService cipherService => _cipherService;
+        protected override IPolicyService policyService => _policyService;
+        protected override IOrganizationService organizationService => _organizationService;
+        protected override ILogger logger => _logger;
+
         public bool ShowNoData
         {
             get => _showNoData;
@@ -76,11 +87,9 @@ namespace Bit.App.Pages
 
         public async Task InitAsync()
         {
+            await InitVaultFilterAsync(true);
             WebsiteIconsEnabled = !(await _stateService.GetDisableFaviconAsync()).GetValueOrDefault();
-            if (!string.IsNullOrWhiteSpace((Page as CiphersPage).SearchBar.Text))
-            {
-                Search((Page as CiphersPage).SearchBar.Text, 200);
-            }
+            PerformSearchIfPopulated();
         }
 
         public void Search(string searchText, int? timeout = null)
@@ -107,8 +116,9 @@ namespace Bit.App.Pages
                     }
                     try
                     {
+                        var vaultFilteredCiphers = await GetAllCiphersAsync();
                         ciphers = await _searchService.SearchCiphersAsync(searchText,
-                            Filter ?? (c => c.IsDeleted == Deleted), null, cts.Token);
+                            Filter ?? (c => c.IsDeleted == Deleted), vaultFilteredCiphers, cts.Token);
                         cts.Token.ThrowIfCancellationRequested();
                     }
                     catch (OperationCanceledException)
@@ -192,6 +202,19 @@ namespace Bit.App.Pages
             }
         }
 
+        private void PerformSearchIfPopulated()
+        {
+            if (!string.IsNullOrWhiteSpace((Page as CiphersPage).SearchBar.Text))
+            {
+                Search((Page as CiphersPage).SearchBar.Text, 200);
+            }
+        }
+
+        protected override async Task OnVaultFilterSelectedAsync()
+        {
+            PerformSearchIfPopulated();
+        }
+
         private async void CipherOptionsAsync(CipherView cipher)
         {
             if ((Page as BaseContentPage).DoOnce())

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

@@ -123,7 +123,7 @@
                         AutomationProperties.Name="{u:I18n Filter}" />
                     <controls:MiButton
                         Text="{Binding Source={x:Static core:BitwardenIcons.ViewCellMenu}}"
-                        StyleClass="list-row-button, list-row-button-platform, btn-disabled"
+                        StyleClass="list-row-button-text, list-row-button-platform"
                         Command="{Binding VaultFilterCommand}"
                         VerticalOptions="Center"
                         HorizontalOptions="End"
@@ -155,7 +155,8 @@
                         ItemTemplate="{StaticResource listItemDataTemplateSelector}"
                         SelectionMode="Single"
                         SelectionChanged="RowSelected"
-                        StyleClass="list, list-platform" />
+                        StyleClass="list, list-platform"
+                        ExtraDataForLogging="Groupings Page" />
                 </RefreshView>
             </StackLayout>
         </ResourceDictionary>

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

@@ -7,6 +7,7 @@ using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
+using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.Forms;
 
@@ -95,21 +96,28 @@ namespace Bit.App.Pages
 
             _broadcasterService.Subscribe(_pageName, async (message) =>
             {
-                if (message.Command == "syncStarted")
+                try
                 {
-                    Device.BeginInvokeOnMainThread(() => IsBusy = true);
-                }
-                else if (message.Command == "syncCompleted")
-                {
-                    await Task.Delay(500);
-                    Device.BeginInvokeOnMainThread(() =>
+                    if (message.Command == "syncStarted")
                     {
-                        IsBusy = false;
-                        if (_vm.LoadedOnce)
+                        Device.BeginInvokeOnMainThread(() => IsBusy = true);
+                    }
+                    else if (message.Command == "syncCompleted")
+                    {
+                        await Task.Delay(500);
+                        Device.BeginInvokeOnMainThread(() =>
                         {
-                            var task = _vm.LoadAsync();
-                        }
-                    });
+                            IsBusy = false;
+                            if (_vm.LoadedOnce)
+                            {
+                                var task = _vm.LoadAsync();
+                            }
+                        });
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LoggerHelper.LogEvenIfCantBeResolved(ex);
                 }
             });
 
@@ -263,7 +271,7 @@ namespace Bit.App.Pages
             }
             if (!_vm.Deleted && DoOnce())
             {
-                var page = new AddEditPage(null, _vm.Type, _vm.FolderId, _vm.CollectionId);
+                var page = new AddEditPage(null, _vm.Type, _vm.FolderId, _vm.CollectionId, _vm.GetVaultFilterOrgId());
                 await Navigation.PushModalAsync(new NavigationPage(page));
             }
         }

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

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Windows.Input;
 using Bit.App.Abstractions;
 using Bit.App.Controls;
 using Bit.App.Resources;
@@ -17,7 +16,7 @@ using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
-    public class GroupingsPageViewModel : BaseViewModel
+    public class GroupingsPageViewModel : VaultFilterViewModel
     {
         private const int NoFolderListSize = 100;
 
@@ -30,10 +29,7 @@ namespace Bit.App.Pages
         private bool _showList;
         private bool _websiteIconsEnabled;
         private bool _syncRefreshing;
-        private bool _showVaultFilter;
-        private string _vaultFilterSelection;
         private string _noDataText;
-        private List<Organization> _organizations;
         private List<CipherView> _allCiphers;
         private Dictionary<string, int> _folderCounts = new Dictionary<string, int>();
         private Dictionary<string, int> _collectionCounts = new Dictionary<string, int>();
@@ -78,9 +74,6 @@ namespace Bit.App.Pages
                 await LoadAsync();
             });
             CipherOptionsCommand = new Command<CipherView>(CipherOptionsAsync);
-            VaultFilterCommand = new AsyncCommand(VaultFilterOptionsAsync,
-                onException: ex => _logger.Exception(ex),
-                allowsMultipleExecutions: false);
 
             AccountSwitchingOverlayViewModel = new AccountSwitchingOverlayViewModel(_stateService, _messagingService, _logger)
             {
@@ -108,6 +101,11 @@ namespace Bit.App.Pages
         public List<Core.Models.View.CollectionView> Collections { get; set; }
         public List<TreeNode<Core.Models.View.CollectionView>> NestedCollections { get; set; }
 
+        protected override ICipherService cipherService => _cipherService;
+        protected override IPolicyService policyService => _policyService;
+        protected override IOrganizationService organizationService => _organizationService;
+        protected override ILogger logger => _logger;
+
         public bool Refreshing
         {
             get => _refreshing;
@@ -153,30 +151,12 @@ namespace Bit.App.Pages
             get => _websiteIconsEnabled;
             set => SetProperty(ref _websiteIconsEnabled, value);
         }
-        public bool ShowVaultFilter
-        {
-            get => _showVaultFilter;
-            set => SetProperty(ref _showVaultFilter, value);
-        }
-        public string VaultFilterDescription
-        {
-            get
-            {
-                if (_vaultFilterSelection == null || _vaultFilterSelection == AppResources.AllVaults)
-                {
-                    return string.Format(AppResources.VaultFilterDescription, AppResources.All);
-                }
-                return string.Format(AppResources.VaultFilterDescription, _vaultFilterSelection);
-            }
-            set => SetProperty(ref _vaultFilterSelection, value);
-        }
 
         public AccountSwitchingOverlayViewModel AccountSwitchingOverlayViewModel { get; }
 
         public ObservableRangeCollection<IGroupingsPageListItem> GroupedItems { get; set; }
         public Command RefreshCommand { get; set; }
         public Command<CipherView> CipherOptionsCommand { get; set; }
-        public ICommand VaultFilterCommand { get; }
         public bool LoadedOnce { get; set; }
 
         public async Task LoadAsync()
@@ -201,14 +181,9 @@ namespace Bit.App.Pages
                 return;
             }
 
-            _organizations = await _organizationService.GetAllAsync();
+            await InitVaultFilterAsync(MainPage);
             if (MainPage)
             {
-                ShowVaultFilter = await _policyService.ShouldShowVaultFilterAsync();
-                if (ShowVaultFilter && _vaultFilterSelection == null)
-                {
-                    _vaultFilterSelection = AppResources.AllVaults;
-                }
                 PageTitle = ShowVaultFilter ? AppResources.Vaults : AppResources.MyVault;
             }
 
@@ -394,22 +369,8 @@ namespace Bit.App.Pages
             SyncRefreshing = false;
         }
 
-        public async Task VaultFilterOptionsAsync()
+        protected override async Task OnVaultFilterSelectedAsync()
         {
-            var options = new List<string> { AppResources.AllVaults, AppResources.MyVault };
-            if (_organizations.Any())
-            {
-                options.AddRange(_organizations.Select(o => o.Name));
-            }
-            var selection = await Page.DisplayActionSheet(AppResources.FilterByVault, AppResources.Cancel, null,
-                options.ToArray());
-            if (selection == AppResources.Cancel ||
-                (_vaultFilterSelection == null && selection == AppResources.AllVaults) ||
-                (_vaultFilterSelection != null && _vaultFilterSelection == selection))
-            {
-                return;
-            }
-            VaultFilterDescription = selection;
             await LoadAsync();
         }
 
@@ -496,8 +457,8 @@ namespace Bit.App.Pages
 
         private async Task LoadDataAsync()
         {
-            var orgId = await FillAllCiphersAndGetOrgIdIfNeededAsync();
             NoDataText = AppResources.NoItems;
+            _allCiphers = await GetAllCiphersAsync();
             HasCiphers = _allCiphers.Any();
             FavoriteCiphers?.Clear();
             NoFolderCiphers?.Clear();
@@ -511,7 +472,7 @@ namespace Bit.App.Pages
 
             if (MainPage)
             {
-                await FillFoldersAndCollectionsAsync(orgId);
+                await FillFoldersAndCollectionsAsync();
                 NestedFolders = await _folderService.GetAllNestedAsync(Folders);
                 HasFolders = NestedFolders.Any(f => f.Node?.Id != null);
                 NestedCollections = Collections != null ? await _collectionService.GetAllNestedAsync(Collections) : null;
@@ -635,28 +596,9 @@ namespace Bit.App.Pages
             }
         }
 
-        private async Task<string> FillAllCiphersAndGetOrgIdIfNeededAsync()
-        {
-            string orgId = null;
-            var decCiphers = await _cipherService.GetAllDecryptedAsync();
-            if (IsVaultFilterMyVault)
-            {
-                _allCiphers = decCiphers.Where(c => c.OrganizationId == null).ToList();
-            }
-            else if (IsVaultFilterOrgVault)
-            {
-                orgId = GetVaultFilterOrgId();
-                _allCiphers = decCiphers.Where(c => c.OrganizationId == orgId).ToList();
-            }
-            else
-            {
-                _allCiphers = decCiphers;
-            }
-            return orgId;
-        }
-
-        private async Task FillFoldersAndCollectionsAsync(string orgId)
+        private async Task FillFoldersAndCollectionsAsync()
         {
+            var orgId = GetVaultFilterOrgId();
             var decFolders = await _folderService.GetAllDecryptedAsync();
             var decCollections = await _collectionService.GetAllDecryptedAsync();
             if (IsVaultFilterMyVault)
@@ -676,16 +618,6 @@ namespace Bit.App.Pages
             }
         }
 
-        private bool IsVaultFilterMyVault => _vaultFilterSelection == AppResources.MyVault;
-
-        private bool IsVaultFilterOrgVault => _vaultFilterSelection != AppResources.AllVaults &&
-                                              _vaultFilterSelection != AppResources.MyVault;
-
-        private string GetVaultFilterOrgId()
-        {
-            return _organizations?.FirstOrDefault(o => o.Name == _vaultFilterSelection)?.Id;
-        }
-
         private List<FolderView> BuildFolders(List<FolderView> decFolders)
         {
             var folders = decFolders.Where(f => _allCiphers.Any(c => c.FolderId == f.Id)).ToList();

src/App/Pages/Vault/PasswordHistoryPage.xaml

@@ -39,7 +39,8 @@
                   IsVisible="{Binding ShowNoData, Converter={StaticResource inverseBool}}"
                   ItemsSource="{Binding History}"
                   VerticalOptions="FillAndExpand"
-                  StyleClass="list, list-platform">
+                  StyleClass="list, list-platform"
+                  ExtraDataForLogging="Password History Page">
             <CollectionView.ItemTemplate>
                 <DataTemplate x:DataType="views:PasswordHistoryView">
                     <Grid

src/App/Pages/Vault/PasswordHistoryPageViewModel.cs

@@ -51,8 +51,7 @@ namespace Bit.App.Pages
         private async void CopyAsync(PasswordHistoryView ph)
         {
             await _clipboardService.CopyTextAsync(ph.Password);
-            _platformUtilsService.ShowToast("info", null,
-                string.Format(AppResources.ValueHasBeenCopied, AppResources.Password));
+            _platformUtilsService.ShowToastForCopiedValue(AppResources.Password);
         }
     }
 }

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

@@ -45,6 +45,8 @@ namespace Bit.App.Pages
             _autofocusCts = new CancellationTokenSource(TimeSpan.FromMinutes(3));
 
             var autofocusCts = _autofocusCts;
+            // this task is needed to be awaited OnDisappearing to avoid some crashes
+            // when changing the value of _zxing.IsScanning
             _continuousAutofocusTask = Task.Run(async () =>
             {
                 try
@@ -52,7 +54,7 @@ namespace Bit.App.Pages
                     while (!autofocusCts.IsCancellationRequested)
                     {
                         await Task.Delay(TimeSpan.FromSeconds(2), autofocusCts.Token);
-                        Device.BeginInvokeOnMainThread(() =>
+                        await Device.InvokeOnMainThreadAsync(() =>
                         {
                             if (!autofocusCts.IsCancellationRequested)
                             {
@@ -73,7 +75,10 @@ namespace Bit.App.Pages
         {
             _autofocusCts?.Cancel();
 
-            await _continuousAutofocusTask;
+            if (_continuousAutofocusTask != null)
+            {
+                await _continuousAutofocusTask;
+            }
             _zxing.IsScanning = false;
 
             base.OnDisappearing();

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

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
+using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.Forms;
 
@@ -56,37 +57,44 @@ namespace Bit.App.Pages
 
             _broadcasterService.Subscribe(nameof(ViewPage), async (message) =>
             {
-                if (message.Command == "syncStarted")
+                try
                 {
-                    Device.BeginInvokeOnMainThread(() => IsBusy = true);
-                }
-                else if (message.Command == "syncCompleted")
-                {
-                    await Task.Delay(500);
-                    Device.BeginInvokeOnMainThread(() =>
+                    if (message.Command == "syncStarted")
                     {
-                        IsBusy = false;
-                        if (message.Data is Dictionary<string, object> data && data.ContainsKey("successfully"))
+                        Device.BeginInvokeOnMainThread(() => IsBusy = true);
+                    }
+                    else if (message.Command == "syncCompleted")
+                    {
+                        await Task.Delay(500);
+                        Device.BeginInvokeOnMainThread(() =>
                         {
-                            var success = data["successfully"] as bool?;
-                            if (success.GetValueOrDefault())
+                            IsBusy = false;
+                            if (message.Data is Dictionary<string, object> data && data.ContainsKey("successfully"))
                             {
-                                var task = _vm.LoadAsync(() => AdjustToolbar());
+                                var success = data["successfully"] as bool?;
+                                if (success.GetValueOrDefault())
+                                {
+                                    var task = _vm.LoadAsync(() => AdjustToolbar());
+                                }
                             }
-                        }
-                    });
-                }
-                else if (message.Command == "selectSaveFileResult")
-                {
-                    Device.BeginInvokeOnMainThread(() =>
+                        });
+                    }
+                    else if (message.Command == "selectSaveFileResult")
                     {
-                        var data = message.Data as Tuple<string, string>;
-                        if (data == null)
+                        Device.BeginInvokeOnMainThread(() =>
                         {
-                            return;
-                        }
-                        _vm.SaveFileSelected(data.Item1, data.Item2);
-                    });
+                            var data = message.Data as Tuple<string, string>;
+                            if (data == null)
+                            {
+                                return;
+                            }
+                            _vm.SaveFileSelected(data.Item1, data.Item2);
+                        });
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LoggerHelper.LogEvenIfCantBeResolved(ex);
                 }
             });
             await LoadOnAppearedAsync(_scrollView, true, async () =>

src/App/Pages/Vault/ViewPageViewModel.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Windows.Input;
 using Bit.App.Abstractions;
 using Bit.App.Resources;
 using Bit.App.Utilities;
@@ -11,6 +12,7 @@ using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
+using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -28,6 +30,7 @@ namespace Bit.App.Pages
         private readonly IPasswordRepromptService _passwordRepromptService;
         private readonly ILocalizeService _localizeService;
         private readonly IClipboardService _clipboardService;
+        private readonly ILogger _logger;
 
         private CipherView _cipher;
         private List<ViewPageFieldViewModel> _fields;
@@ -58,10 +61,11 @@ namespace Bit.App.Pages
             _passwordRepromptService = ServiceContainer.Resolve<IPasswordRepromptService>("passwordRepromptService");
             _localizeService = ServiceContainer.Resolve<ILocalizeService>("localizeService");
             _clipboardService = ServiceContainer.Resolve<IClipboardService>("clipboardService");
+            _logger = ServiceContainer.Resolve<ILogger>("logger");
 
-            CopyCommand = new Command<string>((id) => CopyAsync(id, null));
-            CopyUriCommand = new Command<LoginUriView>(CopyUri);
-            CopyFieldCommand = new Command<FieldView>(CopyField);
+            CopyCommand = new AsyncCommand<string>((id) => CopyAsync(id, null), onException: ex => _logger.Exception(ex), allowsMultipleExecutions: false);
+            CopyUriCommand = new AsyncCommand<LoginUriView>(uriView => CopyAsync("LoginUri", uriView.Uri), onException: ex => _logger.Exception(ex), allowsMultipleExecutions: false);
+            CopyFieldCommand = new AsyncCommand<FieldView>(field => CopyAsync(field.Type == FieldType.Hidden ? "H_FieldValue" : "FieldValue", field.Value), onException: ex => _logger.Exception(ex), allowsMultipleExecutions: false);
             LaunchUriCommand = new Command<LoginUriView>(LaunchUri);
             TogglePasswordCommand = new Command(TogglePassword);
             ToggleCardNumberCommand = new Command(ToggleCardNumber);
@@ -72,9 +76,9 @@ namespace Bit.App.Pages
             PageTitle = AppResources.ViewItem;
         }
 
-        public Command CopyCommand { get; set; }
-        public Command CopyUriCommand { get; set; }
-        public Command CopyFieldCommand { get; set; }
+        public ICommand CopyCommand { get; set; }
+        public ICommand CopyUriCommand { get; set; }
+        public ICommand CopyFieldCommand { get; set; }
         public Command LaunchUriCommand { get; set; }
         public Command TogglePasswordCommand { get; set; }
         public Command ToggleCardNumberCommand { get; set; }
@@ -616,7 +620,7 @@ namespace Bit.App.Pages
             _attachmentFilename = null;
         }
 
-        private async void CopyAsync(string id, string text = null)
+        private async Task CopyAsync(string id, string text = null)
         {
             if (_passwordRepromptService.ProtectedFields.Contains(id) && !await PromptPasswordAsync())
             {
@@ -663,7 +667,7 @@ namespace Bit.App.Pages
                 await _clipboardService.CopyTextAsync(text);
                 if (!string.IsNullOrWhiteSpace(name))
                 {
-                    _platformUtilsService.ShowToast("info", null, string.Format(AppResources.ValueHasBeenCopied, name));
+                    _platformUtilsService.ShowToastForCopiedValue(name);
                 }
                 if (id == "LoginPassword")
                 {
@@ -680,16 +684,6 @@ namespace Bit.App.Pages
             }
         }
 
-        private void CopyUri(LoginUriView uri)
-        {
-            CopyAsync("LoginUri", uri.Uri);
-        }
-
-        private void CopyField(FieldView field)
-        {
-            CopyAsync(field.Type == Core.Enums.FieldType.Hidden ? "H_FieldValue" : "FieldValue", field.Value);
-        }
-
         private void LaunchUri(LoginUriView uri)
         {
             if (uri.CanLaunch && (Page as BaseContentPage).DoOnce())

src/App/Pages/VaultFilterViewModel.cs

@@ -0,0 +1,123 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using Bit.App.Resources;
+using Bit.Core.Abstractions;
+using Bit.Core.Enums;
+using Bit.Core.Models.Domain;
+using Bit.Core.Models.View;
+using Xamarin.CommunityToolkit.ObjectModel;
+
+namespace Bit.App.Pages
+{
+    public abstract class VaultFilterViewModel : BaseViewModel
+    {
+        protected abstract ICipherService cipherService { get; }
+        protected abstract IPolicyService policyService { get; }
+        protected abstract IOrganizationService organizationService { get; }
+        protected abstract ILogger logger { get; }
+
+        protected bool _showVaultFilter;
+        protected bool _personalOwnershipPolicyApplies;
+        protected string _vaultFilterSelection;
+        protected List<Organization> _organizations;
+
+        public VaultFilterViewModel()
+        {
+            VaultFilterCommand = new AsyncCommand(VaultFilterOptionsAsync,
+                onException: ex => logger.Exception(ex),
+                allowsMultipleExecutions: false);
+        }
+
+        public ICommand VaultFilterCommand { get; set; }
+
+        public bool ShowVaultFilter
+        {
+            get => _showVaultFilter;
+            set => SetProperty(ref _showVaultFilter, value);
+        }
+
+        public string VaultFilterDescription
+        {
+            get
+            {
+                if (_vaultFilterSelection == null || _vaultFilterSelection == AppResources.AllVaults)
+                {
+                    return string.Format(AppResources.VaultFilterDescription, AppResources.All);
+                }
+                return string.Format(AppResources.VaultFilterDescription, _vaultFilterSelection);
+            }
+            set => SetProperty(ref _vaultFilterSelection, value);
+        }
+
+        public string GetVaultFilterOrgId()
+        {
+            return _organizations?.FirstOrDefault(o => o.Name == _vaultFilterSelection)?.Id;
+        }
+
+        protected bool IsVaultFilterMyVault => _vaultFilterSelection == AppResources.MyVault;
+
+        protected bool IsVaultFilterOrgVault => _vaultFilterSelection != AppResources.AllVaults &&
+                                                _vaultFilterSelection != AppResources.MyVault;
+
+        protected async Task InitVaultFilterAsync(bool shouldUpdateShowVaultFilter)
+        {
+            _organizations = await organizationService.GetAllAsync();
+            if (_organizations?.Any() ?? false)
+            {
+                _personalOwnershipPolicyApplies = await policyService.PolicyAppliesToUser(PolicyType.PersonalOwnership);
+                var singleOrgPolicyApplies = await policyService.PolicyAppliesToUser(PolicyType.OnlyOrg);
+                if (_vaultFilterSelection == null || (_personalOwnershipPolicyApplies && singleOrgPolicyApplies))
+                {
+                    VaultFilterDescription = AppResources.AllVaults;
+                }
+            }
+            if (shouldUpdateShowVaultFilter)
+            {
+                await Task.Delay(100);
+                ShowVaultFilter = await policyService.ShouldShowVaultFilterAsync();
+            }
+        }
+
+        protected async Task<List<CipherView>> GetAllCiphersAsync()
+        {
+            var decCiphers = await cipherService.GetAllDecryptedAsync();
+            if (IsVaultFilterMyVault)
+            {
+                return decCiphers.Where(c => c.OrganizationId == null).ToList();
+            }
+            if (IsVaultFilterOrgVault)
+            {
+                var orgId = GetVaultFilterOrgId();
+                return decCiphers.Where(c => c.OrganizationId == orgId).ToList();
+            }
+            return decCiphers;
+        }
+
+        protected async Task VaultFilterOptionsAsync()
+        {
+            var options = new List<string> { AppResources.AllVaults };
+            if (!_personalOwnershipPolicyApplies)
+            {
+                options.Add(AppResources.MyVault);
+            }
+            if (_organizations.Any())
+            {
+                options.AddRange(_organizations.OrderBy(o => o.Name).Select(o => o.Name));
+            }
+            var selection = await Page.DisplayActionSheet(AppResources.FilterByVault, AppResources.Cancel, null,
+                options.ToArray());
+            if (selection == null || selection == AppResources.Cancel ||
+                (_vaultFilterSelection == null && selection == AppResources.AllVaults) ||
+                (_vaultFilterSelection != null && _vaultFilterSelection == selection))
+            {
+                return;
+            }
+            VaultFilterDescription = selection;
+            await OnVaultFilterSelectedAsync();
+        }
+
+        protected abstract Task OnVaultFilterSelectedAsync();
+    }
+}

src/App/Resources/AppResources.Designer.cs

@@ -1,7 +1,6 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -10,10 +9,9 @@
 
 namespace Bit.App.Resources {
     using System;
-    using System.Reflection;
     
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.1.0.0")]
     [System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class AppResources {
@@ -353,12 +351,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        public static string Authenticator {
-            get {
-                return ResourceManager.GetString("Authenticator", resourceCulture);
-            }
-        }
-        
         public static string Name {
             get {
                 return ResourceManager.GetString("Name", resourceCulture);
@@ -2705,6 +2697,18 @@ namespace Bit.App.Resources {
             }
         }
         
+        public static string DefaultDarkTheme {
+            get {
+                return ResourceManager.GetString("DefaultDarkTheme", resourceCulture);
+            }
+        }
+        
+        public static string DefaultDarkThemeDescription {
+            get {
+                return ResourceManager.GetString("DefaultDarkThemeDescription", resourceCulture);
+            }
+        }
+        
         public static string CopyNotes {
             get {
                 return ResourceManager.GetString("CopyNotes", resourceCulture);
@@ -2735,6 +2739,12 @@ namespace Bit.App.Resources {
             }
         }
         
+        public static string Nord {
+            get {
+                return ResourceManager.GetString("Nord", resourceCulture);
+            }
+        }
+        
         public static string BlacklistedUris {
             get {
                 return ResourceManager.GetString("BlacklistedUris", resourceCulture);
@@ -3929,15 +3939,15 @@ namespace Bit.App.Resources {
             }
         }
         
-        public static string ReportCrashLogs {
+        public static string SubmitCrashLogs {
             get {
-                return ResourceManager.GetString("ReportCrashLogs", resourceCulture);
+                return ResourceManager.GetString("SubmitCrashLogs", resourceCulture);
             }
         }
         
-        public static string ReportCrashLogsDescription {
+        public static string SubmitCrashLogsDescription {
             get {
-                return ResourceManager.GetString("ReportCrashLogsDescription", resourceCulture);
+                return ResourceManager.GetString("SubmitCrashLogsDescription", resourceCulture);
             }
         }
         

src/App/Resources/AppResources.resx

@@ -299,10 +299,6 @@
     <value>My Vault</value>
     <comment>The title for the vault page.</comment>
   </data>
-  <data name="Authenticator" xml:space="preserve">
-    <value>Authenticator</value>
-    <comment>Authenticator TOTP feature</comment>
-  </data>
   <data name="Name" xml:space="preserve">
     <value>Name</value>
     <comment>Label for an entity name.</comment>
@@ -1545,6 +1541,12 @@
   <data name="ThemeDefault" xml:space="preserve">
     <value>Default (System)</value>
   </data>
+  <data name="DefaultDarkTheme" xml:space="preserve">
+    <value>Default Dark Theme</value>
+  </data>
+  <data name="DefaultDarkThemeDescription" xml:space="preserve">
+    <value>Choose the dark theme to use when using Default (System) theme while your device's dark mode is enabled</value>
+  </data>
   <data name="CopyNotes" xml:space="preserve">
     <value>Copy Note</value>
   </data>
@@ -1561,6 +1563,10 @@
     <value>Black</value>
     <comment>The color black</comment>
   </data>
+  <data name="Nord" xml:space="preserve">
+    <value>Nord</value>
+    <comment>'Nord' is the name of a specific color scheme. It should not be translated.</comment>
+  </data>
   <data name="BlacklistedUris" xml:space="preserve">
     <value>Blacklisted URIs</value>
   </data>
@@ -2200,11 +2206,11 @@
   <data name="EnterTheVerificationCodeThatWasSentToYourEmail" xml:space="preserve">
     <value>Enter the verification code that was sent to your email</value>
   </data>
-  <data name="ReportCrashLogs" xml:space="preserve">
-    <value>Report crash logs</value>
+  <data name="SubmitCrashLogs" xml:space="preserve">
+    <value>Submit crash logs</value>
   </data>
-  <data name="ReportCrashLogsDescription" xml:space="preserve">
-    <value>Help Bitwarden improve app stability by allowing crash reports.</value>
+  <data name="SubmitCrashLogsDescription" xml:space="preserve">
+    <value>Help Bitwarden improve app stability by submitting crash reports.</value>
   </data>
   <data name="OptionsExpanded" xml:space="preserve">
     <value>Options are expanded, tap to collapse.</value>

src/App/Services/MobilePlatformUtilsService.cs

@@ -20,6 +20,7 @@ namespace Bit.App.Services
         private const int DialogPromiseExpiration = 600000; // 10 minutes
 
         private readonly IDeviceActionService _deviceActionService;
+        private readonly IClipboardService _clipboardService;
         private readonly IMessagingService _messagingService;
         private readonly IBroadcasterService _broadcasterService;
 
@@ -28,10 +29,12 @@ namespace Bit.App.Services
 
         public MobilePlatformUtilsService(
             IDeviceActionService deviceActionService,
+            IClipboardService clipboardService,
             IMessagingService messagingService,
             IBroadcasterService broadcasterService)
         {
             _deviceActionService = deviceActionService;
+            _clipboardService = clipboardService;
             _messagingService = messagingService;
             _broadcasterService = broadcasterService;
         }
@@ -129,6 +132,15 @@ namespace Bit.App.Services
             return true;
         }
 
+        public void ShowToastForCopiedValue(string valueNameCopied)
+        {
+            if (!_clipboardService.IsCopyNotificationHandledByPlatform())
+            {
+                ShowToast("info", null,
+                    string.Format(AppResources.ValueHasBeenCopied, valueNameCopied));
+            }
+        }
+
         public bool SupportsFido2()
         {
             return _deviceActionService.SupportsFido2();

src/App/Services/MobileStorageService.cs

@@ -25,6 +25,7 @@ namespace Bit.App.Services
             Constants.LastBuildKey,
             Constants.ClearCiphersCacheKey,
             Constants.BiometricIntegrityKey,
+            Constants.iOSExtensionActiveUserIdKey,
             Constants.iOSAutoFillClearCiphersCacheKey,
             Constants.iOSAutoFillBiometricIntegrityKey,
             Constants.iOSExtensionClearCiphersCacheKey,
@@ -32,7 +33,7 @@ namespace Bit.App.Services
             Constants.iOSShareExtensionClearCiphersCacheKey,
             Constants.iOSShareExtensionBiometricIntegrityKey,
             Constants.RememberedEmailKey,
-            Constants.RememberedOrgIdentifierKey,
+            Constants.RememberedOrgIdentifierKey
         };
 
         public MobileStorageService(

src/App/Styles/Base.xaml

@@ -268,6 +268,16 @@
         <Setter Property="TextColor"
                 Value="{DynamicResource ButtonColor}" />
     </Style>
+    <Style TargetType="Button"
+           ApplyToDerivedTypes="True"
+           Class="list-row-button-text">
+        <Setter Property="BackgroundColor"
+                Value="Transparent" />
+        <Setter Property="Padding"
+                Value="0" />
+        <Setter Property="TextColor"
+                Value="{DynamicResource ButtonTextColor}" />
+    </Style>
     <Style TargetType="Button"
            ApplyToDerivedTypes="True"
            Class="segmented-button">

src/App/Utilities/AccountManagement/AccountsManager.cs

@@ -0,0 +1,217 @@
+using System;
+using System.Threading.Tasks;
+using Bit.App.Abstractions;
+using Bit.App.Models;
+using Bit.App.Resources;
+using Bit.Core.Abstractions;
+using Bit.Core.Enums;
+using Bit.Core.Models.Domain;
+using Bit.Core.Utilities;
+using Xamarin.Forms;
+
+namespace Bit.App.Utilities.AccountManagement
+{
+    public class AccountsManager : IAccountsManager
+    {
+        private readonly IBroadcasterService _broadcasterService;
+        private readonly IVaultTimeoutService _vaultTimeoutService;
+        private readonly IStorageService _secureStorageService;
+        private readonly IStateService _stateService;
+        private readonly IPlatformUtilsService _platformUtilsService;
+        private readonly IAuthService _authService;
+
+        Func<AppOptions> _getOptionsFunc;
+        private IAccountsManagerHost _accountsManagerHost;
+
+        public AccountsManager(IBroadcasterService broadcasterService,
+                               IVaultTimeoutService vaultTimeoutService,
+                               IStorageService secureStorageService,
+                               IStateService stateService,
+                               IPlatformUtilsService platformUtilsService,
+                               IAuthService authService)
+        {
+            _broadcasterService = broadcasterService;
+            _vaultTimeoutService = vaultTimeoutService;
+            _secureStorageService = secureStorageService;
+            _stateService = stateService;
+            _platformUtilsService = platformUtilsService;
+            _authService = authService;
+        }
+
+        private AppOptions Options => _getOptionsFunc?.Invoke() ?? new AppOptions { IosExtension = true };
+
+        public void Init(Func<AppOptions> getOptionsFunc, IAccountsManagerHost accountsManagerHost)
+        {
+            _getOptionsFunc = getOptionsFunc;
+            _accountsManagerHost = accountsManagerHost;
+
+            _broadcasterService.Subscribe(nameof(AccountsManager), OnMessage);
+        }
+
+        public async Task NavigateOnAccountChangeAsync(bool? isAuthed = null)
+        {
+            // TODO: this could be improved by doing chain of responsability pattern
+            // but for now it may be an overkill, if logic gets more complex consider refactoring it
+
+            var authed = isAuthed ?? await _stateService.IsAuthenticatedAsync();
+            if (authed)
+            {
+                if (await _vaultTimeoutService.IsLoggedOutByTimeoutAsync() ||
+                    await _vaultTimeoutService.ShouldLogOutByTimeoutAsync())
+                {
+                    // TODO implement orgIdentifier flow to SSO Login page, same as email flow below
+                    // var orgIdentifier = await _stateService.GetOrgIdentifierAsync();
+
+                    var email = await _stateService.GetEmailAsync();
+                    Options.HideAccountSwitcher = await _stateService.GetActiveUserIdAsync() == null;
+                    _accountsManagerHost.Navigate(NavigationTarget.Login, new LoginNavigationParams(email));
+                }
+                else if (await _vaultTimeoutService.IsLockedAsync() ||
+                         await _vaultTimeoutService.ShouldLockAsync())
+                {
+                    _accountsManagerHost.Navigate(NavigationTarget.Lock);
+                }
+                else if (Options.FromAutofillFramework && Options.SaveType.HasValue)
+                {
+                    _accountsManagerHost.Navigate(NavigationTarget.AddEditCipher);
+                }
+                else if (Options.Uri != null)
+                {
+                    _accountsManagerHost.Navigate(NavigationTarget.AutofillCiphers);
+                }
+                else if (Options.CreateSend != null)
+                {
+                    _accountsManagerHost.Navigate(NavigationTarget.SendAddEdit);
+                }
+                else
+                {
+                    _accountsManagerHost.Navigate(NavigationTarget.Home);
+                }
+            }
+            else
+            {
+                Options.HideAccountSwitcher = await _stateService.GetActiveUserIdAsync() == null;
+                if (await _vaultTimeoutService.IsLoggedOutByTimeoutAsync() ||
+                    await _vaultTimeoutService.ShouldLogOutByTimeoutAsync())
+                {
+                    // TODO implement orgIdentifier flow to SSO Login page, same as email flow below
+                    // var orgIdentifier = await _stateService.GetOrgIdentifierAsync();
+
+                    var email = await _stateService.GetEmailAsync();
+                    _accountsManagerHost.Navigate(NavigationTarget.Login, new LoginNavigationParams(email));
+                }
+                else
+                {
+                    _accountsManagerHost.Navigate(NavigationTarget.HomeLogin);
+                }
+            }
+        }
+
+        private async void OnMessage(Message message)
+        {
+            switch (message.Command)
+            {
+                case AccountsManagerMessageCommands.LOCKED:
+                    Locked(message.Data as Tuple<string, bool>);
+                    break;
+                case AccountsManagerMessageCommands.LOCK_VAULT:
+                    await _vaultTimeoutService.LockAsync(true);
+                    break;
+                case AccountsManagerMessageCommands.LOGOUT:
+                    LogOut(message.Data as Tuple<string, bool, bool>);
+                    break;
+                case AccountsManagerMessageCommands.LOGGED_OUT:
+                    // Clean up old migrated key if they ever log out.
+                    await _secureStorageService.RemoveAsync("oldKey");
+                    break;
+                case AccountsManagerMessageCommands.ADD_ACCOUNT:
+                    AddAccount();
+                    break;
+                case AccountsManagerMessageCommands.ACCOUNT_ADDED:
+                    await _accountsManagerHost.UpdateThemeAsync();
+                    break;
+                case AccountsManagerMessageCommands.SWITCHED_ACCOUNT:
+                    await SwitchedAccountAsync();
+                    break;
+            }
+        }
+
+        private void Locked(Tuple<string, bool> extras)
+        {
+            var userId = extras?.Item1;
+            var userInitiated = extras?.Item2 ?? false;
+            Device.BeginInvokeOnMainThread(async () => await LockedAsync(userId, userInitiated));
+        }
+
+        private async Task LockedAsync(string userId, bool userInitiated)
+        {
+            if (!await _stateService.IsActiveAccountAsync(userId))
+            {
+                _platformUtilsService.ShowToast("info", null, AppResources.AccountLockedSuccessfully);
+                return;
+            }
+
+            var autoPromptBiometric = !userInitiated;
+            if (autoPromptBiometric && Device.RuntimePlatform == Device.iOS)
+            {
+                var vaultTimeout = await _stateService.GetVaultTimeoutAsync();
+                if (vaultTimeout == 0)
+                {
+                    autoPromptBiometric = false;
+                }
+            }
+
+            await _accountsManagerHost.SetPreviousPageInfoAsync();
+
+            Device.BeginInvokeOnMainThread(() => _accountsManagerHost.Navigate(NavigationTarget.Lock, new LockNavigationParams(autoPromptBiometric)));
+        }
+
+        private void AddAccount()
+        {
+            Device.BeginInvokeOnMainThread(() =>
+            {
+                Options.HideAccountSwitcher = false;
+                _accountsManagerHost.Navigate(NavigationTarget.HomeLogin);
+            });
+        }
+
+        private void LogOut(Tuple<string, bool, bool> extras)
+        {
+            var userId = extras?.Item1;
+            var userInitiated = extras?.Item2 ?? true;
+            var expired = extras?.Item3 ?? false;
+            Device.BeginInvokeOnMainThread(async () => await LogOutAsync(userId, userInitiated, expired));
+        }
+
+        private async Task LogOutAsync(string userId, bool userInitiated, bool expired)
+        {
+            await AppHelpers.LogOutAsync(userId, userInitiated);
+            await NavigateOnAccountChangeAsync();
+            _authService.LogOut(() =>
+            {
+                if (expired)
+                {
+                    _platformUtilsService.ShowToast("warning", null, AppResources.LoginExpired);
+                }
+            });
+        }
+
+        private async Task SwitchedAccountAsync()
+        {
+            await AppHelpers.OnAccountSwitchAsync();
+            await Device.InvokeOnMainThreadAsync(async () =>
+            {
+                if (await _vaultTimeoutService.ShouldTimeoutAsync())
+                {
+                    await _vaultTimeoutService.ExecuteTimeoutActionAsync();
+                }
+                else
+                {
+                    await NavigateOnAccountChangeAsync();
+                }
+                await Task.Delay(50);
+                await _accountsManagerHost.UpdateThemeAsync();
+            });
+        }
+    }
+}

src/App/Utilities/AccountManagement/LockNavigationParams.cs

@@ -0,0 +1,14 @@
+using Bit.App.Abstractions;
+
+namespace Bit.App.Utilities.AccountManagement
+{
+    public class LockNavigationParams : INavigationParams
+    {
+        public LockNavigationParams(bool autoPromptBiometric = true)
+        {
+            AutoPromptBiometric = autoPromptBiometric;
+        }
+
+        public bool AutoPromptBiometric { get; }
+    }
+}

src/App/Utilities/AccountManagement/LoginNavigationParams.cs

@@ -0,0 +1,14 @@
+using Bit.App.Abstractions;
+
+namespace Bit.App.Utilities.AccountManagement
+{
+    public class LoginNavigationParams : INavigationParams
+    {
+        public LoginNavigationParams(string email)
+        {
+            Email = email;
+        }
+
+        public string Email { get; }
+    }
+}

src/App/Utilities/AppHelpers.cs

@@ -97,16 +97,14 @@ namespace Bit.App.Utilities
             else if (selection == AppResources.CopyUsername)
             {
                 await clipboardService.CopyTextAsync(cipher.Login.Username);
-                platformUtilsService.ShowToast("info", null,
-                    string.Format(AppResources.ValueHasBeenCopied, AppResources.Username));
+                platformUtilsService.ShowToastForCopiedValue(AppResources.Username);
             }
             else if (selection == AppResources.CopyPassword)
             {
                 if (cipher.Reprompt == CipherRepromptType.None || await passwordRepromptService.ShowPasswordPromptAsync())
                 {
                     await clipboardService.CopyTextAsync(cipher.Login.Password);
-                    platformUtilsService.ShowToast("info", null,
-                        string.Format(AppResources.ValueHasBeenCopied, AppResources.Password));
+                    platformUtilsService.ShowToastForCopiedValue(AppResources.Password);
                     var task = eventService.CollectAsync(Core.Enums.EventType.Cipher_ClientCopiedPassword, cipher.Id);
                 }
             }
@@ -119,8 +117,7 @@ namespace Bit.App.Utilities
                     if (!string.IsNullOrWhiteSpace(totp))
                     {
                         await clipboardService.CopyTextAsync(totp);
-                        platformUtilsService.ShowToast("info", null,
-                            string.Format(AppResources.ValueHasBeenCopied, AppResources.VerificationCodeTotp));
+                        platformUtilsService.ShowToastForCopiedValue(AppResources.VerificationCodeTotp);
                     }
                 }
             }
@@ -133,8 +130,7 @@ namespace Bit.App.Utilities
                 if (cipher.Reprompt == CipherRepromptType.None || await passwordRepromptService.ShowPasswordPromptAsync())
                 {
                     await clipboardService.CopyTextAsync(cipher.Card.Number);
-                    platformUtilsService.ShowToast("info", null,
-                        string.Format(AppResources.ValueHasBeenCopied, AppResources.Number));
+                    platformUtilsService.ShowToastForCopiedValue(AppResources.Number);
                 }
             }
             else if (selection == AppResources.CopySecurityCode)
@@ -142,16 +138,14 @@ namespace Bit.App.Utilities
                 if (cipher.Reprompt == CipherRepromptType.None || await passwordRepromptService.ShowPasswordPromptAsync())
                 {
                     await clipboardService.CopyTextAsync(cipher.Card.Code);
-                    platformUtilsService.ShowToast("info", null,
-                        string.Format(AppResources.ValueHasBeenCopied, AppResources.SecurityCode));
+                    platformUtilsService.ShowToastForCopiedValue(AppResources.SecurityCode);
                     var task = eventService.CollectAsync(Core.Enums.EventType.Cipher_ClientCopiedCardCode, cipher.Id);
                 }
             }
             else if (selection == AppResources.CopyNotes)
             {
                 await clipboardService.CopyTextAsync(cipher.Notes);
-                platformUtilsService.ShowToast("info", null,
-                    string.Format(AppResources.ValueHasBeenCopied, AppResources.Notes));
+                platformUtilsService.ShowToastForCopiedValue(AppResources.Notes);
             }
             return selection;
         }
@@ -262,8 +256,7 @@ namespace Bit.App.Utilities
             var platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
             var clipboardService = ServiceContainer.Resolve<IClipboardService>("clipboardService");
             await clipboardService.CopyTextAsync(GetSendUrl(send));
-            platformUtilsService.ShowToast("info", null,
-                string.Format(AppResources.ValueHasBeenCopied, AppResources.SendLink));
+            platformUtilsService.ShowToastForCopiedValue(AppResources.SendLink);
         }
 
         public static async Task ShareSendUrlAsync(SendView send)

src/App/Utilities/ThemeManager.cs

@@ -17,13 +17,18 @@ namespace Bit.App.Utilities
 
         public static bool IsThemeDirty = false;
 
-        public static void SetThemeStyle(string name, ResourceDictionary resources)
+        public const string Light = "light";
+        public const string Dark = "dark";
+        public const string Black = "black";
+        public const string Nord = "nord";
+
+        public static void SetThemeStyle(string name, string autoDarkName, ResourceDictionary resources)
         {
             try
             {
                 Resources = () => resources;
 
-                var newTheme = NeedsThemeUpdate(name, resources);
+                var newTheme = NeedsThemeUpdate(name, autoDarkName, resources);
                 if (newTheme is null)
                 {
                     return;
@@ -85,22 +90,30 @@ namespace Bit.App.Utilities
                 : Activator.CreateInstance(themeType) as ResourceDictionary;
         }
 
-        static ResourceDictionary NeedsThemeUpdate(string themeName, ResourceDictionary resources)
+        static ResourceDictionary NeedsThemeUpdate(string themeName, string autoDarkThemeName, ResourceDictionary resources)
         {
             switch (themeName)
             {
-                case "dark":
+                case Dark:
                     return CheckAndGetThemeForMergedDictionaries(typeof(Dark), resources);
-                case "black":
+                case Black:
                     return CheckAndGetThemeForMergedDictionaries(typeof(Black), resources);
-                case "nord":
+                case Nord:
                     return CheckAndGetThemeForMergedDictionaries(typeof(Nord), resources);
-                case "light":
+                case Light:
                     return CheckAndGetThemeForMergedDictionaries(typeof(Light), resources);
                 default:
                     if (OsDarkModeEnabled())
                     {
-                        return CheckAndGetThemeForMergedDictionaries(typeof(Dark), resources);
+                        switch (autoDarkThemeName)
+                        {
+                            case Black:
+                                return CheckAndGetThemeForMergedDictionaries(typeof(Black), resources);
+                            case Nord:
+                                return CheckAndGetThemeForMergedDictionaries(typeof(Nord), resources);
+                            default:
+                                return CheckAndGetThemeForMergedDictionaries(typeof(Dark), resources);
+                        }
                     }
                     return CheckAndGetThemeForMergedDictionaries(typeof(Light), resources);
             }
@@ -108,7 +121,7 @@ namespace Bit.App.Utilities
 
         public static void SetTheme(ResourceDictionary resources)
         {
-            SetThemeStyle(GetTheme(), resources);
+            SetThemeStyle(GetTheme(), GetAutoDarkTheme(), resources);
         }
 
         public static string GetTheme()
@@ -117,6 +130,12 @@ namespace Bit.App.Utilities
             return stateService.GetThemeAsync().GetAwaiter().GetResult();
         }
 
+        public static string GetAutoDarkTheme()
+        {
+            var stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            return stateService.GetAutoDarkThemeAsync().GetAwaiter().GetResult();
+        }
+
         public static bool OsDarkModeEnabled()
         {
             if (Application.Current == null)

src/Core/Abstractions/IApiService.cs

@@ -44,7 +44,7 @@ namespace Bit.Core.Abstractions
         Task PutDeleteCipherAsync(string id);
         Task<CipherResponse> PutRestoreCipherAsync(string id);
         Task RefreshIdentityTokenAsync();
-        Task<object> PreValidateSso(string identifier);
+        Task<SsoPrevalidateResponse> PreValidateSso(string identifier);
         Task<TResponse> SendAsync<TRequest, TResponse>(HttpMethod method, string path,
             TRequest body, bool authed, bool hasResponse, bool logoutOnUnauthorized = true);
         void SetUrls(EnvironmentUrls urls);

src/Core/Abstractions/IBroadcasterService.cs

@@ -5,7 +5,8 @@ namespace Bit.Core.Abstractions
 {
     public interface IBroadcasterService
     {
-        void Send(Message message, string id = null);
+        void Send(Message message);
+        void Send(Message message, string id);
         void Subscribe(string id, Action<Message> messageCallback);
         void Unsubscribe(string id);
     }

src/Core/Abstractions/IClipboardService.cs

@@ -8,9 +8,17 @@ namespace Bit.Core.Abstractions
         /// Copies the <paramref name="text"/> to the Clipboard.
         /// If <paramref name="expiresInMs"/> is set > 0 then the Clipboard will be cleared after this time in milliseconds.
         /// if less than 0 then it takes the configuration that the user set in Options.
+        /// If <paramref name="isSensitive"/> is true the sensitive flag is passed to the clipdata to obfuscate the
+        /// clipboard text in the popup (Android 13+ only)
         /// </summary>
         /// <param name="text">Text to be copied to the Clipboard</param>
         /// <param name="expiresInMs">Expiration time in milliseconds of the copied text</param>
-        Task CopyTextAsync(string text, int expiresInMs = -1);
+        /// <param name="isSensitive">Flag to mark copied text as sensitive</param>
+        Task CopyTextAsync(string text, int expiresInMs = -1, bool isSensitive = true);
+
+        /// <summary>
+        /// Returns true if the platform provides its own notification when text is copied to the clipboard
+        /// </summary>
+        bool IsCopyNotificationHandledByPlatform();
     }
 }

src/Core/Abstractions/IPlatformUtilsService.cs

@@ -23,6 +23,7 @@ namespace Bit.Core.Abstractions
         Task<(string password, bool valid)> ShowPasswordDialogAndGetItAsync(string title, string body, Func<string, Task<bool>> validator);
         void ShowToast(string type, string title, string text, Dictionary<string, object> options = null);
         void ShowToast(string type, string title, string[] text, Dictionary<string, object> options = null);
+        void ShowToastForCopiedValue(string valueNameCopied);
         bool SupportsFido2();
         bool SupportsDuo();
         Task<bool> SupportsBiometricAsync();

src/Core/Abstractions/IStateService.cs

@@ -14,6 +14,7 @@ namespace Bit.Core.Abstractions
         Task<string> GetActiveUserIdAsync();
         Task<bool> IsActiveAccountAsync(string userId = null);
         Task SetActiveUserAsync(string userId);
+        Task CheckExtensionActiveUserAndSwitchIfNeededAsync();
         Task<bool> IsAuthenticatedAsync(string userId = null);
         Task<string> GetUserIdAsync(string email);
         Task RefreshAccountViewsAsync(bool allowAddAccountRow);
@@ -109,6 +110,8 @@ namespace Bit.Core.Abstractions
         Task SetRememberedOrgIdentifierAsync(string value);
         Task<string> GetThemeAsync(string userId = null);
         Task SetThemeAsync(string value, string userId = null);
+        Task<string> GetAutoDarkThemeAsync(string userId = null);
+        Task SetAutoDarkThemeAsync(string value, string userId = null);
         Task<bool?> GetAddSitePromptShownAsync(string userId = null);
         Task SetAddSitePromptShownAsync(bool? value, string userId = null);
         Task<bool?> GetPushInitialPromptShownAsync();
@@ -145,5 +148,6 @@ namespace Bit.Core.Abstractions
         Task SetRefreshTokenAsync(string value, bool skipTokenStorage, string userId = null);
         Task<string> GetTwoFactorTokenAsync(string email = null);
         Task SetTwoFactorTokenAsync(string value, string email = null);
+        Task SaveExtensionActiveUserIdToStorageAsync(string userId);
     }
 }

src/Core/Constants.cs

@@ -25,6 +25,7 @@
         public static string iOSExtensionBiometricIntegrityKey = "iOSExtensionBiometricIntegrityState";
         public static string iOSShareExtensionClearCiphersCacheKey = "iOSShareExtensionClearCiphersCache";
         public static string iOSShareExtensionBiometricIntegrityKey = "iOSShareExtensionBiometricIntegrityState";
+        public static string iOSExtensionActiveUserIdKey = "iOSExtensionActiveUserId";
         public static string EventCollectionKey = "eventCollection";
         public static string RememberedEmailKey = "rememberedEmail";
         public static string RememberedOrgIdentifierKey = "rememberedOrgIdentifier";
@@ -72,6 +73,7 @@
         public static string DisableFaviconKey(string userId) => $"disableFavicon_{userId}";
         public static string DefaultUriMatchKey(string userId) => $"defaultUriMatch_{userId}";
         public static string ThemeKey(string userId) => $"theme_{userId}";
+        public static string AutoDarkThemeKey(string userId) => $"autoDarkTheme_{userId}";
         public static string DisableAutoTotpCopyKey(string userId) => $"disableAutoTotpCopy_{userId}";
         public static string PreviousPageKey(string userId) => $"previousPage_{userId}";
         public static string PasswordRepromptAutofillKey(string userId) => $"passwordRepromptAutofillKey_{userId}";

src/Core/Enums/NavigationTarget.cs

@@ -0,0 +1,13 @@
+namespace Bit.Core.Enums
+{
+    public enum NavigationTarget
+    {
+        HomeLogin,
+        Login,
+        Lock,
+        Home,
+        AddEditCipher,
+        AutofillCiphers,
+        SendAddEdit
+    }
+}

src/Core/Models/Response/SsoPrevalidateResponse.cs

@@ -0,0 +1,7 @@
+namespace Bit.Core.Models.Response
+{
+    public class SsoPrevalidateResponse
+    {
+        public string Token { get; set; }
+    }
+}

src/Core/Services/ApiService.cs

@@ -547,7 +547,7 @@ namespace Bit.Core.Services
             return accessToken;
         }
 
-        public async Task<object> PreValidateSso(string identifier)
+        public async Task<SsoPrevalidateResponse> PreValidateSso(string identifier)
         {
             var path = "/account/prevalidate?domainHint=" + WebUtility.UrlEncode(identifier);
             using (var requestMessage = new HttpRequestMessage())
@@ -571,7 +571,8 @@ namespace Bit.Core.Services
                     var error = await HandleErrorAsync(response, false, true);
                     throw new ApiException(error);
                 }
-                return null;
+                var responseJsonString = await response.Content.ReadAsStringAsync();
+                return JsonConvert.DeserializeObject<SsoPrevalidateResponse>(responseJsonString);
             }
         }
 

src/Core/Services/BroadcasterService.cs

@@ -8,24 +8,58 @@ namespace Bit.App.Services
 {
     public class BroadcasterService : IBroadcasterService
     {
+        private readonly ILogger _logger;
         private readonly Dictionary<string, Action<Message>> _subscribers = new Dictionary<string, Action<Message>>();
         private object _myLock = new object();
 
-        public void Send(Message message, string id = null)
+        public BroadcasterService(ILogger logger)
+        {
+            _logger = logger;
+        }
+
+        public void Send(Message message)
         {
             lock (_myLock)
             {
-                if (!string.IsNullOrWhiteSpace(id))
-                {
-                    if (_subscribers.ContainsKey(id))
-                    {
-                        Task.Run(() => _subscribers[id].Invoke(message));
-                    }
-                    return;
-                }
                 foreach (var sub in _subscribers)
                 {
-                    Task.Run(() => sub.Value.Invoke(message));
+                    Task.Run(() =>
+                    {
+                        try
+                        {
+                            sub.Value(message);
+                        }
+                        catch (Exception ex)
+                        {
+                            _logger.Exception(ex);
+                        }
+                    });
+                }
+            }
+        }
+
+        public void Send(Message message, string id)
+        {
+            if (string.IsNullOrWhiteSpace(id))
+            {
+                return;
+            }
+
+            lock (_myLock)
+            {
+                if (_subscribers.TryGetValue(id, out var action))
+                {
+                    Task.Run(() =>
+                    {
+                        try
+                        {
+                            action(message);
+                        }
+                        catch (Exception ex)
+                        {
+                            _logger.Exception(ex);
+                        }
+                    });
                 }
             }
         }
@@ -34,14 +68,7 @@ namespace Bit.App.Services
         {
             lock (_myLock)
             {
-                if (_subscribers.ContainsKey(id))
-                {
-                    _subscribers[id] = messageCallback;
-                }
-                else
-                {
-                    _subscribers.Add(id, messageCallback);
-                }
+                _subscribers[id] = messageCallback;
             }
         }
 

src/Core/Services/PolicyService.cs

@@ -249,9 +249,14 @@ namespace Bit.Core.Services
 
         public async Task<bool> ShouldShowVaultFilterAsync()
         {
-            var organizations = await _organizationService.GetAllAsync();
             var personalOwnershipPolicyApplies = await PolicyAppliesToUser(PolicyType.PersonalOwnership);
-            return (organizations?.Any() ?? false) && !personalOwnershipPolicyApplies;
+            var singleOrgPolicyApplies = await PolicyAppliesToUser(PolicyType.OnlyOrg);
+            if (personalOwnershipPolicyApplies && singleOrgPolicyApplies)
+            {
+                return false;
+            }
+            var organizations = await _organizationService.GetAllAsync();
+            return organizations?.Any() ?? false;
         }
 
         private bool? GetPolicyBool(Policy policy, string key)

src/Core/Services/StateService.cs

@@ -15,16 +15,20 @@ namespace Bit.Core.Services
     {
         private readonly IStorageService _storageService;
         private readonly IStorageService _secureStorageService;
+        private readonly IMessagingService _messagingService;
 
         private State _state;
         private bool _migrationChecked;
 
         public List<AccountView> AccountViews { get; set; }
 
-        public StateService(IStorageService storageService, IStorageService secureStorageService)
+        public StateService(IStorageService storageService,
+                            IStorageService secureStorageService,
+                            IMessagingService messagingService)
         {
             _storageService = storageService;
             _secureStorageService = secureStorageService;
+            _messagingService = messagingService;
         }
 
         public async Task<string> GetActiveUserIdAsync()
@@ -67,6 +71,28 @@ namespace Bit.Core.Services
             await SetPreAuthEnvironmentUrlsAsync(await GetEnvironmentUrlsAsync());
         }
 
+        public async Task CheckExtensionActiveUserAndSwitchIfNeededAsync()
+        {
+            var extensionUserId = await GetExtensionActiveUserIdFromStorageAsync();
+            if (string.IsNullOrEmpty(extensionUserId))
+            {
+                return;
+            }
+
+            if (_state?.ActiveUserId == extensionUserId)
+            {
+                // Clear the value in case the user changes the active user from the app
+                // so if that happens and the user sends the app to background and comes back
+                // the user is not changed again.
+                await SaveExtensionActiveUserIdToStorageAsync(null);
+                return;
+            }
+
+            await SetActiveUserAsync(extensionUserId);
+            await SaveExtensionActiveUserIdToStorageAsync(null);
+            _messagingService.Send(AccountsManagerMessageCommands.SWITCHED_ACCOUNT);
+        }
+
         public async Task<bool> IsAuthenticatedAsync(string userId = null)
         {
             return await GetAccessTokenAsync(userId) != null;
@@ -898,6 +924,25 @@ namespace Bit.Core.Services
             SetValueGloballyAsync(Constants.ThemeKey, value, reconciledOptions).FireAndForget();
         }
 
+        public async Task<string> GetAutoDarkThemeAsync(string userId = null)
+        {
+            var reconciledOptions = ReconcileOptions(new StorageOptions { UserId = userId },
+                await GetDefaultStorageOptionsAsync());
+            var key = Constants.AutoDarkThemeKey(reconciledOptions.UserId);
+            return await GetValueAsync<string>(key, reconciledOptions);
+        }
+
+        public async Task SetAutoDarkThemeAsync(string value, string userId = null)
+        {
+            var reconciledOptions = ReconcileOptions(new StorageOptions { UserId = userId },
+                await GetDefaultStorageOptionsAsync());
+            var key = Constants.AutoDarkThemeKey(reconciledOptions.UserId);
+            await SetValueAsync(key, value, reconciledOptions);
+
+            // TODO remove this to restore per-account Theme support
+            SetValueGloballyAsync(Constants.AutoDarkThemeKey, value, reconciledOptions).FireAndForget();
+        }
+
         public async Task<bool?> GetAddSitePromptShownAsync(string userId = null)
         {
             var reconciledOptions = ReconcileOptions(new StorageOptions { UserId = userId },
@@ -1388,6 +1433,7 @@ namespace Bit.Core.Services
                 await SetPasswordVerifiedAutofillAsync(null, userId);
                 await SetSyncOnRefreshAsync(null, userId);
                 await SetThemeAsync(null, userId);
+                await SetAutoDarkThemeAsync(null, userId);
                 await SetAddSitePromptShownAsync(null, userId);
                 await SetPasswordGenerationOptionsAsync(null, userId);
             }
@@ -1397,6 +1443,7 @@ namespace Bit.Core.Services
         {
             await CheckStateAsync();
             var currentTheme = await GetThemeAsync();
+            var currentAutoDarkTheme = await GetAutoDarkThemeAsync();
             var currentDisableFavicons = await GetDisableFaviconAsync();
 
             account.Settings.EnvironmentUrls = await GetPreAuthEnvironmentUrlsAsync();
@@ -1426,6 +1473,7 @@ namespace Bit.Core.Services
                 account.Settings.VaultTimeoutAction = VaultTimeoutAction.Lock;
             }
             await SetThemeAsync(currentTheme, account.Profile.UserId);
+            await SetAutoDarkThemeAsync(currentAutoDarkTheme, account.Profile.UserId);
             await SetDisableFaviconAsync(currentDisableFavicons, account.Profile.UserId);
 
             state.Accounts[account.Profile.UserId] = account;
@@ -1510,6 +1558,16 @@ namespace Bit.Core.Services
             await _storageService.SaveAsync(Constants.StateKey, state);
         }
 
+        private async Task<string> GetExtensionActiveUserIdFromStorageAsync()
+        {
+            return await _storageService.GetAsync<string>(Constants.iOSExtensionActiveUserIdKey);
+        }
+
+        public async Task SaveExtensionActiveUserIdToStorageAsync(string userId)
+        {
+            await _storageService.SaveAsync(Constants.iOSExtensionActiveUserIdKey, userId);
+        }
+
         private async Task CheckStateAsync()
         {
             if (!_migrationChecked)

src/Core/Utilities/AccountsManagerMessageCommands.cs

@@ -0,0 +1,13 @@
+namespace Bit.Core.Utilities
+{
+    public static class AccountsManagerMessageCommands
+    {
+        public const string LOCKED = "locked";
+        public const string LOCK_VAULT = "lockVault";
+        public const string LOGOUT = "logout";
+        public const string LOGGED_OUT = "loggedOut";
+        public const string ADD_ACCOUNT = "addAccount";
+        public const string ACCOUNT_ADDED = "accountAdded";
+        public const string SWITCHED_ACCOUNT = "switchedAccount";
+    }
+}

src/Core/Utilities/ServiceContainer.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Text;
 using System.Threading.Tasks;
 using Bit.Core.Abstractions;
 using Bit.Core.Services;
@@ -8,7 +10,7 @@ namespace Bit.Core.Utilities
 {
     public static class ServiceContainer
     {
-        public static Dictionary<string, object> RegisteredServices { get; set; } = new Dictionary<string, object>();
+        public static ConcurrentDictionary<string, object> RegisteredServices { get; set; } = new ConcurrentDictionary<string, object>();
         public static bool Inited { get; set; }
 
         public static void Init(string customUserAgent = null, string clearCipherCacheKey = null,
@@ -109,18 +111,17 @@ namespace Bit.Core.Utilities
 
         public static void Register<T>(string serviceName, T obj)
         {
-            if (RegisteredServices.ContainsKey(serviceName))
+            if (!RegisteredServices.TryAdd(serviceName, obj))
             {
                 throw new Exception($"Service {serviceName} has already been registered.");
             }
-            RegisteredServices.Add(serviceName, obj);
         }
 
         public static T Resolve<T>(string serviceName, bool dontThrow = false)
         {
-            if (RegisteredServices.ContainsKey(serviceName))
+            if (RegisteredServices.TryGetValue(serviceName, out var service))
             {
-                return (T)RegisteredServices[serviceName];
+                return (T)service;
             }
             if (dontThrow)
             {
@@ -129,6 +130,59 @@ namespace Bit.Core.Utilities
             throw new Exception($"Service {serviceName} is not registered.");
         }
 
+        public static void Register<T>(T obj)
+            where T : class
+        {
+            Register(typeof(T), obj);
+        }
+
+        public static void Register(Type type, object obj)
+        {
+            var serviceName = GetServiceRegistrationName(type);
+            if (!RegisteredServices.TryAdd(serviceName, obj))
+            {
+                throw new Exception($"Service {serviceName} has already been registered.");
+            }
+        }
+
+        public static T Resolve<T>()
+            where T : class
+        {
+            return (T)Resolve(typeof(T));
+        }
+
+        public static object Resolve(Type type)
+        {
+            var serviceName = GetServiceRegistrationName(type);
+            if (RegisteredServices.TryGetValue(serviceName, out var service))
+            {
+                return service;
+            }
+            throw new Exception($"Service {serviceName} is not registered.");
+        }
+
+        public static bool TryResolve<T>(out T service)
+            where T : class
+        {
+            try
+            {
+                var toReturn = TryResolve(typeof(T), out var serviceObj);
+                service = (T)serviceObj;
+                return toReturn;
+            }
+            catch (Exception)
+            {
+                service = null;
+                return false;
+            }
+        }
+
+        public static bool TryResolve(Type type, out object service)
+        {
+            var serviceName = GetServiceRegistrationName(type);
+            return RegisteredServices.TryGetValue(serviceName, out service);
+        }
+
         public static void Reset()
         {
             foreach (var service in RegisteredServices)
@@ -140,7 +194,33 @@ namespace Bit.Core.Utilities
             }
             Inited = false;
             RegisteredServices.Clear();
-            RegisteredServices = new Dictionary<string, object>();
+            RegisteredServices = new ConcurrentDictionary<string, object>();
+        }
+
+        /// <summary>
+        /// Gets the service registration name
+        /// </summary>
+        /// <param name="type">Type of the service</param>
+        /// <remarks>
+        /// In order to work with already register/resolve we need to maintain the naming convention
+        /// of camelCase without the first "I" on the services interfaces
+        /// e.g. "ITokenService" -> "tokenService"
+        /// </remarks>
+        static string GetServiceRegistrationName(Type type)
+        {
+            var typeName = type.Name;
+            var sb = new StringBuilder();
+
+            var indexToLowerCase = 0;
+            if (typeName[0] == 'I' && char.IsUpper(typeName[1]))
+            {
+                // if it's an interface then we ignore the first char
+                // and lower case the 2nd one (index 1)
+                indexToLowerCase = 1;
+            }
+            sb.Append(char.ToLower(typeName[indexToLowerCase]));
+            sb.Append(typeName.Substring(++indexToLowerCase));
+            return sb.ToString();
         }
     }
 }

src/iOS.Autofill/CredentialProviderViewController.cs

@@ -1,27 +1,32 @@
-using AuthenticationServices;
+using System;
+using System.Threading.Tasks;
+using AuthenticationServices;
 using Bit.App.Abstractions;
+using Bit.App.Models;
+using Bit.App.Pages;
+using Bit.App.Utilities;
+using Bit.App.Utilities.AccountManagement;
 using Bit.Core.Abstractions;
+using Bit.Core.Enums;
 using Bit.Core.Utilities;
 using Bit.iOS.Autofill.Models;
 using Bit.iOS.Core.Utilities;
-using Foundation;
-using System;
-using System.Threading.Tasks;
-using Bit.App.Pages;
-using UIKit;
-using Xamarin.Forms;
-using Bit.App.Utilities;
-using Bit.App.Models;
 using Bit.iOS.Core.Views;
 using CoreNFC;
+using Foundation;
+using UIKit;
+using Xamarin.Forms;
 
 namespace Bit.iOS.Autofill
 {
-    public partial class CredentialProviderViewController : ASCredentialProviderViewController
+    public partial class CredentialProviderViewController : ASCredentialProviderViewController, IAccountsManagerHost
     {
         private Context _context;
         private NFCNdefReaderSession _nfcSession = null;
         private Core.NFCReaderDelegate _nfcDelegate = null;
+        private IAccountsManager _accountsManager;
+
+        private readonly LazyResolve<IStateService> _stateService = new LazyResolve<IStateService>("stateService");
 
         public CredentialProviderViewController(IntPtr handle)
             : base(handle)
@@ -56,7 +61,7 @@ namespace Bit.iOS.Autofill
             }
             if (!await IsAuthed())
             {
-                LaunchHomePage();
+                await _accountsManager.NavigateOnAccountChangeAsync(false);
             }
             else if (await IsLocked())
             {
@@ -78,9 +83,8 @@ namespace Bit.iOS.Autofill
         public override async void ProvideCredentialWithoutUserInteraction(ASPasswordCredentialIdentity credentialIdentity)
         {
             InitAppIfNeeded();
-            var stateService = ServiceContainer.Resolve<IStateService>("stateService");
-            await stateService.SetPasswordRepromptAutofillAsync(false);
-            await stateService.SetPasswordVerifiedAutofillAsync(false);
+            await _stateService.Value.SetPasswordRepromptAutofillAsync(false);
+            await _stateService.Value.SetPasswordVerifiedAutofillAsync(false);
             if (!await IsAuthed() || await IsLocked())
             {
                 var err = new NSError(new NSString("ASExtensionErrorDomain"),
@@ -97,7 +101,7 @@ namespace Bit.iOS.Autofill
             InitAppIfNeeded();
             if (!await IsAuthed())
             {
-                LaunchHomePage();
+                await _accountsManager.NavigateOnAccountChangeAsync(false);
                 return;
             }
             _context.CredentialIdentity = credentialIdentity;
@@ -110,7 +114,7 @@ namespace Bit.iOS.Autofill
             _context.Configuring = true;
             if (!await IsAuthed())
             {
-                LaunchHomePage();
+                await _accountsManager.NavigateOnAccountChangeAsync(false);
                 return;
             }
             CheckLock(() => PerformSegue("setupSegue", this));
@@ -229,7 +233,6 @@ namespace Bit.iOS.Autofill
                 return;
             }
 
-            var stateService = ServiceContainer.Resolve<IStateService>("stateService");
             var decCipher = await cipher.DecryptAsync();
             if (decCipher.Reprompt != Bit.Core.Enums.CipherRepromptType.None)
             {
@@ -237,13 +240,13 @@ namespace Bit.iOS.Autofill
                 // already verified the password.
                 if (!userInteraction)
                 {
-                    await stateService.SetPasswordRepromptAutofillAsync(true);
+                    await _stateService.Value.SetPasswordRepromptAutofillAsync(true);
                     var err = new NSError(new NSString("ASExtensionErrorDomain"),
                     Convert.ToInt32(ASExtensionErrorCode.UserInteractionRequired), null);
                     ExtensionContext?.CancelRequest(err);
                     return;
                 }
-                else if (!await stateService.GetPasswordVerifiedAutofillAsync())
+                else if (!await _stateService.Value.GetPasswordVerifiedAutofillAsync())
                 {
                     // Add a timeout to resolve keyboard not always showing up.
                     await Task.Delay(250);
@@ -258,10 +261,10 @@ namespace Bit.iOS.Autofill
                 }
             }
             string totpCode = null;
-            var disableTotpCopy = await stateService.GetDisableAutoTotpCopyAsync();
+            var disableTotpCopy = await _stateService.Value.GetDisableAutoTotpCopyAsync();
             if (!disableTotpCopy.GetValueOrDefault(false))
             {
-                var canAccessPremiumAsync = await stateService.CanAccessPremiumAsync();
+                var canAccessPremiumAsync = await _stateService.Value.CanAccessPremiumAsync();
                 if (!string.IsNullOrWhiteSpace(decCipher.Login.Totp) &&
                     (canAccessPremiumAsync || cipher.OrganizationUseTotp))
                 {
@@ -275,8 +278,7 @@ namespace Bit.iOS.Autofill
 
         private async void CheckLock(Action notLockedAction)
         {
-            var stateService = ServiceContainer.Resolve<IStateService>("stateService");
-            if (await IsLocked() || await stateService.GetPasswordRepromptAutofillAsync())
+            if (await IsLocked() || await _stateService.Value.GetPasswordRepromptAutofillAsync())
             {
                 PerformSegue("lockPasswordSegue", this);
             }
@@ -294,8 +296,7 @@ namespace Bit.iOS.Autofill
 
         private Task<bool> IsAuthed()
         {
-            var stateService = ServiceContainer.Resolve<IStateService>("stateService");
-            return stateService.IsAuthenticatedAsync();
+            return _stateService.Value.IsAuthenticatedAsync();
         }
 
         private void LogoutIfAuthed()
@@ -304,8 +305,7 @@ namespace Bit.iOS.Autofill
             {
                 if (await IsAuthed())
                 {
-                    var stateService = ServiceContainer.Resolve<IStateService>("stateService");
-                    await AppHelpers.LogOutAsync(await stateService.GetActiveUserIdAsync());
+                    await AppHelpers.LogOutAsync(await _stateService.Value.GetActiveUserIdAsync());
                     var deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
                     if (deviceActionService.SystemMajorVersion() >= 12)
                     {
@@ -331,12 +331,16 @@ namespace Bit.iOS.Autofill
                 Bit.Core.Constants.iOSAutoFillClearCiphersCacheKey, Bit.Core.Constants.iOSAllClearCipherCacheKeys);
             iOSCoreHelpers.InitLogger();
             iOSCoreHelpers.Bootstrap();
-            var app = new App.App(new AppOptions { IosExtension = true });
+            var appOptions = new AppOptions { IosExtension = true };
+            var app = new App.App(appOptions);
             ThemeManager.SetTheme(app.Resources);
             iOSCoreHelpers.AppearanceAdjustments();
             _nfcDelegate = new Core.NFCReaderDelegate((success, message) =>
                 messagingService.Send("gotYubiKeyOTP", message));
             iOSCoreHelpers.SubscribeBroadcastReceiver(this, _nfcSession, _nfcDelegate);
+
+            _accountsManager = ServiceContainer.Resolve<IAccountsManager>("accountsManager");
+            _accountsManager.Init(() => appOptions, this);
         }
 
         private void InitAppIfNeeded()
@@ -514,5 +518,35 @@ namespace Bit.iOS.Autofill
             updateTempPasswordController.ModalPresentationStyle = UIModalPresentationStyle.FullScreen;
             PresentViewController(updateTempPasswordController, true, null);
         }
+
+        public Task SetPreviousPageInfoAsync() => Task.CompletedTask;
+        public Task UpdateThemeAsync() => Task.CompletedTask;
+
+        public void Navigate(NavigationTarget navTarget, INavigationParams navParams = null)
+        {
+            switch (navTarget)
+            {
+                case NavigationTarget.HomeLogin:
+                    DismissViewController(false, () => LaunchHomePage());
+                    break;
+                case NavigationTarget.Login:
+                    if (navParams is LoginNavigationParams loginParams)
+                    {
+                        DismissViewController(false, () => LaunchLoginFlow(loginParams.Email));
+                    }
+                    else
+                    {
+                        DismissViewController(false, () => LaunchLoginFlow());
+                    }
+                    break;
+                case NavigationTarget.Lock:
+                    DismissViewController(false, () => PerformSegue("lockPasswordSegue", this));
+                    break;
+                case NavigationTarget.AutofillCiphers:
+                case NavigationTarget.Home:
+                    DismissViewController(false, () => PerformSegue("loginListSegue", this));
+                    break;
+            }
+        }
     }
 }

src/iOS.Autofill/Info.plist

@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden.autofill</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2022.05.1</string>
+	<string>2022.6.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CFBundleLocalizations</key>

src/iOS.Autofill/LockPasswordViewController.cs

@@ -1,10 +1,17 @@
 using System;
+using Bit.App.Controls;
+using Bit.iOS.Core.Utilities;
 using UIKit;
 
 namespace Bit.iOS.Autofill
 {
-    public partial class LockPasswordViewController : Core.Controllers.LockPasswordViewController
+    public partial class LockPasswordViewController : Core.Controllers.BaseLockPasswordViewController
     {
+        AccountSwitchingOverlayView _accountSwitchingOverlayView;
+        AccountSwitchingOverlayHelper _accountSwitchingOverlayHelper;
+
+        public override UITableView TableView => MainTableView;
+
         public LockPasswordViewController(IntPtr handle)
             : base(handle)
         {
@@ -20,6 +27,21 @@ namespace Bit.iOS.Autofill
         public override Action Success => () => CPViewController.DismissLockAndContinue();
         public override Action Cancel => () => CPViewController.CompleteRequest();
 
+        public override async void ViewDidLoad()
+        {
+            base.ViewDidLoad();
+
+            _accountSwitchingOverlayHelper = new AccountSwitchingOverlayHelper();
+            AccountSwitchingBarButton.Image = await _accountSwitchingOverlayHelper.CreateAvatarImageAsync();
+
+            _accountSwitchingOverlayView = _accountSwitchingOverlayHelper.CreateAccountSwitchingOverlayView(OverlayView);
+        }
+
+        partial void AccountSwitchingBarButton_Activated(UIBarButtonItem sender)
+        {
+            _accountSwitchingOverlayHelper.OnToolbarItemActivated(_accountSwitchingOverlayView, OverlayView);
+        }
+
         partial void SubmitButton_Activated(UIBarButtonItem sender)
         {
             var task = CheckPasswordAsync();

src/iOS.Autofill/LockPasswordViewController.designer.cs

@@ -1,64 +1,79 @@
 // WARNING
 //
-// This file has been generated automatically by Visual Studio from the outlets and
-// actions declared in your storyboard file.
-// Manual changes to this file will not be maintained.
+// This file has been generated automatically by Visual Studio to store outlets and
+// actions made in the UI designer. If it is removed, they will be lost.
+// Manual changes to this file may not be handled correctly.
 //
 using Foundation;
-using System;
 using System.CodeDom.Compiler;
-using UIKit;
 
 namespace Bit.iOS.Autofill
 {
-    [Register ("LockPasswordViewController")]
-    partial class LockPasswordViewController
-    {
-        [Outlet]
-        [GeneratedCode ("iOS Designer", "1.0")]
-        UIKit.UIBarButtonItem CancelButton { get; set; }
+	[Register ("LockPasswordViewController")]
+	partial class LockPasswordViewController
+	{
+		[Outlet]
+		UIKit.UIBarButtonItem AccountSwitchingBarButton { get; set; }
 
-        [Outlet]
-        [GeneratedCode ("iOS Designer", "1.0")]
-        UIKit.UITableView MainTableView { get; set; }
+		[Outlet]
+		[GeneratedCode ("iOS Designer", "1.0")]
+		UIKit.UIBarButtonItem CancelButton { get; set; }
 
-        [Outlet]
-        [GeneratedCode ("iOS Designer", "1.0")]
-        UIKit.UINavigationItem NavItem { get; set; }
+		[Outlet]
+		[GeneratedCode ("iOS Designer", "1.0")]
+		UIKit.UITableView MainTableView { get; set; }
 
-        [Outlet]
-        [GeneratedCode ("iOS Designer", "1.0")]
-        UIKit.UIBarButtonItem SubmitButton { get; set; }
+		[Outlet]
+		[GeneratedCode ("iOS Designer", "1.0")]
+		UIKit.UINavigationItem NavItem { get; set; }
 
-        [Action ("CancelButton_Activated:")]
-        [GeneratedCode ("iOS Designer", "1.0")]
-        partial void CancelButton_Activated (UIKit.UIBarButtonItem sender);
+		[Outlet]
+		UIKit.UIView OverlayView { get; set; }
 
-        [Action ("SubmitButton_Activated:")]
-        [GeneratedCode ("iOS Designer", "1.0")]
-        partial void SubmitButton_Activated (UIKit.UIBarButtonItem sender);
+		[Outlet]
+		[GeneratedCode ("iOS Designer", "1.0")]
+		UIKit.UIBarButtonItem SubmitButton { get; set; }
 
-        void ReleaseDesignerOutlets ()
-        {
-            if (CancelButton != null) {
-                CancelButton.Dispose ();
-                CancelButton = null;
-            }
+		[Action ("AccountSwitchingBarButton_Activated:")]
+		partial void AccountSwitchingBarButton_Activated (UIKit.UIBarButtonItem sender);
 
-            if (MainTableView != null) {
-                MainTableView.Dispose ();
-                MainTableView = null;
-            }
+		[Action ("CancelButton_Activated:")]
+		partial void CancelButton_Activated (UIKit.UIBarButtonItem sender);
 
-            if (NavItem != null) {
-                NavItem.Dispose ();
-                NavItem = null;
-            }
+		[Action ("SubmitButton_Activated:")]
+		partial void SubmitButton_Activated (UIKit.UIBarButtonItem sender);
+		
+		void ReleaseDesignerOutlets ()
+		{
+			if (AccountSwitchingBarButton != null) {
+				AccountSwitchingBarButton.Dispose ();
+				AccountSwitchingBarButton = null;
+			}
 
-            if (SubmitButton != null) {
-                SubmitButton.Dispose ();
-                SubmitButton = null;
-            }
-        }
-    }
-}
+			if (CancelButton != null) {
+				CancelButton.Dispose ();
+				CancelButton = null;
+			}
+
+			if (MainTableView != null) {
+				MainTableView.Dispose ();
+				MainTableView = null;
+			}
+
+			if (NavItem != null) {
+				NavItem.Dispose ();
+				NavItem = null;
+			}
+
+			if (SubmitButton != null) {
+				SubmitButton.Dispose ();
+				SubmitButton = null;
+			}
+
+			if (OverlayView != null) {
+				OverlayView.Dispose ();
+				OverlayView = null;
+			}
+		}
+	}
+}

src/iOS.Autofill/LoginListViewController.cs

@@ -1,19 +1,21 @@
 using System;
+using Bit.App.Abstractions;
+using Bit.App.Controls;
+using Bit.App.Resources;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
 using Bit.iOS.Autofill.Models;
+using Bit.iOS.Autofill.Utilities;
+using Bit.iOS.Core.Controllers;
+using Bit.iOS.Core.Utilities;
+using Bit.iOS.Core.Views;
+using CoreFoundation;
 using Foundation;
 using UIKit;
-using Bit.iOS.Core.Controllers;
-using Bit.App.Resources;
-using Bit.iOS.Core.Views;
-using Bit.iOS.Autofill.Utilities;
-using Bit.iOS.Core.Utilities;
-using Bit.Core.Utilities;
-using Bit.Core.Abstractions;
-using Bit.App.Abstractions;
 
 namespace Bit.iOS.Autofill
 {
-    public partial class LoginListViewController : ExtendedUITableViewController
+    public partial class LoginListViewController : ExtendedUIViewController
     {
         public LoginListViewController(IntPtr handle)
             : base(handle)
@@ -26,17 +28,30 @@ namespace Bit.iOS.Autofill
         public CredentialProviderViewController CPViewController { get; set; }
         public IPasswordRepromptService PasswordRepromptService { get; private set; }
 
+        AccountSwitchingOverlayView _accountSwitchingOverlayView;
+        AccountSwitchingOverlayHelper _accountSwitchingOverlayHelper;
+
+        LazyResolve<IBroadcasterService> _broadcasterService = new LazyResolve<IBroadcasterService>("broadcasterService");
+        LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
+        bool _alreadyLoadItemsOnce = false;
+
         public async override void ViewDidLoad()
         {
             base.ViewDidLoad();
+
+            SubscribeSyncCompleted();
+
             NavItem.Title = AppResources.Items;
             CancelBarButton.Title = AppResources.Cancel;
 
             TableView.RowHeight = UITableView.AutomaticDimension;
             TableView.EstimatedRowHeight = 44;
+            TableView.BackgroundColor = ThemeHelpers.BackgroundColor;
             TableView.Source = new TableSource(this);
             await ((TableSource)TableView.Source).LoadItemsAsync();
 
+            _alreadyLoadItemsOnce = true;
+
             var storageService = ServiceContainer.Resolve<IStorageService>("storageService");
             var needsAutofillReplacement = await storageService.GetAsync<bool?>(
                 Core.Constants.AutofillNeedsIdentityReplacementKey);
@@ -44,6 +59,16 @@ namespace Bit.iOS.Autofill
             {
                 await ASHelpers.ReplaceAllIdentities();
             }
+
+            _accountSwitchingOverlayHelper = new AccountSwitchingOverlayHelper();
+            AccountSwitchingBarButton.Image = await _accountSwitchingOverlayHelper.CreateAvatarImageAsync();
+
+            _accountSwitchingOverlayView = _accountSwitchingOverlayHelper.CreateAccountSwitchingOverlayView(OverlayView);
+        }
+
+        partial void AccountSwitchingBarButton_Activated(UIBarButtonItem sender)
+        {
+            _accountSwitchingOverlayHelper.OnToolbarItemActivated(_accountSwitchingOverlayView, OverlayView);
         }
 
         partial void CancelBarButton_Activated(UIBarButtonItem sender)
@@ -88,6 +113,35 @@ namespace Bit.iOS.Autofill
             }
         }
 
+        private void SubscribeSyncCompleted()
+        {
+            _broadcasterService.Value.Subscribe(nameof(LoginListViewController), message =>
+            {
+                if (message.Command == "syncCompleted" && _alreadyLoadItemsOnce)
+                {
+                    DispatchQueue.MainQueue.DispatchAsync(async () =>
+                    {
+                        try
+                        {
+                            await ((TableSource)TableView.Source).LoadItemsAsync();
+                            TableView.ReloadData();
+                        }
+                        catch (Exception ex)
+                        {
+                            _logger.Value.Exception(ex);
+                        }
+                    });
+                }
+            });
+        }
+
+        public override void ViewDidUnload()
+        {
+            base.ViewDidUnload();
+
+            _broadcasterService.Value.Unsubscribe(nameof(LoginListViewController));
+        }
+
         public void DismissModal()
         {
             DismissViewController(true, async () =>
@@ -99,13 +153,11 @@ namespace Bit.iOS.Autofill
 
         public class TableSource : ExtensionTableSource
         {
-            private Context _context;
             private LoginListViewController _controller;
 
             public TableSource(LoginListViewController controller)
                 : base(controller.Context, controller)
             {
-                _context = controller.Context;
                 _controller = controller;
             }
 

src/iOS.Autofill/LoginListViewController.designer.cs

@@ -1,59 +1,89 @@
 // WARNING
 //
-// This file has been generated automatically by Visual Studio from the outlets and
-// actions declared in your storyboard file.
-// Manual changes to this file will not be maintained.
+// This file has been generated automatically by Visual Studio to store outlets and
+// actions made in the UI designer. If it is removed, they will be lost.
+// Manual changes to this file may not be handled correctly.
 //
 using Foundation;
-using System;
 using System.CodeDom.Compiler;
-using UIKit;
 
 namespace Bit.iOS.Autofill
 {
-    [Register ("LoginListViewController")]
-    partial class LoginListViewController
-    {
-        [Outlet]
-        [GeneratedCode ("iOS Designer", "1.0")]
-        UIKit.UIBarButtonItem AddBarButton { get; set; }
+	[Register ("LoginListViewController")]
+	partial class LoginListViewController
+	{
+		[Outlet]
+		UIKit.UIBarButtonItem AccountSwitchingBarButton { get; set; }
 
-        [Outlet]
-        [GeneratedCode ("iOS Designer", "1.0")]
-        UIKit.UIBarButtonItem CancelBarButton { get; set; }
+		[Outlet]
+		[GeneratedCode ("iOS Designer", "1.0")]
+		UIKit.UIBarButtonItem AddBarButton { get; set; }
 
-        [Outlet]
-        [GeneratedCode ("iOS Designer", "1.0")]
-        UIKit.UINavigationItem NavItem { get; set; }
+		[Outlet]
+		[GeneratedCode ("iOS Designer", "1.0")]
+		UIKit.UIBarButtonItem CancelBarButton { get; set; }
 
-        [Action ("AddBarButton_Activated:")]
-        [GeneratedCode ("iOS Designer", "1.0")]
-        partial void AddBarButton_Activated (UIKit.UIBarButtonItem sender);
+		[Outlet]
+		UIKit.UIView MainView { get; set; }
 
-        [Action ("CancelBarButton_Activated:")]
-        [GeneratedCode ("iOS Designer", "1.0")]
-        partial void CancelBarButton_Activated (UIKit.UIBarButtonItem sender);
+		[Outlet]
+		[GeneratedCode ("iOS Designer", "1.0")]
+		UIKit.UINavigationItem NavItem { get; set; }
 
-        [Action ("SearchBarButton_Activated:")]
-        [GeneratedCode ("iOS Designer", "1.0")]
-        partial void SearchBarButton_Activated (UIKit.UIBarButtonItem sender);
+		[Outlet]
+		UIKit.UIView OverlayView { get; set; }
 
-        void ReleaseDesignerOutlets ()
-        {
-            if (AddBarButton != null) {
-                AddBarButton.Dispose ();
-                AddBarButton = null;
-            }
+		[Outlet]
+		UIKit.UITableView TableView { get; set; }
 
-            if (CancelBarButton != null) {
-                CancelBarButton.Dispose ();
-                CancelBarButton = null;
-            }
+		[Action ("AccountSwitchingBarButton_Activated:")]
+		partial void AccountSwitchingBarButton_Activated (UIKit.UIBarButtonItem sender);
 
-            if (NavItem != null) {
-                NavItem.Dispose ();
-                NavItem = null;
-            }
-        }
-    }
-}
+		[Action ("AddBarButton_Activated:")]
+		partial void AddBarButton_Activated (UIKit.UIBarButtonItem sender);
+
+		[Action ("CancelBarButton_Activated:")]
+		partial void CancelBarButton_Activated (UIKit.UIBarButtonItem sender);
+
+		[Action ("SearchBarButton_Activated:")]
+		partial void SearchBarButton_Activated (UIKit.UIBarButtonItem sender);
+		
+		void ReleaseDesignerOutlets ()
+		{
+			if (AddBarButton != null) {
+				AddBarButton.Dispose ();
+				AddBarButton = null;
+			}
+
+			if (CancelBarButton != null) {
+				CancelBarButton.Dispose ();
+				CancelBarButton = null;
+			}
+
+			if (MainView != null) {
+				MainView.Dispose ();
+				MainView = null;
+			}
+
+			if (NavItem != null) {
+				NavItem.Dispose ();
+				NavItem = null;
+			}
+
+			if (OverlayView != null) {
+				OverlayView.Dispose ();
+				OverlayView = null;
+			}
+
+			if (TableView != null) {
+				TableView.Dispose ();
+				TableView = null;
+			}
+
+			if (AccountSwitchingBarButton != null) {
+				AccountSwitchingBarButton.Dispose ();
+				AccountSwitchingBarButton = null;
+			}
+		}
+	}
+}

src/iOS.Autofill/LoginSearchViewController.cs

@@ -33,10 +33,7 @@ namespace Bit.iOS.Autofill
             CancelBarButton.Title = AppResources.Cancel;
             SearchBar.Placeholder = AppResources.Search;
             SearchBar.BackgroundColor = SearchBar.BarTintColor = ThemeHelpers.ListHeaderBackgroundColor;
-            if (!ThemeHelpers.LightTheme)
-            {
-                SearchBar.KeyboardAppearance = UIKeyboardAppearance.Dark;
-            }
+            SearchBar.UpdateThemeIfNeeded();
 
             TableView.RowHeight = UITableView.AutomaticDimension;
             TableView.EstimatedRowHeight = 44;

src/iOS.Autofill/MainInterface.storyboard

@@ -1,7 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="43">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="43">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -9,30 +13,27 @@
         <scene sceneID="42">
             <objects>
                 <viewController id="43" customClass="CredentialProviderViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="40"/>
-                        <viewControllerLayoutGuide type="bottom" id="41"/>
-                    </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="44">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="logo.png" translatesAutoresizingMaskIntoConstraints="NO" id="1713">
-                                <rect key="frame" x="66" y="316" width="282" height="44"/>
+                                <rect key="frame" x="66" y="396" width="282" height="44"/>
                             </imageView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="YG6-2d-qpF"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="1713" firstAttribute="centerY" secondItem="44" secondAttribute="centerY" constant="-30" id="1763"/>
-                            <constraint firstItem="1713" firstAttribute="centerX" secondItem="44" secondAttribute="centerX" id="1764"/>
+                            <constraint firstItem="1713" firstAttribute="centerX" secondItem="YG6-2d-qpF" secondAttribute="centerX" id="1764"/>
                         </constraints>
                     </view>
                     <connections>
+                        <outlet property="Logo" destination="1713" id="name-outlet-1713"/>
                         <segue destination="oCZ-GQ-aOK" kind="show" identifier="loginListSegue" id="1679"/>
                         <segue destination="6855" kind="presentation" identifier="lockPasswordSegue" id="9874"/>
                         <segue destination="10580" kind="presentation" identifier="setupSegue" modalTransitionStyle="coverVertical" id="11089"/>
                         <segue destination="11552" kind="show" identifier="loginSearchSegue" id="12959"/>
-                        <outlet property="Logo" destination="1713" id="name-outlet-1713"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="45" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -45,7 +46,7 @@
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="oCZ-GQ-aOK" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" translucent="NO" id="8A5-AR-QHS">
-                        <rect key="frame" x="0.0" y="20" width="414" height="50"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="56"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="tintColor" red="0.0" green="0.52549019607843139" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <color key="barTintColor" red="0.23529411764705882" green="0.55294117647058827" blue="0.73725490196078436" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -67,7 +68,7 @@
             <objects>
                 <navigationController definesPresentationContext="YES" id="1845" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" translucent="NO" id="1848">
-                        <rect key="frame" x="0.0" y="20" width="414" height="50"/>
+                        <rect key="frame" x="0.0" y="44" width="414" height="44"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                         <color key="barTintColor" red="0.23529411764705882" green="0.55294117647058827" blue="0.73725490196078436" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <textAttributes key="titleTextAttributes">
@@ -87,7 +88,7 @@
             <objects>
                 <tableViewController id="2087" customClass="LoginAddViewController" sceneMemberID="viewController">
                     <tableView key="view" opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" allowsSelection="NO" rowHeight="50" sectionHeaderHeight="22" sectionFooterHeight="22" id="2088">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="808"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <color key="sectionIndexBackgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
@@ -125,50 +126,79 @@
         <!--Logins-->
         <scene sceneID="2303">
             <objects>
-                <tableViewController id="2304" customClass="LoginListViewController" sceneMemberID="viewController">
-                    <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="2305">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                <viewController id="2304" customClass="LoginListViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="q9o-3n-3xL">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="786"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <prototypes>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" textLabel="3763" detailTextLabel="3764" rowHeight="44" style="IBUITableViewCellStyleSubtitle" id="3761">
-                                <rect key="frame" x="0.0" y="22" width="414" height="44"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3761" id="3762">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                    <subviews>
-                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3763">
-                                            <rect key="frame" x="20" y="4" width="35" height="21.5"/>
+                        <subviews>
+                            <tableView opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="2305">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="737"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <prototypes>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" textLabel="3763" detailTextLabel="3764" rowHeight="44" style="IBUITableViewCellStyleSubtitle" id="3761">
+                                        <rect key="frame" x="0.0" y="44.5" width="414" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3761" id="3762">
+                                            <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Subtitle" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3764">
-                                            <rect key="frame" x="20" y="25.5" width="44" height="14.5"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                    </subviews>
-                                </tableViewCellContentView>
-                            </tableViewCell>
-                        </prototypes>
-                        <connections>
-                            <outlet property="dataSource" destination="2304" id="2306"/>
-                            <outlet property="delegate" destination="2304" id="2307"/>
-                        </connections>
-                    </tableView>
+                                            <subviews>
+                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3763">
+                                                    <rect key="frame" x="20" y="4" width="35" height="21.5"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                    <color key="textColor" systemColor="darkTextColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Subtitle" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3764">
+                                                    <rect key="frame" x="20" y="25.5" width="44" height="14.5"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                                    <color key="textColor" systemColor="darkTextColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                </prototypes>
+                                <connections>
+                                    <outlet property="dataSource" destination="2304" id="2306"/>
+                                    <outlet property="delegate" destination="2304" id="2307"/>
+                                </connections>
+                            </tableView>
+                            <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Tq0-Ep-tHr" userLabel="OverlayView">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="737"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            </view>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="BQW-dG-XMM"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="Tq0-Ep-tHr" firstAttribute="leading" secondItem="BQW-dG-XMM" secondAttribute="leading" id="4wL-FF-CVk"/>
+                            <constraint firstItem="BQW-dG-XMM" firstAttribute="trailing" secondItem="Tq0-Ep-tHr" secondAttribute="trailing" id="5BV-0y-vU1"/>
+                            <constraint firstItem="BQW-dG-XMM" firstAttribute="bottom" secondItem="2305" secondAttribute="bottom" id="6EB-rh-lLS"/>
+                            <constraint firstItem="Tq0-Ep-tHr" firstAttribute="top" secondItem="BQW-dG-XMM" secondAttribute="top" id="eT6-Bv-JaR"/>
+                            <constraint firstItem="BQW-dG-XMM" firstAttribute="trailing" secondItem="2305" secondAttribute="trailing" id="ofJ-fL-adF"/>
+                            <constraint firstItem="BQW-dG-XMM" firstAttribute="bottom" secondItem="Tq0-Ep-tHr" secondAttribute="bottom" id="pBa-o1-Mtx"/>
+                            <constraint firstItem="2305" firstAttribute="top" secondItem="BQW-dG-XMM" secondAttribute="top" id="pGe-1e-B4s"/>
+                            <constraint firstItem="2305" firstAttribute="leading" secondItem="BQW-dG-XMM" secondAttribute="leading" id="xfQ-VQ-yWe"/>
+                        </constraints>
+                    </view>
                     <toolbarItems/>
                     <navigationItem key="navigationItem" title="Logins" id="3734">
-                        <barButtonItem key="leftBarButtonItem" title="Cancel" id="3735">
-                            <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            <connections>
-                                <action selector="CancelBarButton_Activated:" destination="2304" id="3750"/>
-                            </connections>
-                        </barButtonItem>
+                        <leftBarButtonItems>
+                            <barButtonItem title="Cancel" id="3735">
+                                <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <connections>
+                                    <action selector="CancelBarButton_Activated:" destination="2304" id="3750"/>
+                                </connections>
+                            </barButtonItem>
+                            <barButtonItem title="Account" image="person.2" catalog="system" style="plain" id="I0b-et-FGw" userLabel="Accoutn Switching Button">
+                                <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <connections>
+                                    <action selector="AccountSwitchingBarButton_Activated:" destination="2304" id="dZn-bd-bC6"/>
+                                </connections>
+                            </barButtonItem>
+                        </leftBarButtonItems>
                         <rightBarButtonItems>
                             <barButtonItem systemItem="add" id="3736">
                                 <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -186,13 +216,17 @@
                     </navigationItem>
                     <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
                     <connections>
+                        <outlet property="AccountSwitchingBarButton" destination="I0b-et-FGw" id="KZj-EO-7wd"/>
                         <outlet property="AddBarButton" destination="3736" id="name-outlet-3736"/>
                         <outlet property="CancelBarButton" destination="3735" id="name-outlet-3735"/>
+                        <outlet property="MainView" destination="q9o-3n-3xL" id="gjJ-12-71Q"/>
                         <outlet property="NavItem" destination="3734" id="name-outlet-3734"/>
+                        <outlet property="OverlayView" destination="Tq0-Ep-tHr" id="igj-R2-gXJ"/>
+                        <outlet property="TableView" destination="2305" id="aUe-Uz-iIb"/>
                         <segue destination="1845" kind="presentation" identifier="loginAddSegue" modalPresentationStyle="fullScreen" modalTransitionStyle="coverVertical" id="3731"/>
                         <segue destination="11552" kind="show" identifier="loginSearchFromListSegue" id="12574"/>
                     </connections>
-                </tableViewController>
+                </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="2310" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="1157" y="566"/>
@@ -202,7 +236,7 @@
             <objects>
                 <navigationController definesPresentationContext="YES" id="4574" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" translucent="NO" id="4577">
-                        <rect key="frame" x="0.0" y="20" width="414" height="50"/>
+                        <rect key="frame" x="0.0" y="44" width="414" height="44"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                         <color key="tintColor" red="0.0" green="0.52549019607843139" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <color key="barTintColor" red="0.23529411764705882" green="0.55294117647058827" blue="0.73725490196078436" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -222,37 +256,34 @@
         <scene sceneID="4579">
             <objects>
                 <viewController id="4576" customClass="PasswordGeneratorViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="4571"/>
-                        <viewControllerLayoutGuide type="bottom" id="4572"/>
-                    </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="4930">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="808"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <containerView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4933">
-                                <rect key="frame" x="0.0" y="160.5" width="414" height="575.5"/>
+                                <rect key="frame" x="0.0" y="90.5" width="414" height="683.5"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <connections>
                                     <segue destination="4912" kind="embed" id="6480"/>
                                 </connections>
                             </containerView>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Label" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="4940">
-                                <rect key="frame" x="15" y="105" width="384" height="20.5"/>
+                                <rect key="frame" x="15" y="35" width="384" height="20.5"/>
                                 <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <color key="textColor" systemColor="darkTextColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="Kvt-lG-wyu"/>
                         <constraints>
-                            <constraint firstAttribute="trailing" secondItem="4933" secondAttribute="trailing" id="6484"/>
+                            <constraint firstItem="Kvt-lG-wyu" firstAttribute="trailing" secondItem="4933" secondAttribute="trailing" id="6484"/>
                             <constraint firstItem="4933" firstAttribute="top" secondItem="4940" secondAttribute="bottom" constant="35" id="6485"/>
-                            <constraint firstItem="4933" firstAttribute="leading" secondItem="4930" secondAttribute="leading" id="6486"/>
-                            <constraint firstItem="4940" firstAttribute="leading" secondItem="4930" secondAttribute="leading" constant="15" id="6487"/>
-                            <constraint firstItem="4940" firstAttribute="top" secondItem="4571" secondAttribute="bottom" constant="35" id="6488"/>
-                            <constraint firstAttribute="trailing" secondItem="4940" secondAttribute="trailing" constant="15" id="6489"/>
-                            <constraint firstItem="4572" firstAttribute="top" secondItem="4933" secondAttribute="bottom" id="6490"/>
+                            <constraint firstItem="4933" firstAttribute="leading" secondItem="Kvt-lG-wyu" secondAttribute="leading" id="6486"/>
+                            <constraint firstItem="4940" firstAttribute="leading" secondItem="Kvt-lG-wyu" secondAttribute="leading" constant="15" id="6487"/>
+                            <constraint firstItem="4940" firstAttribute="top" secondItem="Kvt-lG-wyu" secondAttribute="top" constant="35" id="6488"/>
+                            <constraint firstItem="Kvt-lG-wyu" firstAttribute="trailing" secondItem="4940" secondAttribute="trailing" constant="15" id="6489"/>
+                            <constraint firstItem="Kvt-lG-wyu" firstAttribute="bottom" secondItem="4933" secondAttribute="bottom" id="6490"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="Generate Password" id="4580">
@@ -287,7 +318,7 @@
             <objects>
                 <tableViewController id="4912" sceneMemberID="viewController">
                     <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="4913">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="575.5"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="683.5"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <connections>
@@ -301,15 +332,11 @@
             <point key="canvasLocation" x="4708" y="-194"/>
         </scene>
         <!--Navigation Controller-->
-        <!--Verify Fingerprint-->
-        <!--Verify PIN-->
-        <!--Navigation Controller-->
-        <!--Navigation Controller-->
         <scene sceneID="6854">
             <objects>
                 <navigationController definesPresentationContext="YES" id="6855" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" translucent="NO" id="6857">
-                        <rect key="frame" x="0.0" y="20" width="414" height="50"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="56"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                         <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <color key="barTintColor" red="0.23529411764705882" green="0.55294117647058827" blue="0.73725490196078436" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -318,88 +345,139 @@
                         </textAttributes>
                     </navigationBar>
                     <connections>
-                        <segue destination="7413" kind="relationship" relationship="rootViewController" id="8266"/>
+                        <segue destination="cn5-F4-59n" kind="relationship" relationship="rootViewController" id="Q23-VB-h61"/>
                     </connections>
                 </navigationController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="6858" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="390" y="1407"/>
+            <point key="canvasLocation" x="120" y="1407"/>
         </scene>
         <!--Verify Master Password-->
-        <scene sceneID="7412">
+        <scene sceneID="5CE-bQ-Rfq">
             <objects>
-                <tableViewController id="7413" customClass="LockPasswordViewController" sceneMemberID="viewController">
-                    <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="7414">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                <viewController id="cn5-F4-59n" customClass="LockPasswordViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="0qM-RN-J2i" userLabel="Main View">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="786"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <connections>
-                            <outlet property="dataSource" destination="7413" id="7415"/>
-                            <outlet property="delegate" destination="7413" id="7416"/>
-                        </connections>
-                    </tableView>
-                    <navigationItem key="navigationItem" title="Verify Master Password" id="8265">
-                        <barButtonItem key="leftBarButtonItem" title="Cancel" id="8268">
+                        <subviews>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="FcI-Ph-m9e">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="786"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <prototypes>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="oQZ-wW-5uB">
+                                        <rect key="frame" x="0.0" y="49.5" width="414" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="oQZ-wW-5uB" id="SUk-LD-cXo">
+                                            <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="1cB-yn-7ii">
+                                        <rect key="frame" x="0.0" y="93.5" width="414" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="1cB-yn-7ii" id="xFt-Jc-feN">
+                                            <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="Fzo-Cj-aM4">
+                                        <rect key="frame" x="0.0" y="137.5" width="414" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Fzo-Cj-aM4" id="vSb-0G-Bic">
+                                            <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                </prototypes>
+                                <sections/>
+                            </tableView>
+                            <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sDX-BN-qLw" userLabel="OverlayView">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="786"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            </view>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="uMZ-kT-NSt"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="FcI-Ph-m9e" firstAttribute="top" secondItem="uMZ-kT-NSt" secondAttribute="top" id="68e-VU-o4s"/>
+                            <constraint firstItem="uMZ-kT-NSt" firstAttribute="bottom" secondItem="FcI-Ph-m9e" secondAttribute="bottom" id="7UM-br-sxz"/>
+                            <constraint firstItem="uMZ-kT-NSt" firstAttribute="bottom" secondItem="sDX-BN-qLw" secondAttribute="bottom" id="QGT-ck-8TL"/>
+                            <constraint firstItem="sDX-BN-qLw" firstAttribute="leading" secondItem="uMZ-kT-NSt" secondAttribute="leading" id="aVW-Nw-awb"/>
+                            <constraint firstItem="uMZ-kT-NSt" firstAttribute="trailing" secondItem="sDX-BN-qLw" secondAttribute="trailing" id="f5n-9J-y3c"/>
+                            <constraint firstItem="FcI-Ph-m9e" firstAttribute="leading" secondItem="uMZ-kT-NSt" secondAttribute="leading" id="sKL-iw-CWd"/>
+                            <constraint firstItem="uMZ-kT-NSt" firstAttribute="trailing" secondItem="FcI-Ph-m9e" secondAttribute="trailing" id="xgg-of-dPl"/>
+                            <constraint firstItem="sDX-BN-qLw" firstAttribute="top" secondItem="uMZ-kT-NSt" secondAttribute="top" id="yO9-oz-zRn"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" title="Verify Master Password" id="NCb-RV-Vqq">
+                        <leftBarButtonItems>
+                            <barButtonItem title="Cancel" id="Xoh-Zv-hhd">
+                                <connections>
+                                    <action selector="CancelButton_Activated:" destination="cn5-F4-59n" id="1gM-mE-phn"/>
+                                </connections>
+                            </barButtonItem>
+                            <barButtonItem title="Account" image="person.2" catalog="system" style="plain" id="nwd-aM-kFD" userLabel="Accoutn Switching Button">
+                                <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <connections>
+                                    <action selector="AccountSwitchingBarButton_Activated:" destination="cn5-F4-59n" id="vVZ-IM-rkU"/>
+                                </connections>
+                            </barButtonItem>
+                        </leftBarButtonItems>
+                        <barButtonItem key="rightBarButtonItem" title="Submit" id="gju-yD-EmI">
                             <connections>
-                                <action selector="CancelButton_Activated:" destination="7413" id="8287"/>
-                            </connections>
-                        </barButtonItem>
-                        <barButtonItem key="rightBarButtonItem" title="Submit" id="8269">
-                            <connections>
-                                <action selector="SubmitButton_Activated:" destination="7413" id="8288"/>
+                                <action selector="SubmitButton_Activated:" destination="cn5-F4-59n" id="O1U-fk-BDh"/>
                             </connections>
                         </barButtonItem>
                     </navigationItem>
                     <connections>
-                        <outlet property="CancelButton" destination="8268" id="name-outlet-8268"/>
-                        <outlet property="MainTableView" destination="7414" id="name-outlet-7414"/>
-                        <outlet property="NavItem" destination="8265" id="name-outlet-8265"/>
-                        <outlet property="SubmitButton" destination="8269" id="name-outlet-8269"/>
+                        <outlet property="AccountSwitchingBarButton" destination="nwd-aM-kFD" id="T8F-CN-2il"/>
+                        <outlet property="CancelButton" destination="Xoh-Zv-hhd" id="mwi-4K-maj"/>
+                        <outlet property="MainTableView" destination="FcI-Ph-m9e" id="Ybv-5r-VGA"/>
+                        <outlet property="NavItem" destination="NCb-RV-Vqq" id="L9b-At-x0A"/>
+                        <outlet property="OverlayView" destination="sDX-BN-qLw" id="veu-q4-CeW"/>
+                        <outlet property="SubmitButton" destination="gju-yD-EmI" id="mjg-yP-09M"/>
                     </connections>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="7419" userLabel="First Responder" sceneMemberID="firstResponder"/>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="vNI-gq-ubp" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="955" y="1407"/>
+            <point key="canvasLocation" x="836" y="1407"/>
         </scene>
         <!--Setup View Controller-->
         <scene sceneID="10573">
             <objects>
                 <viewController id="10570" customClass="SetupViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="10565"/>
-                        <viewControllerLayoutGuide type="bottom" id="10566"/>
-                    </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="10575">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="786"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Extension Activated!" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="11092">
-                                <rect key="frame" x="15" y="100" width="384" height="20.5"/>
+                                <rect key="frame" x="15" y="30" width="384" height="20.5"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <color key="textColor" systemColor="darkTextColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" misplaced="YES" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="11093">
                                 <rect key="frame" x="15" y="134.5" width="570" height="41"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <color key="textColor" systemColor="darkTextColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" misplaced="YES" image="check.png" translatesAutoresizingMaskIntoConstraints="NO" id="11094">
                                 <rect key="frame" x="255" y="205.5" width="90" height="90"/>
                             </imageView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="hcg-mr-Ilx"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                         <constraints>
-                            <constraint firstItem="11092" firstAttribute="leading" secondItem="10575" secondAttribute="leading" constant="15" id="11114"/>
-                            <constraint firstAttribute="trailing" secondItem="11092" secondAttribute="trailing" constant="15" id="11115"/>
-                            <constraint firstItem="11092" firstAttribute="top" secondItem="10565" secondAttribute="bottom" constant="30" id="11116"/>
-                            <constraint firstItem="11093" firstAttribute="leading" secondItem="10575" secondAttribute="leading" constant="15" id="11119"/>
-                            <constraint firstAttribute="trailing" secondItem="11093" secondAttribute="trailing" constant="15" id="11120"/>
+                            <constraint firstItem="11092" firstAttribute="leading" secondItem="hcg-mr-Ilx" secondAttribute="leading" constant="15" id="11114"/>
+                            <constraint firstItem="hcg-mr-Ilx" firstAttribute="trailing" secondItem="11092" secondAttribute="trailing" constant="15" id="11115"/>
+                            <constraint firstItem="11092" firstAttribute="top" secondItem="hcg-mr-Ilx" secondAttribute="top" constant="30" id="11116"/>
+                            <constraint firstItem="11093" firstAttribute="leading" secondItem="hcg-mr-Ilx" secondAttribute="leading" constant="15" id="11119"/>
+                            <constraint firstItem="hcg-mr-Ilx" firstAttribute="trailing" secondItem="11093" secondAttribute="trailing" constant="15" id="11120"/>
                             <constraint firstItem="11093" firstAttribute="top" secondItem="11092" secondAttribute="bottom" constant="20" id="11121"/>
-                            <constraint firstItem="11094" firstAttribute="centerX" secondItem="10575" secondAttribute="centerX" id="11122"/>
+                            <constraint firstItem="11094" firstAttribute="centerX" secondItem="hcg-mr-Ilx" secondAttribute="centerX" id="11122"/>
                             <constraint firstItem="11094" firstAttribute="top" secondItem="11093" secondAttribute="bottom" constant="30" id="11123"/>
                         </constraints>
                     </view>
@@ -429,7 +507,7 @@
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="10580" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" translucent="NO" id="10583">
-                        <rect key="frame" x="0.0" y="20" width="414" height="50"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="56"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                         <color key="barTintColor" red="0.23529411764705882" green="0.55294117647058827" blue="0.73725490196078436" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <textAttributes key="titleTextAttributes">
@@ -450,7 +528,7 @@
             <objects>
                 <tableViewController id="11543" customClass="LoginSearchViewController" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="11545">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="786"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <searchBar key="tableHeaderView" contentMode="redraw" id="13084">
@@ -463,10 +541,10 @@
                         </searchBar>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="11548">
-                                <rect key="frame" x="0.0" y="72" width="414" height="44"/>
+                                <rect key="frame" x="0.0" y="88.5" width="414" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="11548" id="11549">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </tableViewCellContentView>
                             </tableViewCell>
@@ -506,7 +584,7 @@
             <objects>
                 <navigationController id="11552" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" translucent="NO" id="11554">
-                        <rect key="frame" x="0.0" y="20" width="414" height="50"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="56"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                         <color key="barTintColor" red="0.23529411764705882" green="0.55294117647058827" blue="0.73725490196078436" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <textAttributes key="titleTextAttributes">
@@ -522,8 +600,19 @@
             <point key="canvasLocation" x="1920" y="908"/>
         </scene>
     </scenes>
+    <inferredMetricsTieBreakers>
+        <segue reference="12574"/>
+        <segue reference="3731"/>
+    </inferredMetricsTieBreakers>
     <resources>
         <image name="check.png" width="90" height="90"/>
         <image name="logo.png" width="282" height="44"/>
+        <image name="person.2" catalog="system" width="128" height="81"/>
+        <systemColor name="darkTextColor">
+            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
-</document>
+</document>

src/iOS.Autofill/Utilities/AutofillHelpers.cs

@@ -15,7 +15,7 @@ namespace Bit.iOS.Autofill.Utilities
     {
         public async static Task TableRowSelectedAsync(UITableView tableView, NSIndexPath indexPath,
             ExtensionTableSource tableSource, CredentialProviderViewController cpViewController,
-            UITableViewController controller, IPasswordRepromptService passwordRepromptService,
+            UIViewController controller, IPasswordRepromptService passwordRepromptService,
             string loginAddSegue)
         {
             tableView.DeselectRow(indexPath, true);

src/iOS.Core/Controllers/BaseLockPasswordViewController.cs

@@ -0,0 +1,509 @@
+using System;
+using UIKit;
+using Foundation;
+using Bit.iOS.Core.Views;
+using Bit.App.Resources;
+using Bit.iOS.Core.Utilities;
+using Bit.App.Abstractions;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+using System.Threading.Tasks;
+using Bit.App.Utilities;
+using Bit.Core.Models.Domain;
+using Bit.Core.Enums;
+using Bit.App.Pages;
+using Bit.App.Models;
+using Xamarin.Forms;
+using Bit.Core;
+
+namespace Bit.iOS.Core.Controllers
+{
+    public abstract class BaseLockPasswordViewController : ExtendedUIViewController
+    {
+        private IVaultTimeoutService _vaultTimeoutService;
+        private ICryptoService _cryptoService;
+        private IDeviceActionService _deviceActionService;
+        private IStateService _stateService;
+        private IStorageService _secureStorageService;
+        private IPlatformUtilsService _platformUtilsService;
+        private IBiometricService _biometricService;
+        private IKeyConnectorService _keyConnectorService;
+        private bool _isPinProtected;
+        private bool _isPinProtectedWithKey;
+        private bool _pinLock;
+        private bool _biometricLock;
+        private bool _biometricIntegrityValid = true;
+        private bool _passwordReprompt = false;
+        private bool _usesKeyConnector;
+        private bool _biometricUnlockOnly = false;
+
+        protected bool autofillExtension = false;
+
+        public BaseLockPasswordViewController(IntPtr handle)
+            : base(handle)
+        { }
+
+        public abstract UINavigationItem BaseNavItem { get; }
+        public abstract UIBarButtonItem BaseCancelButton { get; }
+        public abstract UIBarButtonItem BaseSubmitButton { get; }
+        public abstract Action Success { get; }
+        public abstract Action Cancel { get; }
+
+        public FormEntryTableViewCell MasterPasswordCell { get; set; } = new FormEntryTableViewCell(
+            AppResources.MasterPassword, useButton: true);
+
+        public string BiometricIntegrityKey { get; set; }
+
+        public UITableViewCell BiometricCell
+        {
+            get
+            {
+                var cell = new UITableViewCell();
+                cell.BackgroundColor = ThemeHelpers.BackgroundColor;
+                if (_biometricIntegrityValid)
+                {
+                    var biometricButtonText = _deviceActionService.SupportsFaceBiometric() ?
+                    AppResources.UseFaceIDToUnlock : AppResources.UseFingerprintToUnlock;
+                    cell.TextLabel.TextColor = ThemeHelpers.PrimaryColor;
+                    cell.TextLabel.Text = biometricButtonText;
+                }
+                else
+                {
+                    cell.TextLabel.TextColor = ThemeHelpers.DangerColor;
+                    cell.TextLabel.Font = ThemeHelpers.GetDangerFont();
+                    cell.TextLabel.Lines = 0;
+                    cell.TextLabel.LineBreakMode = UILineBreakMode.WordWrap;
+                    cell.TextLabel.Text = AppResources.BiometricInvalidatedExtension;
+                }
+                return cell;
+            }
+        }
+
+        public abstract UITableView TableView { get; }
+
+        public override async void ViewDidLoad()
+        {
+            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
+            _cryptoService = ServiceContainer.Resolve<ICryptoService>("cryptoService");
+            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _secureStorageService = ServiceContainer.Resolve<IStorageService>("secureStorageService");
+            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
+            _biometricService = ServiceContainer.Resolve<IBiometricService>("biometricService");
+            _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
+
+            // We re-use the lock screen for autofill extension to verify master password
+            // when trying to access protected items.
+            if (autofillExtension && await _stateService.GetPasswordRepromptAutofillAsync())
+            {
+                _passwordReprompt = true;
+                _isPinProtected = false;
+                _isPinProtectedWithKey = false;
+                _pinLock = false;
+                _biometricLock = false;
+            }
+            else
+            {
+                (_isPinProtected, _isPinProtectedWithKey) = await _vaultTimeoutService.IsPinLockSetAsync();
+                _pinLock = (_isPinProtected && await _stateService.GetPinProtectedKeyAsync() != null) ||
+                           _isPinProtectedWithKey;
+                _biometricLock = await _vaultTimeoutService.IsBiometricLockSetAsync() &&
+                                 await _cryptoService.HasKeyAsync();
+                _biometricIntegrityValid = await _biometricService.ValidateIntegrityAsync(BiometricIntegrityKey);
+                _usesKeyConnector = await _keyConnectorService.GetUsesKeyConnector();
+                _biometricUnlockOnly = _usesKeyConnector && _biometricLock && !_pinLock;
+            }
+
+            if (_pinLock)
+            {
+                BaseNavItem.Title = AppResources.VerifyPIN;
+            }
+            else if (_usesKeyConnector)
+            {
+                BaseNavItem.Title = AppResources.UnlockVault;
+            }
+            else
+            {
+                BaseNavItem.Title = AppResources.VerifyMasterPassword;
+            }
+
+            BaseCancelButton.Title = AppResources.Cancel;
+
+            if (_biometricUnlockOnly)
+            {
+                BaseSubmitButton.Title = null;
+                BaseSubmitButton.Enabled = false;
+            }
+            else
+            {
+                BaseSubmitButton.Title = AppResources.Submit;
+            }
+
+            var descriptor = UIFontDescriptor.PreferredBody;
+
+            if (!_biometricUnlockOnly)
+            {
+                MasterPasswordCell.Label.Text = _pinLock ? AppResources.PIN : AppResources.MasterPassword;
+                MasterPasswordCell.TextField.SecureTextEntry = true;
+                MasterPasswordCell.TextField.ReturnKeyType = UIReturnKeyType.Go;
+                MasterPasswordCell.TextField.ShouldReturn += (UITextField tf) =>
+                {
+                    CheckPasswordAsync().GetAwaiter().GetResult();
+                    return true;
+                };
+                if (_pinLock)
+                {
+                    MasterPasswordCell.TextField.KeyboardType = UIKeyboardType.NumberPad;
+                }
+                MasterPasswordCell.Button.TitleLabel.Font = UIFont.FromName("bwi-font", 28f);
+                MasterPasswordCell.Button.SetTitle(BitwardenIcons.Eye, UIControlState.Normal);
+                MasterPasswordCell.Button.TouchUpInside += (sender, e) =>
+                {
+                    MasterPasswordCell.TextField.SecureTextEntry = !MasterPasswordCell.TextField.SecureTextEntry;
+                    MasterPasswordCell.Button.SetTitle(MasterPasswordCell.TextField.SecureTextEntry ? BitwardenIcons.Eye : BitwardenIcons.EyeSlash, UIControlState.Normal);
+                };
+            }
+
+            if (TableView != null)
+            {
+                TableView.BackgroundColor = ThemeHelpers.BackgroundColor;
+                TableView.SeparatorColor = ThemeHelpers.SeparatorColor;
+            }
+
+            TableView.RowHeight = UITableView.AutomaticDimension;
+            TableView.EstimatedRowHeight = 70;
+            TableView.Source = new TableSource(this);
+            TableView.AllowsSelection = true;
+
+            base.ViewDidLoad();
+
+            if (_biometricLock)
+            {
+                if (!_biometricIntegrityValid)
+                {
+                    return;
+                }
+                var tasks = Task.Run(async () =>
+                {
+                    await Task.Delay(500);
+                    NSRunLoop.Main.BeginInvokeOnMainThread(async () => await PromptBiometricAsync());
+                });
+            }
+        }
+
+        public override async void ViewDidAppear(bool animated)
+        {
+            base.ViewDidAppear(animated);
+
+            // Users with key connector and without biometric or pin has no MP to unlock with
+            if (_usesKeyConnector)
+            {
+                if (!(_pinLock || _biometricLock) ||
+                    (_biometricLock && !_biometricIntegrityValid))
+                {
+                    PromptSSO();
+                }
+            }
+            else if (!_biometricLock || !_biometricIntegrityValid)
+            {
+                MasterPasswordCell.TextField.BecomeFirstResponder();
+            }
+        }
+
+        protected async Task CheckPasswordAsync()
+        {
+            if (string.IsNullOrWhiteSpace(MasterPasswordCell.TextField.Text))
+            {
+                var alert = Dialogs.CreateAlert(AppResources.AnErrorHasOccurred,
+                    string.Format(AppResources.ValidationFieldRequired,
+                        _pinLock ? AppResources.PIN : AppResources.MasterPassword),
+                    AppResources.Ok);
+                PresentViewController(alert, true, null);
+                return;
+            }
+
+            var email = await _stateService.GetEmailAsync();
+            var kdf = await _stateService.GetKdfTypeAsync();
+            var kdfIterations = await _stateService.GetKdfIterationsAsync();
+            var inputtedValue = MasterPasswordCell.TextField.Text;
+
+            if (_pinLock)
+            {
+                var failed = true;
+                try
+                {
+                    if (_isPinProtected)
+                    {
+                        var key = await _cryptoService.MakeKeyFromPinAsync(inputtedValue, email,
+                            kdf.GetValueOrDefault(KdfType.PBKDF2_SHA256), kdfIterations.GetValueOrDefault(5000),
+                            await _stateService.GetPinProtectedKeyAsync());
+                        var encKey = await _cryptoService.GetEncKeyAsync(key);
+                        var protectedPin = await _stateService.GetProtectedPinAsync();
+                        var decPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), encKey);
+                        failed = decPin != inputtedValue;
+                        if (!failed)
+                        {
+                            await AppHelpers.ResetInvalidUnlockAttemptsAsync();
+                            await SetKeyAndContinueAsync(key);
+                        }
+                    }
+                    else
+                    {
+                        var key2 = await _cryptoService.MakeKeyFromPinAsync(inputtedValue, email,
+                            kdf.GetValueOrDefault(KdfType.PBKDF2_SHA256), kdfIterations.GetValueOrDefault(5000));
+                        failed = false;
+                        await AppHelpers.ResetInvalidUnlockAttemptsAsync();
+                        await SetKeyAndContinueAsync(key2);
+                    }
+                }
+                catch
+                {
+                    failed = true;
+                }
+                if (failed)
+                {
+                    var invalidUnlockAttempts = await AppHelpers.IncrementInvalidUnlockAttemptsAsync();
+                    if (invalidUnlockAttempts >= 5)
+                    {
+                        await LogOutAsync();
+                        return;
+                    }
+                    InvalidValue();
+                }
+            }
+            else
+            {
+                var key2 = await _cryptoService.MakeKeyAsync(inputtedValue, email, kdf, kdfIterations);
+
+                var storedKeyHash = await _cryptoService.GetKeyHashAsync();
+                if (storedKeyHash == null)
+                {
+                    var oldKey = await _secureStorageService.GetAsync<string>("oldKey");
+                    if (key2.KeyB64 == oldKey)
+                    {
+                        var localKeyHash = await _cryptoService.HashPasswordAsync(inputtedValue, key2, HashPurpose.LocalAuthorization);
+                        await _secureStorageService.RemoveAsync("oldKey");
+                        await _cryptoService.SetKeyHashAsync(localKeyHash);
+                    }
+                }
+                var passwordValid = await _cryptoService.CompareAndUpdateKeyHashAsync(inputtedValue, key2);
+                if (passwordValid)
+                {
+                    if (_isPinProtected)
+                    {
+                        var protectedPin = await _stateService.GetProtectedPinAsync();
+                        var encKey = await _cryptoService.GetEncKeyAsync(key2);
+                        var decPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), encKey);
+                        var pinKey = await _cryptoService.MakePinKeyAysnc(decPin, email,
+                            kdf.GetValueOrDefault(KdfType.PBKDF2_SHA256), kdfIterations.GetValueOrDefault(5000));
+                        await _stateService.SetPinProtectedKeyAsync(await _cryptoService.EncryptAsync(key2.Key, pinKey));
+                    }
+                    await AppHelpers.ResetInvalidUnlockAttemptsAsync();
+                    await SetKeyAndContinueAsync(key2, true);
+                }
+                else
+                {
+                    var invalidUnlockAttempts = await AppHelpers.IncrementInvalidUnlockAttemptsAsync();
+                    if (invalidUnlockAttempts >= 5)
+                    {
+                        await LogOutAsync();
+                        return;
+                    }
+                    InvalidValue();
+                }
+            }
+        }
+
+        public async Task PromptBiometricAsync()
+        {
+            if (!_biometricLock || !_biometricIntegrityValid)
+            {
+                return;
+            }
+            var success = await _platformUtilsService.AuthenticateBiometricAsync(null,
+                _pinLock ? AppResources.PIN : AppResources.MasterPassword,
+                () => MasterPasswordCell.TextField.BecomeFirstResponder());
+            await _stateService.SetBiometricLockedAsync(!success);
+            if (success)
+            {
+                DoContinue();
+            }
+        }
+
+        public void PromptSSO()
+        {
+            var loginPage = new LoginSsoPage();
+            var app = new App.App(new AppOptions { IosExtension = true });
+            ThemeManager.SetTheme(app.Resources);
+            ThemeManager.ApplyResourcesToPage(loginPage);
+            if (loginPage.BindingContext is LoginSsoPageViewModel vm)
+            {
+                vm.SsoAuthSuccessAction = () => DoContinue();
+                vm.CloseAction = Cancel;
+            }
+
+            var navigationPage = new NavigationPage(loginPage);
+            var loginController = navigationPage.CreateViewController();
+            loginController.ModalPresentationStyle = UIModalPresentationStyle.FullScreen;
+            PresentViewController(loginController, true, null);
+        }
+
+        private async Task SetKeyAndContinueAsync(SymmetricCryptoKey key, bool masterPassword = false)
+        {
+            var hasKey = await _cryptoService.HasKeyAsync();
+            if (!hasKey)
+            {
+                await _cryptoService.SetKeyAsync(key);
+            }
+            DoContinue(masterPassword);
+        }
+
+        private async void DoContinue(bool masterPassword = false)
+        {
+            if (masterPassword)
+            {
+                await _stateService.SetPasswordVerifiedAutofillAsync(true);
+            }
+            await EnableBiometricsIfNeeded();
+            await _stateService.SetBiometricLockedAsync(false);
+            MasterPasswordCell.TextField.ResignFirstResponder();
+            Success();
+        }
+
+        private async Task EnableBiometricsIfNeeded()
+        {
+            // Re-enable biometrics if initial use
+            if (_biometricLock & !_biometricIntegrityValid)
+            {
+                await _biometricService.SetupBiometricAsync(BiometricIntegrityKey);
+            }
+        }
+
+        private void InvalidValue()
+        {
+            var alert = Dialogs.CreateAlert(AppResources.AnErrorHasOccurred,
+                string.Format(null, _pinLock ? AppResources.PIN : AppResources.InvalidMasterPassword),
+                AppResources.Ok, (a) =>
+                {
+
+                    MasterPasswordCell.TextField.Text = string.Empty;
+                    MasterPasswordCell.TextField.BecomeFirstResponder();
+                });
+            PresentViewController(alert, true, null);
+        }
+
+        private async Task LogOutAsync()
+        {
+            await AppHelpers.LogOutAsync(await _stateService.GetActiveUserIdAsync());
+            var authService = ServiceContainer.Resolve<IAuthService>("authService");
+            authService.LogOut(() =>
+            {
+                Cancel?.Invoke();
+            });
+        }
+
+        public class TableSource : ExtendedUITableViewSource
+        {
+            private readonly BaseLockPasswordViewController _controller;
+
+            public TableSource(BaseLockPasswordViewController controller)
+            {
+                _controller = controller;
+            }
+
+            public override UITableViewCell GetCell(UITableView tableView, NSIndexPath indexPath)
+            {
+                if (indexPath.Section == 0)
+                {
+                    if (indexPath.Row == 0)
+                    {
+                        if (_controller._biometricUnlockOnly)
+                        {
+                            return _controller.BiometricCell;
+                        }
+                        else
+                        {
+                            return _controller.MasterPasswordCell;
+                        }
+                    }
+                }
+                else if (indexPath.Section == 1)
+                {
+                    if (indexPath.Row == 0)
+                    {
+                        if (_controller._passwordReprompt)
+                        {
+                            var cell = new ExtendedUITableViewCell();
+                            cell.TextLabel.TextColor = ThemeHelpers.DangerColor;
+                            cell.TextLabel.Font = ThemeHelpers.GetDangerFont();
+                            cell.TextLabel.Lines = 0;
+                            cell.TextLabel.LineBreakMode = UILineBreakMode.WordWrap;
+                            cell.TextLabel.Text = AppResources.PasswordConfirmationDesc;
+                            return cell;
+                        }
+                        else if (!_controller._biometricUnlockOnly)
+                        {
+                            return _controller.BiometricCell;
+                        }
+                    }
+                }
+                return new ExtendedUITableViewCell();
+            }
+
+            public override nfloat GetHeightForRow(UITableView tableView, NSIndexPath indexPath)
+            {
+                return UITableView.AutomaticDimension;
+            }
+
+            public override nint NumberOfSections(UITableView tableView)
+            {
+                return (!_controller._biometricUnlockOnly && _controller._biometricLock) ||
+                    _controller._passwordReprompt
+                    ? 2
+                    : 1;
+            }
+
+            public override nint RowsInSection(UITableView tableview, nint section)
+            {
+                if (section <= 1)
+                {
+                    return 1;
+                }
+                return 0;
+            }
+
+            public override nfloat GetHeightForHeader(UITableView tableView, nint section)
+            {
+                return section == 1 ? 0.00001f : UITableView.AutomaticDimension;
+            }
+
+            public override string TitleForHeader(UITableView tableView, nint section)
+            {
+                return null;
+            }
+
+            public override void RowSelected(UITableView tableView, NSIndexPath indexPath)
+            {
+                tableView.DeselectRow(indexPath, true);
+                tableView.EndEditing(true);
+                if (indexPath.Row == 0 &&
+                    ((_controller._biometricUnlockOnly && indexPath.Section == 0) ||
+                    indexPath.Section == 1))
+                {
+                    var task = _controller.PromptBiometricAsync();
+                    return;
+                }
+                var cell = tableView.CellAt(indexPath);
+                if (cell == null)
+                {
+                    return;
+                }
+                if (cell is ISelectable selectableCell)
+                {
+                    selectableCell.Select();
+                }
+            }
+        }
+    }
+}
+

src/iOS.Core/Controllers/LockPasswordViewController.cs

@@ -18,6 +18,8 @@ using Bit.Core;
 
 namespace Bit.iOS.Core.Controllers
 {
+    // TODO: Leaving this here until all inheritance is changed to use BaseLockPasswordViewController instead of UITableViewController
+    [Obsolete("Use BaseLockPasswordViewController instead")]
     public abstract class LockPasswordViewController : ExtendedUITableViewController
     {
         private IVaultTimeoutService _vaultTimeoutService;

src/iOS.Core/Renderers/CollectionView/ExtendedCollectionViewRenderer.cs

@@ -0,0 +1,16 @@
+using Bit.App.Controls;
+using Bit.iOS.Core.Renderers.CollectionView;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.iOS;
+
+[assembly: ExportRenderer(typeof(ExtendedCollectionView), typeof(ExtendedCollectionViewRenderer))]
+namespace Bit.iOS.Core.Renderers.CollectionView
+{
+    public class ExtendedCollectionViewRenderer : GroupableItemsViewRenderer<ExtendedCollectionView, GroupableItemsViewController<ExtendedCollectionView>>
+    {
+        protected override GroupableItemsViewController<ExtendedCollectionView> CreateController(ExtendedCollectionView itemsView, ItemsViewLayout layout)
+        {
+            return new ExtendedGroupableItemsViewController<ExtendedCollectionView>(itemsView, layout);
+        }
+    }
+}

src/iOS.Core/Renderers/CollectionView/ExtendedGroupableItemsViewController.cs

@@ -0,0 +1,28 @@
+using System;
+using Bit.App.Controls;
+using Foundation;
+using Xamarin.Forms.Platform.iOS;
+
+namespace Bit.iOS.Core.Renderers.CollectionView
+{
+    public class ExtendedGroupableItemsViewController<TItemsView> : GroupableItemsViewController<TItemsView>
+        where TItemsView : ExtendedCollectionView
+    {
+        public ExtendedGroupableItemsViewController(TItemsView groupableItemsView, ItemsViewLayout layout)
+            : base(groupableItemsView, layout)
+        {
+        }
+
+        protected override void UpdateTemplatedCell(TemplatedCell cell, NSIndexPath indexPath)
+        {
+            try
+            {
+                base.UpdateTemplatedCell(cell, indexPath);
+            }
+            catch (Exception ex) when (ItemsView?.ExtraDataForLogging != null)
+            {
+                throw new Exception("Error in ExtendedCollectionView, extra data: " + ItemsView.ExtraDataForLogging, ex);
+            }
+        }
+    }
+}

src/iOS.Core/Renderers/CustomTabbedRenderer.cs

@@ -21,7 +21,7 @@ namespace Bit.iOS.Core.Renderers
         public CustomTabbedRenderer()
         {
             _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
-            _broadcasterService.Subscribe(nameof(CustomTabbedRenderer), async (message) =>
+            _broadcasterService.Subscribe(nameof(CustomTabbedRenderer), (message) =>
             {
                 if (message.Command == "updatedTheme")
                 {