[SG-471] Added mock services. Added Accept/reject command binding, navigation and toast messages.

* [SG-467] Fixed url validation so it works with or without http or https

* [SG-467] Validation has been refactored for simplicity.

.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/release.yml

@@ -13,6 +13,11 @@ on:
           - Initial Release
           - Redeploy
           - Dry Run
+      fdroid_publish:
+        description: 'Publish to f-droid store'
+        required: true
+        default: true
+        type: boolean
 
 jobs:
   release:
@@ -49,17 +54,26 @@ jobs:
           echo "::set-output name=branch-name::$BRANCH_NAME"
 
       - name: Download all artifacts
+        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
         with:
           workflow: build.yml
           workflow_conclusion: success
           branch: ${{ steps.branch.outputs.branch-name }}
 
+      - name: Download all artifacts
+        if: ${{ github.event.inputs.release_type == 'Dry Run' }}
+        uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
+        with:
+          workflow: build.yml
+          workflow_conclusion: success
+          branch: master
+
       - name: Prep Bitwarden iOS release asset
         run: zip -r Bitwarden\ iOS.zip Bitwarden\ iOS
 
       - name: Create release
-        if: github.event.inputs.release_type != 'Dry Run'
+        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         uses: ncipollo/release-action@40bb172bd05f266cf9ba4ff965cb61e9ee5f6d01  # v1.9.0
         with:
           artifacts: "./com.x8bit.bitwarden.aab/com.x8bit.bitwarden.aab,
@@ -78,11 +92,13 @@ jobs:
     name: F-Droid Release
     runs-on: ubuntu-20.04
     needs: release
+    if: inputs.fdroid_publish
     steps:
       - name: Checkout repo
         uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0
 
       - name: Download F-Droid .apk artifact
+        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
         with:
           workflow: build.yml
@@ -90,6 +106,15 @@ jobs:
           branch: ${{ needs.release.outputs.branch-name }}
           name: com.x8bit.bitwarden-fdroid.apk
 
+      - name: Download F-Droid .apk artifact
+        if: ${{ github.event.inputs.release_type == 'Dry Run' }}
+        uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
+        with:
+          workflow: build.yml
+          workflow_conclusion: success
+          branch: master
+          name: com.x8bit.bitwarden-fdroid.apk
+
       - name: Set up Node
         uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561  # v2.5.1
         with:
@@ -155,5 +180,5 @@ jobs:
           cd $GITHUB_WORKSPACE
 
       - name: Deploy to gh-pages
-        if: github.event.inputs.release_type != 'Dry Run'
+        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         run: npm run deploy

.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.

.github/workflows/version-bump.yml

@@ -19,12 +19,6 @@ jobs:
       - name: Create Version Branch
         run: |
           git switch -c version_bump_${{ github.event.inputs.version_number }}
-          git push -u origin version_bump_${{ github.event.inputs.version_number }}
-
-      - name: Checkout Version Branch
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
-        with:
-          ref: version_bump_${{ github.event.inputs.version_number }}
 
       - name: Bump Version - Android XML
         uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
@@ -56,16 +50,32 @@ jobs:
           version: ${{ github.event.inputs.version_number }}
           file_path: "./src/iOS/Info.plist"
 
-      - name: Commit files
+      - name: Setup git
         run: |
           git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git config --local user.name "github-actions[bot]"
+
+      - name: Check if version changed
+        id: version-changed
+        run: |
+          if [ -n "$(git status --porcelain)" ]; then
+            echo "::set-output name=changes_to_commit::TRUE"
+          else
+            echo "::set-output name=changes_to_commit::FALSE"
+            echo "No changes to commit!";
+          fi
+
+      - name: Commit files
+        if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
+        run: |
           git commit -m "Bumped version to ${{ github.event.inputs.version_number }}" -a
 
       - name: Push changes
+        if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
         run: git push -u origin version_bump_${{ github.event.inputs.version_number }}
 
       - name: Create Version PR
+        if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
         env:
           PR_BRANCH: "version_bump_${{ github.event.inputs.version_number }}"
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

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/Accessibility/AccessibilityHelpers.cs

@@ -54,6 +54,7 @@ namespace Bit.Droid.Accessibility
             new Browser("com.google.android.apps.chrome", "url_bar"),
             new Browser("com.google.android.apps.chrome_dev", "url_bar"),
             // Rem. for "com.google.android.captiveportallogin": URL displayed in ActionBar subtitle without viewId.
+            new Browser("com.iode.firefox", "mozac_browser_toolbar_url_view"),
             new Browser("com.jamal2367.styx", "search"),
             new Browser("com.kiwibrowser.browser", "url_bar"),
             new Browser("com.kiwibrowser.browser.dev", "url_bar"),
@@ -67,6 +68,7 @@ namespace Bit.Droid.Accessibility
             new Browser("com.naver.whale", "url_bar"),
             new Browser("com.opera.browser", "url_field"),
             new Browser("com.opera.browser.beta", "url_field"),
+            new Browser("com.opera.gx", "addressbarEdit"),
             new Browser("com.opera.mini.native", "url_field"),
             new Browser("com.opera.mini.native.beta", "url_field"),
             new Browser("com.opera.touch", "addressbarEdit"),

src/Android/Autofill/AutofillHelpers.cs

@@ -73,6 +73,7 @@ namespace Bit.Droid.Autofill
             "com.google.android.apps.chrome",
             "com.google.android.apps.chrome_dev",
             "com.google.android.captiveportallogin",
+            "com.iode.firefox",
             "com.jamal2367.styx",
             "com.kiwibrowser.browser",
             "com.kiwibrowser.browser.dev",
@@ -86,6 +87,7 @@ namespace Bit.Droid.Autofill
             "com.naver.whale",
             "com.opera.browser",
             "com.opera.browser.beta",
+            "com.opera.gx",
             "com.opera.mini.native",
             "com.opera.mini.native.beta",
             "com.opera.touch",

src/Android/MainActivity.cs

@@ -64,10 +64,11 @@ namespace Bit.Droid
             Intent?.Validate();
 
             base.OnCreate(savedInstanceState);
-            if (!CoreHelpers.InDebugMode())
+
+            _deviceActionService.SetScreenCaptureAllowedAsync().FireAndForget(_ =>
             {
                 Window.AddFlags(Android.Views.WindowManagerFlags.Secure);
-            }
+            });
 
             ServiceContainer.Resolve<ILogger>("logger").InitAsync();
 

src/Android/MainApplication.cs

@@ -20,6 +20,7 @@ using System.Net;
 using Bit.App.Utilities;
 using Bit.App.Pages;
 using Bit.App.Utilities.AccountManagement;
+using Bit.App.Controls;
 #if !FDROID
 using Android.Gms.Security;
 #endif
@@ -69,7 +70,8 @@ namespace Bit.Droid
                     ServiceContainer.Resolve<IStorageService>("secureStorageService"),
                     ServiceContainer.Resolve<IStateService>("stateService"),
                     ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService"),
-                    ServiceContainer.Resolve<IAuthService>("authService"));
+                    ServiceContainer.Resolve<IAuthService>("authService"),
+                    ServiceContainer.Resolve<ILogger>("logger"));
                 ServiceContainer.Register<IAccountsManager>("accountsManager", accountsManager);
             }
 #if !FDROID
@@ -99,12 +101,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(() =>
@@ -124,7 +127,7 @@ 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();
@@ -159,6 +162,7 @@ namespace Bit.Droid
             ServiceContainer.Register<ICryptoFunctionService>("cryptoFunctionService", cryptoFunctionService);
             ServiceContainer.Register<ICryptoService>("cryptoService", cryptoService);
             ServiceContainer.Register<IPasswordRepromptService>("passwordRepromptService", passwordRepromptService);
+            ServiceContainer.Register<IAvatarImageSourcePool>("avatarImageSourcePool", new AvatarImageSourcePool());
 
             // Push
 #if FDROID

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.6.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.2" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
 
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30"/>
 

src/Android/Resources/xml/autofillservice.xml

@@ -77,6 +77,9 @@
   <compatibility-package
     android:name="com.google.android.captiveportallogin"
     android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.iode.firefox"
+    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.jamal2367.styx"
     android:maxLongVersionCode="10000000000"/>
@@ -116,6 +119,9 @@
   <compatibility-package
     android:name="com.opera.browser.beta"
     android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.opera.gx"
+    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.opera.mini.native"
     android:maxLongVersionCode="10000000000"/>

src/Android/Services/ClipboardService.cs

@@ -28,17 +28,25 @@ namespace Bit.Droid.Services
 
         public async Task CopyTextAsync(string text, int expiresInMs = -1, bool isSensitive = true)
         {
-             // Xamarin.Essentials.Clipboard currently doesn't support the IS_SENSITIVE flag for API 33+
-            if ((int)Build.VERSION.SdkInt < 33)
+            try
             {
-                await Clipboard.SetTextAsync(text);
-            }
-            else
-            {
-                CopyToClipboard(text, isSensitive);
-            }
+                 // 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()

src/Android/Services/DeviceActionService.cs

@@ -948,5 +948,21 @@ namespace Bit.Droid.Services
         {
             // for any Android-specific cleanup required after switching accounts
         }
+
+        public async Task SetScreenCaptureAllowedAsync()
+        {
+            if (CoreHelpers.ForceScreenCaptureEnabled())
+            {
+                return;
+            }
+
+            var activity = CrossCurrentActivity.Current?.Activity;
+            if (await _stateService.GetScreenCaptureAllowedAsync())
+            {
+                activity.RunOnUiThread(() => activity.Window.ClearFlags(WindowManagerFlags.Secure));
+                return;
+            }
+            activity.RunOnUiThread(() => activity.Window.AddFlags(WindowManagerFlags.Secure));
+        }
     }
 }

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

@@ -8,5 +8,6 @@ namespace Bit.App.Abstractions
     {
         void Init(Func<AppOptions> getOptionsFunc, IAccountsManagerHost accountsManagerHost);
         Task NavigateOnAccountChangeAsync(bool? isAuthed = null);
+        Task LogOutAsync(string userId, bool userInitiated, bool expired);
     }
 }

src/App/Abstractions/IDeviceActionService.cs

@@ -48,5 +48,6 @@ namespace Bit.App.Abstractions
         bool SupportsFido2();
         float GetSystemFontSizeScale();
         Task OnAccountSwitchCompleteAsync();
+        Task SetScreenCaptureAllowedAsync();
     }
 }

src/App/App.csproj

@@ -122,6 +122,9 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Remove="Pages\Accounts\AccountsPopupPage.xaml.cs" />
+    <Compile Update="Pages\Accounts\LoginPasswordlessPage.xaml.cs">
+      <DependentUpon>LoginPasswordlessPage.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>
@@ -129,12 +132,10 @@
     <Folder Include="Behaviors\" />
     <Folder Include="Controls\AccountSwitchingOverlay\" />
     <Folder Include="Utilities\AccountManagement\" />
+    <Folder Include="Controls\DateTime\" />
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Update="Controls\CipherViewCell\CipherViewCell.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
     <EmbeddedResource Remove="Pages\Accounts\AccountsPopupPage.xaml" />
   </ItemGroup>
 
@@ -162,12 +163,6 @@
     </Compile>
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Update="Styles\Base.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Update="Resources\AppResources.cs.Designer.cs">
       <DependentUpon>AppResources.cs.resx</DependentUpon>
@@ -422,5 +417,6 @@
     <None Remove="Xamarin.CommunityToolkit" />
     <None Remove="Controls\AccountSwitchingOverlay\" />
     <None Remove="Utilities\AccountManagement\" />
+    <None Remove="Controls\DateTime\" />
   </ItemGroup>
 </Project>

src/App/App.xaml.cs

@@ -10,6 +10,7 @@ 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;
@@ -56,86 +57,93 @@ namespace Bit.App
             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 == "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();
-                    }
-                }
-                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()));
-                    });
+                    LoggerHelper.LogEvenIfCantBeResolved(ex);
                 }
             });
         }
@@ -293,7 +301,7 @@ namespace Bit.App
                 UpdateThemeAsync();
             };
             Current.MainPage = new NavigationPage(new HomePage(Options));
-            var mainPageTask = _accountsManager.NavigateOnAccountChangeAsync();
+            _accountsManager.NavigateOnAccountChangeAsync().FireAndForget();
             ServiceContainer.Resolve<MobilePlatformUtilsService>("platformUtilsService").Init();
         }
 

src/App/Controls/AccountViewCell/AccountViewCellViewModel.cs

@@ -13,7 +13,8 @@ namespace Bit.App.Controls
         public AccountViewCellViewModel(AccountView accountView)
         {
             AccountView = accountView;
-            AvatarImageSource = new AvatarImageSource(AccountView.Name, AccountView.Email);
+            AvatarImageSource = ServiceContainer.Resolve<IAvatarImageSourcePool>("avatarImageSourcePool")
+                                                ?.GetOrCreateAvatar(AccountView.Name, AccountView.Email);
         }
 
         public AccountView AccountView

src/App/Controls/AvatarImageSource.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using SkiaSharp;
@@ -50,7 +51,7 @@ namespace Bit.App.Controls
 
         private Stream Draw()
         {
-            string chars = null;
+            string chars;
             string upperData = null;
 
             if (string.IsNullOrEmpty(_data))
@@ -71,62 +72,83 @@ namespace Bit.App.Controls
             var textColor = Color.White;
             var size = 50;
 
-            var bitmap = new SKBitmap(
-                size * 2,
+            using (var bitmap = new SKBitmap(size * 2,
                 size * 2,
                 SKImageInfo.PlatformColorType,
-                SKAlphaType.Premul);
-            var canvas = new SKCanvas(bitmap);
-            canvas.Clear(SKColors.Transparent);
-
-            var midX = canvas.LocalClipBounds.Size.ToSizeI().Width / 2;
-            var midY = canvas.LocalClipBounds.Size.ToSizeI().Height / 2;
-            var radius = midX - midX / 5;
-
-            var circlePaint = new SKPaint
+                SKAlphaType.Premul))
             {
-                IsAntialias = true,
-                Style = SKPaintStyle.Fill,
-                StrokeJoin = SKStrokeJoin.Miter,
-                Color = SKColor.Parse(bgColor.ToHex())
-            };
-            canvas.DrawCircle(midX, midY, radius, circlePaint);
+                using (var canvas = new SKCanvas(bitmap))
+                {
+                    canvas.Clear(SKColors.Transparent);
+                    using (var paint = new SKPaint
+                    {
+                        IsAntialias = true,
+                        Style = SKPaintStyle.Fill,
+                        StrokeJoin = SKStrokeJoin.Miter,
+                        Color = SKColor.Parse(bgColor.ToHex())
+                    })
+                    {
+                        var midX = canvas.LocalClipBounds.Size.ToSizeI().Width / 2;
+                        var midY = canvas.LocalClipBounds.Size.ToSizeI().Height / 2;
+                        var radius = midX - midX / 5;
 
-            var typeface = SKTypeface.FromFamilyName("Arial", SKFontStyle.Normal);
-            var textSize = midX / 1.3f;
-            var textPaint = new SKPaint
-            {
-                IsAntialias = true,
-                Style = SKPaintStyle.Fill,
-                Color = SKColor.Parse(textColor.ToHex()),
-                TextSize = textSize,
-                TextAlign = SKTextAlign.Center,
-                Typeface = typeface
-            };
-            var rect = new SKRect();
-            textPaint.MeasureText(chars, ref rect);
-            canvas.DrawText(chars, midX, midY + rect.Height / 2, textPaint);
+                        using (var circlePaint = new SKPaint
+                        {
+                            IsAntialias = true,
+                            Style = SKPaintStyle.Fill,
+                            StrokeJoin = SKStrokeJoin.Miter,
+                            Color = SKColor.Parse(bgColor.ToHex())
+                        })
+                        {
+                            canvas.DrawCircle(midX, midY, radius, circlePaint);
 
-            return SKImage.FromBitmap(bitmap).Encode(SKEncodedImageFormat.Png, 100).AsStream();
+                            var typeface = SKTypeface.FromFamilyName("Arial", SKFontStyle.Normal);
+                            var textSize = midX / 1.3f;
+                            using (var textPaint = new SKPaint
+                            {
+                                IsAntialias = true,
+                                Style = SKPaintStyle.Fill,
+                                Color = SKColor.Parse(textColor.ToHex()),
+                                TextSize = textSize,
+                                TextAlign = SKTextAlign.Center,
+                                Typeface = typeface
+                            })
+                            {
+                                var rect = new SKRect();
+                                textPaint.MeasureText(chars, ref rect);
+                                canvas.DrawText(chars, midX, midY + rect.Height / 2, textPaint);
+
+                                using (var img = SKImage.FromBitmap(bitmap))
+                                {
+                                    var data = img.Encode(SKEncodedImageFormat.Png, 100);
+                                    return data?.AsStream(true);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
         }
 
         private string GetFirstLetters(string data, int charCount)
         {
-            var parts = data.Split();
+            var sanitizedData = data.Trim();
+            var parts = sanitizedData.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+
             if (parts.Length > 1 && charCount <= 2)
             {
-                var text = "";
-                for (int i = 0; i < charCount; i++)
+                var text = string.Empty;
+                for (var i = 0; i < charCount; i++)
                 {
-                    text += parts[i].Substring(0, 1);
+                    text += parts[i][0];
                 }
                 return text;
             }
-            if (data.Length > 2)
+            if (sanitizedData.Length > 2)
             {
-                return data.Substring(0, 2);
+                return sanitizedData.Substring(0, 2);
             }
-            return data;
+            return sanitizedData;
         }
 
         private Color StringToColor(string str)

src/App/Controls/AvatarImageSourcePool.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Concurrent;
+
+namespace Bit.App.Controls
+{
+    public interface IAvatarImageSourcePool
+    {
+        AvatarImageSource GetOrCreateAvatar(string name, string email);
+    }
+
+    public class AvatarImageSourcePool : IAvatarImageSourcePool
+    {
+        private readonly ConcurrentDictionary<string, AvatarImageSource> _cache = new ConcurrentDictionary<string, AvatarImageSource>();
+
+        public AvatarImageSource GetOrCreateAvatar(string name, string email)
+        {
+            var key = $"{name}{email}";
+            if (!_cache.TryGetValue(key, out var avatar))
+            {
+                avatar = new AvatarImageSource(name, email);
+                if (!_cache.TryAdd(key, avatar)
+                    &&
+                    !_cache.TryGetValue(key, out avatar)) // If add fails another thread created the avatar in between the first try get and the try add.
+                {
+                    // if add and get after fails, then something wrong is going on with this method.
+                    throw new InvalidOperationException("Something is wrong creating the avatar image");
+                }
+            }
+            return avatar;
+        }
+    }
+}
+

src/App/Controls/DateTime/DateTimePicker.xaml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Grid
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:controls="clr-namespace:Bit.App.Controls"
+    x:Class="Bit.App.Controls.DateTimePicker"
+    ColumnDefinitions="*,*">
+    <controls:ExtendedDatePicker
+        x:Name="_datePicker"
+        Grid.Column="0"
+        NullableDate="{Binding Date, Mode=TwoWay}"
+        Format="d"
+        AutomationProperties.IsInAccessibleTree="True" />
+    <controls:ExtendedTimePicker
+        x:Name="_timePicker"
+        Grid.Column="1"
+        NullableTime="{Binding Time, Mode=TwoWay}"
+        Format="t"
+        AutomationProperties.IsInAccessibleTree="True" />
+</Grid>

src/App/Controls/DateTime/DateTimePicker.xaml.cs

@@ -0,0 +1,34 @@
+using System.Runtime.CompilerServices;
+using Xamarin.CommunityToolkit.UI.Views;
+using Xamarin.Forms;
+
+namespace Bit.App.Controls
+{
+    public partial class DateTimePicker : Grid
+    {
+        public DateTimePicker()
+        {
+            InitializeComponent();
+        }
+
+        protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            base.OnPropertyChanged(propertyName);
+
+            if (propertyName == nameof(BindingContext)
+                &&
+                BindingContext is DateTimeViewModel dateTimeViewModel)
+            {
+                AutomationProperties.SetName(_datePicker, dateTimeViewModel.DateName);
+                AutomationProperties.SetName(_timePicker, dateTimeViewModel.TimeName);
+
+                _datePicker.PlaceHolder = dateTimeViewModel.DatePlaceholder;
+                _timePicker.PlaceHolder = dateTimeViewModel.TimePlaceholder;
+            }
+        }
+    }
+
+    public class LazyDateTimePicker : LazyView<DateTimePicker>
+    {
+    }
+}

src/App/Controls/DateTime/DateTimeViewModel.cs

@@ -0,0 +1,70 @@
+using System;
+using Bit.Core.Utilities;
+
+namespace Bit.App.Controls
+{
+    public class DateTimeViewModel : ExtendedViewModel
+    {
+        DateTime? _date;
+        TimeSpan? _time;
+
+        public DateTimeViewModel(string dateName, string timeName)
+        {
+            DateName = dateName;
+            TimeName = timeName;
+        }
+
+        public Action<DateTime?> OnDateChanged { get; set; }
+        public Action<TimeSpan?> OnTimeChanged { get; set; }
+
+        public DateTime? Date
+        {
+            get => _date;
+            set
+            {
+                if (SetProperty(ref _date, value))
+                {
+                    OnDateChanged?.Invoke(value);
+                }
+            }
+        }
+        public TimeSpan? Time
+        {
+            get => _time;
+            set
+            {
+                if (SetProperty(ref _time, value))
+                {
+                    OnTimeChanged?.Invoke(value);
+                }
+            }
+        }
+
+        public string DateName { get; }
+        public string TimeName { get; }
+
+        public string DatePlaceholder { get; set; }
+        public string TimePlaceholder { get; set; }
+
+        public DateTime? DateTime
+        {
+            get
+            {
+                if (Date.HasValue)
+                {
+                    if (Time.HasValue)
+                    {
+                        return Date.Value.Add(Time.Value);
+                    }
+                    return Date;
+                }
+                return null;
+            }
+            set
+            {
+                Date = value?.Date;
+                Time = value?.Date.TimeOfDay;
+            }
+        }
+    }
+}

src/App/Pages/Accounts/EnvironmentPage.xaml

@@ -14,7 +14,7 @@
 
     <ContentPage.ToolbarItems>
         <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
-        <ToolbarItem Text="{u:I18n Save}" Clicked="Submit_Clicked" />
+        <ToolbarItem Text="{u:I18n Save}" Command="{Binding SubmitCommand}" />
     </ContentPage.ToolbarItems>
 
     <ScrollView>

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

@@ -36,14 +36,6 @@ namespace Bit.App.Pages
             };
         }
 
-        private async void Submit_Clicked(object sender, EventArgs e)
-        {
-            if (DoOnce())
-            {
-                await _vm.SubmitAsync();
-            }
-        }
-
         private async Task SubmitSuccessAsync()
         {
             _platformUtilsService.ShowToast("success", null, AppResources.EnvironmentSaved);

src/App/Pages/Accounts/EnvironmentPageViewModel.cs

@@ -1,15 +1,17 @@
 using System;
 using System.Threading.Tasks;
+using System.Windows.Input;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
-using Xamarin.Forms;
+using Xamarin.CommunityToolkit.ObjectModel;
 
 namespace Bit.App.Pages
 {
     public class EnvironmentPageViewModel : BaseViewModel
     {
         private readonly IEnvironmentService _environmentService;
+        readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
 
         public EnvironmentPageViewModel()
         {
@@ -22,10 +24,10 @@ namespace Bit.App.Pages
             IdentityUrl = _environmentService.IdentityUrl;
             IconsUrl = _environmentService.IconsUrl;
             NotificationsUrls = _environmentService.NotificationsUrl;
-            SubmitCommand = new Command(async () => await SubmitAsync());
+            SubmitCommand = new AsyncCommand(SubmitAsync, onException: ex => OnSubmitException(ex), allowsMultipleExecutions: false);
         }
 
-        public Command SubmitCommand { get; }
+        public ICommand SubmitCommand { get; }
         public string BaseUrl { get; set; }
         public string ApiUrl { get; set; }
         public string IdentityUrl { get; set; }
@@ -37,6 +39,12 @@ namespace Bit.App.Pages
 
         public async Task SubmitAsync()
         {
+            if (!ValidateUrls())
+            {
+                await Page.DisplayAlert(AppResources.AnErrorHasOccurred, AppResources.EnvironmentPageUrlsError, AppResources.Ok);
+                return;
+            }
+
             var resUrls = await _environmentService.SetUrlsAsync(new Core.Models.Data.EnvironmentUrlData
             {
                 Base = BaseUrl,
@@ -57,5 +65,25 @@ namespace Bit.App.Pages
 
             SubmitSuccessAction?.Invoke();
         }
+
+        public bool ValidateUrls()
+        {
+            bool IsUrlValid(string url)
+            {
+                return string.IsNullOrEmpty(url) || Uri.IsWellFormedUriString(url, UriKind.RelativeOrAbsolute);
+            }
+
+            return IsUrlValid(BaseUrl)
+                && IsUrlValid(ApiUrl)
+                && IsUrlValid(IdentityUrl)
+                && IsUrlValid(WebVaultUrl)
+                && IsUrlValid(IconsUrl);
+        }
+
+        private void OnSubmitException(Exception ex)
+        {
+            _logger.Value.Exception(ex);
+            Page.DisplayAlert(AppResources.AnErrorHasOccurred, AppResources.GenericErrorMessage, AppResources.Ok);
+        }
     }
 }

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/LoginPasswordlessPage.xaml

@@ -0,0 +1,90 @@
+<?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.LoginPasswordlessPage"
+    xmlns:pages="clr-namespace:Bit.App.Pages"
+    xmlns:controls="clr-namespace:Bit.App.Controls"
+    xmlns:u="clr-namespace:Bit.App.Utilities"
+    x:DataType="pages:LoginPasswordlessViewModel"
+    Title="{Binding PageTitle}">
+
+    <ContentPage.BindingContext>
+        <pages:LoginPasswordlessViewModel />
+    </ContentPage.BindingContext>
+
+    <ContentPage.ToolbarItems>
+        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" />
+    </ContentPage.ToolbarItems>
+
+    <ContentPage.Resources>
+        <ResourceDictionary>
+            <u:InverseBoolConverter x:Key="inverseBool" />
+            <u:StringHasValueConverter x:Key="stringHasValue" />
+            <u:IsNotNullConverter x:Key="notNull" />
+        </ResourceDictionary>
+    </ContentPage.Resources>
+    <ScrollView x:Name="_scrollView" Padding="7, 0, 7, 20">
+        <StackLayout>
+            <Label
+                Text="{u:I18n AreYouTryingToLogIn}"
+                FontSize="Title"
+                FontAttributes="Bold"
+                Margin="0,14,0,21"/>
+            <Label
+                Text="{Binding LogInAttempByLabel}"
+                FontSize="Small"
+                Margin="0,0,0,24"/>
+            <Label
+                Text="{u:I18n FingerprintPhrase}"
+                FontSize="Small"
+                FontAttributes="Bold"/>
+            <controls:MonoLabel
+                FormattedText="{Binding FingerprintPhraseFormatted}"
+                FontSize="Medium"
+                Margin="0,0,0,27"/>
+            <Label
+                Text="{u:I18n DeviceType}"
+                FontSize="Small"
+                FontAttributes="Bold"/>
+            <Label
+                Text="{Binding DeviceType}"
+                FontSize="Small"
+                Margin="0,0,0,21"/>
+            <Label
+                Text="{u:I18n IpAddress}"
+                FontSize="Small"
+                FontAttributes="Bold"/>
+            <Label
+                Text="{Binding IpAddress}"
+                FontSize="Small"
+                Margin="0,0,0,21"/>
+            <Label
+                Text="{u:I18n Near}"
+                FontSize="Small"
+                FontAttributes="Bold"/>
+            <Label
+                Text="{Binding NearLocation}"
+                FontSize="Small"
+                Margin="0,0,0,21"/>
+            <Label
+                Text="{u:I18n Time}"
+                FontSize="Small"
+                FontAttributes="Bold"/>
+            <Label
+                Text="{Binding TimeOfRequestText}"
+                FontSize="Small"
+                Margin="0,0,0,57"/>
+            <Button
+                Text="{u:I18n ConfirmLogIn}"
+                Command="{Binding AcceptRequestCommand}"
+                Margin="0,0,0,17"
+                StyleClass="btn-primary"/>
+            <Button
+                Text="{u:I18n DenyLogIn}"
+                Command="{Binding RejectRequestCommand}"
+                StyleClass="btn-secundary"/>
+        </StackLayout>
+    </ScrollView>
+
+</pages:BaseContentPage>

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

@@ -0,0 +1,36 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Bit.App.Pages
+{
+    public partial class LoginPasswordlessPage : BaseContentPage
+    {
+        private LoginPasswordlessViewModel _vm;
+
+        public LoginPasswordlessPage(string fingerprintPhrase, string email, string deviceType, string ipAddress, string location, DateTime requestDate)
+        {
+            InitializeComponent();
+            _vm = BindingContext as LoginPasswordlessViewModel;
+            _vm.Page = this;
+            _vm.Email = email;
+            _vm.DeviceType = deviceType;
+            _vm.IpAddress = ipAddress;
+            _vm.NearLocation = location;
+            _vm.FingerprintPhrase = fingerprintPhrase;
+            _vm.RequestDate = requestDate;
+        }
+
+        private async void Close_Clicked(object sender, System.EventArgs e)
+        {
+            await Close();
+        }
+
+        public async Task Close()
+        {
+            if (DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
+    }
+}

src/App/Pages/Accounts/LoginPasswordlessViewModel.cs

@@ -0,0 +1,189 @@
+using System;
+using System.Threading.Tasks;
+using Bit.App.Resources;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+using Xamarin.Forms;
+using Bit.App.Utilities;
+using System.Linq;
+using Xamarin.CommunityToolkit.ObjectModel;
+using System.Windows.Input;
+
+namespace Bit.App.Pages
+{
+    public class LoginPasswordlessViewModel : BaseViewModel
+    {
+        private IAuthService _authService;
+        private IPlatformUtilsService _platformUtilsService;
+        private ILogger _logger;
+        private string _logInAttempByLabel;
+        private string _deviceType;
+        private FormattedString _fingerprintPhraseFormatted;
+        private string _fingerprintPhrase;
+        private string _email;
+        private string _timeOfRequest;
+        private DateTime _requestDate;
+        private string _nearLocation;
+        private string _ipAddress;
+
+        public LoginPasswordlessViewModel()
+        {
+            _authService = ServiceContainer.Resolve<IAuthService>("authService");
+            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
+            _logger = ServiceContainer.Resolve<ILogger>("logger");
+
+            PageTitle = AppResources.LogInRequested;
+
+            AcceptRequestCommand = new AsyncCommand(AcceptRequestAsync,
+                onException: ex => _logger.Exception(ex),
+                allowsMultipleExecutions: false);
+            RejectRequestCommand = new AsyncCommand(RejectRequestAsync,
+                onException: ex => _logger.Exception(ex),
+                allowsMultipleExecutions: false);
+        }
+
+        public ICommand AcceptRequestCommand { get; }
+
+        public ICommand RejectRequestCommand { get; }
+
+        public string Email
+        {
+            get => _email;
+            set
+            {
+                LogInAttempByLabel = string.Format(AppResources.LogInAttemptByOn, value, "bitwarden login test");
+                SetProperty(ref _email, value);
+            }
+        }
+
+        public string FingerprintPhrase
+        {
+            get => _fingerprintPhrase;
+            set
+            {
+                FingerprintPhraseFormatted = CreateFingerprintPhrase(value);
+                SetProperty(ref _fingerprintPhrase, value);
+            }
+        }
+
+        public FormattedString FingerprintPhraseFormatted
+        {
+            get => _fingerprintPhraseFormatted;
+            set => SetProperty(ref _fingerprintPhraseFormatted, value);
+        }
+
+        public string LogInAttempByLabel
+        {
+            get => _logInAttempByLabel;
+            set => SetProperty(ref _logInAttempByLabel, value);
+        }
+
+        public string DeviceType
+        {
+            get => _deviceType;
+            set => SetProperty(ref _deviceType, value);
+        }
+
+        public string IpAddress
+        {
+            get => _ipAddress;
+            set => SetProperty(ref _ipAddress, value);
+        }
+
+        public string NearLocation
+        {
+            get => _nearLocation;
+            set => SetProperty(ref _nearLocation, value);
+        }
+
+        public DateTime RequestDate
+        {
+            get => _requestDate;
+            set
+            {
+                TimeOfRequestText = CreateRequestDate();
+                SetProperty(ref _requestDate, value);
+            }
+        }
+
+        public string TimeOfRequestText
+        {
+            get => _timeOfRequest;
+            set
+            {
+                SetProperty(ref _timeOfRequest, value);
+            }
+        }
+
+        private FormattedString CreateFingerprintPhrase(string fingerprintPhrase)
+        {
+            var fingerprintList = fingerprintPhrase.Split('-').ToList();
+            var fs = new FormattedString();
+            var lastFingerprint = fingerprintList.LastOrDefault();
+
+            foreach (var fingerprint in fingerprintList)
+            {
+                fs.Spans.Add(new Span
+                {
+                    Text = fingerprint
+                });
+
+                if(fingerprint == lastFingerprint)
+                {
+                    break;
+                }
+
+                fs.Spans.Add(new Span
+                {
+                    Text = "-",
+                    TextColor = ThemeManager.GetResourceColor("DangerColor")
+                });
+            }
+           
+            return fs;
+        }
+
+        private string CreateRequestDate()
+        {
+            var minutesSinceRequest = RequestDate.ToUniversalTime().Minute - DateTime.UtcNow.Minute;
+            if(minutesSinceRequest < 5)
+            {
+                return  AppResources.JustNow;
+            }
+            if(minutesSinceRequest < 59)
+            {
+                return $"{minutesSinceRequest} {AppResources.MinutesAgo}";
+            }
+
+            return RequestDate.ToShortTimeString();
+        }
+
+        private async Task AcceptRequestAsync()
+        {
+            try
+            {
+                var res = await _authService.LogInPasswordlessAcceptAsync();
+                await ((LoginPasswordlessPage)this.Page).Close();
+                _platformUtilsService.ShowToast("info", null, AppResources.LogInAccepted);
+            }
+            catch (Exception ex)
+            {
+                _logger.Exception(ex);
+            }
+        }
+
+        private async Task RejectRequestAsync()
+        {
+            try
+            {
+                var res = await _authService.LogInPasswordlessRejectAsync();
+                await ((LoginPasswordlessPage)this.Page).Close();
+                _platformUtilsService.ShowToast("info", null, AppResources.LogInDenied);
+            }
+            catch (Exception ex)
+            {
+                _logger.Exception(ex);
+            }
+        }
+    }
+}

src/App/Pages/Send/SendAddEditPage.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"
@@ -303,14 +303,14 @@
                                         <ColumnDefinition Width="*" />
                                     </Grid.ColumnDefinitions>
                                     <controls:ExtendedDatePicker
-                                        NullableDate="{Binding DeletionDate, Mode=TwoWay}"
+                                        NullableDate="{Binding DeletionDateTimeViewModel.Date, Mode=TwoWay}"
                                         Format="d"
                                         IsEnabled="{Binding SendEnabled}"
                                         AutomationProperties.IsInAccessibleTree="True"
                                         AutomationProperties.Name="{u:I18n DeletionDate}"
                                         Grid.Column="0" />
                                     <controls:ExtendedTimePicker
-                                        NullableTime="{Binding DeletionTime, Mode=TwoWay}"
+                                        NullableTime="{Binding DeletionDateTimeViewModel.Time, Mode=TwoWay}"
                                         Format="t"
                                         IsEnabled="{Binding SendEnabled}"
                                         AutomationProperties.IsInAccessibleTree="True"
@@ -343,7 +343,7 @@
                                         <ColumnDefinition Width="*" />
                                     </Grid.ColumnDefinitions>
                                     <controls:ExtendedDatePicker
-                                        NullableDate="{Binding ExpirationDate, Mode=TwoWay}"
+                                        NullableDate="{Binding ExpirationDateTimeViewModel.Date, Mode=TwoWay}"
                                         PlaceHolder="mm/dd/yyyy"
                                         Format="d"
                                         IsEnabled="{Binding SendEnabled}"
@@ -351,7 +351,7 @@
                                         AutomationProperties.Name="{u:I18n ExpirationDate}"
                                         Grid.Column="0" />
                                     <controls:ExtendedTimePicker
-                                        NullableTime="{Binding ExpirationTime, Mode=TwoWay}"
+                                        NullableTime="{Binding ExpirationDateTimeViewModel.Time, Mode=TwoWay}"
                                         PlaceHolder="--:-- --"
                                         Format="t"
                                         IsEnabled="{Binding SendEnabled}"

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

@@ -23,7 +23,6 @@ namespace Bit.App.Pages
         private AppOptions _appOptions;
         private SendAddEditPageViewModel _vm;
 
-        public Action OnClose { get; set; }
         public Action AfterSubmit { get; set; }
 
         public SendAddEditPage(
@@ -136,14 +135,7 @@ namespace Bit.App.Pages
 
         private async Task CloseAsync()
         {
-            if (OnClose is null)
-            {
-                await Navigation.PopModalAsync();
-            }
-            else
-            {
-                OnClose();
-            }
+            await Navigation.PopModalAsync();
         }
 
         protected override bool OnBackButtonPressed()

src/App/Pages/Send/SendAddEditPageViewModel.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Bit.App.Abstractions;
+using Bit.App.Controls;
 using Bit.App.Resources;
 using Bit.App.Utilities;
 using Bit.Core;
@@ -23,7 +24,7 @@ namespace Bit.App.Pages
         private readonly IStateService _stateService;
         private readonly ISendService _sendService;
         private readonly ILogger _logger;
-        private bool _sendEnabled;
+        private bool _sendEnabled = true;
         private bool _canAccessPremium;
         private bool _emailVerified;
         private SendView _send;
@@ -33,11 +34,7 @@ namespace Bit.App.Pages
         private int _deletionDateTypeSelectedIndex;
         private int _expirationDateTypeSelectedIndex;
         private DateTime _simpleDeletionDateTime;
-        private DateTime _deletionDate;
-        private TimeSpan _deletionTime;
         private DateTime? _simpleExpirationDateTime;
-        private DateTime? _expirationDate;
-        private TimeSpan? _expirationTime;
         private bool _isOverridingPickers;
         private int? _maxAccessCount;
         private string[] _additionalSendProperties = new[]
@@ -89,8 +86,34 @@ namespace Bit.App.Pages
                 new KeyValuePair<string, string>(AppResources.ThirtyDays, AppResources.ThirtyDays),
                 new KeyValuePair<string, string>(AppResources.Custom, AppResources.Custom),
             };
+
+            DeletionDateTimeViewModel = new DateTimeViewModel(AppResources.DeletionDate, AppResources.DeletionTime);
+            ExpirationDateTimeViewModel = new DateTimeViewModel(AppResources.ExpirationDate, AppResources.ExpirationTime)
+            {
+                OnDateChanged = date =>
+                {
+                    if (!_isOverridingPickers && !ExpirationDateTimeViewModel.Time.HasValue)
+                    {
+                        // auto-set time to current time upon setting date
+                        ExpirationDateTimeViewModel.Time = DateTimeNow().TimeOfDay;
+                    }
+                },
+                OnTimeChanged = time =>
+                {
+                    if (!_isOverridingPickers && !ExpirationDateTimeViewModel.Date.HasValue)
+                    {
+                        // auto-set date to current date upon setting time
+                        ExpirationDateTimeViewModel.Date = DateTime.Today;
+                    }
+                },
+                DatePlaceholder = "mm/dd/yyyy",
+                TimePlaceholder = "--:-- --"
+            };
+
+            AccountSwitchingOverlayViewModel = new AccountSwitchingOverlayViewModel(_stateService, _messagingService, _logger);
         }
 
+        public AccountSwitchingOverlayViewModel AccountSwitchingOverlayViewModel { get; }
         public Command TogglePasswordCommand { get; set; }
         public Command ToggleOptionsCommand { get; set; }
         public string SendId { get; set; }
@@ -126,23 +149,14 @@ namespace Bit.App.Pages
                 }
             }
         }
-        public DateTime DeletionDate
-        {
-            get => _deletionDate;
-            set => SetProperty(ref _deletionDate, value);
-        }
-        public TimeSpan DeletionTime
-        {
-            get => _deletionTime;
-            set => SetProperty(ref _deletionTime, value);
-        }
         public bool ShowOptions
         {
             get => _showOptions;
             set => SetProperty(ref _showOptions, value,
                 additionalPropertyNames: new[]
                 {
-                    nameof(OptionsAccessilibityText)
+                    nameof(OptionsAccessilibityText),
+                    nameof(OptionsShowHideIcon)
                 });
         }
         public int ExpirationDateTypeSelectedIndex
@@ -156,28 +170,7 @@ namespace Bit.App.Pages
                 }
             }
         }
-        public DateTime? ExpirationDate
-        {
-            get => _expirationDate;
-            set
-            {
-                if (SetProperty(ref _expirationDate, value))
-                {
-                    ExpirationDateChanged();
-                }
-            }
-        }
-        public TimeSpan? ExpirationTime
-        {
-            get => _expirationTime;
-            set
-            {
-                if (SetProperty(ref _expirationTime, value))
-                {
-                    ExpirationTimeChanged();
-                }
-            }
-        }
+
         public int? MaxAccessCount
         {
             get => _maxAccessCount;
@@ -205,7 +198,7 @@ namespace Bit.App.Pages
         }
         public string FileName
         {
-            get => _fileName;
+            get => _fileName ?? AppResources.NoFileChosen;
             set
             {
                 if (SetProperty(ref _fileName, value))
@@ -240,10 +233,13 @@ namespace Bit.App.Pages
         public bool IsFile => Send?.Type == SendType.File;
         public bool ShowDeletionCustomPickers => EditMode || DeletionDateTypeSelectedIndex == 6;
         public bool ShowExpirationCustomPickers => EditMode || ExpirationDateTypeSelectedIndex == 7;
+        public DateTimeViewModel DeletionDateTimeViewModel { get; }
+        public DateTimeViewModel ExpirationDateTimeViewModel { get; }
         public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
         public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
         public string FileTypeAccessibilityLabel => IsFile ? AppResources.FileTypeIsSelected : AppResources.FileTypeIsNotSelected;
         public string TextTypeAccessibilityLabel => IsText ? AppResources.TextTypeIsSelected : AppResources.TextTypeIsNotSelected;
+        public string OptionsShowHideIcon => ShowOptions ? BitwardenIcons.ChevronUp : BitwardenIcons.AngleDown;
 
         public async Task InitAsync()
         {
@@ -268,10 +264,8 @@ namespace Bit.App.Pages
                         return false;
                     }
                     Send = await send.DecryptAsync();
-                    DeletionDate = Send.DeletionDate.ToLocalTime();
-                    DeletionTime = DeletionDate.TimeOfDay;
-                    ExpirationDate = Send.ExpirationDate?.ToLocalTime();
-                    ExpirationTime = ExpirationDate?.TimeOfDay;
+                    DeletionDateTimeViewModel.DateTime = Send.DeletionDate.ToLocalTime();
+                    ExpirationDateTimeViewModel.DateTime = Send.ExpirationDate?.ToLocalTime();
                 }
                 else
                 {
@@ -280,8 +274,7 @@ namespace Bit.App.Pages
                     {
                         Type = Type.GetValueOrDefault(defaultType),
                     };
-                    _deletionDate = DateTimeNow().AddDays(7);
-                    _deletionTime = DeletionDate.TimeOfDay;
+                    DeletionDateTimeViewModel.DateTime = DateTimeNow().AddDays(7);
                     DeletionDateTypeSelectedIndex = 4;
                     ExpirationDateTypeSelectedIndex = 0;
                 }
@@ -305,23 +298,22 @@ namespace Bit.App.Pages
         public void ClearExpirationDate()
         {
             _isOverridingPickers = true;
-            ExpirationDate = null;
-            ExpirationTime = null;
+            ExpirationDateTimeViewModel.DateTime = null;
             _isOverridingPickers = false;
         }
 
         private void UpdateSendData()
         {
             // filename
-            if (Send.File != null && FileName != null)
+            if (Send.File != null && _fileName != null)
             {
-                Send.File.FileName = FileName;
+                Send.File.FileName = _fileName;
             }
 
             // deletion date
             if (ShowDeletionCustomPickers)
             {
-                Send.DeletionDate = DeletionDate.Date.Add(DeletionTime).ToUniversalTime();
+                Send.DeletionDate = DeletionDateTimeViewModel.DateTime.Value.ToUniversalTime();
             }
             else
             {
@@ -329,9 +321,9 @@ namespace Bit.App.Pages
             }
 
             // expiration date
-            if (ShowExpirationCustomPickers && ExpirationDate.HasValue && ExpirationTime.HasValue)
+            if (ShowExpirationCustomPickers && ExpirationDateTimeViewModel.DateTime.HasValue)
             {
-                Send.ExpirationDate = ExpirationDate.Value.Date.Add(ExpirationTime.Value).ToUniversalTime();
+                Send.ExpirationDate = ExpirationDateTimeViewModel.DateTime.Value.ToUniversalTime();
             }
             else if (_simpleExpirationDateTime.HasValue)
             {
@@ -484,7 +476,7 @@ namespace Bit.App.Pages
                     return;
                 }
 
-                if (Page is SendAddEditPage sendPage && sendPage.OnClose != null)
+                if (Page is SendAddOnlyPage sendPage && sendPage.OnClose != null)
                 {
                     sendPage.OnClose();
                     return;
@@ -625,24 +617,6 @@ namespace Bit.App.Pages
             }
         }
 
-        private void ExpirationDateChanged()
-        {
-            if (!_isOverridingPickers && !ExpirationTime.HasValue)
-            {
-                // auto-set time to current time upon setting date
-                ExpirationTime = DateTimeNow().TimeOfDay;
-            }
-        }
-
-        private void ExpirationTimeChanged()
-        {
-            if (!_isOverridingPickers && !ExpirationDate.HasValue)
-            {
-                // auto-set date to current date upon setting time
-                ExpirationDate = DateTime.Today;
-            }
-        }
-
         private void MaxAccessCountChanged()
         {
             Send.MaxAccessCount = _maxAccessCount;
@@ -666,5 +640,10 @@ namespace Bit.App.Pages
                 DateTimeKind.Local
             );
         }
+
+        internal void TriggerSendTextPropertyChanged()
+        {
+            Device.BeginInvokeOnMainThread(() => TriggerPropertyChanged(nameof(Send)));
+        }
     }
 }

src/App/Pages/Send/SendAddOnlyOptionsView.xaml

@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentView
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:pages="clr-namespace:Bit.App.Pages"
+    xmlns:u="clr-namespace:Bit.App.Utilities"
+    xmlns:controls="clr-namespace:Bit.App.Controls"
+    xmlns:effects="clr-namespace:Bit.App.Effects"
+    xmlns:ios="clr-namespace:Xamarin.Forms.PlatformConfiguration.iOSSpecific;assembly=Xamarin.Forms.Core"
+    x:DataType="pages:SendAddEditPageViewModel"
+    x:Class="Bit.App.Pages.SendAddOnlyOptionsView">
+    <ContentView.Resources>
+        <ResourceDictionary>
+            <u:InverseBoolConverter x:Key="inverseBool" />
+        </ResourceDictionary>
+    </ContentView.Resources>
+    <ContentView.Content>
+        <StackLayout>
+            <StackLayout
+                StyleClass="box-row"
+                Margin="0,10,0,0">
+                <Label
+                    Text="{u:I18n DeletionDate}"
+                    StyleClass="box-label" />
+                <Picker
+                    x:Name="_deletionDateTypePicker"
+                    ItemsSource="{Binding DeletionTypeOptions, Mode=OneTime}"
+                    SelectedIndex="{Binding DeletionDateTypeSelectedIndex}"
+                    IsEnabled="{Binding SendEnabled}"
+                    StyleClass="box-value"
+                    ItemDisplayBinding="{Binding Key}"
+                    ios:Picker.UpdateMode="WhenFinished"
+                    AutomationProperties.IsInAccessibleTree="True"
+                    AutomationProperties.Name="{u:I18n DeletionTime}" />
+                <controls:LazyDateTimePicker
+                    x:Name="_lazyDeletionDateTimePicker"
+                    BindingContext="{Binding DeletionDateTimeViewModel}"
+                    IsVisible="{Binding ShowDeletionCustomPickers}"
+                    Margin="0,5,0,0" />
+                <Label
+                    Text="{u:I18n DeletionDateInfo}"
+                    StyleClass="box-footer-label"
+                    Margin="0,5,0,0" />
+            </StackLayout>
+            <StackLayout StyleClass="box-row" Margin="0,5,0,0">
+                <Label
+                    Text="{u:I18n ExpirationDate}"
+                    StyleClass="box-label" />
+                <Picker
+                    x:Name="_expirationDateTypePicker"
+                    ItemsSource="{Binding ExpirationTypeOptions, Mode=OneTime}"
+                    SelectedIndex="{Binding ExpirationDateTypeSelectedIndex}"
+                    ItemDisplayBinding="{Binding Key}"
+                    ios:Picker.UpdateMode="WhenFinished"
+                    IsEnabled="{Binding SendEnabled}"
+                    StyleClass="box-value"
+                    AutomationProperties.IsInAccessibleTree="True"
+                    AutomationProperties.Name="{u:I18n ExpirationTime}" />
+                <controls:LazyDateTimePicker
+                    x:Name="_lazyExpirationDateTimePicker"
+                    BindingContext="{Binding ExpirationDateTimeViewModel}"
+                    IsVisible="{Binding ShowExpirationCustomPickers}"
+                    Margin="0,5,0,0" />
+                <Label
+                    Text="{u:I18n ExpirationDateInfo}"
+                    StyleClass="box-footer-label"
+                    HorizontalOptions="StartAndExpand"
+                    Margin="0,5,0,0" />
+            </StackLayout>
+            <StackLayout
+                StyleClass="box-row"
+                Margin="0,5,0,0">
+                <Label
+                    Text="{u:I18n MaximumAccessCount}"
+                    StyleClass="box-label" />
+                <StackLayout
+                    StyleClass="box-row"
+                    Orientation="Horizontal">
+                    <Entry
+                        Text="{Binding MaxAccessCount}"
+                        IsEnabled="{Binding SendEnabled}"
+                        StyleClass="box-value"
+                        Keyboard="Numeric"
+                        MaxLength="9"
+                        TextChanged="OnMaxAccessCountTextChanged"
+                        HorizontalOptions="FillAndExpand" />
+                    <controls:ExtendedStepper
+                        x:Name="_maxAccessCountStepper"
+                        Value="{Binding MaxAccessCount}"
+                        Maximum="999999999"
+                        IsEnabled="{Binding SendEnabled}"
+                        Margin="10,0,0,0" />
+                </StackLayout>
+                <Label
+                    Text="{u:I18n MaximumAccessCountInfo}"
+                    StyleClass="box-footer-label" />
+            </StackLayout>
+            <StackLayout
+                StyleClass="box-row"
+                Margin="0,5,0,0">
+                <Label
+                    Text="{u:I18n NewPassword}"
+                    StyleClass="box-label" />
+                <StackLayout Orientation="Horizontal">
+                    <Entry
+                        Text="{Binding NewPassword}"
+                        IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
+                        IsEnabled="{Binding SendEnabled}"
+                        StyleClass="box-value"
+                        IsSpellCheckEnabled="False"
+                        IsTextPredictionEnabled="False"
+                        HorizontalOptions="FillAndExpand" />
+                    <controls:IconButton
+                        IsEnabled="{Binding SendEnabled}"
+                        StyleClass="box-row-button, box-row-button-platform"
+                        Text="{Binding ShowPasswordIcon}"
+                        Command="{Binding TogglePasswordCommand}"
+                        Margin="10,0,0,0"
+                        AutomationProperties.IsInAccessibleTree="True"
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
+                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
+                </StackLayout>
+                <Label
+                    Text="{u:I18n PasswordInfo}"
+                    StyleClass="box-footer-label"
+                    Margin="0,5,0,0" />
+            </StackLayout>
+            <StackLayout
+                StyleClass="box-row"
+                Margin="0,5,0,0">
+                <Label
+                    Text="{u:I18n Notes}"
+                    StyleClass="box-label" />
+                <Editor
+                    x:Name="_notesEditor"
+                    AutoSize="TextChanges"
+                    Text="{Binding Send.Notes}"
+                    IsEnabled="{Binding SendEnabled}"
+                    StyleClass="box-value"
+                    Margin="0,10,0,5"
+                    effects:ScrollEnabledEffect.IsScrollEnabled="false" >
+                    <Editor.Effects>
+                        <effects:ScrollEnabledEffect />
+                    </Editor.Effects>
+                </Editor>
+                <BoxView
+                    StyleClass="box-row-separator" />
+                <Label
+                    Text="{u:I18n NotesInfo}"
+                    StyleClass="box-footer-label"
+                    Margin="0,5,0,0" />
+            </StackLayout>
+            <StackLayout
+                StyleClass="box-row, box-row-switch"
+                Margin="0,5,0,0">
+                <Label
+                    Text="{u:I18n HideEmail}"
+                    StyleClass="box-label-regular"
+                    VerticalOptions="Center"
+                    HorizontalOptions="StartAndExpand" />
+                <Switch
+                    IsToggled="{Binding Send.HideEmail}"
+                    IsEnabled="{Binding DisableHideEmailControl, Converter={StaticResource inverseBool}}"
+                    HorizontalOptions="End"
+                    Margin="10,0,0,0" />
+            </StackLayout>
+            <StackLayout
+                StyleClass="box-row, box-row-switch"
+                Margin="0,5,0,0">
+                <Label
+                    Text="{u:I18n DisableSend}"
+                    StyleClass="box-label-regular"
+                    VerticalOptions="Center"
+                    HorizontalOptions="StartAndExpand" />
+                <Switch
+                    IsToggled="{Binding Send.Disabled}"
+                    IsEnabled="{Binding SendEnabled}"
+                    HorizontalOptions="End"
+                    Margin="10,0,0,0" />
+            </StackLayout>
+        </StackLayout>
+    </ContentView.Content>
+</ContentView>

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

@@ -0,0 +1,91 @@
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+using Bit.App.Behaviors;
+using Xamarin.CommunityToolkit.UI.Views;
+using Xamarin.Forms;
+
+namespace Bit.App.Pages
+{
+    public partial class SendAddOnlyOptionsView : ContentView
+    {
+        public SendAddOnlyOptionsView()
+        {
+            InitializeComponent();
+        }
+
+        private SendAddEditPageViewModel ViewModel => BindingContext as SendAddEditPageViewModel;
+
+        public void SetMainScrollView(ScrollView scrollView)
+        {
+            _notesEditor.Behaviors.Add(new EditorPreventAutoBottomScrollingOnFocusedBehavior { ParentScrollView = scrollView });
+        }
+
+        private void OnMaxAccessCountTextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (ViewModel is null)
+            {
+                return;
+            }
+
+            if (string.IsNullOrWhiteSpace(e.NewTextValue))
+            {
+                ViewModel.MaxAccessCount = null;
+                _maxAccessCountStepper.Value = 0;
+                return;
+            }
+            // accept only digits
+            if (!int.TryParse(e.NewTextValue, out int _))
+            {
+                ((Entry)sender).Text = e.OldTextValue;
+            }
+        }
+
+        protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            base.OnPropertyChanged(propertyName);
+
+            if (propertyName == nameof(BindingContext)
+               &&
+               ViewModel != null)
+            {
+                ViewModel.PropertyChanged += ViewModel_PropertyChanged;
+            }
+        }
+
+        private void ViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if (!_lazyDeletionDateTimePicker.IsLoaded
+                &&
+                e.PropertyName == nameof(SendAddEditPageViewModel.ShowDeletionCustomPickers)
+                &&
+                ViewModel.ShowDeletionCustomPickers)
+            {
+                _lazyDeletionDateTimePicker.LoadViewAsync();
+            }
+
+            if (!_lazyExpirationDateTimePicker.IsLoaded
+                &&
+                e.PropertyName == nameof(SendAddEditPageViewModel.ShowExpirationCustomPickers)
+                &&
+                ViewModel.ShowExpirationCustomPickers)
+            {
+                _lazyExpirationDateTimePicker.LoadViewAsync();
+            }
+        }
+    }
+
+    public class SendAddOnlyOptionsLazyView : LazyView<SendAddOnlyOptionsView>
+    {
+        public ScrollView MainScrollView { get; set; }
+
+        public override async ValueTask LoadViewAsync()
+        {
+            await base.LoadViewAsync();
+
+            if (Content is SendAddOnlyOptionsView optionsView)
+            {
+                optionsView.SetMainScrollView(MainScrollView);
+            }
+        }
+    }
+}

src/App/Pages/Send/SendAddOnlyPage.xaml

@@ -0,0 +1,190 @@
+<?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.SendAddOnlyPage"
+    xmlns:pages="clr-namespace:Bit.App.Pages"
+    xmlns:u="clr-namespace:Bit.App.Utilities"
+    xmlns:controls="clr-namespace:Bit.App.Controls"
+    xmlns:behaviors="clr-namespace:Bit.App.Behaviors"
+    xmlns:effects="clr-namespace:Bit.App.Effects"
+    x:DataType="pages:SendAddEditPageViewModel"
+    x:Name="_page"
+    Title="{Binding PageTitle}">
+    <ContentPage.BindingContext>
+        <pages:SendAddEditPageViewModel />
+    </ContentPage.BindingContext>
+
+    <ContentPage.ToolbarItems>
+        <!--Order matters here or the avatar's image won't be updated correctly, check iOS CustomNavigationRenderer for more info-->
+        <controls:ExtendedToolbarItem
+            x:Name="_accountAvatar"
+            IconImageSource="{Binding AvatarImageSource}"
+            Command="{Binding Source={x:Reference _accountListOverlay}, Path=ToggleVisibililtyCommand}"
+            Order="Primary"
+            Priority="-2"
+            UseOriginalImage="True"
+            AutomationProperties.IsInAccessibleTree="True"
+            AutomationProperties.Name="{u:I18n Account}" />
+        <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" x:Name="_closeItem" />
+        <ToolbarItem Text="{u:I18n Save}" Clicked="Save_Clicked" Order="Primary" x:Name="_saveItem"/>
+    </ContentPage.ToolbarItems>
+
+    <ContentPage.Resources>
+        <ResourceDictionary>
+            <u:InverseBoolConverter x:Key="inverseBool" />
+        </ResourceDictionary>
+    </ContentPage.Resources>
+
+    <AbsoluteLayout>
+        <ScrollView
+            x:Name="_scrollView"
+            AbsoluteLayout.LayoutBounds="0, 0, 1, 1"
+            AbsoluteLayout.LayoutFlags="All">
+            <StackLayout x:Name="_mainContainer" StyleClass="box">
+                <Frame
+                    IsVisible="{Binding SendEnabled, Converter={StaticResource inverseBool}}"
+                    Padding="10"
+                    Margin="0, 12, 0, 0"
+                    HasShadow="False"
+                    BackgroundColor="Transparent"
+                    BorderColor="Accent">
+                    <Label
+                        Text="{u:I18n SendDisabledWarning}"
+                        StyleClass="text-muted, text-sm, text-bold"
+                        HorizontalTextAlignment="Center" />
+                </Frame>
+                <Frame
+                    IsVisible="{Binding SendOptionsPolicyInEffect}"
+                    Padding="10"
+                    Margin="0, 12, 0, 0"
+                    HasShadow="False"
+                    BackgroundColor="Transparent"
+                    BorderColor="Accent">
+                    <Label
+                        Text="{u:I18n SendOptionsPolicyInEffect}"
+                        StyleClass="text-muted, text-sm, text-bold"
+                        HorizontalTextAlignment="Center" />
+                </Frame>
+                <StackLayout StyleClass="box-row">
+                    <Label
+                        Text="{u:I18n Name}"
+                        StyleClass="box-label" />
+                    <Entry
+                        x:Name="_nameEntry"
+                        Text="{Binding Send.Name}"
+                        IsEnabled="{Binding SendEnabled}"
+                        StyleClass="box-value" />
+                    <Label
+                        Text="{u:I18n NameInfo}"
+                        StyleClass="box-footer-label"
+                        Margin="0,5,0,0" />
+                </StackLayout>
+                <StackLayout
+                    StyleClass="box-row"
+                    IsVisible="{Binding IsFile}">
+                    <Label
+                        Text="{u:I18n TypeFile}"
+                        StyleClass="box-label" />
+                    <StackLayout
+                        StyleClass="box-row">
+                        <Label
+                            Text="{Binding FileName}"
+                            LineBreakMode="CharacterWrap"
+                            StyleClass="text-sm, text-muted"
+                            HorizontalOptions="FillAndExpand"
+                            HorizontalTextAlignment="Center" />
+                        <Label
+                            Margin="0, 5, 0, 0"
+                            Text="{u:I18n MaxFileSize}"
+                            StyleClass="text-sm, text-muted"
+                            HorizontalOptions="FillAndExpand"
+                            HorizontalTextAlignment="Center" />
+                    </StackLayout>
+                </StackLayout>
+                <StackLayout
+                    StyleClass="box-row"
+                    IsVisible="{Binding IsText}">
+                    <Label
+                        Text="{u:I18n TypeText}"
+                        StyleClass="box-label" />
+                    <Editor
+                        x:Name="_textEditor"
+                        AutoSize="TextChanges"
+                        Text="{Binding Send.Text.Text}"
+                        IsEnabled="{Binding SendEnabled}"
+                        StyleClass="box-value"
+                        Margin="{Binding EditorMargins}" 
+                        effects:ScrollEnabledEffect.IsScrollEnabled="false" >
+                        <Editor.Behaviors>
+                            <behaviors:EditorPreventAutoBottomScrollingOnFocusedBehavior ParentScrollView="{x:Reference _scrollView}" />
+                        </Editor.Behaviors>
+                        <Editor.Effects>
+                            <effects:ScrollEnabledEffect />
+                        </Editor.Effects>
+                    </Editor>
+                    <BoxView
+                        StyleClass="box-row-separator" />
+                    <Label
+                        Text="{u:I18n TypeTextInfo}"
+                        StyleClass="box-footer-label"
+                        Margin="0,5,0,10" />
+                    <StackLayout
+                        StyleClass="box-row, box-row-switch"
+                        Margin="0,10,0,0">
+                        <Label
+                            Text="{u:I18n HideTextByDefault}"
+                            StyleClass="box-label-regular"
+                            VerticalOptions="Center"
+                            HorizontalOptions="StartAndExpand" />
+                        <Switch
+                            IsToggled="{Binding Send.Text.Hidden}"
+                            IsEnabled="{Binding SendEnabled}"
+                            HorizontalOptions="End"
+                            Margin="10,0,0,0" />
+                    </StackLayout>
+                </StackLayout>
+                <StackLayout
+                    StyleClass="box-row, box-row-switch">
+                    <Label
+                        Text="{Binding ShareOnSaveText}"
+                        StyleClass="box-label-regular"
+                        VerticalOptions="Center"
+                        HorizontalOptions="StartAndExpand" />
+                    <Switch
+                        IsToggled="{Binding ShareOnSave}"
+                        IsEnabled="{Binding SendEnabled}"
+                        HorizontalOptions="End"
+                        Margin="10,0,0,0" />
+                </StackLayout>
+                <StackLayout
+                    Orientation="Horizontal"
+                    Spacing="0"
+                    AutomationProperties.IsInAccessibleTree="True"
+                    AutomationProperties.Name="{Binding OptionsAccessilibityText}">
+                    <StackLayout.GestureRecognizers>
+                        <TapGestureRecognizer Tapped="OptionsHeader_Tapped" />
+                    </StackLayout.GestureRecognizers>
+                    <Label
+                        Text="{u:I18n Options}"
+                        TextColor="{DynamicResource PrimaryColor}"
+                        Margin="0,0,5,0"
+                        AutomationProperties.IsInAccessibleTree="False"/>
+                    <controls:IconLabel
+                        Text="{Binding OptionsShowHideIcon}"
+                        TextColor="{DynamicResource PrimaryColor}"
+                        AutomationProperties.IsInAccessibleTree="False"/>
+                </StackLayout>
+                <pages:SendAddOnlyOptionsLazyView x:Name="_lazyOptionsView" IsVisible="{Binding ShowOptions}" />
+            </StackLayout>
+        </ScrollView>
+        
+        <controls:AccountSwitchingOverlayView
+            x:Name="_accountListOverlay"
+            AbsoluteLayout.LayoutBounds="0, 0, 1, 1"
+            AbsoluteLayout.LayoutFlags="All"
+            LongPressAccountEnabled="False"
+            BindingContext="{Binding AccountSwitchingOverlayViewModel}"/>
+    </AbsoluteLayout>
+    
+</pages:BaseContentPage>

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

@@ -0,0 +1,178 @@
+using System;
+using System.Threading.Tasks;
+using Bit.App.Models;
+using Bit.App.Utilities;
+using Bit.Core.Abstractions;
+using Bit.Core.Enums;
+using Bit.Core.Utilities;
+using Xamarin.Forms;
+
+namespace Bit.App.Pages
+{
+    /// <summary>
+    /// This is a version of <see cref="SendAddEditPage"/> that is reduced for adding only and adapted
+    /// for performance for iOS Share extension.
+    /// </summary>
+    /// <remarks>
+    /// This should NOT be used in Android.
+    /// </remarks>
+    public partial class SendAddOnlyPage : BaseContentPage
+    {
+        private readonly IVaultTimeoutService _vaultTimeoutService;
+        private readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
+
+        private AppOptions _appOptions;
+        private SendAddEditPageViewModel _vm;
+
+        public Action OnClose { get; set; }
+        public Action AfterSubmit { get; set; }
+
+        public SendAddOnlyPage(
+            AppOptions appOptions = null,
+            string sendId = null,
+            SendType? type = null)
+        {
+            if (appOptions?.IosExtension != true)
+            {
+                throw new InvalidOperationException(nameof(SendAddOnlyPage) + " is only prepared to be used in iOS share extension");
+            }
+
+            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
+            _appOptions = appOptions;
+            InitializeComponent();
+            _vm = BindingContext as SendAddEditPageViewModel;
+            _vm.Page = this;
+            _vm.SendId = sendId;
+            _vm.Type = appOptions?.CreateSend?.Item1 ?? type;
+
+            if (_vm.IsText)
+            {
+                _nameEntry.ReturnType = ReturnType.Next;
+                _nameEntry.ReturnCommand = new Command(() => _textEditor.Focus());
+            }
+        }
+
+        protected override async void OnAppearing()
+        {
+            base.OnAppearing();
+
+            try
+            {
+                if (!await AppHelpers.IsVaultTimeoutImmediateAsync())
+                {
+                    await _vaultTimeoutService.CheckVaultTimeoutAsync();
+                }
+                if (await _vaultTimeoutService.IsLockedAsync())
+                {
+                    return;
+                }
+                await _vm.InitAsync();
+
+                if (!await _vm.LoadAsync())
+                {
+                    await CloseAsync();
+                    return;
+                }
+
+                _accountAvatar?.OnAppearing();
+                await Device.InvokeOnMainThreadAsync(async () => _vm.AvatarImageSource = await GetAvatarImageSourceAsync());
+
+                await HandleCreateRequest();
+                if (string.IsNullOrWhiteSpace(_vm.Send?.Name))
+                {
+                    RequestFocus(_nameEntry);
+                }
+                AdjustToolbar();
+            }
+            catch (Exception ex)
+            {
+                _logger.Value.Exception(ex);
+                await CloseAsync();
+            }
+        }
+
+        protected override void OnDisappearing()
+        {
+            base.OnDisappearing();
+            _accountAvatar?.OnDisappearing();
+        }
+
+        private async Task CloseAsync()
+        {
+            if (OnClose is null)
+            {
+                await Navigation.PopModalAsync();
+            }
+            else
+            {
+                OnClose();
+            }
+        }
+
+        private async void Save_Clicked(object sender, EventArgs e)
+        {
+            if (DoOnce())
+            {
+                var submitted = await _vm.SubmitAsync();
+                if (submitted)
+                {
+                    AfterSubmit?.Invoke();
+                }
+            }
+        }
+
+        private async void Close_Clicked(object sender, EventArgs e)
+        {
+            if (DoOnce())
+            {
+                await CloseAsync();
+            }
+        }
+
+        private void AdjustToolbar()
+        {
+            _saveItem.IsEnabled = _vm.SendEnabled;
+        }
+
+        private Task HandleCreateRequest()
+        {
+            if (_appOptions?.CreateSend == null)
+            {
+                return Task.CompletedTask;
+            }
+
+            _vm.IsAddFromShare = true;
+            _vm.CopyInsteadOfShareAfterSaving = _appOptions.CopyInsteadOfShareAfterSaving;
+
+            var name = _appOptions.CreateSend.Item2;
+            _vm.Send.Name = name;
+
+            var type = _appOptions.CreateSend.Item1;
+            if (type == SendType.File)
+            {
+                _vm.FileData = _appOptions.CreateSend.Item3;
+                _vm.FileName = name;
+            }
+            else
+            {
+                var text = _appOptions.CreateSend.Item4;
+                _vm.Send.Text.Text = text;
+                _vm.TriggerSendTextPropertyChanged();
+            }
+            _appOptions.CreateSend = null;
+
+            return Task.CompletedTask;
+        }
+
+        void OptionsHeader_Tapped(object sender, EventArgs e)
+        {
+            _vm.ToggleOptionsCommand.Execute(null);
+
+            if (!_lazyOptionsView.IsLoaded)
+            {
+                _lazyOptionsView.MainScrollView = _scrollView;
+                _lazyOptionsView.LoadViewAsync();
+            }
+        }
+    }
+}

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/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
@@ -66,31 +83,31 @@
             <StackLayout StyleClass="box">
                 <StackLayout StyleClass="box-row, box-row-switch">
                     <Label
-                        Text="{u:I18n DisableAutoTotpCopy}"
+                        Text="{u:I18n CopyTotpAutomatically}"
                         StyleClass="box-label-regular"
                         HorizontalOptions="StartAndExpand" />
                     <Switch
-                        IsToggled="{Binding DisableAutoTotpCopy}"
+                        IsToggled="{Binding AutoTotpCopy}"
                         StyleClass="box-value"
                         HorizontalOptions="End" />
                 </StackLayout>
                 <Label
-                    Text="{u:I18n DisableAutoTotpCopyDescription}"
+                    Text="{u:I18n CopyTotpAutomaticallyDescription}"
                     StyleClass="box-footer-label, box-footer-label-switch" />
             </StackLayout>
             <StackLayout StyleClass="box">
                 <StackLayout StyleClass="box-row, box-row-switch">
                     <Label
-                        Text="{u:I18n DisableWebsiteIcons}"
+                        Text="{u:I18n ShowWebsiteIcons}"
                         StyleClass="box-label-regular"
                         HorizontalOptions="StartAndExpand" />
                     <Switch
-                        IsToggled="{Binding DisableFavicon}"
+                        IsToggled="{Binding Favicon}"
                         StyleClass="box-value"
                         HorizontalOptions="End" />
                 </StackLayout>
                 <Label
-                    Text="{u:I18n DisableWebsiteIconsDescription}"
+                    Text="{u:I18n ShowWebsiteIconsDescription}"
                     StyleClass="box-footer-label, box-footer-label-switch" />
             </StackLayout>
             <StackLayout StyleClass="box" IsVisible="{Binding ShowAndroidAutofillSettings}">
@@ -100,16 +117,16 @@
                 </StackLayout>
                 <StackLayout StyleClass="box-row, box-row-switch">
                     <Label
-                        Text="{u:I18n DisableSavePrompt}"
+                        Text="{u:I18n AskToAddLogin}"
                         StyleClass="box-label-regular"
                         HorizontalOptions="StartAndExpand" />
                     <Switch
-                        IsToggled="{Binding AutofillDisableSavePrompt}"
+                        IsToggled="{Binding AutofillSavePrompt}"
                         StyleClass="box-value"
                         HorizontalOptions="End" />
                 </StackLayout>
                 <Label
-                    Text="{u:I18n DisableSavePromptDescription}"
+                    Text="{u:I18n AskToAddLoginDescription}"
                     StyleClass="box-footer-label, box-footer-label-switch" />
             </StackLayout>
             <StackLayout StyleClass="box" IsVisible="{Binding ShowAndroidAutofillSettings}">

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

@@ -12,17 +12,17 @@ namespace Bit.App.Pages
 {
     public class OptionsPageViewModel : BaseViewModel
     {
-        private readonly ITotpService _totpService;
         private readonly IStateService _stateService;
         private readonly IMessagingService _messagingService;
 
 
-        private bool _autofillDisableSavePrompt;
+        private bool _autofillSavePrompt;
         private string _autofillBlacklistedUris;
-        private bool _disableFavicon;
-        private bool _disableAutoTotpCopy;
+        private bool _favicon;
+        private bool _autoTotpCopy;
         private int _clearClipboardSelectedIndex;
         private int _themeSelectedIndex;
+        private int _autoDarkThemeSelectedIndex;
         private int _uriMatchSelectedIndex;
         private bool _inited;
         private bool _updatingAutofill;
@@ -30,7 +30,6 @@ namespace Bit.App.Pages
 
         public OptionsPageViewModel()
         {
-            _totpService = ServiceContainer.Resolve<ITotpService>("totpService");
             _stateService = ServiceContainer.Resolve<IStateService>("stateService");
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
 
@@ -53,10 +52,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 +76,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 +86,7 @@ namespace Bit.App.Pages
             {
                 if (SetProperty(ref _clearClipboardSelectedIndex, value))
                 {
-                    var task = SaveClipboardChangedAsync();
+                    SaveClipboardChangedAsync().FireAndForget();
                 }
             }
         }
@@ -90,9 +96,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,43 +126,43 @@ namespace Bit.App.Pages
             {
                 if (SetProperty(ref _uriMatchSelectedIndex, value))
                 {
-                    var task = SaveDefaultUriAsync();
+                    SaveDefaultUriAsync().FireAndForget();
                 }
             }
         }
 
-        public bool DisableFavicon
+        public bool Favicon
         {
-            get => _disableFavicon;
+            get => _favicon;
             set
             {
-                if (SetProperty(ref _disableFavicon, value))
+                if (SetProperty(ref _favicon, value))
                 {
-                    var task = UpdateDisableFaviconAsync();
+                    UpdateFaviconAsync().FireAndForget();
                 }
             }
         }
 
-        public bool DisableAutoTotpCopy
+        public bool AutoTotpCopy
         {
-            get => _disableAutoTotpCopy;
+            get => _autoTotpCopy;
             set
             {
-                if (SetProperty(ref _disableAutoTotpCopy, value))
+                if (SetProperty(ref _autoTotpCopy, value))
                 {
-                    var task = UpdateAutoTotpCopyAsync();
+                    UpdateAutoTotpCopyAsync().FireAndForget();
                 }
             }
         }
 
-        public bool AutofillDisableSavePrompt
+        public bool AutofillSavePrompt
         {
-            get => _autofillDisableSavePrompt;
+            get => _autofillSavePrompt;
             set
             {
-                if (SetProperty(ref _autofillDisableSavePrompt, value))
+                if (SetProperty(ref _autofillSavePrompt, value))
                 {
-                    var task = UpdateAutofillDisableSavePromptAsync();
+                    UpdateAutofillSavePromptAsync().FireAndForget();
                 }
             }
         }
@@ -159,13 +181,15 @@ namespace Bit.App.Pages
 
         public async Task InitAsync()
         {
-            AutofillDisableSavePrompt = (await _stateService.GetAutofillDisableSavePromptAsync()).GetValueOrDefault();
+            AutofillSavePrompt = !(await _stateService.GetAutofillDisableSavePromptAsync()).GetValueOrDefault();
             var blacklistedUrisList = await _stateService.GetAutofillBlacklistedUrisAsync();
             AutofillBlacklistedUris = blacklistedUrisList != null ? string.Join(", ", blacklistedUrisList) : null;
-            DisableAutoTotpCopy = !(await _totpService.IsAutoCopyEnabledAsync());
-            DisableFavicon = (await _stateService.GetDisableFaviconAsync()).GetValueOrDefault();
+            AutoTotpCopy = !(await _stateService.GetDisableAutoTotpCopyAsync() ?? false);
+            Favicon = !(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);
@@ -178,15 +202,17 @@ namespace Bit.App.Pages
         {
             if (_inited)
             {
-                await _stateService.SetDisableAutoTotpCopyAsync(DisableAutoTotpCopy);
+                // TODO: [PS-961] Fix negative function names
+                await _stateService.SetDisableAutoTotpCopyAsync(!AutoTotpCopy);
             }
         }
 
-        private async Task UpdateDisableFaviconAsync()
+        private async Task UpdateFaviconAsync()
         {
             if (_inited)
             {
-                await _stateService.SetDisableFaviconAsync(DisableFavicon);
+                // TODO: [PS-961] Fix negative function names
+                await _stateService.SetDisableFaviconAsync(!Favicon);
             }
         }
 
@@ -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");
             }
@@ -217,11 +243,12 @@ namespace Bit.App.Pages
             }
         }
 
-        private async Task UpdateAutofillDisableSavePromptAsync()
+        private async Task UpdateAutofillSavePromptAsync()
         {
             if (_inited)
             {
-                await _stateService.SetAutofillDisableSavePromptAsync(AutofillDisableSavePrompt);
+                // TODO: [PS-961] Fix negative function names
+                await _stateService.SetAutofillDisableSavePromptAsync(!AutofillSavePrompt);
             }
         }
 

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

@@ -2,18 +2,13 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Threading.Tasks;
-using Bit.App.Abstractions;
 using Bit.App.Controls;
-using Bit.App.Pages.Accounts;
-using Bit.App.Resources;
-using Bit.Core.Utilities;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
     public partial class SettingsPage : BaseContentPage
     {
-        private readonly IDeviceActionService _deviceActionService;
         private readonly TabsPage _tabsPage;
         private SettingsPageViewModel _vm;
 
@@ -21,7 +16,6 @@ namespace Bit.App.Pages
         {
             _tabsPage = tabsPage;
             InitializeComponent();
-            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
             _vm = BindingContext as SettingsPageViewModel;
             _vm.Page = this;
         }
@@ -67,122 +61,12 @@ namespace Bit.App.Pages
             }
         }
 
-        private async void RowSelected(object sender, SelectionChangedEventArgs e)
+        private void RowSelected(object sender, SelectionChangedEventArgs e)
         {
             ((ExtendedCollectionView)sender).SelectedItem = null;
-            if (!DoOnce())
+            if (e.CurrentSelection?.FirstOrDefault() is SettingsPageListItem item)
             {
-                return;
-            }
-            if (!(e.CurrentSelection?.FirstOrDefault() is SettingsPageListItem item))
-            {
-                return;
-            }
-
-            if (item.Name == AppResources.Sync)
-            {
-                await Navigation.PushModalAsync(new NavigationPage(new SyncPage()));
-            }
-            else if (item.Name == AppResources.AutofillServices)
-            {
-                await Navigation.PushModalAsync(new NavigationPage(new AutofillServicesPage(this)));
-            }
-            else if (item.Name == AppResources.PasswordAutofill)
-            {
-                await Navigation.PushModalAsync(new NavigationPage(new AutofillPage()));
-            }
-            else if (item.Name == AppResources.AppExtension)
-            {
-                await Navigation.PushModalAsync(new NavigationPage(new ExtensionPage()));
-            }
-            else if (item.Name == AppResources.Options)
-            {
-                await Navigation.PushModalAsync(new NavigationPage(new OptionsPage()));
-            }
-            else if (item.Name == AppResources.Folders)
-            {
-                await Navigation.PushModalAsync(new NavigationPage(new FoldersPage()));
-            }
-            else if (item.Name == AppResources.About)
-            {
-                await _vm.AboutAsync();
-            }
-            else if (item.Name == AppResources.HelpAndFeedback)
-            {
-                _vm.Help();
-            }
-            else if (item.Name == AppResources.FingerprintPhrase)
-            {
-                await _vm.FingerprintAsync();
-            }
-            else if (item.Name == AppResources.RateTheApp)
-            {
-                _vm.Rate();
-            }
-            else if (item.Name == AppResources.ImportItems)
-            {
-                _vm.Import();
-            }
-            else if (item.Name == AppResources.ExportVault)
-            {
-                await Navigation.PushModalAsync(new NavigationPage(new ExportVaultPage()));
-            }
-            else if (item.Name == AppResources.LearnOrg)
-            {
-                await _vm.ShareAsync();
-            }
-            else if (item.Name == AppResources.WebVault)
-            {
-                _vm.WebVault();
-            }
-            else if (item.Name == AppResources.ChangeMasterPassword)
-            {
-                await _vm.ChangePasswordAsync();
-            }
-            else if (item.Name == AppResources.TwoStepLogin)
-            {
-                await _vm.TwoStepAsync();
-            }
-            else if (item.Name == AppResources.LogOut)
-            {
-                await _vm.LogOutAsync();
-            }
-            else if (item.Name == AppResources.DeleteAccount)
-            {
-                await Navigation.PushModalAsync(new NavigationPage(new DeleteAccountPage()));
-            }
-            else if (item.Name == AppResources.LockNow)
-            {
-                await _vm.LockAsync();
-            }
-            else if (item.Name == AppResources.VaultTimeout)
-            {
-                await _vm.VaultTimeoutAsync();
-            }
-            else if (item.Name == AppResources.VaultTimeoutAction)
-            {
-                await _vm.VaultTimeoutActionAsync();
-            }
-            else if (item.Name == AppResources.UnlockWithPIN)
-            {
-                await _vm.UpdatePinAsync();
-            }
-            else if (item.Name == AppResources.SubmitCrashLogs)
-            {
-                await _vm.LoggerReportingAsync();
-            }
-            else
-            {
-                var biometricName = AppResources.Biometrics;
-                if (Device.RuntimePlatform == Device.iOS)
-                {
-                    var supportsFace = await _deviceActionService.SupportsFaceBiometricAsync();
-                    biometricName = supportsFace ? AppResources.FaceID : AppResources.TouchID;
-                }
-                if (item.Name == string.Format(AppResources.UnlockWith, biometricName))
-                {
-                    await _vm.UpdateBiometricAsync();
-                }
+                _vm?.ExecuteSettingItemCommand.Execute(item);
             }
         }
     }

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

@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using Bit.App.Resources;
 using Bit.App.Utilities;
 using Xamarin.Forms;
@@ -12,6 +13,8 @@ namespace Bit.App.Pages
         public string SubLabel { get; set; }
         public TimeSpan? Time { get; set; }
         public bool UseFrame { get; set; }
+        public Func<Task> ExecuteAsync { get; set; }
+
         public bool SubLabelTextEnabled => SubLabel == AppResources.Enabled;
         public string LineBreakMode => SubLabel == null ? "TailTruncation" : "";
         public bool ShowSubLabel => SubLabel.Length != 0;

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

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Bit.App.Abstractions;
+using Bit.App.Pages.Accounts;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Models.Domain;
-using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;
@@ -30,11 +30,13 @@ namespace Bit.App.Pages
         private readonly IKeyConnectorService _keyConnectorService;
         private readonly IClipboardService _clipboardService;
         private readonly ILogger _loggerService;
+
         private const int CustomVaultTimeoutValue = -100;
 
         private bool _supportsBiometric;
         private bool _pin;
         private bool _biometric;
+        private bool _screenCaptureAllowed;
         private string _lastSyncDate;
         private string _vaultTimeoutDisplayValue;
         private string _vaultTimeoutActionDisplayValue;
@@ -84,10 +86,14 @@ namespace Bit.App.Pages
 
             GroupedItems = new ObservableRangeCollection<ISettingsPageListItem>();
             PageTitle = AppResources.Settings;
+
+            ExecuteSettingItemCommand = new AsyncCommand<SettingsPageListItem>(item => item.ExecuteAsync(), onException: _loggerService.Exception, allowsMultipleExecutions: false);
         }
 
         public ObservableRangeCollection<ISettingsPageListItem> GroupedItems { get; set; }
 
+        public IAsyncCommand<SettingsPageListItem> ExecuteSettingItemCommand { get; }
+
         public async Task InitAsync()
         {
             _supportsBiometric = await _platformUtilsService.SupportsBiometricAsync();
@@ -117,6 +123,7 @@ namespace Bit.App.Pages
             var pinSet = await _vaultTimeoutService.IsPinLockSetAsync();
             _pin = pinSet.Item1 || pinSet.Item2;
             _biometric = await _vaultTimeoutService.IsBiometricLockSetAsync();
+            _screenCaptureAllowed = await _stateService.GetScreenCaptureAllowedAsync();
 
             if (_vaultTimeoutDisplayValue == null)
             {
@@ -257,6 +264,17 @@ namespace Bit.App.Pages
                 }
                 var cleanSelection = selection.Replace("✓ ", string.Empty);
                 var selectionOption = _vaultTimeouts.FirstOrDefault(o => o.Key == cleanSelection);
+
+                // Check if the selected Timeout action is "Never" and if it's different from the previous selected value
+                if (selectionOption.Value == null && selectionOption.Value != oldTimeout)
+                {
+                    var confirmed = await _platformUtilsService.ShowDialogAsync(AppResources.NeverLockWarning,
+                        AppResources.Warning, AppResources.Yes, AppResources.Cancel);
+                    if (!confirmed)
+                    {
+                        return;
+                    }
+                }
                 _vaultTimeoutDisplayValue = selectionOption.Key;
                 newTimeout = selectionOption.Value;
             }
@@ -423,6 +441,8 @@ namespace Bit.App.Pages
 
         public void BuildList()
         {
+            //TODO: Refactor this once navigation is abstracted so that it doesn't depend on Page, e.g. Page.Navigation.PushModalAsync...
+
             var doUpper = Device.RuntimePlatform != Device.Android;
             var autofillItems = new List<SettingsPageListItem>();
             if (Device.RuntimePlatform == Device.Android)
@@ -430,38 +450,69 @@ namespace Bit.App.Pages
                 autofillItems.Add(new SettingsPageListItem
                 {
                     Name = AppResources.AutofillServices,
-                    SubLabel = _deviceActionService.AutofillServicesEnabled() ?
-                        AppResources.Enabled : AppResources.Disabled
+                    SubLabel = _deviceActionService.AutofillServicesEnabled() ? AppResources.Enabled : AppResources.Disabled,
+                    ExecuteAsync = () => Page.Navigation.PushModalAsync(new NavigationPage(new AutofillServicesPage(Page as SettingsPage)))
                 });
             }
             else
             {
                 if (_deviceActionService.SystemMajorVersion() >= 12)
                 {
-                    autofillItems.Add(new SettingsPageListItem { Name = AppResources.PasswordAutofill });
+                    autofillItems.Add(new SettingsPageListItem
+                    {
+                        Name = AppResources.PasswordAutofill,
+                        ExecuteAsync = () => Page.Navigation.PushModalAsync(new NavigationPage(new AutofillPage()))
+                    });
                 }
-                autofillItems.Add(new SettingsPageListItem { Name = AppResources.AppExtension });
+                autofillItems.Add(new SettingsPageListItem
+                {
+                    Name = AppResources.AppExtension,
+                    ExecuteAsync = () => Page.Navigation.PushModalAsync(new NavigationPage(new ExtensionPage()))
+                });
             }
             var manageItems = new List<SettingsPageListItem>
             {
-                new SettingsPageListItem { Name = AppResources.Folders },
-                new SettingsPageListItem { Name = AppResources.Sync, SubLabel = _lastSyncDate }
+                new SettingsPageListItem
+                {
+                    Name = AppResources.Folders,
+                    ExecuteAsync = () => Page.Navigation.PushModalAsync(new NavigationPage(new FoldersPage()))
+                },
+                new SettingsPageListItem
+                {
+                    Name = AppResources.Sync,
+                    SubLabel = _lastSyncDate,
+                    ExecuteAsync = () => Page.Navigation.PushModalAsync(new NavigationPage(new SyncPage()))
+                }
             };
             var securityItems = new List<SettingsPageListItem>
             {
-                new SettingsPageListItem { Name = AppResources.VaultTimeout, SubLabel = _vaultTimeoutDisplayValue },
+                new SettingsPageListItem
+                {
+                    Name = AppResources.VaultTimeout,
+                    SubLabel = _vaultTimeoutDisplayValue,
+                    ExecuteAsync = () => VaultTimeoutAsync() },
                 new SettingsPageListItem
                 {
                     Name = AppResources.VaultTimeoutAction,
-                    SubLabel = _vaultTimeoutActionDisplayValue
+                    SubLabel = _vaultTimeoutActionDisplayValue,
+                    ExecuteAsync = () => VaultTimeoutActionAsync()
                 },
                 new SettingsPageListItem
                 {
                     Name = AppResources.UnlockWithPIN,
-                    SubLabel = _pin ? AppResources.Enabled : AppResources.Disabled
+                    SubLabel = _pin ? AppResources.Enabled : AppResources.Disabled,
+                    ExecuteAsync = () => UpdatePinAsync()
                 },
-                new SettingsPageListItem { Name = AppResources.LockNow },
-                new SettingsPageListItem { Name = AppResources.TwoStepLogin }
+                new SettingsPageListItem
+                {
+                    Name = AppResources.LockNow,
+                    ExecuteAsync = () => LockAsync()
+                },
+                new SettingsPageListItem
+                {
+                    Name = AppResources.TwoStepLogin,
+                    ExecuteAsync = () => TwoStepAsync()
+                }
             };
             if (_supportsBiometric || _biometric)
             {
@@ -474,7 +525,8 @@ namespace Bit.App.Pages
                 var item = new SettingsPageListItem
                 {
                     Name = string.Format(AppResources.UnlockWith, biometricName),
-                    SubLabel = _biometric ? AppResources.Enabled : AppResources.Disabled
+                    SubLabel = _biometric ? AppResources.Enabled : AppResources.Disabled,
+                    ExecuteAsync = () => UpdateBiometricAsync()
                 };
                 securityItems.Insert(2, item);
             }
@@ -497,40 +549,98 @@ namespace Bit.App.Pages
                     UseFrame = true,
                 });
             }
+            if (Device.RuntimePlatform == Device.Android)
+            {
+                securityItems.Add(new SettingsPageListItem
+                {
+                    Name = AppResources.AllowScreenCapture,
+                    SubLabel = _screenCaptureAllowed ? AppResources.Enabled : AppResources.Disabled,
+                    ExecuteAsync = () => SetScreenCaptureAllowedAsync()
+                });
+            }
             var accountItems = new List<SettingsPageListItem>
             {
-                new SettingsPageListItem { Name = AppResources.FingerprintPhrase },
-                new SettingsPageListItem { Name = AppResources.LogOut }
+                new SettingsPageListItem
+                {
+                    Name = AppResources.FingerprintPhrase,
+                    ExecuteAsync = () => FingerprintAsync()
+                },
+                new SettingsPageListItem
+                {
+                    Name = AppResources.LogOut,
+                    ExecuteAsync = () => LogOutAsync()
+                }
             };
             if (_showChangeMasterPassword)
             {
-                accountItems.Insert(0, new SettingsPageListItem { Name = AppResources.ChangeMasterPassword });
+                accountItems.Insert(0, new SettingsPageListItem
+                {
+                    Name = AppResources.ChangeMasterPassword,
+                    ExecuteAsync = () => ChangePasswordAsync()
+                });
             }
             var toolsItems = new List<SettingsPageListItem>
             {
-                new SettingsPageListItem { Name = AppResources.ImportItems },
-                new SettingsPageListItem { Name = AppResources.ExportVault }
+                new SettingsPageListItem
+                {
+                    Name = AppResources.ImportItems,
+                    ExecuteAsync = () => Device.InvokeOnMainThreadAsync(() => Import())
+                },
+                new SettingsPageListItem
+                {
+                    Name = AppResources.ExportVault,
+                    ExecuteAsync = () => Page.Navigation.PushModalAsync(new NavigationPage(new ExportVaultPage()))
+                }
             };
             if (IncludeLinksWithSubscriptionInfo())
             {
-                toolsItems.Add(new SettingsPageListItem { Name = AppResources.LearnOrg });
-                toolsItems.Add(new SettingsPageListItem { Name = AppResources.WebVault });
+                toolsItems.Add(new SettingsPageListItem
+                {
+                    Name = AppResources.LearnOrg,
+                    ExecuteAsync = () => ShareAsync()
+                });
+                toolsItems.Add(new SettingsPageListItem
+                {
+                    Name = AppResources.WebVault,
+                    ExecuteAsync = () => Device.InvokeOnMainThreadAsync(() => WebVault())
+                });
             }
 
             var otherItems = new List<SettingsPageListItem>
             {
-                new SettingsPageListItem { Name = AppResources.Options },
-                new SettingsPageListItem { Name = AppResources.About },
-                new SettingsPageListItem { Name = AppResources.HelpAndFeedback },
+                new SettingsPageListItem
+                {
+                    Name = AppResources.Options,
+                    ExecuteAsync = () => Page.Navigation.PushModalAsync(new NavigationPage(new OptionsPage()))
+                },
+                new SettingsPageListItem
+                {
+                    Name = AppResources.About,
+                    ExecuteAsync = () => AboutAsync()
+                },
+                new SettingsPageListItem
+                {
+                    Name = AppResources.HelpAndFeedback,
+                    ExecuteAsync = () => Device.InvokeOnMainThreadAsync(() => Help())
+                },
 #if !FDROID 
                 new SettingsPageListItem
                 {
                     Name = AppResources.SubmitCrashLogs,
                     SubLabel = _reportLoggingEnabled ? AppResources.Enabled : AppResources.Disabled,
+                    ExecuteAsync = () => LoggerReportingAsync()
                 },
 #endif
-                new SettingsPageListItem { Name = AppResources.RateTheApp },
-                new SettingsPageListItem { Name = AppResources.DeleteAccount }
+                new SettingsPageListItem
+                {
+                    Name = AppResources.RateTheApp,
+                    ExecuteAsync = () => Device.InvokeOnMainThreadAsync(() => Rate())
+                },
+                new SettingsPageListItem
+                {
+                    Name = AppResources.DeleteAccount,
+                    ExecuteAsync = () => Page.Navigation.PushModalAsync(new NavigationPage(new DeleteAccountPage()))
+                }
             };
 
             // TODO: improve this. Leaving this as is to reduce error possibility on the hotfix.
@@ -610,5 +720,33 @@ namespace Bit.App.Pages
         private string CreateSelectableOption(string option, bool selected) => selected ? $"✓ {option}" : option;
 
         private bool CompareSelection(string selection, string compareTo) => selection == compareTo || selection == $"✓ {compareTo}";
+
+        public async Task SetScreenCaptureAllowedAsync()
+        {
+            if (CoreHelpers.ForceScreenCaptureEnabled())
+            {
+                return;
+            }
+
+            try
+            {
+                if (!_screenCaptureAllowed
+                    &&
+                    !await Page.DisplayAlert(AppResources.AllowScreenCapture, AppResources.AreYouSureYouWantToEnableScreenCapture, AppResources.Yes, AppResources.No))
+                {
+                    return;
+                }
+
+                await _stateService.SetScreenCaptureAllowedAsync(!_screenCaptureAllowed);
+                _screenCaptureAllowed = !_screenCaptureAllowed;
+                await _deviceActionService.SetScreenCaptureAllowedAsync();
+                BuildList();
+            }
+            catch (Exception ex)
+            {
+                _loggerService.Exception(ex);
+                await Page.DisplayAlert(AppResources.AnErrorHasOccurred, AppResources.GenericErrorMessage, AppResources.Ok);
+            }
+        }
     }
 }

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

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

@@ -181,6 +181,8 @@ namespace Bit.App.Pages
                 return;
             }
 
+            _deviceActionService.SetScreenCaptureAllowedAsync().FireAndForget();
+
             await InitVaultFilterAsync(MainPage);
             if (MainPage)
             {

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())
             {
@@ -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())
@@ -756,7 +750,7 @@ namespace Bit.App.Pages
             {
                 if (IsBooleanType)
                 {
-                    return _field.Value == "true" ? BitwardenIcons.Square : BitwardenIcons.CheckSquare;
+                    return _field.Value == "true" ? BitwardenIcons.CheckSquare : BitwardenIcons.Square;
                 }
                 else if (IsLinkedType)
                 {

src/App/Resources/AppResources.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -236,7 +236,7 @@
     <comment>The button text that allows user to launch the website to their web browser.</comment>
   </data>
   <data name="HelpAndFeedback" xml:space="preserve">
-    <value>Help and Feedback</value>
+    <value>Help and feedback</value>
   </data>
   <data name="Hide" xml:space="preserve">
     <value>Hide</value>
@@ -269,7 +269,7 @@
     <comment>Title for login page. (noun)</comment>
   </data>
   <data name="LogOut" xml:space="preserve">
-    <value>Log Out</value>
+    <value>Log out</value>
     <comment>The log out button text (verb).</comment>
   </data>
   <data name="LogoutConfirmation" xml:space="preserve">
@@ -412,7 +412,7 @@
     <value>Add an Item</value>
   </data>
   <data name="AppExtension" xml:space="preserve">
-    <value>App Extension</value>
+    <value>App extension</value>
   </data>
   <data name="AutofillAccessibilityDescription" xml:space="preserve">
     <value>Use the Bitwarden accessibility service to auto-fill your logins across apps and the web.</value>
@@ -516,7 +516,7 @@
     <value>Get your master password hint</value>
   </data>
   <data name="ImportItems" xml:space="preserve">
-    <value>Import Items</value>
+    <value>Import items</value>
   </data>
   <data name="ImportItemsConfirmation" xml:space="preserve">
     <value>You can bulk import items from the bitwarden.com web vault. Do you want to visit the website now?</value>
@@ -549,10 +549,10 @@
     <value>Immediately</value>
   </data>
   <data name="VaultTimeout" xml:space="preserve">
-    <value>Vault Timeout</value>
+    <value>Vault timeout</value>
   </data>
   <data name="VaultTimeoutAction" xml:space="preserve">
-    <value>Vault Timeout Action</value>
+    <value>Vault timeout action</value>
   </data>
   <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
     <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
@@ -647,7 +647,7 @@
     <comment>Push notifications for apple products</comment>
   </data>
   <data name="RateTheApp" xml:space="preserve">
-    <value>Rate the App</value>
+    <value>Rate the app</value>
   </data>
   <data name="RateTheAppDescription" xml:space="preserve">
     <value>Please consider helping us out with a good review!</value>
@@ -701,7 +701,7 @@
     <comment>What Apple calls their fingerprint reader.</comment>
   </data>
   <data name="TwoStepLogin" xml:space="preserve">
-    <value>Two-step Login</value>
+    <value>Two-step login</value>
   </data>
   <data name="TwoStepLoginConfirmation" xml:space="preserve">
     <value>Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be enabled on the bitwarden.com web vault. Do you want to visit the website now?</value>
@@ -710,7 +710,7 @@
     <value>Unlock with {0}</value>
   </data>
   <data name="UnlockWithPIN" xml:space="preserve">
-    <value>Unlock with PIN Code</value>
+    <value>Unlock with PIN code</value>
   </data>
   <data name="Validating" xml:space="preserve">
     <value>Validating</value>
@@ -907,11 +907,11 @@
   <data name="CopyTotp" xml:space="preserve">
     <value>Copy TOTP</value>
   </data>
-  <data name="DisableAutoTotpCopyDescription" xml:space="preserve">
-    <value>If your login has an authenticator key attached to it, the TOTP verification code is automatically copied to your clipboard whenever you auto-fill the login.</value>
+  <data name="CopyTotpAutomaticallyDescription" xml:space="preserve">
+    <value>If a login has an authenticator key, copy the TOTP verification code to your clip-board when you auto-fill the login.</value>
   </data>
-  <data name="DisableAutoTotpCopy" xml:space="preserve">
-    <value>Disable Automatic TOTP Copy</value>
+  <data name="CopyTotpAutomatically" xml:space="preserve">
+    <value>Copy TOTP automatically</value>
   </data>
   <data name="PremiumRequired" xml:space="preserve">
     <value>A premium membership is required to use this feature.</value>
@@ -1128,11 +1128,11 @@
   <data name="Expiration" xml:space="preserve">
     <value>Expiration</value>
   </data>
-  <data name="DisableWebsiteIcons" xml:space="preserve">
-    <value>Disable Website Icons</value>
+  <data name="ShowWebsiteIcons" xml:space="preserve">
+    <value>Show website icons</value>
   </data>
-  <data name="DisableWebsiteIconsDescription" xml:space="preserve">
-    <value>Website Icons provide a recognizable image next to each login item in your vault.</value>
+  <data name="ShowWebsiteIconsDescription" xml:space="preserve">
+    <value>Show a recognizable image next to each login.</value>
   </data>
   <data name="IconsUrl" xml:space="preserve">
     <value>Icons Server URL</value>
@@ -1311,7 +1311,7 @@
     <value>5. Select "Bitwarden"</value>
   </data>
   <data name="PasswordAutofill" xml:space="preserve">
-    <value>Password AutoFill</value>
+    <value>Password auto-fill</value>
   </data>
   <data name="BitwardenAutofillAlert2" xml:space="preserve">
     <value>The easiest way to add new logins to your vault is by using the Bitwarden Password AutoFill extension. Learn more about using the Bitwarden Password AutoFill extension by navigating to the "Settings" screen.</value>
@@ -1449,7 +1449,7 @@
     <value>There are no folders to list.</value>
   </data>
   <data name="FingerprintPhrase" xml:space="preserve">
-    <value>Fingerprint Phrase</value>
+    <value>Fingerprint phrase</value>
     <comment>A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing.</comment>
   </data>
   <data name="YourAccountsFingerprint" xml:space="preserve">
@@ -1460,10 +1460,10 @@
     <value>Bitwarden allows you to share your vault items with others by using an organization account. Would you like to visit the bitwarden.com website to learn more?</value>
   </data>
   <data name="ExportVault" xml:space="preserve">
-    <value>Export Vault</value>
+    <value>Export vault</value>
   </data>
   <data name="LockNow" xml:space="preserve">
-    <value>Lock Now</value>
+    <value>Lock now</value>
   </data>
   <data name="PIN" xml:space="preserve">
     <value>PIN</value>
@@ -1517,7 +1517,7 @@
     <value>2 minutes</value>
   </data>
   <data name="ClearClipboard" xml:space="preserve">
-    <value>Clear Clipboard</value>
+    <value>Clear clipboard</value>
     <comment>Clipboard is the operating system thing where you copy/paste data to on your device.</comment>
   </data>
   <data name="ClearClipboardDescription" xml:space="preserve">
@@ -1525,7 +1525,7 @@
     <comment>Clipboard is the operating system thing where you copy/paste data to on your device.</comment>
   </data>
   <data name="DefaultUriMatchDetection" xml:space="preserve">
-    <value>Default URI Match Detection</value>
+    <value>Default URI match detection</value>
     <comment>Default URI match detection for auto-fill.</comment>
   </data>
   <data name="DefaultUriMatchDetectionDescription" xml:space="preserve">
@@ -1541,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>
@@ -1557,20 +1563,24 @@
     <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>
   <data name="BlacklistedUrisDescription" xml:space="preserve">
     <value>URIs that are blacklisted will not offer auto-fill. The list should be comma separated. Ex: "https://twitter.com, androidapp://com.twitter.android".</value>
   </data>
-  <data name="DisableSavePrompt" xml:space="preserve">
-    <value>Disable Save Prompt</value>
+  <data name="AskToAddLogin" xml:space="preserve">
+    <value>Ask to add login</value>
   </data>
-  <data name="DisableSavePromptDescription" xml:space="preserve">
-    <value>The "Save Prompt" automatically prompts you to save new items to your vault whenever you enter them for the first time.</value>
+  <data name="AskToAddLoginDescription" xml:space="preserve">
+    <value>Ask to add an item if one isn't found in your vault.</value>
   </data>
   <data name="OnRestart" xml:space="preserve">
-    <value>On App Restart</value>
+    <value>On app restart</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>Auto-fill makes it easy to securely access your Bitwarden vault from other websites and apps. It looks like you have not enabled an auto-fill service for Bitwarden. Enable auto-fill for Bitwarden from the "Settings" screen.</value>
@@ -2149,13 +2159,13 @@
     <value>Account removed successfully</value>
   </data>
   <data name="DeleteAccount" xml:space="preserve">
-    <value>Delete Account</value>
+    <value>Delete account</value>
   </data>
   <data name="DeletingYourAccountIsPermanent" xml:space="preserve">
     <value>Deleting your account is permanent</value>
   </data>
   <data name="DeleteAccountExplanation" xml:space="preserve">
-    <value>Your account and all associated data will be erased and unrecoverable. Are you sure you want to continue?</value>
+    <value>Your account and all vault data will be erased and unrecoverable. Are you sure you want to continue?</value>
   </data>
   <data name="DeletingYourAccount" xml:space="preserve">
     <value>Deleting your account</value>
@@ -2244,4 +2254,61 @@
   <data name="All" xml:space="preserve">
     <value>All</value>
   </data>
+  <data name="NeverLockWarning" xml:space="preserve">
+    <value>Setting your lock options to “Never” keeps your vault available to anyone with access to your device. If you use this option, you should ensure that you keep your device properly protected.</value>
+  </data>
+  <data name="EnvironmentPageUrlsError" xml:space="preserve">
+    <value>One or more of the URLs entered are invalid. Please revise it and try to save again.</value>
+  </data>
+  <data name="GenericErrorMessage" xml:space="preserve">
+    <value>We were unable to process your request. Please try again or contact us.</value>
+  </data>
+  <data name="AllowScreenCapture" xml:space="preserve">
+    <value>Allow Screen Capture</value>
+  </data>
+  <data name="AreYouSureYouWantToEnableScreenCapture" xml:space="preserve">
+    <value>Are you sure you want to enable Screen Capture?</value>
+  </data>
+  <data name="LogInRequested" xml:space="preserve">
+    <value>Log in requested</value>
+  </data>
+  <data name="AreYouTryingToLogIn" xml:space="preserve">
+    <value>Are you trying to log in?</value>
+  </data>
+  <data name="LogInAttemptByOn" xml:space="preserve">
+    <value>Log in attempt by {0} on {1}</value>
+  </data>
+  <data name="FingerprintPhrase" xml:space="preserve">
+    <value>Fingerprint phrase</value>
+  </data>
+  <data name="DeviceType" xml:space="preserve">
+    <value>Device Type</value>
+  </data>
+  <data name="IpAddress" xml:space="preserve">
+    <value>IP Address</value>
+  </data>
+  <data name="Time" xml:space="preserve">
+    <value>Time</value>
+  </data>
+  <data name="Near" xml:space="preserve">
+    <value>Near</value>
+  </data>
+  <data name="ConfirmLogIn" xml:space="preserve">
+    <value>Confirm Log In</value>
+  </data>
+  <data name="DenyLogIn" xml:space="preserve">
+    <value>Deny Log In</value>
+  </data>
+  <data name="JustNow" xml:space="preserve">
+    <value>Just Now</value>
+  </data>
+  <data name="MinutesAgo" xml:space="preserve">
+    <value>minutes ago</value>
+  </data>
+  <data name="LogInAccepted" xml:space="preserve">
+    <value>Log in accepted</value>
+  </data>
+  <data name="LogInDenied" xml:space="preserve">
+    <value>Log in denied</value>
+  </data>
 </root>

src/App/Utilities/AccountManagement/AccountsManager.cs

@@ -19,6 +19,7 @@ namespace Bit.App.Utilities.AccountManagement
         private readonly IStateService _stateService;
         private readonly IPlatformUtilsService _platformUtilsService;
         private readonly IAuthService _authService;
+        private readonly ILogger _logger;
 
         Func<AppOptions> _getOptionsFunc;
         private IAccountsManagerHost _accountsManagerHost;
@@ -28,7 +29,8 @@ namespace Bit.App.Utilities.AccountManagement
                                IStorageService secureStorageService,
                                IStateService stateService,
                                IPlatformUtilsService platformUtilsService,
-                               IAuthService authService)
+                               IAuthService authService,
+                               ILogger logger)
         {
             _broadcasterService = broadcasterService;
             _vaultTimeoutService = vaultTimeoutService;
@@ -36,6 +38,7 @@ namespace Bit.App.Utilities.AccountManagement
             _stateService = stateService;
             _platformUtilsService = platformUtilsService;
             _authService = authService;
+            _logger = logger;
         }
 
         private AppOptions Options => _getOptionsFunc?.Invoke() ?? new AppOptions { IosExtension = true };
@@ -109,42 +112,49 @@ namespace Bit.App.Utilities.AccountManagement
 
         private async void OnMessage(Message message)
         {
-            switch (message.Command)
+            try
             {
-                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;
+                switch (message.Command)
+                {
+                    case AccountsManagerMessageCommands.LOCKED:
+                        await Device.InvokeOnMainThreadAsync(() => LockedAsync(message.Data as Tuple<string, bool>));
+                        break;
+                    case AccountsManagerMessageCommands.LOCK_VAULT:
+                        await _vaultTimeoutService.LockAsync(true);
+                        break;
+                    case AccountsManagerMessageCommands.LOGOUT:
+                        var extras = message.Data as Tuple<string, bool, bool>;
+                        var userId = extras?.Item1;
+                        var userInitiated = extras?.Item2 ?? true;
+                        var expired = extras?.Item3 ?? false;
+                        await Device.InvokeOnMainThreadAsync(() => LogOutAsync(userId, userInitiated, expired));
+                        break;
+                    case AccountsManagerMessageCommands.LOGGED_OUT:
+                        // Clean up old migrated key if they ever log out.
+                        await _secureStorageService.RemoveAsync("oldKey");
+                        break;
+                    case AccountsManagerMessageCommands.ADD_ACCOUNT:
+                        await AddAccountAsync();
+                        break;
+                    case AccountsManagerMessageCommands.ACCOUNT_ADDED:
+                        await _accountsManagerHost.UpdateThemeAsync();
+                        break;
+                    case AccountsManagerMessageCommands.SWITCHED_ACCOUNT:
+                        await SwitchedAccountAsync();
+                        break;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.Exception(ex);
             }
         }
 
-        private void Locked(Tuple<string, bool> extras)
+        private async Task LockedAsync(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);
@@ -163,27 +173,19 @@ namespace Bit.App.Utilities.AccountManagement
 
             await _accountsManagerHost.SetPreviousPageInfoAsync();
 
-            Device.BeginInvokeOnMainThread(() => _accountsManagerHost.Navigate(NavigationTarget.Lock, new LockNavigationParams(autoPromptBiometric)));
+            await Device.InvokeOnMainThreadAsync(() => _accountsManagerHost.Navigate(NavigationTarget.Lock, new LockNavigationParams(autoPromptBiometric)));
         }
 
-        private void AddAccount()
+        private async Task AddAccountAsync()
         {
-            Device.BeginInvokeOnMainThread(() =>
+            await Device.InvokeOnMainThreadAsync(() =>
             {
                 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)
+        public async Task LogOutAsync(string userId, bool userInitiated, bool expired)
         {
             await AppHelpers.LogOutAsync(userId, userInitiated);
             await NavigateOnAccountChangeAsync();

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/IAuthService.cs

@@ -25,6 +25,11 @@ namespace Bit.Core.Abstractions
         Task<AuthResult> LogInSsoAsync(string code, string codeVerifier, string redirectUrl, string orgId);
         Task<AuthResult> LogInCompleteAsync(string email, string masterPassword, TwoFactorProviderType twoFactorProvider, string twoFactorToken, bool? remember = null);
         Task<AuthResult> LogInTwoFactorAsync(TwoFactorProviderType twoFactorProvider, string twoFactorToken, string captchaToken, bool? remember = null);
+
+        Task<AuthResult> GetLogInPasswordlessRequestsAsync();
+        Task<AuthResult> LogInPasswordlessAcceptAsync();
+        Task<AuthResult> LogInPasswordlessRejectAsync();
+
         void LogOut(Action callback);
         void Init();
     }

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/IStateService.cs

@@ -110,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();
@@ -146,6 +148,8 @@ 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<bool> GetScreenCaptureAllowedAsync(string userId = null);
+        Task SetScreenCaptureAllowedAsync(bool value, string userId = null);
         Task SaveExtensionActiveUserIdToStorageAsync(string userId);
     }
 }

src/Core/Abstractions/ITotpService.cs

@@ -6,6 +6,5 @@ namespace Bit.Core.Abstractions
     {
         Task<string> GetCodeAsync(string key);
         int GetTimeInterval(string key);
-        Task<bool> IsAutoCopyEnabledAsync();
     }
 }

src/Core/Constants.cs

@@ -73,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/Models/Domain/Account.cs

@@ -94,11 +94,13 @@ namespace Bit.Core.Models.Domain
                 EnvironmentUrls = copy.EnvironmentUrls;
                 VaultTimeout = copy.VaultTimeout;
                 VaultTimeoutAction = copy.VaultTimeoutAction;
+                ScreenCaptureAllowed = copy.ScreenCaptureAllowed;
             }
 
             public EnvironmentUrlData EnvironmentUrls;
             public int? VaultTimeout;
             public VaultTimeoutAction? VaultTimeoutAction;
+            public bool ScreenCaptureAllowed;
         }
 
         public class AccountVolatileData

src/Core/Services/ApiService.cs

@@ -589,7 +589,19 @@ namespace Bit.Core.Services
             {
                 requestMessage.Version = new Version(1, 0);
                 requestMessage.Method = method;
+
+                if (!Uri.IsWellFormedUriString(ApiBaseUrl, UriKind.Absolute))
+                {
+                    throw new ApiException(new ErrorResponse
+                    {
+                        StatusCode = HttpStatusCode.BadGateway,
+                        //Note: This message is hardcoded until AppResources.resx gets moved into Core.csproj
+                        Message = "One or more URLs saved in the Settings are incorrect. Please revise it and try to log in again."
+                    });
+                }
+
                 requestMessage.RequestUri = new Uri(string.Concat(ApiBaseUrl, path));
+
                 if (body != null)
                 {
                     var bodyType = body.GetType();

src/Core/Services/AuthService.cs

@@ -6,6 +6,7 @@ using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Domain;
 using Bit.Core.Models.Request;
+using Bit.Core.Utilities;
 
 namespace Bit.Core.Services
 {
@@ -173,7 +174,7 @@ namespace Bit.Core.Services
         public void LogOut(Action callback)
         {
             callback.Invoke();
-            _messagingService.Send("loggedOut");
+            _messagingService.Send(AccountsManagerMessageCommands.LOGGED_OUT);
         }
 
         public List<TwoFactorProvider> GetSupportedTwoFactorProviders()
@@ -467,5 +468,9 @@ namespace Bit.Core.Services
             TwoFactorProvidersData = null;
             SelectedTwoFactorProviderType = null;
         }
+
+        public async Task<AuthResult> GetLogInPasswordlessRequestsAsync() => await Task.FromResult<AuthResult>(new AuthResult());
+        public async Task<AuthResult> LogInPasswordlessAcceptAsync() => await Task.FromResult<AuthResult>(new AuthResult());
+        public async Task<AuthResult> LogInPasswordlessRejectAsync() => await Task.FromResult<AuthResult>(new AuthResult());
     }
 }

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/StateMigrationService.cs

@@ -191,7 +191,7 @@ namespace Bit.Core.Services
                 EnvironmentUrls = environmentUrls,
                 VaultTimeout = vaultTimeout,
                 VaultTimeoutAction =
-                    vaultTimeoutAction == "logout" ? VaultTimeoutAction.Logout : VaultTimeoutAction.Lock,
+                    vaultTimeoutAction == "logout" ? VaultTimeoutAction.Logout : VaultTimeoutAction.Lock
             };
             var state = new State { Accounts = new Dictionary<string, Account> { [userId] = account } };
             state.ActiveUserId = userId;

src/Core/Services/StateService.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using Bit.Core.Abstractions;
@@ -558,6 +559,27 @@ namespace Bit.Core.Services
             await SaveAccountAsync(account, reconciledOptions);
         }
 
+        public async Task<bool> GetScreenCaptureAllowedAsync(string userId = null)
+        {
+            if (CoreHelpers.ForceScreenCaptureEnabled())
+            {
+                return true;
+            }
+
+            return (await GetAccountAsync(
+                ReconcileOptions(new StorageOptions { UserId = userId }, await GetDefaultStorageOptionsAsync())
+            ))?.Settings?.ScreenCaptureAllowed ?? false;
+        }
+
+        public async Task SetScreenCaptureAllowedAsync(bool value, string userId = null)
+        {
+            var reconciledOptions = ReconcileOptions(new StorageOptions { UserId = userId },
+                await GetDefaultStorageOptionsAsync());
+            var account = await GetAccountAsync(reconciledOptions);
+            account.Settings.ScreenCaptureAllowed = value;
+            await SaveAccountAsync(account, reconciledOptions);
+        }
+
         public async Task<DateTime?> GetLastFileCacheClearAsync()
         {
             var options = await GetDefaultStorageOptionsAsync();
@@ -924,6 +946,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 },
@@ -1414,6 +1455,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);
             }
@@ -1423,6 +1465,7 @@ namespace Bit.Core.Services
         {
             await CheckStateAsync();
             var currentTheme = await GetThemeAsync();
+            var currentAutoDarkTheme = await GetAutoDarkThemeAsync();
             var currentDisableFavicons = await GetDisableFaviconAsync();
 
             account.Settings.EnvironmentUrls = await GetPreAuthEnvironmentUrlsAsync();
@@ -1440,6 +1483,7 @@ namespace Bit.Core.Services
                 var existingAccount = state.Accounts[account.Profile.UserId];
                 account.Settings.VaultTimeout = existingAccount.Settings.VaultTimeout;
                 account.Settings.VaultTimeoutAction = existingAccount.Settings.VaultTimeoutAction;
+                account.Settings.ScreenCaptureAllowed = existingAccount.Settings.ScreenCaptureAllowed;
             }
 
             // New account defaults
@@ -1452,6 +1496,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;

src/Core/Services/TotpService.cs

@@ -10,14 +10,11 @@ namespace Bit.Core.Services
     {
         private const string SteamChars = "23456789BCDFGHJKMNPQRTVWXY";
 
-        private readonly IStateService _stateService;
         private readonly ICryptoFunctionService _cryptoFunctionService;
 
         public TotpService(
-            IStateService stateService,
             ICryptoFunctionService cryptoFunctionService)
         {
-            _stateService = stateService;
             _cryptoFunctionService = cryptoFunctionService;
         }
 
@@ -132,11 +129,5 @@ namespace Bit.Core.Services
             }
             return period;
         }
-
-        public async Task<bool> IsAutoCopyEnabledAsync()
-        {
-            var disabled = await _stateService.GetDisableAutoTotpCopyAsync();
-            return !disabled.GetValueOrDefault();
-        }
     }
 }

src/Core/Utilities/CoreHelpers.cs

@@ -34,6 +34,25 @@ namespace Bit.Core.Utilities
 #endif
         }
 
+        /// <summary>
+        /// Returns whether to force enabling the screen capture.
+        /// On Debug it will allow screen capture by default but this method
+        /// makes it easier to test the change on enabling/disabling the feature
+        /// on debug.
+        /// </summary>
+        /// <remarks>
+        /// To test enabling/disabling in DEBUG, just return <c>false</c> in the #if condition
+        /// and that's it.
+        /// </remarks>
+        public static bool ForceScreenCaptureEnabled()
+        {
+#if DEBUG
+            return true;
+#else
+            return false;
+#endif
+        }
+
         public static string GetHostname(string uriString)
         {
             var uri = GetUri(uriString);

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,
@@ -72,7 +74,7 @@ namespace Bit.Core.Utilities
                 });
             var passwordGenerationService = new PasswordGenerationService(cryptoService, stateService,
                 cryptoFunctionService, policyService);
-            var totpService = new TotpService(stateService, cryptoFunctionService);
+            var totpService = new TotpService(cryptoFunctionService);
             var authService = new AuthService(cryptoService, cryptoFunctionService, apiService, stateService,
                 tokenService, appIdService, i18nService, platformUtilsService, messagingService, vaultTimeoutService,
                 keyConnectorService);
@@ -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

@@ -8,10 +8,12 @@ using Bit.App.Utilities;
 using Bit.App.Utilities.AccountManagement;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
+using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Bit.iOS.Autofill.Models;
 using Bit.iOS.Core.Utilities;
 using Bit.iOS.Core.Views;
+using CoreFoundation;
 using CoreNFC;
 using Foundation;
 using UIKit;
@@ -36,88 +38,128 @@ namespace Bit.iOS.Autofill
 
         public override void ViewDidLoad()
         {
-            InitApp();
-            base.ViewDidLoad();
-            Logo.Image = new UIImage(ThemeHelpers.LightTheme ? "logo.png" : "logo_white.png");
-            View.BackgroundColor = ThemeHelpers.SplashBackgroundColor;
-            _context = new Context
+            try
             {
-                ExtContext = ExtensionContext
-            };
+                InitApp();
+                base.ViewDidLoad();
+                Logo.Image = new UIImage(ThemeHelpers.LightTheme ? "logo.png" : "logo_white.png");
+                View.BackgroundColor = ThemeHelpers.SplashBackgroundColor;
+                _context = new Context
+                {
+                    ExtContext = ExtensionContext
+                };
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+                throw;
+            }
         }
 
         public override async void PrepareCredentialList(ASCredentialServiceIdentifier[] serviceIdentifiers)
         {
-            InitAppIfNeeded();
-            _context.ServiceIdentifiers = serviceIdentifiers;
-            if (serviceIdentifiers.Length > 0)
+            try
             {
-                var uri = serviceIdentifiers[0].Identifier;
-                if (serviceIdentifiers[0].Type == ASCredentialServiceIdentifierType.Domain)
+                InitAppIfNeeded();
+                _context.ServiceIdentifiers = serviceIdentifiers;
+                if (serviceIdentifiers.Length > 0)
                 {
-                    uri = string.Concat("https://", uri);
+                    var uri = serviceIdentifiers[0].Identifier;
+                    if (serviceIdentifiers[0].Type == ASCredentialServiceIdentifierType.Domain)
+                    {
+                        uri = string.Concat("https://", uri);
+                    }
+                    _context.UrlString = uri;
                 }
-                _context.UrlString = uri;
-            }
-            if (!await IsAuthed())
-            {
-                await _accountsManager.NavigateOnAccountChangeAsync(false);
-            }
-            else if (await IsLocked())
-            {
-                PerformSegue("lockPasswordSegue", this);
-            }
-            else
-            {
-                if (_context.ServiceIdentifiers == null || _context.ServiceIdentifiers.Length == 0)
+                if (!await IsAuthed())
                 {
-                    PerformSegue("loginSearchSegue", this);
+                    await _accountsManager.NavigateOnAccountChangeAsync(false);
+                }
+                else if (await IsLocked())
+                {
+                    PerformSegue("lockPasswordSegue", this);
                 }
                 else
                 {
-                    PerformSegue("loginListSegue", this);
+                    if (_context.ServiceIdentifiers == null || _context.ServiceIdentifiers.Length == 0)
+                    {
+                        PerformSegue("loginSearchSegue", this);
+                    }
+                    else
+                    {
+                        PerformSegue("loginListSegue", this);
+                    }
                 }
             }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+                throw;
+            }
         }
 
         public override async void ProvideCredentialWithoutUserInteraction(ASPasswordCredentialIdentity credentialIdentity)
         {
-            InitAppIfNeeded();
-            await _stateService.Value.SetPasswordRepromptAutofillAsync(false);
-            await _stateService.Value.SetPasswordVerifiedAutofillAsync(false);
-            if (!await IsAuthed() || await IsLocked())
+            try
             {
-                var err = new NSError(new NSString("ASExtensionErrorDomain"),
-                    Convert.ToInt32(ASExtensionErrorCode.UserInteractionRequired), null);
-                ExtensionContext.CancelRequest(err);
-                return;
+                InitAppIfNeeded();
+                await _stateService.Value.SetPasswordRepromptAutofillAsync(false);
+                await _stateService.Value.SetPasswordVerifiedAutofillAsync(false);
+                if (!await IsAuthed() || await IsLocked())
+                {
+                    var err = new NSError(new NSString("ASExtensionErrorDomain"),
+                        Convert.ToInt32(ASExtensionErrorCode.UserInteractionRequired), null);
+                    ExtensionContext.CancelRequest(err);
+                    return;
+                }
+                _context.CredentialIdentity = credentialIdentity;
+                await ProvideCredentialAsync(false);
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+                throw;
             }
-            _context.CredentialIdentity = credentialIdentity;
-            await ProvideCredentialAsync(false);
         }
 
         public override async void PrepareInterfaceToProvideCredential(ASPasswordCredentialIdentity credentialIdentity)
         {
-            InitAppIfNeeded();
-            if (!await IsAuthed())
+            try
             {
-                await _accountsManager.NavigateOnAccountChangeAsync(false);
-                return;
+                InitAppIfNeeded();
+                if (!await IsAuthed())
+                {
+                    await _accountsManager.NavigateOnAccountChangeAsync(false);
+                    return;
+                }
+                _context.CredentialIdentity = credentialIdentity;
+                await CheckLockAsync(async () => await ProvideCredentialAsync());
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+                throw;
             }
-            _context.CredentialIdentity = credentialIdentity;
-            CheckLock(async () => await ProvideCredentialAsync());
         }
 
         public override async void PrepareInterfaceForExtensionConfiguration()
         {
-            InitAppIfNeeded();
-            _context.Configuring = true;
-            if (!await IsAuthed())
+            try
             {
-                await _accountsManager.NavigateOnAccountChangeAsync(false);
-                return;
+                InitAppIfNeeded();
+                _context.Configuring = true;
+                if (!await IsAuthed())
+                {
+                    await _accountsManager.NavigateOnAccountChangeAsync(false);
+                    return;
+                }
+                await CheckLockAsync(() => PerformSegue("setupSegue", this));
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+                throw;
             }
-            CheckLock(() => PerformSegue("setupSegue", this));
         }
 
         public void CompleteRequest(string id = null, string username = null,
@@ -159,34 +201,43 @@ namespace Bit.iOS.Autofill
 
         public override void PrepareForSegue(UIStoryboardSegue segue, NSObject sender)
         {
-            if (segue.DestinationViewController is UINavigationController navController)
+            try
             {
-                if (navController.TopViewController is LoginListViewController listLoginController)
+                if (segue.DestinationViewController is UINavigationController navController)
                 {
-                    listLoginController.Context = _context;
-                    listLoginController.CPViewController = this;
-                    segue.DestinationViewController.PresentationController.Delegate =
-                        new CustomPresentationControllerDelegate(listLoginController.DismissModalAction);
-                }
-                else if (navController.TopViewController is LoginSearchViewController listSearchController)
-                {
-                    listSearchController.Context = _context;
-                    listSearchController.CPViewController = this;
-                    segue.DestinationViewController.PresentationController.Delegate =
-                        new CustomPresentationControllerDelegate(listSearchController.DismissModalAction);
-                }
-                else if (navController.TopViewController is LockPasswordViewController passwordViewController)
-                {
-                    passwordViewController.CPViewController = this;
-                    segue.DestinationViewController.PresentationController.Delegate =
-                        new CustomPresentationControllerDelegate(passwordViewController.DismissModalAction);
-                }
-                else if (navController.TopViewController is SetupViewController setupViewController)
-                {
-                    setupViewController.CPViewController = this;
-                    segue.DestinationViewController.PresentationController.Delegate =
-                        new CustomPresentationControllerDelegate(setupViewController.DismissModalAction);
+                    if (navController.TopViewController is LoginListViewController listLoginController)
+                    {
+                        listLoginController.Context = _context;
+                        listLoginController.CPViewController = this;
+                        segue.DestinationViewController.PresentationController.Delegate =
+                            new CustomPresentationControllerDelegate(listLoginController.DismissModalAction);
+                    }
+                    else if (navController.TopViewController is LoginSearchViewController listSearchController)
+                    {
+                        listSearchController.Context = _context;
+                        listSearchController.CPViewController = this;
+                        segue.DestinationViewController.PresentationController.Delegate =
+                            new CustomPresentationControllerDelegate(listSearchController.DismissModalAction);
+                    }
+                    else if (navController.TopViewController is LockPasswordViewController passwordViewController)
+                    {
+                        passwordViewController.CPViewController = this;
+                        segue.DestinationViewController.PresentationController.Delegate =
+                            new CustomPresentationControllerDelegate(passwordViewController.DismissModalAction);
+                    }
+                    else if (navController.TopViewController is SetupViewController setupViewController)
+                    {
+                        setupViewController.CPViewController = this;
+                        segue.DestinationViewController.PresentationController.Delegate =
+                            new CustomPresentationControllerDelegate(setupViewController.DismissModalAction);
+                    }
                 }
+
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+                throw;
             }
         }
 
@@ -194,93 +245,109 @@ namespace Bit.iOS.Autofill
         {
             DismissViewController(false, async () =>
             {
-                if (_context.CredentialIdentity != null)
+                try
                 {
-                    await ProvideCredentialAsync();
-                    return;
+                    if (_context.CredentialIdentity != null)
+                    {
+                        await ProvideCredentialAsync();
+                        return;
+                    }
+                    if (_context.Configuring)
+                    {
+                        PerformSegue("setupSegue", this);
+                        return;
+                    }
+                    if (_context.ServiceIdentifiers == null || _context.ServiceIdentifiers.Length == 0)
+                    {
+                        PerformSegue("loginSearchSegue", this);
+                    }
+                    else
+                    {
+                        PerformSegue("loginListSegue", this);
+                    }
                 }
-                if (_context.Configuring)
+                catch (Exception ex)
                 {
-                    PerformSegue("setupSegue", this);
-                    return;
-                }
-                if (_context.ServiceIdentifiers == null || _context.ServiceIdentifiers.Length == 0)
-                {
-                    PerformSegue("loginSearchSegue", this);
-                }
-                else
-                {
-                    PerformSegue("loginListSegue", this);
+                    LoggerHelper.LogEvenIfCantBeResolved(ex);
+                    throw;
                 }
             });
         }
 
         private async Task ProvideCredentialAsync(bool userInteraction = true)
         {
-            var cipherService = ServiceContainer.Resolve<ICipherService>("cipherService", true);
-            Bit.Core.Models.Domain.Cipher cipher = null;
-            var cancel = cipherService == null || _context.CredentialIdentity?.RecordIdentifier == null;
-            if (!cancel)
+            try
             {
-                cipher = await cipherService.GetAsync(_context.CredentialIdentity.RecordIdentifier);
-                cancel = cipher == null || cipher.Type != Bit.Core.Enums.CipherType.Login || cipher.Login == null;
-            }
-            if (cancel)
-            {
-                var err = new NSError(new NSString("ASExtensionErrorDomain"),
-                    Convert.ToInt32(ASExtensionErrorCode.CredentialIdentityNotFound), null);
-                ExtensionContext?.CancelRequest(err);
-                return;
-            }
-
-            var decCipher = await cipher.DecryptAsync();
-            if (decCipher.Reprompt != Bit.Core.Enums.CipherRepromptType.None)
-            {
-                // Prompt for password using either the lock screen or dialog unless
-                // already verified the password.
-                if (!userInteraction)
+                var cipherService = ServiceContainer.Resolve<ICipherService>("cipherService", true);
+                Bit.Core.Models.Domain.Cipher cipher = null;
+                var cancel = cipherService == null || _context.CredentialIdentity?.RecordIdentifier == null;
+                if (!cancel)
+                {
+                    cipher = await cipherService.GetAsync(_context.CredentialIdentity.RecordIdentifier);
+                    cancel = cipher == null || cipher.Type != Bit.Core.Enums.CipherType.Login || cipher.Login == null;
+                }
+                if (cancel)
                 {
-                    await _stateService.Value.SetPasswordRepromptAutofillAsync(true);
                     var err = new NSError(new NSString("ASExtensionErrorDomain"),
-                    Convert.ToInt32(ASExtensionErrorCode.UserInteractionRequired), null);
+                        Convert.ToInt32(ASExtensionErrorCode.CredentialIdentityNotFound), null);
                     ExtensionContext?.CancelRequest(err);
                     return;
                 }
-                else if (!await _stateService.Value.GetPasswordVerifiedAutofillAsync())
+
+                var decCipher = await cipher.DecryptAsync();
+                if (decCipher.Reprompt != Bit.Core.Enums.CipherRepromptType.None)
                 {
-                    // Add a timeout to resolve keyboard not always showing up.
-                    await Task.Delay(250);
-                    var passwordRepromptService = ServiceContainer.Resolve<IPasswordRepromptService>("passwordRepromptService");
-                    if (!await passwordRepromptService.ShowPasswordPromptAsync())
+                    // Prompt for password using either the lock screen or dialog unless
+                    // already verified the password.
+                    if (!userInteraction)
                     {
+                        await _stateService.Value.SetPasswordRepromptAutofillAsync(true);
                         var err = new NSError(new NSString("ASExtensionErrorDomain"),
-                            Convert.ToInt32(ASExtensionErrorCode.UserCanceled), null);
+                        Convert.ToInt32(ASExtensionErrorCode.UserInteractionRequired), null);
                         ExtensionContext?.CancelRequest(err);
                         return;
                     }
+                    else if (!await _stateService.Value.GetPasswordVerifiedAutofillAsync())
+                    {
+                        // Add a timeout to resolve keyboard not always showing up.
+                        await Task.Delay(250);
+                        var passwordRepromptService = ServiceContainer.Resolve<IPasswordRepromptService>("passwordRepromptService");
+                        if (!await passwordRepromptService.ShowPasswordPromptAsync())
+                        {
+                            var err = new NSError(new NSString("ASExtensionErrorDomain"),
+                                Convert.ToInt32(ASExtensionErrorCode.UserCanceled), null);
+                            ExtensionContext?.CancelRequest(err);
+                            return;
+                        }
+                    }
                 }
-            }
-            string totpCode = null;
-            var disableTotpCopy = await _stateService.Value.GetDisableAutoTotpCopyAsync();
-            if (!disableTotpCopy.GetValueOrDefault(false))
-            {
-                var canAccessPremiumAsync = await _stateService.Value.CanAccessPremiumAsync();
-                if (!string.IsNullOrWhiteSpace(decCipher.Login.Totp) &&
-                    (canAccessPremiumAsync || cipher.OrganizationUseTotp))
+                string totpCode = null;
+                var disableTotpCopy = await _stateService.Value.GetDisableAutoTotpCopyAsync();
+                if (!disableTotpCopy.GetValueOrDefault(false))
                 {
-                    var totpService = ServiceContainer.Resolve<ITotpService>("totpService");
-                    totpCode = await totpService.GetCodeAsync(decCipher.Login.Totp);
+                    var canAccessPremiumAsync = await _stateService.Value.CanAccessPremiumAsync();
+                    if (!string.IsNullOrWhiteSpace(decCipher.Login.Totp) &&
+                        (canAccessPremiumAsync || cipher.OrganizationUseTotp))
+                    {
+                        var totpService = ServiceContainer.Resolve<ITotpService>("totpService");
+                        totpCode = await totpService.GetCodeAsync(decCipher.Login.Totp);
+                    }
                 }
-            }
 
-            CompleteRequest(decCipher.Id, decCipher.Login.Username, decCipher.Login.Password, totpCode);
+                CompleteRequest(decCipher.Id, decCipher.Login.Username, decCipher.Login.Password, totpCode);
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+                throw;
+            }
         }
 
-        private async void CheckLock(Action notLockedAction)
+        private async Task CheckLockAsync(Action notLockedAction)
         {
             if (await IsLocked() || await _stateService.Value.GetPasswordRepromptAutofillAsync())
             {
-                PerformSegue("lockPasswordSegue", this);
+                DispatchQueue.MainQueue.DispatchAsync(() =>  PerformSegue("lockPasswordSegue", this));
             }
             else
             {
@@ -303,15 +370,21 @@ namespace Bit.iOS.Autofill
         {
             NSRunLoop.Main.BeginInvokeOnMainThread(async () =>
             {
-                if (await IsAuthed())
+                try
                 {
-                    await AppHelpers.LogOutAsync(await _stateService.Value.GetActiveUserIdAsync());
-                    var deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
-                    if (deviceActionService.SystemMajorVersion() >= 12)
+                    if (await IsAuthed())
                     {
-                        await ASCredentialIdentityStore.SharedStore?.RemoveAllCredentialIdentitiesAsync();
+                        await AppHelpers.LogOutAsync(await _stateService.Value.GetActiveUserIdAsync());
+                        if (UIDevice.CurrentDevice.CheckSystemVersion(12, 0))
+                        {
+                            await ASCredentialIdentityStore.SharedStore?.RemoveAllCredentialIdentitiesAsync();
+                        }
                     }
                 }
+                catch (Exception ex)
+                {
+                    LoggerHelper.LogEvenIfCantBeResolved(ex);
+                }
             });
         }
 

src/iOS.Autofill/Info.plist

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

src/iOS.Core/Controllers/BaseLockPasswordViewController.cs

@@ -1,20 +1,20 @@
 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.Abstractions;
 using Bit.App.Models;
-using Xamarin.Forms;
+using Bit.App.Pages;
+using Bit.App.Resources;
+using Bit.App.Utilities;
 using Bit.Core;
+using Bit.Core.Abstractions;
+using Bit.Core.Enums;
+using Bit.Core.Models.Domain;
+using Bit.Core.Utilities;
+using Bit.iOS.Core.Utilities;
+using Bit.iOS.Core.Views;
+using Foundation;
+using UIKit;
+using Xamarin.Forms;
 
 namespace Bit.iOS.Core.Controllers
 {
@@ -28,6 +28,7 @@ namespace Bit.iOS.Core.Controllers
         private IPlatformUtilsService _platformUtilsService;
         private IBiometricService _biometricService;
         private IKeyConnectorService _keyConnectorService;
+        private IAccountsManager _accountManager;
         private bool _isPinProtected;
         private bool _isPinProtectedWithKey;
         private bool _pinLock;
@@ -39,6 +40,10 @@ namespace Bit.iOS.Core.Controllers
 
         protected bool autofillExtension = false;
 
+        public BaseLockPasswordViewController()
+        {
+        }
+
         public BaseLockPasswordViewController(IntPtr handle)
             : base(handle)
         { }
@@ -80,7 +85,7 @@ namespace Bit.iOS.Core.Controllers
         }
 
         public abstract UITableView TableView { get; }
-
+        
         public override async void ViewDidLoad()
         {
             _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
@@ -91,6 +96,7 @@ namespace Bit.iOS.Core.Controllers
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
             _biometricService = ServiceContainer.Resolve<IBiometricService>("biometricService");
             _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
+            _accountManager = ServiceContainer.Resolve<IAccountsManager>("accountsManager");
 
             // We re-use the lock screen for autofill extension to verify master password
             // when trying to access protected items.
@@ -168,13 +174,12 @@ namespace Bit.iOS.Core.Controllers
             {
                 TableView.BackgroundColor = ThemeHelpers.BackgroundColor;
                 TableView.SeparatorColor = ThemeHelpers.SeparatorColor;
+                TableView.RowHeight = UITableView.AutomaticDimension;
+                TableView.EstimatedRowHeight = 70;
+                TableView.Source = new TableSource(this);
+                TableView.AllowsSelection = true;
             }
 
-            TableView.RowHeight = UITableView.AutomaticDimension;
-            TableView.EstimatedRowHeight = 70;
-            TableView.Source = new TableSource(this);
-            TableView.AllowsSelection = true;
-
             base.ViewDidLoad();
 
             if (_biometricLock)
@@ -191,7 +196,7 @@ namespace Bit.iOS.Core.Controllers
             }
         }
 
-        public override async void ViewDidAppear(bool animated)
+        public override void ViewDidAppear(bool animated)
         {
             base.ViewDidAppear(animated);
 
@@ -262,13 +267,7 @@ namespace Bit.iOS.Core.Controllers
                 }
                 if (failed)
                 {
-                    var invalidUnlockAttempts = await AppHelpers.IncrementInvalidUnlockAttemptsAsync();
-                    if (invalidUnlockAttempts >= 5)
-                    {
-                        await LogOutAsync();
-                        return;
-                    }
-                    InvalidValue();
+                    await HandleFailedCredentialsAsync();
                 }
             }
             else
@@ -303,17 +302,22 @@ namespace Bit.iOS.Core.Controllers
                 }
                 else
                 {
-                    var invalidUnlockAttempts = await AppHelpers.IncrementInvalidUnlockAttemptsAsync();
-                    if (invalidUnlockAttempts >= 5)
-                    {
-                        await LogOutAsync();
-                        return;
-                    }
-                    InvalidValue();
+                    await HandleFailedCredentialsAsync();
                 }
             }
         }
 
+        private async Task HandleFailedCredentialsAsync()
+        {
+            var invalidUnlockAttempts = await AppHelpers.IncrementInvalidUnlockAttemptsAsync();
+            if (invalidUnlockAttempts >= 5)
+            {
+                await _accountManager.LogOutAsync(await _stateService.GetActiveUserIdAsync(), false, false);
+                return;
+            }
+            InvalidValue();
+        }
+
         public async Task PromptBiometricAsync()
         {
             if (!_biometricLock || !_biometricIntegrityValid)
@@ -392,38 +396,43 @@ namespace Bit.iOS.Core.Controllers
             PresentViewController(alert, true, null);
         }
 
-        private async Task LogOutAsync()
+        protected override void Dispose(bool disposing)
         {
-            await AppHelpers.LogOutAsync(await _stateService.GetActiveUserIdAsync());
-            var authService = ServiceContainer.Resolve<IAuthService>("authService");
-            authService.LogOut(() =>
-            {
-                Cancel?.Invoke();
-            });
+            base.Dispose(disposing);
+
+            MasterPasswordCell?.Dispose();
+            MasterPasswordCell = null;
+
+            TableView?.Dispose();
         }
 
         public class TableSource : ExtendedUITableViewSource
         {
-            private readonly BaseLockPasswordViewController _controller;
+            private readonly WeakReference<BaseLockPasswordViewController> _controller;
 
             public TableSource(BaseLockPasswordViewController controller)
             {
-                _controller = controller;
+                _controller = new WeakReference<BaseLockPasswordViewController>(controller);
             }
 
             public override UITableViewCell GetCell(UITableView tableView, NSIndexPath indexPath)
             {
+                if (!_controller.TryGetTarget(out var controller))
+                {
+                    return new ExtendedUITableViewCell();
+                }
+
                 if (indexPath.Section == 0)
                 {
                     if (indexPath.Row == 0)
                     {
-                        if (_controller._biometricUnlockOnly)
+                        if (controller._biometricUnlockOnly)
                         {
-                            return _controller.BiometricCell;
+                            return controller.BiometricCell;
                         }
                         else
                         {
-                            return _controller.MasterPasswordCell;
+                            return controller.MasterPasswordCell;
                         }
                     }
                 }
@@ -431,7 +440,7 @@ namespace Bit.iOS.Core.Controllers
                 {
                     if (indexPath.Row == 0)
                     {
-                        if (_controller._passwordReprompt)
+                        if (controller._passwordReprompt)
                         {
                             var cell = new ExtendedUITableViewCell();
                             cell.TextLabel.TextColor = ThemeHelpers.DangerColor;
@@ -441,9 +450,9 @@ namespace Bit.iOS.Core.Controllers
                             cell.TextLabel.Text = AppResources.PasswordConfirmationDesc;
                             return cell;
                         }
-                        else if (!_controller._biometricUnlockOnly)
+                        else if (!controller._biometricUnlockOnly)
                         {
-                            return _controller.BiometricCell;
+                            return controller.BiometricCell;
                         }
                     }
                 }
@@ -457,8 +466,13 @@ namespace Bit.iOS.Core.Controllers
 
             public override nint NumberOfSections(UITableView tableView)
             {
-                return (!_controller._biometricUnlockOnly && _controller._biometricLock) ||
-                    _controller._passwordReprompt
+                if (!_controller.TryGetTarget(out var controller))
+                {
+                    return 0;
+                }
+
+                return (!controller._biometricUnlockOnly && controller._biometricLock) ||
+                    controller._passwordReprompt
                     ? 2
                     : 1;
             }
@@ -484,13 +498,18 @@ namespace Bit.iOS.Core.Controllers
 
             public override void RowSelected(UITableView tableView, NSIndexPath indexPath)
             {
+                if (!_controller.TryGetTarget(out var controller))
+                {
+                    return;
+                }
+
                 tableView.DeselectRow(indexPath, true);
                 tableView.EndEditing(true);
                 if (indexPath.Row == 0 &&
-                    ((_controller._biometricUnlockOnly && indexPath.Section == 0) ||
+                    ((controller._biometricUnlockOnly && indexPath.Section == 0) ||
                     indexPath.Section == 1))
                 {
-                    var task = _controller.PromptBiometricAsync();
+                    var task = controller.PromptBiometricAsync();
                     return;
                 }
                 var cell = tableView.CellAt(indexPath);

src/iOS.Core/Controllers/ExtendedUIViewController.cs

@@ -7,7 +7,11 @@ namespace Bit.iOS.Core.Controllers
     public class ExtendedUIViewController : UIViewController
     {
         public Action DismissModalAction { get; set; }
-        
+
+        public ExtendedUIViewController()
+        {
+        }
+
         public ExtendedUIViewController(IntPtr handle)
             : base(handle)
         {
@@ -28,16 +32,28 @@ namespace Bit.iOS.Core.Controllers
             {
                 View.BackgroundColor = ThemeHelpers.BackgroundColor;
             }
-            if (NavigationController?.NavigationBar != null)
+            UpdateNavigationBarTheme();
+        }
+
+        protected virtual void UpdateNavigationBarTheme()
+        {
+            UpdateNavigationBarTheme(NavigationController?.NavigationBar);
+        }
+
+        protected void UpdateNavigationBarTheme(UINavigationBar navBar)
+        {
+            if (navBar is null)
             {
-                NavigationController.NavigationBar.BarTintColor = ThemeHelpers.NavBarBackgroundColor;
-                NavigationController.NavigationBar.BackgroundColor = ThemeHelpers.NavBarBackgroundColor;
-                NavigationController.NavigationBar.TintColor = ThemeHelpers.NavBarTextColor;
-                NavigationController.NavigationBar.TitleTextAttributes = new UIStringAttributes
-                {
-                    ForegroundColor = ThemeHelpers.NavBarTextColor
-                };
+                return;
             }
+
+            navBar.BarTintColor = ThemeHelpers.NavBarBackgroundColor;
+            navBar.BackgroundColor = ThemeHelpers.NavBarBackgroundColor;
+            navBar.TintColor = ThemeHelpers.NavBarTextColor;
+            navBar.TitleTextAttributes = new UIStringAttributes
+            {
+                ForegroundColor = ThemeHelpers.NavBarTextColor
+            };
         }
     }
 }

src/iOS.Core/Controllers/LockPasswordViewController.cs

@@ -184,7 +184,7 @@ namespace Bit.iOS.Core.Controllers
             }
         }
 
-        public override async void ViewDidAppear(bool animated)
+        public override void ViewDidAppear(bool animated)
         {
             base.ViewDidAppear(animated);
 

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

@@ -0,0 +1,16 @@
+using System;
+namespace Bit.iOS.Core.Renderers.CollectionView
+{
+    public class CollectionException : Exception
+    {
+        public CollectionException(string message)
+            : base(message)
+        {
+        }
+
+        public CollectionException(string message, Exception innerEx)
+            : base(message, innerEx)
+        {
+        }
+    }
+}

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

@@ -1,6 +1,8 @@
 using System;
 using Bit.App.Controls;
+using Bit.Core.Services;
 using Foundation;
+using UIKit;
 using Xamarin.Forms.Platform.iOS;
 
 namespace Bit.iOS.Core.Renderers.CollectionView
@@ -13,6 +15,11 @@ namespace Bit.iOS.Core.Renderers.CollectionView
         {
         }
 
+        protected override UICollectionViewDelegateFlowLayout CreateDelegator()
+        {
+            return new ExtendedGroupableItemsViewDelegator<TItemsView, ExtendedGroupableItemsViewController<TItemsView>>(ItemsViewLayout, this);
+        }
+
         protected override void UpdateTemplatedCell(TemplatedCell cell, NSIndexPath indexPath)
         {
             try
@@ -21,7 +28,17 @@ namespace Bit.iOS.Core.Renderers.CollectionView
             }
             catch (Exception ex) when (ItemsView?.ExtraDataForLogging != null)
             {
-                throw new Exception("Error in ExtendedCollectionView, extra data: " + ItemsView.ExtraDataForLogging, ex);
+                var colEx = new CollectionException("Error in ExtendedCollectionView -> ExtendedGroupableItemsViewController, extra data: " + ItemsView.ExtraDataForLogging, ex);
+                try
+                {
+                    LoggerHelper.LogEvenIfCantBeResolved(colEx);
+                }
+                catch
+                {
+                    // Do nothing in here, this is temporary to get more info about the crash, if the logger fails, we want to get the info
+                    // by crashing with the original exception and not the logger one
+                }
+                throw colEx;
             }
         }
     }

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

@@ -0,0 +1,43 @@
+using System;
+using Bit.App.Controls;
+using Bit.Core.Services;
+using CoreGraphics;
+using Foundation;
+using UIKit;
+using Xamarin.Forms.Platform.iOS;
+
+namespace Bit.iOS.Core.Renderers.CollectionView
+{
+    public class ExtendedGroupableItemsViewDelegator<TItemsView, TViewController> : GroupableItemsViewDelegator<TItemsView, TViewController>
+        where TItemsView : ExtendedCollectionView
+        where TViewController : GroupableItemsViewController<TItemsView>
+    {
+        public ExtendedGroupableItemsViewDelegator(ItemsViewLayout itemsViewLayout, TViewController itemsViewController)
+            : base(itemsViewLayout, itemsViewController)
+        {
+        }
+
+        public override CGSize GetSizeForItem(UICollectionView collectionView, UICollectionViewLayout layout, NSIndexPath indexPath)
+        {
+            // Added this to get extra information on a crash when getting the size for an item.
+            try
+            {
+                return base.GetSizeForItem(collectionView, layout, indexPath);
+            }
+            catch (Exception ex) when (ViewController?.ItemsView?.ExtraDataForLogging != null)
+            {
+                var colEx = new CollectionException("Error in ExtendedCollectionView -> ExtendedGroupableItemsViewDelegator, extra data: " + ViewController.ItemsView.ExtraDataForLogging, ex);
+                try
+                {
+                    LoggerHelper.LogEvenIfCantBeResolved(colEx);
+                }
+                catch
+                {
+                    // Do nothing in here, this is temporary to get more info about the crash, if the logger fails, we want to get the info
+                    // by crashing with the original exception and not the logger one
+                }
+                throw colEx;
+            }
+        }
+    }
+}

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")
                 {

src/iOS.Core/Services/DeviceActionService.cs

@@ -604,6 +604,12 @@ namespace Bit.iOS.Core.Services
             await ASHelpers.ReplaceAllIdentities();
         }
 
+        public Task SetScreenCaptureAllowedAsync()
+        {
+            // only used by Android. Not possible in iOS
+            return Task.CompletedTask;
+        }
+
         public class PickerDelegate : UIDocumentPickerDelegate
         {
             private readonly DeviceActionService _deviceActionService;

src/iOS.Core/Utilities/AccountSwitchingOverlayHelper.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using Bit.App.Controls;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
@@ -10,9 +11,11 @@ namespace Bit.iOS.Core.Utilities
 {
     public class AccountSwitchingOverlayHelper
     {
-        IStateService _stateService;
-        IMessagingService _messagingService;
-        ILogger _logger;
+        const string DEFAULT_SYSTEM_AVATAR_IMAGE = "person.2";
+        
+        readonly IStateService _stateService;
+        readonly IMessagingService _messagingService;
+        readonly ILogger _logger;
 
         public AccountSwitchingOverlayHelper()
         {
@@ -23,9 +26,24 @@ namespace Bit.iOS.Core.Utilities
 
         public async Task<UIImage> CreateAvatarImageAsync()
         {
-            var avatarImageSource = new AvatarImageSource(await _stateService.GetNameAsync(), await _stateService.GetEmailAsync());
-            var avatarUIImage = await avatarImageSource.GetNativeImageAsync();
-            return avatarUIImage.ImageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal);
+            try
+            {
+                if (_stateService is null)
+                {
+                    throw new NullReferenceException(nameof(_stateService));
+                }
+                
+                var avatarImageSource = new AvatarImageSource(await _stateService.GetNameAsync(), await _stateService.GetEmailAsync());
+                using (var avatarUIImage = await avatarImageSource.GetNativeImageAsync())
+                {
+                    return avatarUIImage?.ImageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal) ?? UIImage.GetSystemImage(DEFAULT_SYSTEM_AVATAR_IMAGE);
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.Exception(ex);
+                return UIImage.GetSystemImage(DEFAULT_SYSTEM_AVATAR_IMAGE);
+            }
         }
 
         public AccountSwitchingOverlayView CreateAccountSwitchingOverlayView(UIView containerView)

src/iOS.Core/Utilities/ImageSourceExtensions.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Bit.Core.Services;
 using UIKit;
 using Xamarin.Forms;
-using Xamarin.Forms.Internals;
 using Xamarin.Forms.Platform.iOS;
 
 namespace Bit.iOS.Core.Utilities
@@ -17,25 +17,29 @@ namespace Bit.iOS.Core.Utilities
         public static async Task<UIImage> GetNativeImageAsync(this ImageSource source, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (source == null || source.IsEmpty)
+            {
                 return null;
+            }
 
             var handler = Xamarin.Forms.Internals.Registrar.Registered.GetHandlerForObject<IImageSourceHandler>(source);
             if (handler == null)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(new InvalidOperationException("GetNativeImageAsync failed cause IImageSourceHandler couldn't be found"));
                 return null;
+            }
 
             try
             {
                 float scale = (float)UIScreen.MainScreen.Scale;
-
                 return await handler.LoadImageAsync(source, scale: scale, cancelationToken: cancellationToken);
             }
             catch (OperationCanceledException)
             {
-                Log.Warning("Image loading", "Image load cancelled");
+                LoggerHelper.LogEvenIfCantBeResolved(new OperationCanceledException("GetNativeImageAsync was cancelled"));
             }
             catch (Exception ex)
             {
-                Log.Warning("Image loading", $"Image load failed: {ex}");
+                LoggerHelper.LogEvenIfCantBeResolved(new InvalidOperationException("GetNativeImageAsync failed", ex));
             }
 
             return null;

src/iOS.Core/Utilities/ThemeHelpers.cs

@@ -83,10 +83,10 @@ namespace Bit.iOS.Core.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/iOS.Core/Utilities/iOSCoreHelpers.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Threading.Tasks;
 using Bit.App.Abstractions;
+using Bit.App.Controls;
 using Bit.App.Models;
 using Bit.App.Pages;
 using Bit.App.Resources;
@@ -15,6 +16,7 @@ using Bit.iOS.Core.Services;
 using CoreNFC;
 using Foundation;
 using UIKit;
+using Xamarin.Forms;
 
 namespace Bit.iOS.Core.Utilities
 {
@@ -26,6 +28,42 @@ namespace Bit.iOS.Core.Utilities
         public static string AppGroupId = "group.com.8bit.bitwarden";
         public static string AccessGroup = "LTZ2PFU5D6.com.8bit.bitwarden";
 
+        public static void InitApp<T>(T rootController,
+            string clearCipherCacheKey,
+            NFCNdefReaderSession nfcSession,
+            out NFCReaderDelegate nfcDelegate,
+            out IAccountsManager accountsManager)
+            where T : UIViewController, IAccountsManagerHost
+        {
+            Forms.Init();
+
+            if (ServiceContainer.RegisteredServices.Count > 0)
+            {
+                ServiceContainer.Reset();
+            }
+            RegisterLocalServices();
+            var deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            var messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
+            ServiceContainer.Init(deviceActionService.DeviceUserAgent,
+                                  clearCipherCacheKey,
+                                  Bit.Core.Constants.iOSAllClearCipherCacheKeys);   
+            InitLogger();
+            Bootstrap();
+
+            var appOptions = new AppOptions { IosExtension = true };
+            var app = new App.App(appOptions);
+            ThemeManager.SetTheme(app.Resources);
+
+            AppearanceAdjustments();
+
+            nfcDelegate = new Core.NFCReaderDelegate((success, message) =>
+                messagingService.Send("gotYubiKeyOTP", message));
+            SubscribeBroadcastReceiver(rootController, nfcSession, nfcDelegate);
+
+            accountsManager = ServiceContainer.Resolve<IAccountsManager>("accountsManager");
+            accountsManager.Init(() => appOptions, rootController);
+        }
+
         public static void InitLogger()
         {
             ServiceContainer.Resolve<ILogger>("logger").InitAsync();
@@ -38,13 +76,15 @@ namespace Bit.iOS.Core.Utilities
                 ServiceContainer.Register<INativeLogService>("nativeLogService", new ConsoleLogService());
             }
 
+            ILogger logger = null;
             if (ServiceContainer.Resolve<ILogger>("logger", true) == null)
             {
 #if DEBUG
-                ServiceContainer.Register<ILogger>("logger", DebugLogger.Instance);
+                logger = DebugLogger.Instance;
 #else
-                ServiceContainer.Register<ILogger>("logger", Logger.Instance);
+                logger = Logger.Instance;
 #endif
+                ServiceContainer.Register("logger", logger);
             }
 
             var preferencesStorage = new PreferencesStorageService(AppGroupId);
@@ -52,7 +92,7 @@ namespace Bit.iOS.Core.Utilities
             var liteDbStorage = new LiteDbStorageService(
                 Path.Combine(appGroupContainer.Path, "Library", "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 KeyChainStorageService(AppId, AccessGroup,
@@ -87,6 +127,7 @@ namespace Bit.iOS.Core.Utilities
             ServiceContainer.Register<ICryptoFunctionService>("cryptoFunctionService", cryptoFunctionService);
             ServiceContainer.Register<ICryptoService>("cryptoService", cryptoService);
             ServiceContainer.Register<IPasswordRepromptService>("passwordRepromptService", passwordRepromptService);
+            ServiceContainer.Register<IAvatarImageSourcePool>("avatarImageSourcePool", new AvatarImageSourcePool());
         }
 
         public static void Bootstrap(Func<Task> postBootstrapFunc = null)
@@ -179,7 +220,8 @@ namespace Bit.iOS.Core.Utilities
                 ServiceContainer.Resolve<IStorageService>("secureStorageService"),
                 ServiceContainer.Resolve<IStateService>("stateService"),
                 ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService"),
-                ServiceContainer.Resolve<IAuthService>("authService"));
+                ServiceContainer.Resolve<IAuthService>("authService"),
+                ServiceContainer.Resolve<ILogger>("logger"));
             ServiceContainer.Register<IAccountsManager>("accountsManager", accountsManager);
 
             if (postBootstrapFunc != null)

src/iOS.Core/iOS.Core.csproj

@@ -201,6 +201,8 @@
     <Compile Include="Renderers\CollectionView\ExtendedCollectionViewRenderer.cs" />
     <Compile Include="Renderers\CollectionView\ExtendedGroupableItemsViewController.cs" />
     <Compile Include="Utilities\UISearchBarExtensions.cs" />
+    <Compile Include="Renderers\CollectionView\CollectionException.cs" />
+    <Compile Include="Renderers\CollectionView\ExtendedGroupableItemsViewDelegator.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\App\App.csproj">

src/iOS.Extension/Info.plist

@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden.find-login-action-extension</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2022.6.1</string>
+	<string>2022.6.2</string>
 	<key>CFBundleLocalizations</key>
 	<array>
 		<string>en</string>

src/iOS.ShareExtension/ExtensionNavigationController.cs

@@ -0,0 +1,27 @@
+// This file has been autogenerated from a class added in the UI designer.
+
+using System;
+using UIKit;
+
+namespace Bit.iOS.ShareExtension
+{
+    public partial class ExtensionNavigationController : UINavigationController
+	{
+		public ExtensionNavigationController (IntPtr handle) : base (handle)
+		{
+		}
+
+        public override UIViewController PopViewController(bool animated)
+        {
+            TopViewController?.Dispose();
+            return base.PopViewController(animated);
+
+        }
+
+        public override void DismissModalViewController(bool animated)
+        {
+            ModalViewController?.Dispose();
+            base.DismissModalViewController(animated);
+        }
+    }
+}

src/iOS.ShareExtension/ExtensionNavigationController.designer.cs

@@ -0,0 +1,20 @@
+// WARNING
+//
+// 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.CodeDom.Compiler;
+
+namespace Bit.iOS.ShareExtension
+{
+	[Register ("ExtensionNavigationController")]
+	partial class ExtensionNavigationController
+	{
+		
+		void ReleaseDesignerOutlets ()
+		{
+		}
+	}
+}

src/iOS.ShareExtension/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2022.6.1</string>
+	<string>2022.6.2</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>MinimumOSVersion</key>

src/iOS.ShareExtension/LoadingViewController.cs

@@ -7,11 +7,11 @@ 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.Services;
 using Bit.Core.Utilities;
-using Bit.iOS.Core;
 using Bit.iOS.Core.Controllers;
 using Bit.iOS.Core.Utilities;
 using Bit.iOS.Core.Views;
@@ -24,16 +24,33 @@ using Xamarin.Forms;
 
 namespace Bit.iOS.ShareExtension
 {
-    public partial class LoadingViewController : ExtendedUIViewController
+    public partial class LoadingViewController : ExtendedUIViewController, IAccountsManagerHost
     {
+        const string STORYBOARD_NAME = "MainInterface";
+
         private Context _context = new Context();
         private NFCNdefReaderSession _nfcSession = null;
         private Core.NFCReaderDelegate _nfcDelegate = null;
+        private IAccountsManager _accountsManager;
 
         readonly LazyResolve<IStateService> _stateService = new LazyResolve<IStateService>("stateService");
         readonly LazyResolve<IVaultTimeoutService> _vaultTimeoutService = new LazyResolve<IVaultTimeoutService>("vaultTimeoutService");
-        readonly LazyResolve<IDeviceActionService> _deviceActionService = new LazyResolve<IDeviceActionService>("deviceActionService");
-        readonly LazyResolve<IEventService> _eventService = new LazyResolve<IEventService>("eventService");
+
+        Lazy<UIStoryboard> _storyboard = new Lazy<UIStoryboard>(() => UIStoryboard.FromName(STORYBOARD_NAME, null));
+
+        private App.App _app = null;
+        private UIViewController _currentModalController;
+        private bool _presentingOnNavigationPage;
+
+        private ExtensionNavigationController ExtNavigationController
+        {
+            get
+            {
+                NavigationController.PresentationController.Delegate =
+                    new CustomPresentationControllerDelegate(CompleteRequest);
+                return NavigationController as ExtensionNavigationController;
+            }
+        }
 
         public LoadingViewController(IntPtr handle)
             : base(handle)
@@ -41,39 +58,38 @@ namespace Bit.iOS.ShareExtension
 
         public override void ViewDidLoad()
         {
-            InitApp();
+            iOSCoreHelpers.InitApp(this, Bit.Core.Constants.iOSShareExtensionClearCiphersCacheKey,
+                _nfcSession, out _nfcDelegate, out _accountsManager);
 
             base.ViewDidLoad();
 
             Logo.Image = new UIImage(ThemeHelpers.LightTheme ? "logo.png" : "logo_white.png");
             View.BackgroundColor = ThemeHelpers.SplashBackgroundColor;
             _context.ExtensionContext = ExtensionContext;
+            _context.ProviderType = GetProviderTypeFromExtensionInputItems();
+        }
 
+        /// <summary>
+        /// Gets the provider <see cref="UTType"/> given the input items
+        /// </summary>
+        private string GetProviderTypeFromExtensionInputItems()
+        {
             foreach (var item in ExtensionContext.InputItems)
             {
-                var processed = false;
                 foreach (var itemProvider in item.Attachments)
                 {
                     if (itemProvider.HasItemConformingTo(UTType.PlainText))
                     {
-                        _context.ProviderType = UTType.PlainText;
-
-                        processed = true;
-                        break;
+                        return UTType.PlainText;
                     }
-                    else if (itemProvider.HasItemConformingTo(UTType.Data))
+
+                    if (itemProvider.HasItemConformingTo(UTType.Data))
                     {
-                        _context.ProviderType = UTType.Data;
-
-                        processed = true;
-                        break;
+                        return UTType.Data;
                     }
                 }
-                if (processed)
-                {
-                    break;
-                }
             }
+            return null;
         }
 
         public override async void ViewDidAppear(bool animated)
@@ -84,12 +100,12 @@ namespace Bit.iOS.ShareExtension
             {
                 if (!await IsAuthed())
                 {
-                    LaunchHomePage();
+                    await _accountsManager.NavigateOnAccountChangeAsync(false);
                     return;
                 }
                 else if (await IsLocked())
                 {
-                    PerformSegue("lockPasswordSegue", this);
+                    NavigateToLockViewController();
                 }
                 else
                 {
@@ -102,24 +118,52 @@ namespace Bit.iOS.ShareExtension
             }
         }
 
-        public override void PrepareForSegue(UIStoryboardSegue segue, NSObject sender)
+        void NavigateToLockViewController()
         {
-            if (segue.DestinationViewController is UINavigationController navController
-                &&
-                navController.TopViewController is LockPasswordViewController passwordViewController)
+            var viewController = _storyboard.Value.InstantiateViewController("lockVC") as LockPasswordViewController;
+            viewController.LoadingController = this;
+            viewController.ModalPresentationStyle = UIModalPresentationStyle.FullScreen;
+
+            if (_presentingOnNavigationPage)
             {
-                passwordViewController.LoadingController = this;
-                segue.DestinationViewController.PresentationController.Delegate =
-                    new CustomPresentationControllerDelegate(passwordViewController.DismissModalAction);
+                _presentingOnNavigationPage = false;
+                DismissViewController(true, () => ExtNavigationController.PushViewController(viewController, true));
+            }
+            else
+            {
+                ExtNavigationController.PushViewController(viewController, true);
             }
         }
 
         public void DismissLockAndContinue()
         {
             Debug.WriteLine("BW Log, Dismissing lock controller.");
+
+            ClearBeforeNavigating();
+
             DismissViewController(false, () => ContinueOnAsync().FireAndForget());
         }
 
+        private void DismissAndLaunch(Action pageToLaunch)
+        {
+            ClearBeforeNavigating();
+
+            DismissViewController(false, pageToLaunch);
+        }
+
+        void ClearBeforeNavigating()
+        {
+            _currentModalController?.Dispose();
+            _currentModalController = null;
+
+            if (_storyboard.IsValueCreated)
+            {
+                _storyboard.Value.Dispose();
+                _storyboard = null;
+                _storyboard = new Lazy<UIStoryboard>(() => UIStoryboard.FromName(STORYBOARD_NAME, null));
+            }
+        }
+
         private async Task ContinueOnAsync()
         {
             Tuple<SendType, string, byte[], string> createSend = null;
@@ -140,20 +184,24 @@ namespace Bit.iOS.ShareExtension
                 CreateSend = createSend,
                 CopyInsteadOfShareAfterSaving = true
             };
-            var sendAddEditPage = new SendAddEditPage(appOptions)
+            var sendPage = new SendAddOnlyPage(appOptions)
             {
                 OnClose = () => CompleteRequest(),
                 AfterSubmit = () => CompleteRequest()
             };
 
-            var app = new App.App(appOptions);
-            ThemeManager.SetTheme(app.Resources);
-            ThemeManager.ApplyResourcesToPage(sendAddEditPage);
+            SetupAppAndApplyResources(sendPage);
 
-            var navigationPage = new NavigationPage(sendAddEditPage);
-            var sendAddEditController = navigationPage.CreateViewController();
-            sendAddEditController.ModalPresentationStyle = UIModalPresentationStyle.FullScreen;
-            PresentViewController(sendAddEditController, true, null);
+            NavigateToPage(sendPage);
+        }
+
+        private void NavigateToPage(ContentPage page)
+        {
+            var navigationPage = new NavigationPage(page);
+            _currentModalController = navigationPage.CreateViewController();
+            _currentModalController.ModalPresentationStyle = UIModalPresentationStyle.FullScreen;
+            _presentingOnNavigationPage = true;
+            PresentViewController(_currentModalController, true, null);
         }
 
         private async Task<(string, byte[])> LoadDataBytesAsync()
@@ -202,31 +250,6 @@ namespace Bit.iOS.ShareExtension
             });
         }
 
-        private void InitApp()
-        {
-            // Init Xamarin Forms
-            Forms.Init();
-
-            if (ServiceContainer.RegisteredServices.Count > 0)
-            {
-                ServiceContainer.Reset();
-            }
-            iOSCoreHelpers.RegisterLocalServices();
-            var messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
-            ServiceContainer.Init(_deviceActionService.Value.DeviceUserAgent,
-                Bit.Core.Constants.iOSShareExtensionClearCiphersCacheKey, Bit.Core.Constants.iOSAllClearCipherCacheKeys);
-            iOSCoreHelpers.InitLogger();
-            iOSCoreHelpers.Bootstrap();
-
-            var app = new App.App(new AppOptions { IosExtension = true });
-            ThemeManager.SetTheme(app.Resources);
-
-            iOSCoreHelpers.AppearanceAdjustments();
-            _nfcDelegate = new NFCReaderDelegate((success, message) =>
-                messagingService.Send("gotYubiKeyOTP", message));
-            iOSCoreHelpers.SubscribeBroadcastReceiver(this, _nfcSession, _nfcDelegate);
-        }
-
         private Task<bool> IsLocked()
         {
             return _vaultTimeoutService.Value.IsLockedAsync();
@@ -244,7 +267,7 @@ namespace Bit.iOS.ShareExtension
                 if (await IsAuthed())
                 {
                     await AppHelpers.LogOutAsync(await _stateService.Value.GetActiveUserIdAsync());
-                    if (_deviceActionService.Value.SystemMajorVersion() >= 12)
+                    if (UIDevice.CurrentDevice.CheckSystemVersion(12, 0))
                     {
                         await ASCredentialIdentityStore.SharedStore?.RemoveAllCredentialIdentitiesAsync();
                     }
@@ -252,83 +275,75 @@ namespace Bit.iOS.ShareExtension
             });
         }
 
+        private App.App SetupAppAndApplyResources(ContentPage page)
+        {
+            if (_app is null)
+            {
+                var app = new App.App(new AppOptions { IosExtension = true });
+                ThemeManager.SetTheme(app.Resources);
+            }
+            ThemeManager.ApplyResourcesToPage(page);
+            return _app;
+        }
+
         private void LaunchHomePage()
         {
             var homePage = new HomePage();
-            var app = new App.App(new AppOptions { IosExtension = true });
-            ThemeManager.SetTheme(app.Resources);
-            ThemeManager.ApplyResourcesToPage(homePage);
+            SetupAppAndApplyResources(homePage);
             if (homePage.BindingContext is HomeViewModel vm)
             {
-                vm.StartLoginAction = () => DismissViewController(false, () => LaunchLoginFlow());
-                vm.StartRegisterAction = () => DismissViewController(false, () => LaunchRegisterFlow());
-                vm.StartSsoLoginAction = () => DismissViewController(false, () => LaunchLoginSsoFlow());
-                vm.StartEnvironmentAction = () => DismissViewController(false, () => LaunchEnvironmentFlow());
+                vm.StartLoginAction = () => DismissAndLaunch(() => LaunchLoginFlow());
+                vm.StartRegisterAction = () => DismissAndLaunch(() => LaunchRegisterFlow());
+                vm.StartSsoLoginAction = () => DismissAndLaunch(() => LaunchLoginSsoFlow());
+                vm.StartEnvironmentAction = () => DismissAndLaunch(() => LaunchEnvironmentFlow());
                 vm.CloseAction = () => CompleteRequest();
             }
 
-            var navigationPage = new NavigationPage(homePage);
-            var loginController = navigationPage.CreateViewController();
-            loginController.ModalPresentationStyle = UIModalPresentationStyle.FullScreen;
-            PresentViewController(loginController, true, null);
-
+            NavigateToPage(homePage);
             LogoutIfAuthed();
         }
 
         private void LaunchEnvironmentFlow()
         {
             var environmentPage = new EnvironmentPage();
-            var app = new App.App(new AppOptions { IosExtension = true });
-            ThemeManager.SetTheme(app.Resources);
+            SetupAppAndApplyResources(environmentPage);
             ThemeManager.ApplyResourcesToPage(environmentPage);
             if (environmentPage.BindingContext is EnvironmentPageViewModel vm)
             {
-                vm.SubmitSuccessAction = () => DismissViewController(false, () => LaunchHomePage());
-                vm.CloseAction = () => DismissViewController(false, () => LaunchHomePage());
+                vm.SubmitSuccessAction = () => DismissAndLaunch(() => LaunchHomePage());
+                vm.CloseAction = () => DismissAndLaunch(() => LaunchHomePage());
             }
 
-            var navigationPage = new NavigationPage(environmentPage);
-            var loginController = navigationPage.CreateViewController();
-            loginController.ModalPresentationStyle = UIModalPresentationStyle.FullScreen;
-            PresentViewController(loginController, true, null);
+            NavigateToPage(environmentPage);
         }
 
         private void LaunchRegisterFlow()
         {
             var registerPage = new RegisterPage(null);
-            var app = new App.App(new AppOptions { IosExtension = true });
-            ThemeManager.SetTheme(app.Resources);
-            ThemeManager.ApplyResourcesToPage(registerPage);
+            SetupAppAndApplyResources(registerPage);
             if (registerPage.BindingContext is RegisterPageViewModel vm)
             {
-                vm.RegistrationSuccess = () => DismissViewController(false, () => LaunchLoginFlow(vm.Email));
-                vm.CloseAction = () => DismissViewController(false, () => LaunchHomePage());
+                vm.RegistrationSuccess = () => DismissAndLaunch(() => LaunchLoginFlow(vm.Email));
+                vm.CloseAction = () => DismissAndLaunch(() => LaunchHomePage());
             }
-
-            var navigationPage = new NavigationPage(registerPage);
-            var loginController = navigationPage.CreateViewController();
-            loginController.ModalPresentationStyle = UIModalPresentationStyle.FullScreen;
-            PresentViewController(loginController, true, null);
+            NavigateToPage(registerPage);
         }
 
         private void LaunchLoginFlow(string email = null)
         {
             var loginPage = new LoginPage(email);
-            var app = new App.App(new AppOptions { IosExtension = true });
-            ThemeManager.SetTheme(app.Resources);
-            ThemeManager.ApplyResourcesToPage(loginPage);
+            SetupAppAndApplyResources(loginPage);
             if (loginPage.BindingContext is LoginPageViewModel vm)
             {
-                vm.StartTwoFactorAction = () => DismissViewController(false, () => LaunchTwoFactorFlow(false));
-                vm.UpdateTempPasswordAction = () => DismissViewController(false, () => LaunchUpdateTempPasswordFlow());
-                vm.LogInSuccessAction = () => DismissLockAndContinue();
+                vm.StartTwoFactorAction = () => DismissAndLaunch(() => LaunchTwoFactorFlow(false));
+                vm.UpdateTempPasswordAction = () => DismissAndLaunch(() => LaunchUpdateTempPasswordFlow());
+                vm.LogInSuccessAction = () =>
+                {
+                    DismissLockAndContinue();
+                };
                 vm.CloseAction = () => CompleteRequest();
             }
-
-            var navigationPage = new NavigationPage(loginPage);
-            var loginController = navigationPage.CreateViewController();
-            loginController.ModalPresentationStyle = UIModalPresentationStyle.FullScreen;
-            PresentViewController(loginController, true, null);
+            NavigateToPage(loginPage);
 
             LogoutIfAuthed();
         }
@@ -336,22 +351,16 @@ namespace Bit.iOS.ShareExtension
         private void LaunchLoginSsoFlow()
         {
             var loginPage = new LoginSsoPage();
-            var app = new App.App(new AppOptions { IosExtension = true });
-            ThemeManager.SetTheme(app.Resources);
-            ThemeManager.ApplyResourcesToPage(loginPage);
+            SetupAppAndApplyResources(loginPage);
             if (loginPage.BindingContext is LoginSsoPageViewModel vm)
             {
-                vm.StartTwoFactorAction = () => DismissViewController(false, () => LaunchTwoFactorFlow(true));
-                vm.StartSetPasswordAction = () => DismissViewController(false, () => LaunchSetPasswordFlow());
-                vm.UpdateTempPasswordAction = () => DismissViewController(false, () => LaunchUpdateTempPasswordFlow());
+                vm.StartTwoFactorAction = () => DismissAndLaunch(() => LaunchTwoFactorFlow(true));
+                vm.StartSetPasswordAction = () => DismissAndLaunch(() => LaunchSetPasswordFlow());
+                vm.UpdateTempPasswordAction = () => DismissAndLaunch(() => LaunchUpdateTempPasswordFlow());
                 vm.SsoAuthSuccessAction = () => DismissLockAndContinue();
-                vm.CloseAction = () => DismissViewController(false, () => LaunchHomePage());
+                vm.CloseAction = () => DismissAndLaunch(() => LaunchHomePage());
             }
-
-            var navigationPage = new NavigationPage(loginPage);
-            var loginController = navigationPage.CreateViewController();
-            loginController.ModalPresentationStyle = UIModalPresentationStyle.FullScreen;
-            PresentViewController(loginController, true, null);
+            NavigateToPage(loginPage);
 
             LogoutIfAuthed();
         }
@@ -359,65 +368,97 @@ namespace Bit.iOS.ShareExtension
         private void LaunchTwoFactorFlow(bool authingWithSso)
         {
             var twoFactorPage = new TwoFactorPage();
-            var app = new App.App(new AppOptions { IosExtension = true });
-            ThemeManager.SetTheme(app.Resources);
-            ThemeManager.ApplyResourcesToPage(twoFactorPage);
+            SetupAppAndApplyResources(twoFactorPage);
             if (twoFactorPage.BindingContext is TwoFactorPageViewModel vm)
             {
                 vm.TwoFactorAuthSuccessAction = () => DismissLockAndContinue();
-                vm.StartSetPasswordAction = () => DismissViewController(false, () => LaunchSetPasswordFlow());
+                vm.StartSetPasswordAction = () => DismissAndLaunch(() => LaunchSetPasswordFlow());
                 if (authingWithSso)
                 {
-                    vm.CloseAction = () => DismissViewController(false, () => LaunchLoginSsoFlow());
+                    vm.CloseAction = () => DismissAndLaunch(() => LaunchLoginSsoFlow());
                 }
                 else
                 {
-                    vm.CloseAction = () => DismissViewController(false, () => LaunchLoginFlow());
+                    vm.CloseAction = () => DismissAndLaunch(() => LaunchLoginFlow());
                 }
-                vm.UpdateTempPasswordAction = () => DismissViewController(false, () => LaunchUpdateTempPasswordFlow());
+                vm.UpdateTempPasswordAction = () => DismissAndLaunch(() => LaunchUpdateTempPasswordFlow());
             }
-
-            var navigationPage = new NavigationPage(twoFactorPage);
-            var twoFactorController = navigationPage.CreateViewController();
-            twoFactorController.ModalPresentationStyle = UIModalPresentationStyle.FullScreen;
-            PresentViewController(twoFactorController, true, null);
+            NavigateToPage(twoFactorPage);
         }
 
         private void LaunchSetPasswordFlow()
         {
             var setPasswordPage = new SetPasswordPage();
-            var app = new App.App(new AppOptions { IosExtension = true });
-            ThemeManager.SetTheme(app.Resources);
-            ThemeManager.ApplyResourcesToPage(setPasswordPage);
+            SetupAppAndApplyResources(setPasswordPage);
             if (setPasswordPage.BindingContext is SetPasswordPageViewModel vm)
             {
-                vm.UpdateTempPasswordAction = () => DismissViewController(false, () => LaunchUpdateTempPasswordFlow());
+                vm.UpdateTempPasswordAction = () => DismissAndLaunch(() => LaunchUpdateTempPasswordFlow());
                 vm.SetPasswordSuccessAction = () => DismissLockAndContinue();
-                vm.CloseAction = () => DismissViewController(false, () => LaunchHomePage());
+                vm.CloseAction = () => DismissAndLaunch(() => LaunchHomePage());
             }
-
-            var navigationPage = new NavigationPage(setPasswordPage);
-            var setPasswordController = navigationPage.CreateViewController();
-            setPasswordController.ModalPresentationStyle = UIModalPresentationStyle.FullScreen;
-            PresentViewController(setPasswordController, true, null);
+            NavigateToPage(setPasswordPage);
         }
 
         private void LaunchUpdateTempPasswordFlow()
         {
             var updateTempPasswordPage = new UpdateTempPasswordPage();
-            var app = new App.App(new AppOptions { IosExtension = true });
-            ThemeManager.SetTheme(app.Resources);
-            ThemeManager.ApplyResourcesToPage(updateTempPasswordPage);
+            SetupAppAndApplyResources(updateTempPasswordPage);
             if (updateTempPasswordPage.BindingContext is UpdateTempPasswordPageViewModel vm)
             {
-                vm.UpdateTempPasswordSuccessAction = () => DismissViewController(false, () => LaunchHomePage());
-                vm.LogOutAction = () => DismissViewController(false, () => LaunchHomePage());
+                vm.UpdateTempPasswordSuccessAction = () => DismissAndLaunch(() => LaunchHomePage());
+                vm.LogOutAction = () => DismissAndLaunch(() => LaunchHomePage());
+            }
+            NavigateToPage(updateTempPasswordPage);
+        }
+
+        public void Navigate(NavigationTarget navTarget, INavigationParams navParams = null)
+        {
+            if (ExtNavigationController?.ViewControllers?.Any() ?? false)
+            {
+                ExtNavigationController.PopViewController(false);
+            }
+            else if (ExtNavigationController?.ModalViewController != null)
+            {
+                ExtNavigationController.DismissModalViewController(false);
             }
 
-            var navigationPage = new NavigationPage(updateTempPasswordPage);
-            var updateTempPasswordController = navigationPage.CreateViewController();
-            updateTempPasswordController.ModalPresentationStyle = UIModalPresentationStyle.FullScreen;
-            PresentViewController(updateTempPasswordController, true, null);
+            switch (navTarget)
+            {
+                case NavigationTarget.HomeLogin:
+                    ExecuteLaunch(LaunchHomePage);
+                    break;
+                case NavigationTarget.Login:
+                    if (navParams is LoginNavigationParams loginParams)
+                    {
+                        ExecuteLaunch(() => LaunchLoginFlow(loginParams.Email));
+                    }
+                    else
+                    {
+                        ExecuteLaunch(() => LaunchLoginFlow());
+                    }
+                    break;
+                case NavigationTarget.Lock:
+                    NavigateToLockViewController();
+                    break;
+                case NavigationTarget.Home:
+                    DismissLockAndContinue();
+                    break;
+            }
         }
+
+        private void ExecuteLaunch(Action launchAction)
+        {
+            if (_presentingOnNavigationPage)
+            {
+                DismissAndLaunch(launchAction);
+            }
+            else
+            {
+                launchAction();
+            }
+        }
+
+        public Task SetPreviousPageInfoAsync() => Task.CompletedTask;
+        public Task UpdateThemeAsync() => Task.CompletedTask;
     }
 }

src/iOS.ShareExtension/LockPasswordViewController.cs

@@ -1,11 +1,22 @@
+using Bit.App.Controls;
+using Bit.Core.Utilities;
 using Bit.iOS.Core.Utilities;
 using System;
 using UIKit;
 
 namespace Bit.iOS.ShareExtension
 {
-    public partial class LockPasswordViewController : Core.Controllers.LockPasswordViewController
+    public partial class LockPasswordViewController : Core.Controllers.BaseLockPasswordViewController
     {
+        AccountSwitchingOverlayView _accountSwitchingOverlayView;
+        AccountSwitchingOverlayHelper _accountSwitchingOverlayHelper;
+
+        public LockPasswordViewController()
+        {
+            BiometricIntegrityKey = Bit.Core.Constants.iOSShareExtensionBiometricIntegrityKey;
+            DismissModalAction = Cancel;
+        }
+
         public LockPasswordViewController(IntPtr handle)
             : base(handle)
         {
@@ -17,24 +28,80 @@ namespace Bit.iOS.ShareExtension
         public override UINavigationItem BaseNavItem => _navItem;
         public override UIBarButtonItem BaseCancelButton => _cancelButton;
         public override UIBarButtonItem BaseSubmitButton => _submitButton;
-        public override Action Success => () => LoadingController.DismissLockAndContinue();
-        public override Action Cancel => () => LoadingController.CompleteRequest();
+        public override Action Success => () =>
+        {
+            LoadingController?.Navigate(Bit.Core.Enums.NavigationTarget.Home);
+            LoadingController = null;
+        };
+        public override Action Cancel => () =>
+        {
+            LoadingController?.CompleteRequest();
+            LoadingController = null;
+        };
 
-        public override void ViewDidLoad()
+        public override UITableView TableView => _mainTableView;
+
+        public override async void ViewDidLoad()
         {
             base.ViewDidLoad();
+
             _cancelButton.TintColor = ThemeHelpers.NavBarTextColor;
             _submitButton.TintColor = ThemeHelpers.NavBarTextColor;
+
+            _accountSwitchingOverlayHelper = new AccountSwitchingOverlayHelper();
+            _accountSwitchingButton.Image = await _accountSwitchingOverlayHelper.CreateAvatarImageAsync();
+
+            _accountSwitchingOverlayView = _accountSwitchingOverlayHelper.CreateAccountSwitchingOverlayView(_overlayView);
+        }
+
+        protected override void UpdateNavigationBarTheme()
+        {
+            UpdateNavigationBarTheme(_navBar);
+        }
+
+        partial void AccountSwitchingButton_Activated(UIBarButtonItem sender)
+        {
+            _accountSwitchingOverlayHelper.OnToolbarItemActivated(_accountSwitchingOverlayView, _overlayView);
         }
 
         partial void SubmitButton_Activated(UIBarButtonItem sender)
         {
-            var task = CheckPasswordAsync();
+            CheckPasswordAsync().FireAndForget();
         }
 
         partial void CancelButton_Activated(UIBarButtonItem sender)
         {
             Cancel();
         }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (TableView != null)
+                {
+                    TableView.Source?.Dispose();
+                }
+                if (_accountSwitchingButton?.Image != null)
+                {
+                    var img = _accountSwitchingButton.Image;
+                    _accountSwitchingButton.Image = null;
+                    img.Dispose();
+                }
+                if (_accountSwitchingOverlayView != null && _overlayView?.Subviews != null)
+                {
+                    foreach (var subView in _overlayView.Subviews)
+                    {
+                        subView.RemoveFromSuperview();
+                        subView.Dispose();
+                    }
+                    _accountSwitchingOverlayView = null;
+                    _overlayView.RemoveFromSuperview();
+                }
+                _accountSwitchingOverlayHelper = null;
+            }   
+
+            base.Dispose(disposing);
+        }
     }
 }

src/iOS.ShareExtension/LockPasswordViewController.designer.cs

@@ -12,18 +12,30 @@ namespace Bit.iOS.ShareExtension
 	[Register ("LockPasswordViewController")]
 	partial class LockPasswordViewController
 	{
+		[Outlet]
+		UIKit.UIBarButtonItem _accountSwitchingButton { get; set; }
+
 		[Outlet]
 		UIKit.UIBarButtonItem _cancelButton { get; set; }
 
 		[Outlet]
 		UIKit.UITableView _mainTableView { get; set; }
 
+		[Outlet]
+		UIKit.UINavigationBar _navBar { get; set; }
+
 		[Outlet]
 		UIKit.UINavigationItem _navItem { get; set; }
 
+		[Outlet]
+		UIKit.UIView _overlayView { get; set; }
+
 		[Outlet]
 		UIKit.UIBarButtonItem _submitButton { get; set; }
 
+		[Action ("AccountSwitchingButton_Activated:")]
+		partial void AccountSwitchingButton_Activated (UIKit.UIBarButtonItem sender);
+
 		[Action ("CancelButton_Activated:")]
 		partial void CancelButton_Activated (UIKit.UIBarButtonItem sender);
 
@@ -32,6 +44,11 @@ namespace Bit.iOS.ShareExtension
 		
 		void ReleaseDesignerOutlets ()
 		{
+			if (_accountSwitchingButton != null) {
+				_accountSwitchingButton.Dispose ();
+				_accountSwitchingButton = null;
+			}
+
 			if (_cancelButton != null) {
 				_cancelButton.Dispose ();
 				_cancelButton = null;
@@ -47,10 +64,20 @@ namespace Bit.iOS.ShareExtension
 				_navItem = null;
 			}
 
+			if (_overlayView != null) {
+				_overlayView.Dispose ();
+				_overlayView = null;
+			}
+
 			if (_submitButton != null) {
 				_submitButton.Dispose ();
 				_submitButton = null;
 			}
+
+			if (_navBar != null) {
+				_navBar.Dispose ();
+				_navBar = null;
+			}
 		}
 	}
 }

src/iOS.ShareExtension/MainInterface.storyboard

@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="2vH-Do-uhk">
+<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="2vH-Do-uhk">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
+        <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>
@@ -11,10 +13,6 @@
         <scene sceneID="kFr-IN-5GS">
             <objects>
                 <viewController id="bHU-LX-EpF" customClass="LoadingViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="8LE-gl-yDT"/>
-                        <viewControllerLayoutGuide type="bottom" id="MuK-nA-9iu"/>
-                    </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="z2O-Vp-jY9">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="808"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -23,25 +21,25 @@
                                 <rect key="frame" x="66" y="352" width="282" height="44"/>
                             </imageView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="jNx-Vd-K6U"/>
                         <constraints>
-                            <constraint firstItem="Zdy-yw-n0p" firstAttribute="centerX" secondItem="z2O-Vp-jY9" secondAttribute="centerX" id="6DT-HB-vS5"/>
+                            <constraint firstItem="Zdy-yw-n0p" firstAttribute="centerX" secondItem="jNx-Vd-K6U" secondAttribute="centerX" id="6DT-HB-vS5"/>
                             <constraint firstItem="Zdy-yw-n0p" firstAttribute="centerY" secondItem="z2O-Vp-jY9" secondAttribute="centerY" constant="-30" id="o9N-Tv-Iwq"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="74l-Va-Vqa"/>
                     <connections>
                         <outlet property="Logo" destination="Zdy-yw-n0p" id="1Qk-EK-0BO"/>
-                        <segue destination="rh6-Mf-4Ja" kind="presentation" identifier="lockPasswordSegue" id="ZUl-jv-5se"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="yJx-cc-wzs" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="-374" y="560"/>
         </scene>
-        <!--Navigation Controller-->
+        <!--Extension Navigation Controller-->
         <scene sceneID="Wgx-vz-XqL">
             <objects>
-                <navigationController definesPresentationContext="YES" id="2vH-Do-uhk" sceneMemberID="viewController">
+                <navigationController definesPresentationContext="YES" id="2vH-Do-uhk" customClass="ExtensionNavigationController" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" hidden="YES" contentMode="scaleToFill" translucent="NO" id="JoO-jQ-16M">
                         <rect key="frame" x="0.0" y="44" width="414" height="44"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
@@ -54,60 +52,89 @@
             </objects>
             <point key="canvasLocation" x="-1097" y="564"/>
         </scene>
-        <!--Navigation Controller-->
-        <scene sceneID="Tzp-2o-9k7">
+        <!--Lock Password View Controller-->
+        <scene sceneID="vQB-cT-8IC">
             <objects>
-                <navigationController definesPresentationContext="YES" id="rh6-Mf-4Ja" sceneMemberID="viewController">
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" translucent="NO" id="UDq-kw-Ue7">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="56"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                    </navigationBar>
-                    <connections>
-                        <segue destination="85y-W9-d8q" kind="relationship" relationship="rootViewController" id="TeA-GE-A22"/>
-                    </connections>
-                </navigationController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="BVV-5B-aim" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-375" y="1262"/>
-        </scene>
-        <!--Verify Master Password-->
-        <scene sceneID="OEb-ak-BVc">
-            <objects>
-                <tableViewController id="85y-W9-d8q" 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="9on-wf-zdb">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="786"/>
+                <viewController storyboardIdentifier="lockVC" id="Vi7-LV-nWW" customClass="LockPasswordViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="Vfd-7B-19G">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <connections>
-                            <outlet property="dataSource" destination="85y-W9-d8q" id="3il-RO-S3K"/>
-                            <outlet property="delegate" destination="85y-W9-d8q" id="bLb-h4-pr3"/>
-                        </connections>
-                    </tableView>
-                    <navigationItem key="navigationItem" title="Verify Master Password" id="qL3-iV-6Ld">
-                        <barButtonItem key="leftBarButtonItem" title="Cancel" id="d8j-HZ-erD">
-                            <connections>
-                                <action selector="CancelButton_Activated:" destination="85y-W9-d8q" id="p54-B0-Vyf"/>
-                            </connections>
-                        </barButtonItem>
-                        <barButtonItem key="rightBarButtonItem" title="Submit" id="8a7-Vz-SJA">
-                            <connections>
-                                <action selector="SubmitButton_Activated:" destination="85y-W9-d8q" id="P8A-7O-lpY"/>
-                            </connections>
-                        </barButtonItem>
-                    </navigationItem>
+                        <subviews>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" estimatedSectionHeaderHeight="-1" sectionFooterHeight="18" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="M1A-84-x5l">
+                                <rect key="frame" x="0.0" y="88" width="414" height="774"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            </tableView>
+                            <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ijE-Pa-OBq" userLabel="OverlayView">
+                                <rect key="frame" x="0.0" y="88" width="414" height="774"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            </view>
+                            <navigationBar contentMode="scaleToFill" translucent="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fav-Fz-6ZK">
+                                <rect key="frame" x="0.0" y="44" width="414" height="44"/>
+                                <items>
+                                    <navigationItem title="Verify Master Password" id="aka-In-IYk">
+                                        <leftBarButtonItems>
+                                            <barButtonItem title="Cancel" id="LrG-Qx-w4Q">
+                                                <connections>
+                                                    <action selector="CancelButton_Activated:" destination="Vi7-LV-nWW" id="qyZ-i9-Dwz"/>
+                                                </connections>
+                                            </barButtonItem>
+                                            <barButtonItem title="Item" image="person.2" catalog="system" style="plain" id="nlD-Xn-HtM" userLabel="Account Switching Button">
+                                                <color key="tintColor" systemColor="systemBackgroundColor"/>
+                                                <connections>
+                                                    <action selector="AccountSwitchingButton_Activated:" destination="Vi7-LV-nWW" id="G3U-rv-UOl"/>
+                                                </connections>
+                                            </barButtonItem>
+                                        </leftBarButtonItems>
+                                        <barButtonItem key="rightBarButtonItem" title="Submit" id="oQD-QK-YPB">
+                                            <connections>
+                                                <action selector="SubmitButton_Activated:" destination="Vi7-LV-nWW" id="DgO-TS-MPf"/>
+                                            </connections>
+                                        </barButtonItem>
+                                    </navigationItem>
+                                </items>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="barPosition">
+                                        <integer key="value" value="3"/>
+                                    </userDefinedRuntimeAttribute>
+                                </userDefinedRuntimeAttributes>
+                            </navigationBar>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="SSW-s3-JwL"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="M1A-84-x5l" firstAttribute="leading" secondItem="SSW-s3-JwL" secondAttribute="leading" id="3Es-aL-5Og"/>
+                            <constraint firstItem="ijE-Pa-OBq" firstAttribute="leading" secondItem="SSW-s3-JwL" secondAttribute="leading" id="6Lj-CR-OFz"/>
+                            <constraint firstItem="fav-Fz-6ZK" firstAttribute="leading" secondItem="SSW-s3-JwL" secondAttribute="leading" id="BEJ-gh-NAq"/>
+                            <constraint firstItem="fav-Fz-6ZK" firstAttribute="top" secondItem="SSW-s3-JwL" secondAttribute="top" id="CLE-2p-LI3"/>
+                            <constraint firstItem="SSW-s3-JwL" firstAttribute="trailing" secondItem="M1A-84-x5l" secondAttribute="trailing" id="GaL-B0-2Lg"/>
+                            <constraint firstItem="SSW-s3-JwL" firstAttribute="bottom" secondItem="M1A-84-x5l" secondAttribute="bottom" id="LG1-vj-VhW"/>
+                            <constraint firstItem="SSW-s3-JwL" firstAttribute="trailing" secondItem="ijE-Pa-OBq" secondAttribute="trailing" id="Q3J-Wa-mnY"/>
+                            <constraint firstItem="ijE-Pa-OBq" firstAttribute="top" secondItem="fav-Fz-6ZK" secondAttribute="bottom" id="h8T-rn-ZPU"/>
+                            <constraint firstItem="SSW-s3-JwL" firstAttribute="trailing" secondItem="fav-Fz-6ZK" secondAttribute="trailing" id="tux-AN-Z92"/>
+                            <constraint firstItem="SSW-s3-JwL" firstAttribute="bottom" secondItem="ijE-Pa-OBq" secondAttribute="bottom" id="zLh-RX-eSc"/>
+                            <constraint firstItem="M1A-84-x5l" firstAttribute="top" secondItem="fav-Fz-6ZK" secondAttribute="bottom" id="zgM-he-DYl"/>
+                        </constraints>
+                    </view>
                     <connections>
-                        <outlet property="_cancelButton" destination="d8j-HZ-erD" id="wlI-el-Snh"/>
-                        <outlet property="_mainTableView" destination="9on-wf-zdb" id="ltj-yY-5ue"/>
-                        <outlet property="_navItem" destination="qL3-iV-6Ld" id="Grb-Ta-NCF"/>
-                        <outlet property="_submitButton" destination="8a7-Vz-SJA" id="LS8-6Y-Wkp"/>
+                        <outlet property="_accountSwitchingButton" destination="nlD-Xn-HtM" id="SSG-zv-bAc"/>
+                        <outlet property="_cancelButton" destination="LrG-Qx-w4Q" id="aag-ZZ-Ifs"/>
+                        <outlet property="_mainTableView" destination="M1A-84-x5l" id="pA4-ao-Fhu"/>
+                        <outlet property="_navBar" destination="fav-Fz-6ZK" id="Q9p-Dw-ipx"/>
+                        <outlet property="_navItem" destination="aka-In-IYk" id="www-Lt-x1g"/>
+                        <outlet property="_overlayView" destination="ijE-Pa-OBq" id="n9e-Lg-4WO"/>
+                        <outlet property="_submitButton" destination="oQD-QK-YPB" id="SEp-KK-YeP"/>
                     </connections>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="5by-Sa-d9m" userLabel="First Responder" sceneMemberID="firstResponder"/>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Czu-9n-yKC" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="335" y="1260"/>
+            <point key="canvasLocation" x="403" y="560"/>
         </scene>
     </scenes>
     <resources>
         <image name="logo.png" width="282" height="44"/>
+        <image name="person.2" catalog="system" width="128" height="81"/>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>

src/iOS.ShareExtension/iOS.ShareExtension.csproj

@@ -26,7 +26,6 @@
     <MtouchLink>None</MtouchLink>
     <MtouchArch>x86_64</MtouchArch>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
-    <DeviceSpecificBuild>false</DeviceSpecificBuild>
     <MtouchVerbosity></MtouchVerbosity>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <AssemblyName>BitwardeniOSShareExtension</AssemblyName>
@@ -193,6 +192,10 @@
     <Compile Include="LockPasswordViewController.designer.cs">
       <DependentUpon>LockPasswordViewController.cs</DependentUpon>
     </Compile>
+    <Compile Include="ExtensionNavigationController.cs" />
+    <Compile Include="ExtensionNavigationController.designer.cs">
+      <DependentUpon>ExtensionNavigationController.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\App\App.csproj">

src/iOS/AppDelegate.cs

@@ -59,114 +59,121 @@ namespace Bit.iOS
 
             _broadcasterService.Subscribe(nameof(AppDelegate), async (message) =>
             {
-                if (message.Command == "startEventTimer")
+                try
                 {
-                    StartEventTimer();
-                }
-                else if (message.Command == "stopEventTimer")
-                {
-                    var task = StopEventTimerAsync();
-                }
-                else if (message.Command == "updatedTheme")
-                {
-                    Device.BeginInvokeOnMainThread(() =>
+                    if (message.Command == "startEventTimer")
                     {
-                        iOSCoreHelpers.AppearanceAdjustments();
-                    });
-                }
-                else if (message.Command == "listenYubiKeyOTP")
-                {
-                    iOSCoreHelpers.ListenYubiKey((bool)message.Data, _deviceActionService, _nfcSession, _nfcDelegate);
-                }
-                else if (message.Command == "unlocked")
-                {
-                    var needsAutofillReplacement = await _storageService.GetAsync<bool?>(
-                        Core.Constants.AutofillNeedsIdentityReplacementKey);
-                    if (needsAutofillReplacement.GetValueOrDefault())
+                        StartEventTimer();
+                    }
+                    else if (message.Command == "stopEventTimer")
+                    {
+                        var task = StopEventTimerAsync();
+                    }
+                    else if (message.Command == "updatedTheme")
+                    {
+                        Device.BeginInvokeOnMainThread(() =>
+                        {
+                            iOSCoreHelpers.AppearanceAdjustments();
+                        });
+                    }
+                    else if (message.Command == "listenYubiKeyOTP")
+                    {
+                        iOSCoreHelpers.ListenYubiKey((bool)message.Data, _deviceActionService, _nfcSession, _nfcDelegate);
+                    }
+                    else if (message.Command == "unlocked")
+                    {
+                        var needsAutofillReplacement = await _storageService.GetAsync<bool?>(
+                            Core.Constants.AutofillNeedsIdentityReplacementKey);
+                        if (needsAutofillReplacement.GetValueOrDefault())
+                        {
+                            await ASHelpers.ReplaceAllIdentities();
+                        }
+                    }
+                    else if (message.Command == "showAppExtension")
+                    {
+                        Device.BeginInvokeOnMainThread(() => ShowAppExtension((ExtensionPageViewModel)message.Data));
+                    }
+                    else if (message.Command == "syncCompleted")
+                    {
+                        if (message.Data is Dictionary<string, object> data && data.ContainsKey("successfully"))
+                        {
+                            var success = data["successfully"] as bool?;
+                            if (success.GetValueOrDefault() && _deviceActionService.SystemMajorVersion() >= 12)
+                            {
+                                await ASHelpers.ReplaceAllIdentities();
+                            }
+                        }
+                    }
+                    else if (message.Command == "addedCipher" || message.Command == "editedCipher" ||
+                        message.Command == "restoredCipher")
+                    {
+                        if (_deviceActionService.SystemMajorVersion() >= 12)
+                        {
+                            if (await ASHelpers.IdentitiesCanIncremental())
+                            {
+                                var cipherId = message.Data as string;
+                                if (message.Command == "addedCipher" && !string.IsNullOrWhiteSpace(cipherId))
+                                {
+                                    var identity = await ASHelpers.GetCipherIdentityAsync(cipherId);
+                                    if (identity == null)
+                                    {
+                                        return;
+                                    }
+                                    await ASCredentialIdentityStore.SharedStore?.SaveCredentialIdentitiesAsync(
+                                        new ASPasswordCredentialIdentity[] { identity });
+                                    return;
+                                }
+                            }
+                            await ASHelpers.ReplaceAllIdentities();
+                        }
+                    }
+                    else if (message.Command == "deletedCipher" || message.Command == "softDeletedCipher")
+                    {
+                        if (_deviceActionService.SystemMajorVersion() >= 12)
+                        {
+                            if (await ASHelpers.IdentitiesCanIncremental())
+                            {
+                                var identity = ASHelpers.ToCredentialIdentity(
+                                    message.Data as Bit.Core.Models.View.CipherView);
+                                if (identity == null)
+                                {
+                                    return;
+                                }
+                                await ASCredentialIdentityStore.SharedStore?.RemoveCredentialIdentitiesAsync(
+                                    new ASPasswordCredentialIdentity[] { identity });
+                                return;
+                            }
+                            await ASHelpers.ReplaceAllIdentities();
+                        }
+                    }
+                    else if (message.Command == "logout")
+                    {
+                        if (_deviceActionService.SystemMajorVersion() >= 12)
+                        {
+                            await ASCredentialIdentityStore.SharedStore?.RemoveAllCredentialIdentitiesAsync();
+                        }
+                    }
+                    else if ((message.Command == "softDeletedCipher" || message.Command == "restoredCipher")
+                        && _deviceActionService.SystemMajorVersion() >= 12)
                     {
                         await ASHelpers.ReplaceAllIdentities();
                     }
-                }
-                else if (message.Command == "showAppExtension")
-                {
-                    Device.BeginInvokeOnMainThread(() => ShowAppExtension((ExtensionPageViewModel)message.Data));
-                }
-                else if (message.Command == "syncCompleted")
-                {
-                    if (message.Data is Dictionary<string, object> data && data.ContainsKey("successfully"))
+                    else if (message.Command == "vaultTimeoutActionChanged")
                     {
-                        var success = data["successfully"] as bool?;
-                        if (success.GetValueOrDefault() && _deviceActionService.SystemMajorVersion() >= 12)
+                        var timeoutAction = await _stateService.GetVaultTimeoutActionAsync();
+                        if (timeoutAction == VaultTimeoutAction.Logout)
+                        {
+                            await ASCredentialIdentityStore.SharedStore?.RemoveAllCredentialIdentitiesAsync();
+                        }
+                        else
                         {
                             await ASHelpers.ReplaceAllIdentities();
                         }
                     }
                 }
-                else if (message.Command == "addedCipher" || message.Command == "editedCipher" ||
-                    message.Command == "restoredCipher")
+                catch (Exception ex)
                 {
-                    if (_deviceActionService.SystemMajorVersion() >= 12)
-                    {
-                        if (await ASHelpers.IdentitiesCanIncremental())
-                        {
-                            var cipherId = message.Data as string;
-                            if (message.Command == "addedCipher" && !string.IsNullOrWhiteSpace(cipherId))
-                            {
-                                var identity = await ASHelpers.GetCipherIdentityAsync(cipherId);
-                                if (identity == null)
-                                {
-                                    return;
-                                }
-                                await ASCredentialIdentityStore.SharedStore?.SaveCredentialIdentitiesAsync(
-                                    new ASPasswordCredentialIdentity[] { identity });
-                                return;
-                            }
-                        }
-                        await ASHelpers.ReplaceAllIdentities();
-                    }
-                }
-                else if (message.Command == "deletedCipher" || message.Command == "softDeletedCipher")
-                {
-                    if (_deviceActionService.SystemMajorVersion() >= 12)
-                    {
-                        if (await ASHelpers.IdentitiesCanIncremental())
-                        {
-                            var identity = ASHelpers.ToCredentialIdentity(
-                                message.Data as Bit.Core.Models.View.CipherView);
-                            if (identity == null)
-                            {
-                                return;
-                            }
-                            await ASCredentialIdentityStore.SharedStore?.RemoveCredentialIdentitiesAsync(
-                                new ASPasswordCredentialIdentity[] { identity });
-                            return;
-                        }
-                        await ASHelpers.ReplaceAllIdentities();
-                    }
-                }
-                else if (message.Command == "logout")
-                {
-                    if (_deviceActionService.SystemMajorVersion() >= 12)
-                    {
-                        await ASCredentialIdentityStore.SharedStore?.RemoveAllCredentialIdentitiesAsync();
-                    }
-                }
-                else if ((message.Command == "softDeletedCipher" || message.Command == "restoredCipher")
-                    && _deviceActionService.SystemMajorVersion() >= 12)
-                {
-                    await ASHelpers.ReplaceAllIdentities();
-                }
-                else if (message.Command == "vaultTimeoutActionChanged")
-                {
-                    var timeoutAction = await _stateService.GetVaultTimeoutActionAsync();
-                    if (timeoutAction == VaultTimeoutAction.Logout)
-                    {
-                        await ASCredentialIdentityStore.SharedStore?.RemoveAllCredentialIdentitiesAsync();
-                    }
-                    else
-                    {
-                        await ASHelpers.ReplaceAllIdentities();
-                    }
+                    LoggerHelper.LogEvenIfCantBeResolved(ex);
                 }
             });
 

src/iOS/Info.plist

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