Merge branch 'master' into rc

* master:
  Build: Upload dSYMs to AppCenter (#1776)
  Fix for vault timeout not firing on resume (#1775)

.github/workflows/build.yml

@@ -6,10 +6,6 @@ on:
     branches-ignore:
       - 'l10n_master'
       - 'gh-pages'
-    paths-ignore:
-      - '.github/workflows/**'
-  workflow_dispatch:
-    inputs: {}
 
 jobs:
   cloc:
@@ -47,7 +43,7 @@ jobs:
             echo "::set-output name=rc_branch_exists::0"
           fi
 
-          if [[ $(git ls-remote --heads origin hotfix-rc) ]]; then
+          if [[ $(git ls-remote --heads origin hotfix) ]]; then
             echo "::set-output name=hotfix_branch_exists::1"
           else
             echo "::set-output name=hotfix_branch_exists::0"
@@ -186,9 +182,9 @@ jobs:
               && needs.setup.outputs.rc_branch_exists == 0
               && needs.setup.outputs.hotfix_branch_exists == 0)
             || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
-            || github.ref == 'refs/heads/hotfix-rc'
+            || github.ref == 'refs/heads/hotfix'
         run: |
-          PUBLISHER_PATH="$GITHUB_WORKSPACE/store/google/Publisher/bin/Release/netcoreapp3.1/Publisher.dll"
+          PUBLISHER_PATH="$GITHUB_WORKSPACE/store/google/Publisher/bin/Release/netcoreapp2.0/Publisher.dll"
           CREDS_PATH="$HOME/secrets/play_creds.json"
           AAB_PATH="$GITHUB_WORKSPACE/com.x8bit.bitwarden.aab"
           TRACK="internal"
@@ -241,7 +237,6 @@ jobs:
         run: |
           $androidPath = $($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj");
           $appPath = $($env:GITHUB_WORKSPACE + "/src/App/App.csproj");
-          $corePath = $($env:GITHUB_WORKSPACE + "/src/Core/Core.csproj");
 
           $androidManifest = $($env:GITHUB_WORKSPACE + "/src/Android/Properties/AndroidManifest.xml");
 
@@ -307,18 +302,6 @@ jobs:
           $appCenterNode.ParentNode.RemoveChild($appCenterNode);
 
           $xml.Save($appPath);
-
-          Write-Output "########################################"
-          Write-Output "##### Uninstall from Core.csproj"
-          Write-Output "########################################"
-
-          $xml=New-Object XML;
-          $xml.Load($corePath);
-
-          $appCenterNode=$xml.SelectSingleNode("/Project/ItemGroup/PackageReference[@Include='Microsoft.AppCenter.Crashes']");
-          $appCenterNode.ParentNode.RemoveChild($appCenterNode);
-
-          $xml.Save($corePath);
         shell: pwsh
 
       - name: Restore packages
@@ -531,7 +514,7 @@ jobs:
               && needs.setup.outputs.rc_branch_exists == 0
               && needs.setup.outputs.hotfix_branch_exists == 0)
             || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
-            || github.ref == 'refs/heads/hotfix-rc'
+            || github.ref == 'refs/heads/hotfix'
         uses: actions/setup-node@v2
         with:
           node-version: '14'
@@ -543,10 +526,11 @@ jobs:
               && needs.setup.outputs.rc_branch_exists == 0
               && needs.setup.outputs.hotfix_branch_exists == 0)
             || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
-            || github.ref == 'refs/heads/hotfix-rc'
+            || github.ref == 'refs/heads/hotfix'
         env:
           APPCENTER_IOS_TOKEN: ${{ steps.retrieve-secrets.outputs.appcenter-ios-token }}
-        run: appcenter crashes upload-symbols -a kspearrin/bitwarden -s "./bitwarden-export/dSYMs" --token $APPCENTER_IOS_TOKEN
+        run: |
+          appcenter crashes upload-symbols -a kspearrin/bitwarden -s "./bitwarden-export/dSYMs" --token $APPCENTER_IOS_TOKEN
         shell: bash
 
       - name: Deploy to App Store
@@ -555,7 +539,7 @@ jobs:
               && needs.setup.outputs.rc_branch_exists == 0
               && needs.setup.outputs.hotfix_branch_exists == 0)
             || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
-            || github.ref == 'refs/heads/hotfix-rc'
+            || github.ref == 'refs/heads/hotfix'
         env:
           APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
@@ -618,7 +602,7 @@ jobs:
         if: |
             (github.ref == 'refs/heads/master')
             || (github.ref == 'refs/heads/rc')
-            || (github.ref == 'refs/heads/hotfix-rc')
+            || (github.ref == 'refs/heads/hotfix')
         env:
           CLOC_STATUS: ${{ needs.cloc.result }}
           ANDROID_STATUS: ${{ needs.android.result }}

.github/workflows/enforce-labels.yml

@@ -1,16 +0,0 @@
----
-name: Enforce PR labels
-
-on:
-  pull_request:
-    types: [labeled, unlabeled, opened, edited, synchronize]
-jobs:
-  enforce-label:
-    name: EnforceLabel
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Enforce Label
-        uses: yogevbd/enforce-label-action@8d1e1709b1011e6d90400a0e6cf7c0b77aa5efeb
-        with:
-          BANNED_LABELS: "hold"
-          BANNED_LABELS_DESCRIPTION: "PRs on hold cannot be merged"

.github/workflows/release.yml

@@ -12,7 +12,6 @@ on:
         options:
           - Initial Release
           - Redeploy
-          - dry-run
 
 jobs:
   release:
@@ -22,23 +21,21 @@ jobs:
       branch-name: ${{ steps.branch.outputs.branch-name }}
     steps:
       - name: Branch check
-        if: github.event.inputs.release_type != 'dry-run'
         run: |
-          if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ "$GITHUB_REF" != "refs/heads/hotfix-rc" ]]; then
+          if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ "$GITHUB_REF" != "refs/heads/hotfix" ]]; then
             echo "==================================="
-            echo "[!] Can only release from the 'rc' or 'hotfix-rc' branches"
+            echo "[!] Can only release from the 'rc' or 'hotfix' branches"
             echo "==================================="
             exit 1
           fi
 
       - name: Checkout repo
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
 
       - name: Retrieve Mobile release version
         id: retrieve-mobile-version
         run: |
-          ver=$(sed -E -n '/^<manifest/s/^.*[ ]android:versionName="([^"]+)".*$/\1/p' \
-          ./src/Android/Properties/AndroidManifest.xml | tr -d '"')
+          ver=$(sed -E -n '/^<manifest/s/^.*[ ]android:versionName="([^"]+)".*$/\1/p' ./src/Android/Properties/AndroidManifest.xml | tr -d '"')
           echo "::set-output name=mobile_version::${ver}"
         shell: bash
 
@@ -65,23 +62,19 @@ jobs:
           echo "::set-output name=branch-name::$BRANCH_NAME"
 
       - name: Download all artifacts
-        uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
+        uses: dawidd6/action-download-artifact@b9571484721e8187f1fd08147b497129f8972c74  # v2.14.0
         with:
           workflow: build.yml
           workflow_conclusion: success
           branch: ${{ steps.branch.outputs.branch-name }}
 
-      - 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'
-        uses: ncipollo/release-action@40bb172bd05f266cf9ba4ff965cb61e9ee5f6d01  # v1.9.0
+        uses: ncipollo/release-action@95215a3cb6e6a1908b3c44e00b4fdb15548b1e09  # v2.8.5
         with:
           artifacts: "./com.x8bit.bitwarden.aab/com.x8bit.bitwarden.aab,
                       ./com.x8bit.bitwarden.apk/com.x8bit.bitwarden.apk,
                       ./com.x8bit.bitwarden-fdroid.apk/com.x8bit.bitwarden-fdroid.apk,
-                      ./Bitwarden iOS.zip"
+                      ./Bitwarden.ipa/Bitwarden.ipa"
           commit: ${{ github.sha }}
           tag: v${{ steps.retrieve-mobile-version.outputs.mobile_version }}
           name: Version ${{ steps.retrieve-mobile-version.outputs.mobile_version }}
@@ -96,10 +89,10 @@ jobs:
     needs: release
     steps:
       - name: Checkout repo
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
 
       - name: Download F-Droid .apk artifact
-        uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
+        uses: dawidd6/action-download-artifact@b9571484721e8187f1fd08147b497129f8972c74  # v2.14.0
         with:
           workflow: build.yml
           workflow_conclusion: success
@@ -107,7 +100,7 @@ jobs:
           name: com.x8bit.bitwarden-fdroid.apk
 
       - name: Set up Node
-        uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561  # v2.5.1
+        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea  # v2.3.0
         with:
           node-version: '10.x'
 
@@ -171,5 +164,4 @@ jobs:
           cd $GITHUB_WORKSPACE
 
       - name: Deploy to gh-pages
-        if: github.event.inputs.release_type != 'dry-run'
         run: npm run deploy

.github/workflows/workflow-linter.yml

@@ -1,11 +0,0 @@
----
-name: Workflow Linter
-
-on:
-  pull_request:
-    paths:
-      - .github/workflows/**
-
-jobs:
-  call-workflow:
-    uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@master

README.md

@@ -23,10 +23,6 @@ The Bitwarden mobile application is written in C# with Xamarin Android, Xamarin
 - Restore the nuget packages.
 - Build and run the app.
 
-# We're Hiring!
-
-Interested in contributing in a big way? Consider joining our team! We're hiring for many positions. Please take a look at our [Careers page](https://bitwarden.com/careers/) to see what opportunities are currently open as well as what it's like to work at Bitwarden.
-
 # 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.

src/Android/Accessibility/AccessibilityHelpers.cs

@@ -31,8 +31,6 @@ namespace Bit.Droid.Accessibility
             // So keep them in sync with:
             //   - AutofillHelpers.{TrustedBrowsers,CompatBrowsers}
             //   - Resources/xml/autofillservice.xml
-            new Browser("alook.browser", "search_fragment_input_view"),
-            new Browser("alook.browser.google", "search_fragment_input_view"),
             new Browser("com.amazon.cloud9", "url"),
             new Browser("com.android.browser", "url"),
             new Browser("com.android.chrome", "url_bar"),

src/Android/Accessibility/AccessibilityService.cs

@@ -10,6 +10,7 @@ using Android.Views;
 using Android.Views.Accessibility;
 using Android.Widget;
 using Bit.App.Resources;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 
@@ -24,7 +25,7 @@ namespace Bit.Droid.Accessibility
         private const string BitwardenPackage = "com.x8bit.bitwarden";
         private const string BitwardenWebsite = "vault.bitwarden.com";
 
-        private IStateService _stateService;
+        private IStorageService _storageService;
         private IBroadcasterService _broadcasterService;
         private DateTime? _lastSettingsReload = null;
         private TimeSpan _settingsReloadSpan = TimeSpan.FromMinutes(1);
@@ -443,9 +444,9 @@ namespace Bit.Droid.Accessibility
 
         private void LoadServices()
         {
-            if (_stateService == null)
+            if (_storageService == null)
             {
-                _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+                _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
             }
             if (_broadcasterService == null)
             {
@@ -459,12 +460,12 @@ namespace Bit.Droid.Accessibility
             if (_lastSettingsReload == null || (now - _lastSettingsReload.Value) > _settingsReloadSpan)
             {
                 _lastSettingsReload = now;
-                var uris = await _stateService.GetAutofillBlacklistedUrisAsync();
+                var uris = await _storageService.GetAsync<List<string>>(Constants.AutofillBlacklistedUrisKey);
                 if (uris != null)
                 {
                     _blacklistedUris = new HashSet<string>(uris);
                 }
-                var isAutoFillTileAdded = await _stateService.GetAutofillTileAddedAsync();
+                var isAutoFillTileAdded = await _storageService.GetAsync<bool?>(Constants.AutofillTileAdded);
                 AccessibilityHelpers.IsAutofillTileAdded = isAutoFillTileAdded.GetValueOrDefault();
             }
         }

src/Android/Android.csproj

@@ -84,7 +84,7 @@
     <PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.2.5.2" />
     <PackageReference Include="Xamarin.AndroidX.Migration" Version="1.0.8" />
     <PackageReference Include="Xamarin.Essentials">
-      <Version>1.7.1</Version>
+      <Version>1.7.0</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Firebase.Messaging">
       <Version>122.0.0</Version>
@@ -171,8 +171,7 @@
     <AndroidResource Include="Resources\drawable-xxhdpi\logo_legacy.png" />
     <AndroidResource Include="Resources\drawable-xxhdpi\logo_white_legacy.png" />
     <AndroidResource Include="Resources\drawable\card.xml" />
-    <AndroidResource Include="Resources\drawable\cog_environment.xml" />
-    <AndroidResource Include="Resources\drawable\cog_settings.xml" />
+    <AndroidResource Include="Resources\drawable\cog.xml" />
     <AndroidResource Include="Resources\drawable\icon.xml" />
     <AndroidResource Include="Resources\drawable\ic_launcher_foreground.xml" />
     <AndroidResource Include="Resources\drawable\ic_warning.xml" />

src/Android/Autofill/AutofillHelpers.cs

@@ -51,8 +51,6 @@ namespace Bit.Droid.Autofill
         //   - ... to keep this list in sync with values in AccessibilityHelpers.SupportedBrowsers [Section A], too.
         public static HashSet<string> CompatBrowsers = new HashSet<string>
         {
-            "alook.browser",
-            "alook.browser.google",
             "com.amazon.cloud9",
             "com.android.browser",
             "com.android.chrome",

src/Android/Autofill/AutofillService.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Android;
+using Android;
 using Android.App;
 using Android.Content;
 using Android.OS;
@@ -12,6 +9,12 @@ using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
+#if !FDROID
+using Microsoft.AppCenter.Crashes;
+#endif
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Bit.Droid.Autofill
 {
@@ -23,9 +26,9 @@ namespace Bit.Droid.Autofill
     {
         private ICipherService _cipherService;
         private IVaultTimeoutService _vaultTimeoutService;
+        private IStorageService _storageService;
         private IPolicyService _policyService;
-        private IStateService _stateService;
-        private LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
+        private IUserService _userService;
 
         public async override void OnFillRequest(FillRequest request, CancellationSignal cancellationSignal,
             FillCallback callback)
@@ -41,18 +44,18 @@ namespace Bit.Droid.Autofill
                 var parser = new Parser(structure, ApplicationContext);
                 parser.Parse();
 
-                if (_stateService == null)
+                if (_storageService == null)
                 {
-                    _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+                    _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
                 }
 
-                var shouldAutofill = await parser.ShouldAutofillAsync(_stateService);
+                var shouldAutofill = await parser.ShouldAutofillAsync(_storageService);
                 if (!shouldAutofill)
                 {
                     return;
                 }
 
-                var inlineAutofillEnabled = await _stateService.GetInlineAutofillEnabledAsync() ?? true;
+                var inlineAutofillEnabled = await _storageService.GetAsync<bool?>(Constants.InlineAutofillEnabledKey) ?? true;
 
                 if (_vaultTimeoutService == null)
                 {
@@ -73,7 +76,7 @@ namespace Bit.Droid.Autofill
 
                 // build response
                 var response = AutofillHelpers.CreateFillResponse(parser, items, locked, inlineAutofillEnabled, request);
-                var disableSavePrompt = await _stateService.GetAutofillDisableSavePromptAsync();
+                var disableSavePrompt = await _storageService.GetAsync<bool?>(Constants.AutofillDisableSavePromptKey);
                 if (!disableSavePrompt.GetValueOrDefault())
                 {
                     AutofillHelpers.AddSaveInfo(parser, request, response, parser.FieldCollection);
@@ -82,7 +85,9 @@ namespace Bit.Droid.Autofill
             }
             catch (Exception e)
             {
-                _logger.Value.Exception(e);
+#if !FDROID
+                Crashes.TrackError(e);
+#endif
             }
         }
 
@@ -96,12 +101,12 @@ namespace Bit.Droid.Autofill
                     return;
                 }
 
-                if (_stateService == null)
+                if (_storageService == null)
                 {
-                    _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+                    _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
                 }
 
-                var disableSavePrompt = await _stateService.GetAutofillDisableSavePromptAsync();
+                var disableSavePrompt = await _storageService.GetAsync<bool?>(Constants.AutofillDisableSavePromptKey);
                 if (disableSavePrompt.GetValueOrDefault())
                 {
                     return;
@@ -156,7 +161,9 @@ namespace Bit.Droid.Autofill
             }
             catch (Exception e)
             {
-                _logger.Value.Exception(e);
+#if !FDROID
+                Crashes.TrackError(e);
+#endif
             }
         }
     }

src/Android/Autofill/Parser.cs

@@ -80,13 +80,13 @@ namespace Bit.Droid.Autofill
             }
         }
 
-        public async Task<bool> ShouldAutofillAsync(IStateService stateService)
+        public async Task<bool> ShouldAutofillAsync(IStorageService storageService)
         {
             var fillable = !string.IsNullOrWhiteSpace(Uri) && !AutofillHelpers.BlacklistedUris.Contains(Uri) &&
                 FieldCollection != null && FieldCollection.Fillable;
             if (fillable)
             {
-                var blacklistedUris = await stateService.GetAutofillBlacklistedUrisAsync();
+                var blacklistedUris = await storageService.GetAsync<List<string>>(Constants.AutofillBlacklistedUrisKey);
                 if (blacklistedUris != null && blacklistedUris.Count > 0)
                 {
                     fillable = !new HashSet<string>(blacklistedUris).Contains(Uri);

src/Android/MainActivity.cs

@@ -32,7 +32,7 @@ namespace Bit.Droid
         private IDeviceActionService _deviceActionService;
         private IMessagingService _messagingService;
         private IBroadcasterService _broadcasterService;
-        private IStateService _stateService;
+        private IUserService _userService;
         private IAppIdService _appIdService;
         private IEventService _eventService;
         private PendingIntent _eventUploadPendingIntent;
@@ -53,7 +53,7 @@ namespace Bit.Droid
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
             _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _userService = ServiceContainer.Resolve<IUserService>("userService");
             _appIdService = ServiceContainer.Resolve<IAppIdService>("appIdService");
             _eventService = ServiceContainer.Resolve<IEventService>("eventService");
 
@@ -69,8 +69,8 @@ namespace Bit.Droid
                 Window.AddFlags(Android.Views.WindowManagerFlags.Secure);
             }
 
-#if !DEBUG && !FDROID
-            var appCenterHelper = new AppCenterHelper(_appIdService, _stateService);
+#if !FDROID
+            var appCenterHelper = new AppCenterHelper(_appIdService, _userService);
             var appCenterTask = appCenterHelper.InitAsync();
 #endif
 
@@ -375,7 +375,7 @@ namespace Bit.Droid
         {
             Window?.SetStatusBarColor(ThemeHelpers.NavBarBackgroundColor);
             Window?.DecorView.SetBackgroundColor(ThemeHelpers.BackgroundColor);
-            ThemeHelpers.SetAppearance(ThemeManager.GetTheme(), ThemeManager.OsDarkModeEnabled());
+            ThemeHelpers.SetAppearance(ThemeManager.GetTheme(true), ThemeManager.OsDarkModeEnabled());
         }
 
         private void ExitApp()

src/Android/MainApplication.cs

@@ -53,8 +53,7 @@ namespace Bit.Droid
                     ServiceContainer.Resolve<IApiService>("apiService"),
                     ServiceContainer.Resolve<IMessagingService>("messagingService"),
                     ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService"),
-                    ServiceContainer.Resolve<IDeviceActionService>("deviceActionService"),
-                    ServiceContainer.Resolve<ILogger>("logger"));
+                    ServiceContainer.Resolve<IDeviceActionService>("deviceActionService"));
                 ServiceContainer.Register<IDeleteAccountActionFlowExecutioner>("deleteAccountActionFlowExecutioner", deleteAccountActionFlowExecutioner);
 
                 var verificationActionsFlowHelper = new VerificationActionsFlowHelper(
@@ -88,14 +87,7 @@ namespace Bit.Droid
 
         private void RegisterLocalServices()
         {
-            ServiceContainer.Register<INativeLogService>("nativeLogService", new AndroidLogService());
-#if FDROID
-            ServiceContainer.Register<ILogger>("logger", new StubLogger());
-#elif DEBUG
-            ServiceContainer.Register<ILogger>("logger", DebugLogger.Instance);
-#else
-            ServiceContainer.Register<ILogger>("logger", Logger.Instance);
-#endif
+            ServiceContainer.Register<ILogService>("logService", new AndroidLogService());
 
             // Note: This might cause a race condition. Investigate more.
             Task.Run(() =>
@@ -121,16 +113,13 @@ namespace Bit.Droid
             var secureStorageService = new SecureStorageService();
             var cryptoPrimitiveService = new CryptoPrimitiveService();
             var mobileStorageService = new MobileStorageService(preferencesStorage, liteDbStorage);
-            var stateService = new StateService(mobileStorageService, secureStorageService);
-            var stateMigrationService =
-                new StateMigrationService(liteDbStorage, preferencesStorage, secureStorageService);
-            var deviceActionService = new DeviceActionService(stateService, messagingService,
+            var deviceActionService = new DeviceActionService(mobileStorageService, messagingService,
                 broadcasterService, () => ServiceContainer.Resolve<IEventService>("eventService"));
             var platformUtilsService = new MobilePlatformUtilsService(deviceActionService, messagingService,
                 broadcasterService);
             var biometricService = new BiometricService();
             var cryptoFunctionService = new PclCryptoFunctionService(cryptoPrimitiveService);
-            var cryptoService = new CryptoService(stateService, cryptoFunctionService);
+            var cryptoService = new CryptoService(mobileStorageService, secureStorageService, cryptoFunctionService);
             var passwordRepromptService = new MobilePasswordRepromptService(platformUtilsService, cryptoService);
 
             ServiceContainer.Register<IBroadcasterService>("broadcasterService", broadcasterService);
@@ -140,9 +129,7 @@ namespace Bit.Droid
             ServiceContainer.Register<ICryptoPrimitiveService>("cryptoPrimitiveService", cryptoPrimitiveService);
             ServiceContainer.Register<IStorageService>("storageService", mobileStorageService);
             ServiceContainer.Register<IStorageService>("secureStorageService", secureStorageService);
-            ServiceContainer.Register<IStateService>("stateService", stateService);
-            ServiceContainer.Register<IStateMigrationService>("stateMigrationService", stateMigrationService);
-            ServiceContainer.Register<IClipboardService>("clipboardService", new ClipboardService(stateService));
+            ServiceContainer.Register<IClipboardService>("clipboardService", new ClipboardService(mobileStorageService));
             ServiceContainer.Register<IDeviceActionService>("deviceActionService", deviceActionService);
             ServiceContainer.Register<IPlatformUtilsService>("platformUtilsService", platformUtilsService);
             ServiceContainer.Register<IBiometricService>("biometricService", biometricService);
@@ -161,7 +148,7 @@ namespace Bit.Droid
             ServiceContainer.Register<IPushNotificationListenerService>(
                 "pushNotificationListenerService", notificationListenerService);
             var androidPushNotificationService = new AndroidPushNotificationService(
-                stateService, notificationListenerService);
+                mobileStorageService, notificationListenerService);
             ServiceContainer.Register<IPushNotificationService>(
                 "pushNotificationService", androidPushNotificationService);
 #endif
@@ -177,6 +164,10 @@ namespace Bit.Droid
 
         private async Task BootstrapAsync()
         {
+            var disableFavicon = await ServiceContainer.Resolve<IStorageService>("storageService")
+                .GetAsync<bool?>(Constants.DisableFaviconKey);
+            await ServiceContainer.Resolve<IStateService>("stateService").SaveAsync(
+                Constants.DisableFaviconKey, disableFavicon);
             await ServiceContainer.Resolve<IEnvironmentService>("environmentService").SetUrlsFromStorageAsync();
         }
     }

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

src/Android/Push/FirebaseMessagingService.cs

@@ -16,10 +16,10 @@ namespace Bit.Droid.Push
     {
         public async override void OnNewToken(string token)
         {
-            var stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            var storageService = ServiceContainer.Resolve<IStorageService>("storageService");
             var pushNotificationService = ServiceContainer.Resolve<IPushNotificationService>("pushNotificationService");
             
-            await stateService.SetPushRegisteredTokenAsync(token);
+            await storageService.SaveAsync(Core.Constants.PushRegisteredTokenKey, token);
             await pushNotificationService.RegisterAsync();
         }
         

src/Android/Receivers/PackageReplacedReceiver.cs

@@ -1,4 +1,5 @@
-using Android.App;
+using System;
+using Android.App;
 using Android.Content;
 using Bit.App.Abstractions;
 using Bit.App.Utilities;
@@ -13,10 +14,9 @@ namespace Bit.Droid.Receivers
     {
         public override async void OnReceive(Context context, Intent intent)
         {
-            await AppHelpers.PerformUpdateTasksAsync(
-                ServiceContainer.Resolve<ISyncService>("syncService"),
-                ServiceContainer.Resolve<IDeviceActionService>("deviceActionService"), 
-                ServiceContainer.Resolve<IStateService>("stateService"));
+            var storageService = ServiceContainer.Resolve<IStorageService>("storageService");
+            await AppHelpers.PerformUpdateTasksAsync(ServiceContainer.Resolve<ISyncService>("syncService"),
+                ServiceContainer.Resolve<IDeviceActionService>("deviceActionService"), storageService);
         }
     }
 }

src/Android/Renderers/CustomTabbedRenderer.cs

@@ -1,9 +1,7 @@
 using Android.Content;
 using Android.Views;
-using Bit.App.Pages;
 using Bit.Droid.Renderers;
 using Google.Android.Material.BottomNavigation;
-using Google.Android.Material.Navigation;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.Android;
 using Xamarin.Forms.Platform.Android.AppCompat;
@@ -11,7 +9,7 @@ using Xamarin.Forms.Platform.Android.AppCompat;
 [assembly: ExportRenderer(typeof(TabbedPage), typeof(CustomTabbedRenderer))]
 namespace Bit.Droid.Renderers
 {
-    public class CustomTabbedRenderer : TabbedPageRenderer, NavigationBarView.IOnItemReselectedListener
+    public class CustomTabbedRenderer : TabbedPageRenderer, BottomNavigationView.IOnNavigationItemReselectedListener
     {
         private TabbedPage _page;
 
@@ -23,7 +21,7 @@ namespace Bit.Droid.Renderers
             if (e.NewElement != null)
             {
                 _page = e.NewElement;
-                GetBottomNavigationView()?.SetOnItemReselectedListener(this);
+                GetBottomNavigationView()?.SetOnNavigationItemReselectedListener(this);
             }
             else
             {
@@ -55,10 +53,6 @@ namespace Bit.Droid.Renderers
         {
             if (_page?.CurrentPage?.Navigation != null && _page.CurrentPage.Navigation.NavigationStack.Count > 0)
             {
-                if (_page is TabsPage tabsPage)
-                {
-                    tabsPage.OnPageReselected();
-                }
                 Device.BeginInvokeOnMainThread(async () => await _page.CurrentPage.Navigation.PopToRootAsync());
             }
         }

src/Android/Resources/drawable/cog.xml

@@ -6,4 +6,4 @@
     <path
         android:fillColor="#FF000000"
         android:pathData="M532.989 289.887l-3.872-2.528c-3.197-1.866-5.744-4.667-7.299-8.026-1.558-3.358-2.048-7.113-1.405-10.759v-24.64c-0.682-3.57-0.202-7.266 1.37-10.542s4.154-5.964 7.366-7.666l4.768-2.4c12.013-7.054 20.768-18.547 24.384-32 3.421-13.333 1.661-27.466-4.928-39.552l-25.056-43.872c-7.011-11.727-18.259-20.313-31.418-23.987-13.161-3.674-27.229-2.155-39.303 4.243l-4.384 2.208c-3.286 1.769-6.983 2.63-10.711 2.496-3.731-0.135-7.357-1.261-10.505-3.263-7.082-4.796-14.579-8.951-22.4-12.416-3.28-1.636-6.038-4.157-7.962-7.278s-2.935-6.719-2.918-10.386v-6.528c0.099-6.965-1.197-13.879-3.808-20.335s-6.49-12.326-11.401-17.264c-4.915-4.937-10.765-8.842-17.209-11.486s-13.351-3.972-20.317-3.907h-51.2c-6.952-0.043-13.842 1.301-20.267 3.954s-12.257 6.561-17.154 11.496c-4.896 4.935-8.758 10.797-11.361 17.243s-3.892 13.347-3.794 20.298v5.472c0.032 3.614-0.938 7.165-2.802 10.261s-4.55 5.614-7.758 7.275c-5.691 2.572-11.197 5.533-16.48 8.864l-6.080 3.584c-3.102 2.221-6.788 3.481-10.6 3.623s-7.582-0.839-10.84-2.823l-3.968-1.952c-5.856-3.516-12.377-5.778-19.153-6.642s-13.656-0.314-20.208 1.618c-13.446 3.716-24.885 12.58-31.84 24.672l-24.96 43.68c-3.566 6.048-5.867 12.757-6.763 19.721s-0.37 14.037 1.547 20.791c1.743 6.495 4.779 12.571 8.925 17.866s9.317 9.699 15.203 12.95l2.88 2.848 1.312 0.928c3.197 1.867 5.744 4.667 7.3 8.026s2.046 7.113 1.403 10.758v24.704c0.326 3.533-0.314 7.087-1.853 10.283s-3.918 5.913-6.883 7.861l-4.768 2.4c-11.724 7.217-20.258 18.63-23.866 31.917s-2.020 27.447 4.442 39.603l25.088 43.872c6.806 11.955 18.058 20.739 31.308 24.445 13.25 3.702 27.425 2.026 39.445-4.669l4.352-2.176c3.287-1.792 6.994-2.669 10.736-2.547 3.742 0.125 7.382 1.248 10.544 3.251 7.082 4.797 14.578 8.954 22.4 12.416 3.281 1.635 6.038 4.157 7.962 7.28 1.923 3.12 2.934 6.717 2.918 10.384v5.472c-0.102 6.954 1.185 13.859 3.788 20.31s6.468 12.317 11.368 17.251c4.901 4.938 10.738 8.845 17.169 11.495s13.327 3.987 20.282 3.936h51.2c6.957 0.051 13.856-1.286 20.288-3.936s12.272-6.557 17.175-11.491c4.902-4.938 8.771-10.8 11.379-17.251 2.605-6.451 3.897-13.357 3.798-20.313v-5.472c-0.032-3.613 0.938-7.165 2.803-10.259 1.863-3.098 4.547-5.616 7.757-7.277 5.683-2.567 11.181-5.526 16.448-8.864l1.376-0.8 4.704-2.784c3.111-2.211 6.803-3.466 10.618-3.606 3.815-0.144 7.587 0.832 10.854 2.807l3.968 1.952c5.993 3.568 12.653 5.878 19.565 6.791 6.915 0.912 13.945 0.409 20.659-1.478 6.599-1.805 12.755-4.95 18.080-9.248 5.325-4.295 9.706-9.645 12.864-15.712l24.96-43.68c3.504-5.907 5.757-12.474 6.615-19.289 0.861-6.816 0.307-13.735-1.622-20.327-3.584-13.397-12.298-24.846-24.256-31.873zM319.997 346.752c-17.949 0-35.495-5.322-50.419-15.296-14.924-9.971-26.556-24.144-33.424-40.727s-8.666-34.83-5.165-52.434c3.502-17.604 12.145-33.775 24.837-46.466s28.862-21.335 46.466-24.837c17.604-3.502 35.852-1.704 52.434 5.164s30.755 18.501 40.73 33.425c9.971 14.924 15.293 32.47 15.293 50.419 0 24.069-9.562 47.153-26.579 64.17-17.021 17.021-40.103 26.582-64.173 26.582z" />
-</vector>
+</vector>

src/Android/Resources/drawable/cog_environment.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="640dp"
-    android:height="512dp"
-    android:viewportWidth="640"
-    android:viewportHeight="512">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M532.989 289.887l-3.872-2.528c-3.197-1.866-5.744-4.667-7.299-8.026-1.558-3.358-2.048-7.113-1.405-10.759v-24.64c-0.682-3.57-0.202-7.266 1.37-10.542s4.154-5.964 7.366-7.666l4.768-2.4c12.013-7.054 20.768-18.547 24.384-32 3.421-13.333 1.661-27.466-4.928-39.552l-25.056-43.872c-7.011-11.727-18.259-20.313-31.418-23.987-13.161-3.674-27.229-2.155-39.303 4.243l-4.384 2.208c-3.286 1.769-6.983 2.63-10.711 2.496-3.731-0.135-7.357-1.261-10.505-3.263-7.082-4.796-14.579-8.951-22.4-12.416-3.28-1.636-6.038-4.157-7.962-7.278s-2.935-6.719-2.918-10.386v-6.528c0.099-6.965-1.197-13.879-3.808-20.335s-6.49-12.326-11.401-17.264c-4.915-4.937-10.765-8.842-17.209-11.486s-13.351-3.972-20.317-3.907h-51.2c-6.952-0.043-13.842 1.301-20.267 3.954s-12.257 6.561-17.154 11.496c-4.896 4.935-8.758 10.797-11.361 17.243s-3.892 13.347-3.794 20.298v5.472c0.032 3.614-0.938 7.165-2.802 10.261s-4.55 5.614-7.758 7.275c-5.691 2.572-11.197 5.533-16.48 8.864l-6.080 3.584c-3.102 2.221-6.788 3.481-10.6 3.623s-7.582-0.839-10.84-2.823l-3.968-1.952c-5.856-3.516-12.377-5.778-19.153-6.642s-13.656-0.314-20.208 1.618c-13.446 3.716-24.885 12.58-31.84 24.672l-24.96 43.68c-3.566 6.048-5.867 12.757-6.763 19.721s-0.37 14.037 1.547 20.791c1.743 6.495 4.779 12.571 8.925 17.866s9.317 9.699 15.203 12.95l2.88 2.848 1.312 0.928c3.197 1.867 5.744 4.667 7.3 8.026s2.046 7.113 1.403 10.758v24.704c0.326 3.533-0.314 7.087-1.853 10.283s-3.918 5.913-6.883 7.861l-4.768 2.4c-11.724 7.217-20.258 18.63-23.866 31.917s-2.020 27.447 4.442 39.603l25.088 43.872c6.806 11.955 18.058 20.739 31.308 24.445 13.25 3.702 27.425 2.026 39.445-4.669l4.352-2.176c3.287-1.792 6.994-2.669 10.736-2.547 3.742 0.125 7.382 1.248 10.544 3.251 7.082 4.797 14.578 8.954 22.4 12.416 3.281 1.635 6.038 4.157 7.962 7.28 1.923 3.12 2.934 6.717 2.918 10.384v5.472c-0.102 6.954 1.185 13.859 3.788 20.31s6.468 12.317 11.368 17.251c4.901 4.938 10.738 8.845 17.169 11.495s13.327 3.987 20.282 3.936h51.2c6.957 0.051 13.856-1.286 20.288-3.936s12.272-6.557 17.175-11.491c4.902-4.938 8.771-10.8 11.379-17.251 2.605-6.451 3.897-13.357 3.798-20.313v-5.472c-0.032-3.613 0.938-7.165 2.803-10.259 1.863-3.098 4.547-5.616 7.757-7.277 5.683-2.567 11.181-5.526 16.448-8.864l1.376-0.8 4.704-2.784c3.111-2.211 6.803-3.466 10.618-3.606 3.815-0.144 7.587 0.832 10.854 2.807l3.968 1.952c5.993 3.568 12.653 5.878 19.565 6.791 6.915 0.912 13.945 0.409 20.659-1.478 6.599-1.805 12.755-4.95 18.080-9.248 5.325-4.295 9.706-9.645 12.864-15.712l24.96-43.68c3.504-5.907 5.757-12.474 6.615-19.289 0.861-6.816 0.307-13.735-1.622-20.327-3.584-13.397-12.298-24.846-24.256-31.873zM319.997 346.752c-17.949 0-35.495-5.322-50.419-15.296-14.924-9.971-26.556-24.144-33.424-40.727s-8.666-34.83-5.165-52.434c3.502-17.604 12.145-33.775 24.837-46.466s28.862-21.335 46.466-24.837c17.604-3.502 35.852-1.704 52.434 5.164s30.755 18.501 40.73 33.425c9.971 14.924 15.293 32.47 15.293 50.419 0 24.069-9.562 47.153-26.579 64.17-17.021 17.021-40.103 26.582-64.173 26.582z" />
-</vector>

src/Android/Resources/xml/autofillservice.xml

@@ -11,12 +11,6 @@
   -->
 <autofill-service xmlns:android="http://schemas.android.com/apk/res/android"
     android:supportsInlineSuggestions="true">
-  <compatibility-package
-    android:name="alook.browser"
-    android:maxLongVersionCode="10000000000"/>
-  <compatibility-package
-    android:name="alook.browser.google"
-    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.amazon.cloud9"
     android:maxLongVersionCode="10000000000"/>

src/Android/Services/AndroidLogService.cs

@@ -3,7 +3,7 @@ using System;
 
 namespace Bit.Core.Services
 {
-    public class AndroidLogService : INativeLogService
+    public class AndroidLogService : ILogService
     {
         private static readonly string _tag = "BITWARDEN";
 

src/Android/Services/AndroidPushNotificationService.cs

@@ -3,6 +3,7 @@ using System;
 using System.Threading.Tasks;
 using AndroidX.Core.App;
 using Bit.App.Abstractions;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Xamarin.Forms;
 
@@ -10,14 +11,14 @@ namespace Bit.Droid.Services
 {
     public class AndroidPushNotificationService : IPushNotificationService
     {
-        private readonly IStateService _stateService;
+        private readonly IStorageService _storageService;
         private readonly IPushNotificationListenerService _pushNotificationListenerService;
 
         public AndroidPushNotificationService(
-            IStateService stateService,
+            IStorageService storageService,
             IPushNotificationListenerService pushNotificationListenerService)
         {
-            _stateService = stateService;
+            _storageService = storageService;
             _pushNotificationListenerService = pushNotificationListenerService;
         }
 
@@ -25,12 +26,12 @@ namespace Bit.Droid.Services
 
         public async Task<string> GetTokenAsync()
         {
-            return await _stateService.GetPushCurrentTokenAsync();
+            return await _storageService.GetAsync<string>(Constants.PushCurrentTokenKey);
         }
 
         public async Task RegisterAsync()
         {
-            var registeredToken = await _stateService.GetPushRegisteredTokenAsync();
+            var registeredToken = await _storageService.GetAsync<string>(Constants.PushRegisteredTokenKey);
             var currentToken = await GetTokenAsync();
             if (!string.IsNullOrWhiteSpace(registeredToken) && registeredToken != currentToken)
             {
@@ -38,7 +39,7 @@ namespace Bit.Droid.Services
             }
             else
             {
-                await _stateService.SetPushLastRegistrationDateAsync(DateTime.UtcNow);
+                await _storageService.SaveAsync(Constants.PushLastRegistrationDateKey, DateTime.UtcNow);
             }
         }
 

src/Android/Services/ClipboardService.cs

@@ -12,12 +12,12 @@ namespace Bit.Droid.Services
 {
     public class ClipboardService : IClipboardService
     {
-        private readonly IStateService _stateService;
+        private readonly IStorageService _storageService;
         private readonly Lazy<PendingIntent> _clearClipboardPendingIntent;
 
-        public ClipboardService(IStateService stateService)
+        public ClipboardService(IStorageService storageService)
         {
-            _stateService = stateService;
+            _storageService = storageService;
 
             _clearClipboardPendingIntent = new Lazy<PendingIntent>(() =>
                 PendingIntent.GetBroadcast(CrossCurrentActivity.Current.Activity,
@@ -39,7 +39,7 @@ namespace Bit.Droid.Services
             if (clearMs < 0)
             {
                 // if not set then we need to check if the user set this config
-                var clearSeconds = await _stateService.GetClearClipboardAsync();
+                var clearSeconds = await _storageService.GetAsync<int?>(Constants.ClearClipboardKey);
                 if (clearSeconds != null)
                 {
                     clearMs = clearSeconds.Value * 1000;

src/Android/Services/DeviceActionService.cs

@@ -35,7 +35,7 @@ namespace Bit.Droid.Services
 {
     public class DeviceActionService : IDeviceActionService
     {
-        private readonly IStateService _stateService;
+        private readonly IStorageService _storageService;
         private readonly IMessagingService _messagingService;
         private readonly IBroadcasterService _broadcasterService;
         private readonly Func<IEventService> _eventServiceFunc;
@@ -47,12 +47,12 @@ namespace Bit.Droid.Services
         private string _userAgent;
 
         public DeviceActionService(
-            IStateService stateService,
+            IStorageService storageService,
             IMessagingService messagingService,
             IBroadcasterService broadcasterService,
             Func<IEventService> eventServiceFunc)
         {
-            _stateService = stateService;
+            _storageService = storageService;
             _messagingService = messagingService;
             _broadcasterService = broadcasterService;
             _eventServiceFunc = eventServiceFunc;
@@ -333,7 +333,7 @@ namespace Bit.Droid.Services
             try
             {
                 DeleteDir(CrossCurrentActivity.Current.Activity.CacheDir);
-                await _stateService.SetLastFileCacheClearAsync(DateTime.UtcNow);
+                await _storageService.SaveAsync(Constants.LastFileCacheClearKey, DateTime.UtcNow);
             }
             catch (Exception) { }
         }
@@ -916,8 +916,9 @@ namespace Bit.Droid.Services
         {
             if (!string.IsNullOrWhiteSpace(cipher?.Login?.Totp))
             {
-                var autoCopyDisabled = await _stateService.GetDisableAutoTotpCopyAsync();
-                var canAccessPremium = await _stateService.CanAccessPremiumAsync();
+                var userService = ServiceContainer.Resolve<IUserService>("userService");
+                var autoCopyDisabled = await _storageService.GetAsync<bool?>(Constants.DisableAutoTotpCopyKey);
+                var canAccessPremium = await userService.CanAccessPremiumAsync();
                 if ((canAccessPremium || cipher.OrganizationUseTotp) && !autoCopyDisabled.GetValueOrDefault())
                 {
                     var totpService = ServiceContainer.Resolve<ITotpService>("totpService");
@@ -937,16 +938,5 @@ namespace Bit.Droid.Services
                 Context.ClipboardService) as Android.Content.ClipboardManager;
             clipboardManager.PrimaryClip = ClipData.NewPlainText("bitwarden", text);
         }
-
-        public float GetSystemFontSizeScale()
-        {
-            var activity = CrossCurrentActivity.Current?.Activity as MainActivity;
-            return activity?.Resources?.Configuration?.FontScale ?? 1;
-        }
-        
-        public async Task OnAccountSwitchCompleteAsync()
-        {
-            // for any Android-specific cleanup required after switching accounts
-        }
     }
 }

src/Android/Tiles/AutofillTileService.cs

@@ -4,6 +4,7 @@ using Android.Content;
 using Android.Runtime;
 using Android.Service.QuickSettings;
 using Bit.App.Resources;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 using Bit.Droid.Accessibility;
@@ -17,7 +18,7 @@ namespace Bit.Droid.Tile
     [Register("com.x8bit.bitwarden.AutofillTileService")]
     public class AutofillTileService : TileService
     {
-        private IStateService _stateService;
+        private IStorageService _storageService;
         
         public override void OnTileAdded()
         {
@@ -58,11 +59,11 @@ namespace Bit.Droid.Tile
         private void SetTileAdded(bool isAdded)
         {
             AccessibilityHelpers.IsAutofillTileAdded = isAdded;
-            if (_stateService == null)
+            if (_storageService == null)
             {
-                _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+                _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
             }
-            _stateService.SetAutofillTileAddedAsync(isAdded);
+            _storageService.SaveAsync(Constants.AutofillTileAdded, isAdded);
         }
 
         private void ScanAndFill()

src/Android/Utilities/AppCenterHelper.cs

@@ -12,22 +12,22 @@ namespace Bit.Droid.Utilities
         private const string AppSecret = "d3834185-b4a6-4347-9047-b86c65293d42";
 
         private readonly IAppIdService _appIdService;
-        private readonly IStateService _stateService;
+        private readonly IUserService _userService;
 
         private string _userId;
         private string _appId;
         
         public AppCenterHelper(
             IAppIdService appIdService,
-            IStateService stateService)
+            IUserService userService)
         {
             _appIdService = appIdService;
-            _stateService = stateService;
+            _userService = userService;
         }
 
         public async Task InitAsync()
         {
-            _userId = await _stateService.GetActiveUserIdAsync();
+            _userId = await _userService.GetUserIdAsync();
             _appId = await _appIdService.GetAppIdAsync();
             
             AppCenter.Start(AppSecret, typeof(Crashes));

src/App/Abstractions/IDeviceActionService.cs

@@ -45,7 +45,5 @@ namespace Bit.App.Abstractions
         long GetActiveTime();
         void CloseMainApp();
         bool SupportsFido2();
-        float GetSystemFontSizeScale();
-        Task OnAccountSwitchCompleteAsync();
     }
 }

src/App/App.csproj

@@ -15,13 +15,12 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AppCenter.Crashes" Version="4.4.0" />
     <PackageReference Include="Plugin.Fingerprint" Version="2.1.4" />
-    <PackageReference Include="SkiaSharp.Views.Forms" Version="2.80.3" />
-    <PackageReference Include="Xamarin.CommunityToolkit" Version="2.0.0" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.7.1" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
     <PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.11.982" />
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2337" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
     <PackageReference Include="ZXing.Net.Mobile" Version="2.4.1" />
     <PackageReference Include="ZXing.Net.Mobile.Forms" Version="2.4.1" />
+    <PackageReference Include="Xamarin.CommunityToolkit" Version="1.3.1" />
   </ItemGroup>
 
   <ItemGroup>
@@ -122,20 +121,17 @@
       <DependentUpon>SendGroupingsPage.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Remove="Pages\Accounts\AccountsPopupPage.xaml.cs" />
   </ItemGroup>
 
   <ItemGroup>
     <Folder Include="Resources\" />
     <Folder Include="Behaviors\" />
-    <Folder Include="Controls\AccountSwitchingOverlay\" />
   </ItemGroup>
 
   <ItemGroup>
     <EmbeddedResource Update="Controls\CipherViewCell\CipherViewCell.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Remove="Pages\Accounts\AccountsPopupPage.xaml" />
   </ItemGroup>
 
   <ItemGroup>
@@ -420,6 +416,5 @@
   <ItemGroup>
     <None Remove="Behaviors\" />
     <None Remove="Xamarin.CommunityToolkit" />
-    <None Remove="Controls\AccountSwitchingOverlay\" />
   </ItemGroup>
 </Project>

src/App/App.xaml.cs

@@ -4,12 +4,12 @@ using Bit.App.Pages;
 using Bit.App.Resources;
 using Bit.App.Services;
 using Bit.App.Utilities;
+using Bit.Core;
 using Bit.Core.Abstractions;
-using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
 using System;
+using System.Threading;
 using System.Threading.Tasks;
-using Bit.Core.Enums;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 
@@ -18,6 +18,7 @@ namespace Bit.App
 {
     public partial class App : Application
     {
+        private readonly IUserService _userService;
         private readonly IBroadcasterService _broadcasterService;
         private readonly IMessagingService _messagingService;
         private readonly IStateService _stateService;
@@ -25,6 +26,7 @@ namespace Bit.App
         private readonly ISyncService _syncService;
         private readonly IPlatformUtilsService _platformUtilsService;
         private readonly IAuthService _authService;
+        private readonly IStorageService _storageService;
         private readonly IStorageService _secureStorageService;
         private readonly IDeviceActionService _deviceActionService;
 
@@ -38,6 +40,7 @@ namespace Bit.App
                 Current = this;
                 return;
             }
+            _userService = ServiceContainer.Resolve<IUserService>("userService");
             _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
             _stateService = ServiceContainer.Resolve<IStateService>("stateService");
@@ -45,6 +48,7 @@ namespace Bit.App
             _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
             _authService = ServiceContainer.Resolve<IAuthService>("authService");
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
             _secureStorageService = ServiceContainer.Resolve<IStorageService>("secureStorageService");
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
 
@@ -73,10 +77,7 @@ namespace Bit.App
                 }
                 else if (message.Command == "locked")
                 {
-                    var extras = message.Data as Tuple<string, bool>;
-                    var userId = extras?.Item1;
-                    var userInitiated = extras?.Item2 ?? false;
-                    Device.BeginInvokeOnMainThread(async () => await LockedAsync(userId, userInitiated));
+                    await LockedAsync(!(message.Data as bool?).GetValueOrDefault());
                 }
                 else if (message.Command == "lockVault")
                 {
@@ -84,11 +85,8 @@ namespace Bit.App
                 }
                 else if (message.Command == "logout")
                 {
-                    var extras = message.Data as Tuple<string, bool, bool>;
-                    var userId = extras?.Item1;
-                    var userInitiated = extras?.Item2 ?? true;
-                    var expired = extras?.Item3 ?? false;
-                    Device.BeginInvokeOnMainThread(async () => await LogOutAsync(userId, userInitiated, expired));
+                    Device.BeginInvokeOnMainThread(async () =>
+                        await LogOutAsync((message.Data as bool?).GetValueOrDefault()));
                 }
                 else if (message.Command == "loggedOut")
                 {
@@ -109,18 +107,6 @@ namespace Bit.App
                         await SleptAsync();
                     }
                 }
-                else if (message.Command == "addAccount")
-                {
-                    await AddAccount();
-                }
-                else if (message.Command == "accountAdded")
-                {
-                    await UpdateThemeAsync();
-                }
-                else if (message.Command == "switchedAccount")
-                {
-                    await SwitchedAccountAsync();
-                }
                 else if (message.Command == "migrated")
                 {
                     await Task.Delay(1000);
@@ -182,7 +168,7 @@ namespace Bit.App
             if (string.IsNullOrWhiteSpace(Options.Uri))
             {
                 var updated = await AppHelpers.PerformUpdateTasksAsync(_syncService, _deviceActionService,
-                    _stateService);
+                    _storageService);
                 if (!updated)
                 {
                     SyncIfNeeded();
@@ -206,7 +192,7 @@ namespace Bit.App
                 var isLocked = await _vaultTimeoutService.IsLockedAsync();
                 if (!isLocked)
                 {
-                    await _stateService.SetLastActiveTimeAsync(_deviceActionService.GetActiveTime());
+                    await _storageService.SaveAsync(Constants.LastActiveTimeKey, _deviceActionService.GetActiveTime());
                 }
                 SetTabsPageFromAutofill(isLocked);
                 await SleptAsync();
@@ -247,7 +233,7 @@ namespace Bit.App
         {
             await Device.InvokeOnMainThreadAsync(() =>
             {
-                ThemeManager.SetTheme(Current.Resources);
+                ThemeManager.SetTheme(Device.RuntimePlatform == Device.Android, Current.Resources);
                 _messagingService.Send("updatedTheme");
             });
         }
@@ -260,12 +246,12 @@ namespace Bit.App
             new System.Globalization.UmAlQuraCalendar();
         }
 
-        private async Task LogOutAsync(string userId, bool userInitiated, bool expired)
+        private async Task LogOutAsync(bool expired)
         {
-            await AppHelpers.LogOutAsync(userId, userInitiated);
-            await SetMainPageAsync();
+            await AppHelpers.LogOutAsync();
             _authService.LogOut(() =>
             {
+                Current.MainPage = new HomePage();
                 if (expired)
                 {
                     _platformUtilsService.ShowToast("warning", null, AppResources.LoginExpired);
@@ -273,50 +259,12 @@ namespace Bit.App
             });
         }
 
-        private async Task AddAccount()
-        {
-            Device.BeginInvokeOnMainThread(async () =>
-            {
-                Options.HideAccountSwitcher = false;
-                Current.MainPage = new NavigationPage(new HomePage(Options));
-            });
-        }
-
-        private async Task SwitchedAccountAsync()
-        {
-            await AppHelpers.OnAccountSwitchAsync();
-            Device.BeginInvokeOnMainThread(async () =>
-            {
-                if (await _vaultTimeoutService.ShouldTimeoutAsync())
-                {
-                    await _vaultTimeoutService.ExecuteTimeoutActionAsync();
-                }
-                else
-                {
-                    await SetMainPageAsync();
-                }
-                await Task.Delay(50);
-                await UpdateThemeAsync();
-            });
-        }
-
         private async Task SetMainPageAsync()
         {
-            var authed = await _stateService.IsAuthenticatedAsync();
+            var authed = await _userService.IsAuthenticatedAsync();
             if (authed)
             {
-                if (await _vaultTimeoutService.IsLoggedOutByTimeoutAsync() ||
-                    await _vaultTimeoutService.ShouldLogOutByTimeoutAsync())
-                {
-                    // TODO implement orgIdentifier flow to SSO Login page, same as email flow below
-                    // var orgIdentifier = await _stateService.GetOrgIdentifierAsync();
-
-                    var email = await _stateService.GetEmailAsync();
-                    Options.HideAccountSwitcher = await _stateService.GetActiveUserIdAsync() == null;
-                    Current.MainPage = new NavigationPage(new LoginPage(email, Options));
-                }
-                else if (await _vaultTimeoutService.IsLockedAsync() || 
-                         await _vaultTimeoutService.ShouldLockAsync())
+                if (await _vaultTimeoutService.IsLockedAsync())
                 {
                     Current.MainPage = new NavigationPage(new LockPage(Options));
                 }
@@ -339,26 +287,13 @@ namespace Bit.App
             }
             else
             {
-                Options.HideAccountSwitcher = await _stateService.GetActiveUserIdAsync() == null;
-                if (await _vaultTimeoutService.IsLoggedOutByTimeoutAsync() ||
-                    await _vaultTimeoutService.ShouldLogOutByTimeoutAsync())
-                {
-                    // TODO implement orgIdentifier flow to SSO Login page, same as email flow below
-                    // var orgIdentifier = await _stateService.GetOrgIdentifierAsync();
-
-                    var email = await _stateService.GetEmailAsync();
-                    Current.MainPage = new NavigationPage(new LoginPage(email, Options));
-                }
-                else
-                {
-                    Current.MainPage = new NavigationPage(new HomePage(Options));
-                }
+                Current.MainPage = new HomePage(Options);
             }
         }
 
         private async Task ClearCacheIfNeededAsync()
         {
-            var lastClear = await _stateService.GetLastFileCacheClearAsync();
+            var lastClear = await _storageService.GetAsync<DateTime?>(Constants.LastFileCacheClearKey);
             if ((DateTime.UtcNow - lastClear.GetValueOrDefault(DateTime.MinValue)).TotalDays >= 1)
             {
                 var task = Task.Run(() => _deviceActionService.ClearCacheAsync());
@@ -401,12 +336,12 @@ namespace Bit.App
         {
             InitializeComponent();
             SetCulture();
-            ThemeManager.SetTheme(Current.Resources);
+            ThemeManager.SetTheme(Device.RuntimePlatform == Device.Android, Current.Resources);
             Current.RequestedThemeChanged += (s, a) =>
             {
                 UpdateThemeAsync();
             };
-            Current.MainPage = new NavigationPage(new HomePage(Options));
+            Current.MainPage = new HomePage();
             var mainPageTask = SetMainPageAsync();
             ServiceContainer.Resolve<MobilePlatformUtilsService>("platformUtilsService").Init();
         }
@@ -428,18 +363,12 @@ namespace Bit.App
             });
         }
 
-        private async Task LockedAsync(string userId, bool userInitiated)
+        private async Task LockedAsync(bool autoPromptBiometric)
         {
-            if (!await _stateService.IsActiveAccountAsync(userId))
-            {
-                _platformUtilsService.ShowToast("info", null, AppResources.AccountLockedSuccessfully);
-                return;
-            }
-
-            var autoPromptBiometric = !userInitiated;
+            await _stateService.PurgeAsync();
             if (autoPromptBiometric && Device.RuntimePlatform == Device.iOS)
             {
-                var vaultTimeout = await _stateService.GetVaultTimeoutAsync();
+                var vaultTimeout = await _storageService.GetAsync<int?>(Constants.VaultTimeoutKey);
                 if (vaultTimeout == 0)
                 {
                     autoPromptBiometric = false;
@@ -469,7 +398,7 @@ namespace Bit.App
                     }
                 }
             }
-            await _stateService.SetPreviousPageInfoAsync(lastPageBeforeLock);
+            await _storageService.SaveAsync(Constants.PreviousPageKey, lastPageBeforeLock);
             var lockPage = new LockPage(Options, autoPromptBiometric);
             Device.BeginInvokeOnMainThread(() => Current.MainPage = new NavigationPage(lockPage));
         }

src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayView.xaml

@@ -1,57 +0,0 @@
-<?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:xct="http://xamarin.com/schemas/2020/toolkit"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:effects="clr-namespace:Bit.App.Effects"
-    xmlns:view="clr-namespace:Bit.Core.Models.View;assembly=BitwardenCore"
-    x:Name="_mainOverlay"
-    x:DataType="controls:AccountSwitchingOverlayViewModel"
-    x:Class="Bit.App.Controls.AccountSwitchingOverlayView"
-    BackgroundColor="#22000000"
-    Padding="0"
-    IsVisible="False">
-    <StackLayout
-        x:Name="_accountListContainer"
-        VerticalOptions="Fill"
-        HorizontalOptions="FillAndExpand"
-        BackgroundColor="Transparent">
-        <Frame
-            Padding="0"
-            HorizontalOptions="Fill"
-            VerticalOptions="Start"
-            xct:ShadowEffect.Color="Black"
-            xct:ShadowEffect.Radius="10"
-            xct:ShadowEffect.OffsetY="3">
-            <ListView
-                x:Name="_accountListView"
-                ItemsSource="{Binding BindingContext.AccountViews, Source={x:Reference _mainOverlay}}"
-                BackgroundColor="{DynamicResource BackgroundColor}"
-                VerticalOptions="Start"
-                RowHeight="{Binding AccountListRowHeight, Source={x:Reference _mainOverlay}}"
-                effects:ScrollViewContentInsetAdjustmentBehaviorEffect.ContentInsetAdjustmentBehavior="Never">
-                <ListView.ItemTemplate>
-                    <DataTemplate x:DataType="view:AccountView">
-                        <controls:AccountViewCell
-                            Account="{Binding .}"
-                            SelectAccountCommand="{Binding SelectAccountCommand, Source={x:Reference _mainOverlay}}"
-                            LongPressAccountCommand="{Binding LongPressAccountCommand, Source={x:Reference _mainOverlay}}"
-                            />
-                    </DataTemplate>
-                </ListView.ItemTemplate>
-                <ListView.Effects>
-                    <effects:ScrollViewContentInsetAdjustmentBehaviorEffect />
-                </ListView.Effects>
-            </ListView>
-        </Frame>
-        <BoxView
-            BackgroundColor="Transparent"
-            HorizontalOptions="Fill"
-            VerticalOptions="FillAndExpand">
-            <BoxView.GestureRecognizers>
-                <TapGestureRecognizer Tapped="FreeSpaceOverlay_Tapped" />
-            </BoxView.GestureRecognizers>
-        </BoxView>
-    </StackLayout>
-</ContentView>

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

@@ -1,188 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public partial class AccountSwitchingOverlayView : ContentView
-    {
-        public static readonly BindableProperty MainPageProperty = BindableProperty.Create(
-            nameof(MainPage),
-            typeof(ContentPage),
-            typeof(AccountSwitchingOverlayView),
-            defaultBindingMode: BindingMode.OneWay);
-
-        public static readonly BindableProperty MainFabProperty = BindableProperty.Create(
-            nameof(MainFab),
-            typeof(View),
-            typeof(AccountSwitchingOverlayView),
-            defaultBindingMode: BindingMode.OneWay);
-
-        public ContentPage MainPage
-        {
-            get => (ContentPage)GetValue(MainPageProperty);
-            set => SetValue(MainPageProperty, value);
-        }
-
-        public View MainFab
-        {
-            get => (View)GetValue(MainFabProperty);
-            set => SetValue(MainFabProperty, value);
-        }
-
-        readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
-
-        public AccountSwitchingOverlayView()
-        {
-            InitializeComponent();
-
-            ToggleVisibililtyCommand = new AsyncCommand(ToggleVisibilityAsync,
-                onException: ex => _logger.Value.Exception(ex),
-                allowsMultipleExecutions: false);
-
-            SelectAccountCommand = new AsyncCommand<AccountViewCellViewModel>(SelectAccountAsync,
-                onException: ex => _logger.Value.Exception(ex),
-                allowsMultipleExecutions: false);
-
-            LongPressAccountCommand = new AsyncCommand<AccountViewCellViewModel>(LongPressAccountAsync,
-                onException: ex => _logger.Value.Exception(ex),
-                allowsMultipleExecutions: false);
-        }
-
-        public AccountSwitchingOverlayViewModel ViewModel => BindingContext as AccountSwitchingOverlayViewModel;
-
-        public ICommand ToggleVisibililtyCommand { get; }
-
-        public ICommand SelectAccountCommand { get; }
-
-        public ICommand LongPressAccountCommand { get; }
-
-        public int AccountListRowHeight => Device.RuntimePlatform == Device.Android ? 74 : 70;
-
-        public async Task ToggleVisibilityAsync()
-        {
-            if (IsVisible)
-            {
-                await HideAsync();
-            }
-            else
-            {
-                await ShowAsync();
-            }
-        }
-
-        public async Task ShowAsync()
-        {
-            if (ViewModel == null)
-            {
-                return;
-            }
-
-            await ViewModel.RefreshAccountViewsAsync();
-
-            await Device.InvokeOnMainThreadAsync(async () =>
-            {
-                // start listView in default (off-screen) position
-                await _accountListContainer.TranslateTo(0, _accountListContainer.Height * -1, 0);
-
-                // re-measure in case accounts have been removed without changing screens
-                if (ViewModel.AccountViews != null)
-                {
-                    _accountListView.HeightRequest = AccountListRowHeight * ViewModel.AccountViews.Count;
-                }
-
-                // set overlay opacity to zero before making visible and start fade-in
-                Opacity = 0;
-                IsVisible = true;
-                this.FadeTo(1, 100);
-                
-                if (Device.RuntimePlatform == Device.Android && MainFab != null)
-                {
-                    // start fab fade-out
-                    MainFab.FadeTo(0, 200);
-                }
-
-                // slide account list into view
-                await _accountListContainer.TranslateTo(0, 0, 200, Easing.SinOut);
-            });
-        }
-
-        public async Task HideAsync()
-        {
-            if (!IsVisible)
-            {
-                // already hidden, don't animate again
-                return;
-            }
-            // Not all animations are awaited. This is intentional to allow multiple simultaneous animations.
-            await Device.InvokeOnMainThreadAsync(async () =>
-            {
-                // start overlay fade-out
-                this.FadeTo(0, 200);
-
-                if (Device.RuntimePlatform == Device.Android && MainFab != null)
-                {
-                    // start fab fade-in
-                    MainFab.FadeTo(1, 200);
-                }
-
-                // slide account list out of view
-                await _accountListContainer.TranslateTo(0, _accountListContainer.Height * -1, 200, Easing.SinIn);
-
-                // remove overlay
-                IsVisible = false;
-            });
-        }
-
-        private async void FreeSpaceOverlay_Tapped(object sender, EventArgs e)
-        {
-            try
-            {
-                await HideAsync();
-            }
-            catch (Exception ex)
-            {
-                _logger.Value.Exception(ex);
-            }
-        }
-
-        private async Task SelectAccountAsync(AccountViewCellViewModel item)
-        {
-            try
-            {
-                await Task.Delay(100);
-                await HideAsync();
-
-                ViewModel?.SelectAccountCommand?.Execute(item);
-            }
-            catch (Exception ex)
-            {
-                _logger.Value.Exception(ex);
-            }
-        }
-
-        private async Task LongPressAccountAsync(AccountViewCellViewModel item)
-        {
-            if (!item.IsAccount)
-            {
-                return;
-            }
-            try
-            {
-                await Task.Delay(100);
-                await HideAsync();
-
-                ViewModel?.LongPressAccountCommand?.Execute(
-                    new Tuple<ContentPage, AccountViewCellViewModel>(MainPage, item));
-            }
-            catch (Exception ex)
-            {
-                _logger.Value.Exception(ex);
-            }
-        }
-    }
-}

src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayViewModel.cs

@@ -1,84 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Utilities;
-using Bit.Core.Abstractions;
-using Bit.Core.Models.View;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public class AccountSwitchingOverlayViewModel : ExtendedViewModel
-    {
-        private readonly IStateService _stateService;
-        private readonly IMessagingService _messagingService;
-
-        public AccountSwitchingOverlayViewModel(IStateService stateService,
-            IMessagingService messagingService,
-            ILogger logger)
-        {
-            _stateService = stateService;
-            _messagingService = messagingService;
-            
-            SelectAccountCommand = new AsyncCommand<AccountViewCellViewModel>(SelectAccountAsync,
-                onException: ex => logger.Exception(ex),
-                allowsMultipleExecutions: false);
-            
-            LongPressAccountCommand = new AsyncCommand<Tuple<ContentPage, AccountViewCellViewModel>>(LongPressAccountAsync,
-                onException: ex => logger.Exception(ex),
-                allowsMultipleExecutions: false);
-        }
-
-        // this needs to be a new list every time for the binding to get updated,
-        // XF doesn't currentlyl provide a direct way to update on same instance
-        // https://github.com/xamarin/Xamarin.Forms/issues/1950
-        public List<AccountView> AccountViews => _stateService?.AccountViews is null ? null : new List<AccountView>(_stateService.AccountViews);
-
-        public bool AllowActiveAccountSelection { get; set; }
-
-        public bool AllowAddAccountRow { get; set; }
-
-        public ICommand SelectAccountCommand { get; }
-
-        public ICommand LongPressAccountCommand { get; }
-
-        private async Task SelectAccountAsync(AccountViewCellViewModel item)
-        {
-            if (item.AccountView.IsAccount)
-            {
-                if (!item.AccountView.IsActive)
-                {
-                    await _stateService.SetActiveUserAsync(item.AccountView.UserId);
-                    _messagingService.Send("switchedAccount");
-                }
-                else if (AllowActiveAccountSelection)
-                {
-                    _messagingService.Send("switchedAccount");
-                }
-            }
-            else
-            {
-                _messagingService.Send("addAccount");
-            }
-        }
-
-        private async Task LongPressAccountAsync(Tuple<ContentPage, AccountViewCellViewModel> item)
-        {
-            var (page, account) = item;
-            if (account.AccountView.IsAccount)
-            {
-                await AppHelpers.AccountListOptions(page, account);
-            }
-        }
-
-        public async Task RefreshAccountViewsAsync()
-        {
-            await _stateService.RefreshAccountViewsAsync(AllowAddAccountRow);
-
-            Device.BeginInvokeOnMainThread(() => TriggerPropertyChanged(nameof(AccountViews)));
-        }
-    }
-}

src/App/Controls/AccountViewCell/AccountViewCell.xaml

@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ViewCell xmlns="http://xamarin.com/schemas/2014/forms"
-          xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-          xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
-          x:Class="Bit.App.Controls.AccountViewCell"
-          xmlns:controls="clr-namespace:Bit.App.Controls"
-          xmlns:u="clr-namespace:Bit.App.Utilities"
-          x:Name="_accountView"
-          x:DataType="controls:AccountViewCellViewModel">
-    <Grid RowSpacing="0"
-          ColumnSpacing="0"
-          xct:TouchEffect.NativeAnimation="True"
-          xct:TouchEffect.Command="{Binding SelectAccountCommand, Source={x:Reference _accountView}}"
-          xct:TouchEffect.CommandParameter="{Binding .}"
-          xct:TouchEffect.LongPressCommand="{Binding LongPressAccountCommand, Source={x:Reference _accountView}}"
-          xct:TouchEffect.LongPressCommandParameter="{Binding .}">
-
-        <Grid.Resources>
-            <u:InverseBoolConverter x:Key="inverseBool" />
-        </Grid.Resources>
-
-        <Grid
-            IsVisible="{Binding IsAccount}"
-            VerticalOptions="CenterAndExpand">
-            
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <Image
-                Grid.Column="0"
-                Source="{Binding AvatarImageSource}"
-                HorizontalOptions="Center"
-                Margin="10,0"
-                VerticalOptions="Center" />
-
-            <Grid
-                Grid.Column="1"
-                RowSpacing="1"
-                VerticalOptions="Center">
-
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-
-                <Label
-                    Grid.Row="0"
-                    Text="{Binding AccountView.Email}"
-                    IsVisible="{Binding IsActive}"
-                    StyleClass="accountlist-title, accountlist-title-platform"
-                    LineBreakMode="TailTruncation" />
-                <Label
-                    Grid.Row="0"
-                    Text="{Binding AccountView.Email}"
-                    IsVisible="{Binding IsActive, Converter={StaticResource inverseBool}}"
-                    StyleClass="accountlist-title, accountlist-title-platform"
-                    TextColor="{DynamicResource MutedColor}"
-                    LineBreakMode="TailTruncation" />
-                <Label
-                    Grid.Row="1"
-                    IsVisible="{Binding ShowHostname}"
-                    Text="{Binding AccountView.Hostname}"
-                    StyleClass="accountlist-sub, accountlist-sub-platform"
-                    LineBreakMode="TailTruncation" />
-                <Label
-                    Grid.Row="2"
-                    Text="{u:I18n AccountUnlocked}"
-                    IsVisible="{Binding IsUnlockedAndNotActive}"
-                    StyleClass="accountlist-sub, accountlist-sub-platform"
-                    FontAttributes="Italic"
-                    TextTransform="Lowercase"
-                    LineBreakMode="TailTruncation" />
-                <Label
-                    Grid.Row="2"
-                    Text="{u:I18n AccountLocked}"
-                    IsVisible="{Binding IsLockedAndNotActive}"
-                    StyleClass="accountlist-sub, accountlist-sub-platform"
-                    FontAttributes="Italic"
-                    TextTransform="Lowercase"
-                    LineBreakMode="TailTruncation" />
-                <Label
-                    Grid.Row="2"
-                    Text="{u:I18n AccountLoggedOut}"
-                    IsVisible="{Binding IsLoggedOutAndNotActive}"
-                    StyleClass="accountlist-sub, accountlist-sub-platform"
-                    FontAttributes="Italic"
-                    TextTransform="Lowercase"
-                    LineBreakMode="TailTruncation" />
-            </Grid>
-
-            <controls:IconLabel
-                Grid.Column="2"
-                Text="{Binding AuthStatusIconNotActive}" 
-                IsVisible="{Binding IsActive, Converter={StaticResource inverseBool}}"
-                Margin="12,0"
-                HorizontalOptions="Center"
-                VerticalOptions="Center"
-                StyleClass="list-icon, list-icon-platform" />
-            <controls:IconLabel
-                Grid.Column="2"
-                Text="{Binding AuthStatusIconActive}" 
-                IsVisible="{Binding IsActive}"
-                Margin="12,0"
-                HorizontalOptions="Center"
-                VerticalOptions="Center"
-                StyleClass="list-icon, list-icon-platform"
-                TextColor="{DynamicResource TextColor}"/>
-        </Grid>
-
-        <Grid
-            IsVisible="{Binding IsAccount, Converter={StaticResource inverseBool}}"
-            VerticalOptions="CenterAndExpand">
-            
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <Image
-                Grid.Column="0"
-                VerticalOptions="Center"
-                HorizontalOptions="Center"
-                Margin="14,0"
-                WidthRequest="{OnPlatform 24, iOS=24, Android=26}"
-                HeightRequest="{OnPlatform 24, iOS=24, Android=26}"
-                Source="plus.png"
-                xct:IconTintColorEffect.TintColor="{DynamicResource TextColor}"
-                AutomationProperties.IsInAccessibleTree="False" />
-            <Label
-                Text="{u:I18n AddAccount}"
-                StyleClass="accountlist-title, accountlist-title-platform"
-                LineBreakMode="TailTruncation"
-                VerticalOptions="Center"
-                Grid.Column="1" />
-        </Grid>
-    </Grid>
-</ViewCell>

src/App/Controls/AccountViewCell/AccountViewCell.xaml.cs

@@ -1,54 +0,0 @@
-using Bit.Core.Models.View;
-using System.Windows.Input;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public partial class AccountViewCell : ViewCell
-    {
-        public static readonly BindableProperty AccountProperty = BindableProperty.Create(
-            nameof(Account), typeof(AccountView), typeof(AccountViewCell));
-
-        public static readonly BindableProperty SelectAccountCommandProperty = BindableProperty.Create(
-            nameof(SelectAccountCommand), typeof(ICommand), typeof(AccountViewCell));
-
-        public static readonly BindableProperty LongPressAccountCommandProperty = BindableProperty.Create(
-            nameof(LongPressAccountCommand), typeof(ICommand), typeof(AccountViewCell));
-
-        public AccountViewCell()
-        {
-            InitializeComponent();
-        }
-
-        public AccountView Account
-        {
-            get => GetValue(AccountProperty) as AccountView;
-            set => SetValue(AccountProperty, value);
-        }
-
-        public ICommand SelectAccountCommand
-        {
-            get => GetValue(SelectAccountCommandProperty) as ICommand;
-            set => SetValue(SelectAccountCommandProperty, value);
-        }
-
-        public ICommand LongPressAccountCommand
-        {
-            get => GetValue(LongPressAccountCommandProperty) as ICommand;
-            set => SetValue(LongPressAccountCommandProperty, value);
-        }
-
-        protected override void OnPropertyChanged(string propertyName = null)
-        {
-            base.OnPropertyChanged(propertyName);
-            if (propertyName == AccountProperty.PropertyName)
-            {
-                if (Account == null)
-                {
-                    return;
-                }
-                BindingContext = new AccountViewCellViewModel(Account);
-            }
-        }
-    }
-}

src/App/Controls/AccountViewCell/AccountViewCellViewModel.cs

@@ -1,93 +0,0 @@
-using Bit.Core;
-using Bit.Core.Enums;
-using Bit.Core.Models.View;
-using Bit.Core.Utilities;
-
-namespace Bit.App.Controls
-{
-    public class AccountViewCellViewModel : ExtendedViewModel
-    {
-        private AccountView _accountView;
-        private AvatarImageSource _avatar;
-
-        public AccountViewCellViewModel(AccountView accountView)
-        {
-            AccountView = accountView;
-            AvatarImageSource = new AvatarImageSource(AccountView.Name, AccountView.Email);
-        }
-
-        public AccountView AccountView
-        {
-            get => _accountView;
-            set => SetProperty(ref _accountView, value);
-        }
-
-        public AvatarImageSource AvatarImageSource
-        {
-            get => _avatar;
-            set => SetProperty(ref _avatar, value);
-        }
-
-        public bool IsAccount
-        {
-            get => AccountView.IsAccount;
-        }
-
-        public bool ShowHostname
-        {
-            get => !string.IsNullOrWhiteSpace(AccountView.Hostname) && AccountView.Hostname != "vault.bitwarden.com";
-        }
-
-        public bool IsActive
-        {
-            get => AccountView.IsActive;
-        }
-
-        public bool IsUnlocked
-        {
-            get => AccountView.AuthStatus == AuthenticationStatus.Unlocked;
-        }
-
-        public bool IsUnlockedAndNotActive
-        {
-            get => IsUnlocked && !IsActive;
-        }
-
-        public bool IsLocked
-        {
-            get => AccountView.AuthStatus == AuthenticationStatus.Locked;
-        }
-
-        public bool IsLockedAndNotActive
-        {
-            get => IsLocked && !IsActive;
-        }
-
-        public bool IsLoggedOut
-        {
-            get => AccountView.AuthStatus == AuthenticationStatus.LoggedOut;
-        }
-
-        public bool IsLoggedOutAndNotActive
-        {
-            get => IsLoggedOut && !IsActive;
-        }
-
-        public string AuthStatusIconActive
-        {
-            get => BitwardenIcons.CheckCircle;
-        }
-
-        public string AuthStatusIconNotActive
-        {
-            get
-            {
-                if (IsUnlocked)
-                {
-                    return BitwardenIcons.Unlock;
-                }
-                return BitwardenIcons.Lock;
-            }
-        }
-    }
-}

src/App/Controls/AvatarImageSource.cs

@@ -1,153 +0,0 @@
-using System;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using SkiaSharp;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public class AvatarImageSource : StreamImageSource
-    {
-        private string _data;
-
-        public override bool Equals(object obj)
-        {
-            if (obj is null)
-            {
-                return false;
-            }
-
-            if (obj is AvatarImageSource avatar)
-            {
-                return avatar._data == _data;
-            }
-
-            return base.Equals(obj);
-        }
-
-        public override int GetHashCode() => _data?.GetHashCode() ?? -1;
-
-        public AvatarImageSource(string name = null, string email = null)
-        {
-            _data = name;
-            if (string.IsNullOrWhiteSpace(_data))
-            {
-                _data = email;
-            }
-        }
-
-        public override Func<CancellationToken, Task<Stream>> Stream => GetStreamAsync;
-
-        private Task<Stream> GetStreamAsync(CancellationToken userToken = new CancellationToken())
-        {
-            OnLoadingStarted();
-            userToken.Register(CancellationTokenSource.Cancel);
-            var result = Draw();
-            OnLoadingCompleted(CancellationTokenSource.IsCancellationRequested);
-            return Task.FromResult(result);
-        }
-
-        private Stream Draw()
-        {
-            string chars = null;
-            string upperData = null;
-
-            if (string.IsNullOrEmpty(_data))
-            {
-                chars = "..";
-            }
-            else if (_data?.Length > 1)
-            {
-                upperData = _data.ToUpper();
-                chars = GetFirstLetters(upperData, 2);
-            }
-            else
-            {
-                chars = upperData = _data.ToUpper();
-            }
-
-            var bgColor = StringToColor(upperData);
-            var textColor = Color.White;
-            var size = 50;
-
-            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
-            {
-                IsAntialias = true,
-                Style = SKPaintStyle.Fill,
-                StrokeJoin = SKStrokeJoin.Miter,
-                Color = SKColor.Parse(bgColor.ToHex())
-            };
-            canvas.DrawCircle(midX, midY, radius, circlePaint);
-
-            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);
-
-            return SKImage.FromBitmap(bitmap).Encode(SKEncodedImageFormat.Png, 100).AsStream();
-        }
-
-        private string GetFirstLetters(string data, int charCount)
-        {
-            var parts  = data.Split();
-            if (parts.Length > 1 && charCount <= 2)
-            {
-                var text = "";
-                for (int i = 0; i < charCount; i++)
-                {
-                    text += parts[i].Substring(0,1);
-                }
-                return text;
-            }
-            if (data.Length > 2)
-            {
-                return data.Substring(0, 2);
-            }
-            return data;
-        }
-
-        private Color StringToColor(string str)
-        {
-            if (str == null)
-            {
-                return Color.FromHex("#33ffffff");
-            }
-            var hash = 0;
-            for (var i = 0; i < str.Length; i++)
-            {
-                hash = str[i] + ((hash << 5) - hash);
-            }
-            var color = "#FF";
-            for (var i = 0; i < 3; i++)
-            {
-                var value = (hash >> (i * 8)) & 0xff;
-                var base16 = "00" + Convert.ToString(value, 16);
-                color += base16.Substring(base16.Length - 2);
-            }
-            return Color.FromHex(color);
-        }
-    }
-}

src/App/Controls/CipherViewCell/CipherViewCell.xaml

@@ -12,10 +12,10 @@
     x:DataType="controls:CipherViewCellViewModel">
 
     <Grid.Resources>
-        <u:IconGlyphConverter x:Key="iconGlyphConverter"/>
-        <u:IconImageConverter x:Key="iconImageConverter"/>
-        <u:InverseBoolConverter x:Key="inverseBool" />
-        <u:StringHasValueConverter x:Key="stringHasValueConverter" />
+          <u:IconGlyphConverter x:Key="iconGlyphConverter"/>
+          <u:IconImageConverter x:Key="iconImageConverter"/>
+          <u:InverseBoolConverter x:Key="inverseBool" />
+          <u:StringHasValueConverter x:Key="stringHasValueConverter" />
     </Grid.Resources>
 
     <Grid.RowDefinitions>
@@ -23,7 +23,7 @@
     </Grid.RowDefinitions>
 
     <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="40" x:Name="_iconColumn" />
+        <ColumnDefinition Width="40" />
         <ColumnDefinition Width="*" />
         <ColumnDefinition Width="60" />
     </Grid.ColumnDefinitions>
@@ -35,21 +35,17 @@
         StyleClass="list-icon, list-icon-platform"
         IsVisible="{Binding ShowIconImage, Converter={StaticResource inverseBool}}"
         Text="{Binding Cipher, Converter={StaticResource iconGlyphConverter}}"
-        ShouldUpdateFontSizeDynamicallyForAccesibility="True"
         AutomationProperties.IsInAccessibleTree="False" />
 
     <ff:CachedImage
-        x:Name="_iconImage"
         Grid.Column="0"
         BitmapOptimizations="True"
         ErrorPlaceholder="login.png"
         LoadingPlaceholder="login.png"
-        HorizontalOptions="CenterAndExpand"
-        VerticalOptions="CenterAndExpand"
-        Margin="9"
+        HorizontalOptions="Center"
+        VerticalOptions="Center"
         WidthRequest="22"
         HeightRequest="22"
-        Aspect="AspectFit"
         IsVisible="{Binding ShowIconImage}"
         Source="{Binding IconImageSource, Mode=OneTime}"
         AutomationProperties.IsInAccessibleTree="False" />
@@ -116,4 +112,4 @@
         AutomationProperties.IsInAccessibleTree="True"
         AutomationProperties.Name="{u:I18n Options}" />
 
-</controls:ExtendedGrid>
+</controls:ExtendedGrid>

src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs

@@ -1,16 +1,11 @@
 using System;
-using Bit.App.Abstractions;
 using Bit.Core.Models.View;
-using Bit.Core.Utilities;
 using Xamarin.Forms;
 
 namespace Bit.App.Controls
 {
     public partial class CipherViewCell : ExtendedGrid
     {
-        private const int ICON_COLUMN_DEFAULT_WIDTH = 40;
-        private const int ICON_IMAGE_DEFAULT_WIDTH = 22;
-
         public static readonly BindableProperty CipherProperty = BindableProperty.Create(
             nameof(Cipher), typeof(CipherView), typeof(CipherViewCell), default(CipherView), BindingMode.OneWay);
 
@@ -23,11 +18,6 @@ namespace Bit.App.Controls
         public CipherViewCell()
         {
             InitializeComponent();
-
-            var fontScale = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService").GetSystemFontSizeScale();
-            _iconColumn.Width = new GridLength(ICON_COLUMN_DEFAULT_WIDTH * fontScale, GridUnitType.Absolute);
-            _iconImage.WidthRequest = ICON_IMAGE_DEFAULT_WIDTH * fontScale;
-            _iconImage.HeightRequest = ICON_IMAGE_DEFAULT_WIDTH * fontScale;
         }
 
         public bool? WebsiteIconsEnabled

src/App/Controls/ExtendedToolbarItem.cs

@@ -1,29 +0,0 @@
-using System;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public class ExtendedToolbarItem : ToolbarItem
-    {
-        public bool UseOriginalImage { get; set; }
-
-        // HACK: For the issue of correctly updating the avatar toolbar item color on iOS
-        // we need to subscribe to the PropertyChanged event of the ToolbarItem on the CustomNavigationRenderer
-        // The problem is that there are a lot of private places where the navigation renderer disposes objects
-        // that we don't have access to, and that we should in order to properly prevent memory leaks
-        // So as a hack solution we have this OnAppearing/OnDisappearing actions and methods to be called on page lifecycle
-        // to subscribe/unsubscribe indirectly on the CustomNavigationRenderer
-        public Action OnAppearingAction { get; set; }
-        public Action OnDisappearingAction { get; set; }
-
-        public void OnAppearing()
-        {
-            OnAppearingAction?.Invoke();
-        }
-
-        public void OnDisappearing()
-        {
-            OnDisappearingAction?.Invoke();
-        }
-    }
-}

src/App/Controls/IconLabel.cs

@@ -4,8 +4,6 @@ namespace Bit.App.Controls
 {
     public class IconLabel : Label
     {
-        public bool ShouldUpdateFontSizeDynamicallyForAccesibility { get; set; }
-
         public IconLabel()
         {
             switch (Device.RuntimePlatform)

src/App/Controls/SendViewCell/SendViewCell.xaml

@@ -19,7 +19,7 @@
     </Grid.RowDefinitions>
 
     <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="40" x:Name="_iconColumn" />
+        <ColumnDefinition Width="40" />
         <ColumnDefinition Width="*" />
         <ColumnDefinition Width="60" />
     </Grid.ColumnDefinitions>
@@ -31,7 +31,6 @@
         VerticalOptions="Center"
         StyleClass="list-icon, list-icon-platform"
         Text="{Binding Send, Converter={StaticResource sendIconGlyphConverter}}"
-        ShouldUpdateFontSizeDynamicallyForAccesibility="True"
         AutomationProperties.IsInAccessibleTree="False" />
 
     <Grid RowSpacing="0" ColumnSpacing="0" Grid.Row="0" Grid.Column="1" VerticalOptions="Center" Padding="0, 7">

src/App/Controls/SendViewCell/SendViewCell.xaml.cs

@@ -1,7 +1,5 @@
 using System;
-using Bit.App.Abstractions;
 using Bit.Core.Models.View;
-using Bit.Core.Utilities;
 using Xamarin.Forms;
 
 namespace Bit.App.Controls
@@ -20,9 +18,6 @@ namespace Bit.App.Controls
         public SendViewCell()
         {
             InitializeComponent();
-
-            var deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
-            _iconColumn.Width = new GridLength(40 * deviceActionService.GetSystemFontSizeScale(), GridUnitType.Absolute);
         }
 
         public SendView Send

src/App/Effects/ScrollViewContentInsetAdjustmentBehaviorEffect.cs

@@ -1,33 +0,0 @@
-using Xamarin.Forms;
-
-namespace Bit.App.Effects
-{
-    public enum ScrollContentInsetAdjustmentBehavior
-    {
-        Automatic,
-        ScrollableAxes,
-        Never,
-        Always
-    }
-
-    public class ScrollViewContentInsetAdjustmentBehaviorEffect : RoutingEffect
-    {
-        public static readonly BindableProperty ContentInsetAdjustmentBehaviorProperty =
-          BindableProperty.CreateAttached("ContentInsetAdjustmentBehavior", typeof(ScrollContentInsetAdjustmentBehavior), typeof(ScrollViewContentInsetAdjustmentBehaviorEffect), ScrollContentInsetAdjustmentBehavior.Automatic);
-
-        public static ScrollContentInsetAdjustmentBehavior GetContentInsetAdjustmentBehavior(BindableObject view)
-        {
-            return (ScrollContentInsetAdjustmentBehavior)view.GetValue(ContentInsetAdjustmentBehaviorProperty);
-        }
-
-        public static void SetContentInsetAdjustmentBehavior(BindableObject view, ScrollContentInsetAdjustmentBehavior value)
-        {
-            view.SetValue(ContentInsetAdjustmentBehaviorProperty, value);
-        }
-
-        public ScrollViewContentInsetAdjustmentBehaviorEffect()
-            : base($"Bitwarden.{nameof(ScrollViewContentInsetAdjustmentBehaviorEffect)}")
-        {
-        }
-    }
-}

src/App/Models/AppOptions.cs

@@ -22,7 +22,6 @@ namespace Bit.App.Models
         public bool IosExtension { get; set; }
         public Tuple<SendType, string, byte[], string> CreateSend { get; set; }
         public bool CopyInsteadOfShareAfterSaving { get; set; }
-        public bool HideAccountSwitcher { get; set; }
 
         public void SetAllFrom(AppOptions o)
         {
@@ -47,7 +46,6 @@ namespace Bit.App.Models
             IosExtension = o.IosExtension;
             CreateSend = o.CreateSend;
             CopyInsteadOfShareAfterSaving = o.CopyInsteadOfShareAfterSaving;
-            HideAccountSwitcher = o.HideAccountSwitcher;
         }
     }
 }

src/App/Models/PreviousPageInfo.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.Models.Data
+namespace Bit.App.Models
 {
     public class PreviousPageInfo
     {

src/App/Pages/Accounts/BaseChangePasswordViewModel.cs

@@ -14,7 +14,7 @@ namespace Bit.App.Pages
     public class BaseChangePasswordViewModel : BaseViewModel
     {
         protected readonly IPlatformUtilsService _platformUtilsService;
-        protected readonly IStateService _stateService;
+        protected readonly IUserService _userService;
         protected readonly IPolicyService _policyService;
         protected readonly IPasswordGenerationService _passwordGenerationService;
         protected readonly II18nService _i18nService;
@@ -31,7 +31,7 @@ namespace Bit.App.Pages
         protected BaseChangePasswordViewModel()
         {
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _userService = ServiceContainer.Resolve<IUserService>("userService");
             _policyService = ServiceContainer.Resolve<IPolicyService>("policyService");
             _passwordGenerationService =
                 ServiceContainer.Resolve<IPasswordGenerationService>("passwordGenerationService");
@@ -172,7 +172,7 @@ namespace Bit.App.Pages
 
         private async Task<List<string>> GetPasswordStrengthUserInput()
         {
-            var email = await _stateService.GetEmailAsync();
+            var email = await _userService.GetEmailAsync();
             List<string> userInput = null;
             var atPosition = email.IndexOf('@');
             if (atPosition > -1)

src/App/Pages/Accounts/DeleteAccountViewModel.cs

@@ -5,6 +5,9 @@ using Bit.App.Utilities;
 using Bit.Core.Abstractions;
 using Bit.Core.Exceptions;
 using Bit.Core.Utilities;
+#if !FDROID
+using Microsoft.AppCenter.Crashes;
+#endif
 
 namespace Bit.App.Pages
 {
@@ -12,13 +15,11 @@ namespace Bit.App.Pages
     {
         readonly IPlatformUtilsService _platformUtilsService;
         readonly IVerificationActionsFlowHelper _verificationActionsFlowHelper;
-        readonly ILogger _logger;
 
         public DeleteAccountViewModel()
         {
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
             _verificationActionsFlowHelper = ServiceContainer.Resolve<IVerificationActionsFlowHelper>("verificationActionsFlowHelper");
-            _logger = ServiceContainer.Resolve<ILogger>("logger");
 
             PageTitle = AppResources.DeleteAccount;
         }
@@ -43,7 +44,9 @@ namespace Bit.App.Pages
             }
             catch (System.Exception ex)
             {
-                _logger.Exception(ex);
+#if !FDROID
+                Crashes.TrackError(ex);
+#endif
                 await _platformUtilsService.ShowDialogAsync(AppResources.AnErrorHasOccurred);
             }
         }
@@ -57,19 +60,16 @@ namespace Bit.App.Pages
         readonly IMessagingService _messagingService;
         readonly IPlatformUtilsService _platformUtilsService;
         readonly IDeviceActionService _deviceActionService;
-        readonly ILogger _logger;
 
         public DeleteAccountActionFlowExecutioner(IApiService apiService,
             IMessagingService messagingService,
             IPlatformUtilsService platformUtilsService,
-            IDeviceActionService deviceActionService,
-            ILogger logger)
+            IDeviceActionService deviceActionService)
         {
             _apiService = apiService;
             _messagingService = messagingService;
             _platformUtilsService = platformUtilsService;
             _deviceActionService = deviceActionService;
-            _logger = logger;
         }
 
         public async Task Execute(IActionFlowParmeters parameters)
@@ -102,7 +102,9 @@ namespace Bit.App.Pages
             catch (System.Exception ex)
             {
                 await _deviceActionService.HideLoadingAsync();
-                _logger.Exception(ex);
+#if !FDROID
+                Crashes.TrackError(ex);
+#endif
                 await _platformUtilsService.ShowDialogAsync(AppResources.AnErrorHasOccurred);
             }
         }

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

@@ -10,11 +10,14 @@ namespace Bit.App.Pages
     public partial class EnvironmentPage : BaseContentPage
     {
         private readonly IPlatformUtilsService _platformUtilsService;
+        private readonly IMessagingService _messagingService;
         private readonly EnvironmentPageViewModel _vm;
 
         public EnvironmentPage()
         {
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
+            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
+            _messagingService.Send("showStatusBar", true);
             InitializeComponent();
             _vm = BindingContext as EnvironmentPageViewModel;
             _vm.Page = this;
@@ -32,6 +35,7 @@ namespace Bit.App.Pages
             _vm.SubmitSuccessAction = () => Device.BeginInvokeOnMainThread(async () => await SubmitSuccessAsync());
             _vm.CloseAction = async () =>
             {
+                _messagingService.Send("showStatusBar", false);
                 await Navigation.PopModalAsync();
             };
         }

src/App/Pages/Accounts/HomePage.xaml

@@ -6,76 +6,49 @@
     xmlns:pages="clr-namespace:Bit.App.Pages"
     xmlns:controls="clr-namespace:Bit.App.Controls"
     xmlns:u="clr-namespace:Bit.App.Utilities"
+    xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
     x:DataType="pages:HomeViewModel"
-    x:Name="_page"
     Title="{Binding PageTitle}">
     <ContentPage.BindingContext>
         <pages:HomeViewModel />
     </ContentPage.BindingContext>
-
+    
     <ContentPage.ToolbarItems>
-        <controls:ExtendedToolbarItem
-            x:Name="_accountAvatar"
-            x:Key="accountAvatar"
-            IconImageSource="{Binding AvatarImageSource}"
-            Command="{Binding Source={x:Reference _accountListOverlay}, Path=ToggleVisibililtyCommand}"
-            Order="Primary"
-            Priority="-1"
-            UseOriginalImage="True"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Account}" />
-        <ToolbarItem
-            Icon="cog_environment.png" Clicked="Environment_Clicked" Order="Primary"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Options}" />
+        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
     </ContentPage.ToolbarItems>
 
-    <ContentPage.Resources>
-        <ResourceDictionary>
-            <StackLayout x:Name="_mainLayout" x:Key="mainLayout" Spacing="0" Padding="10, 5">
-                <StackLayout VerticalOptions="CenterAndExpand" Spacing="20">
-                    <Image
-                        x:Name="_logo"
-                        Source="logo.png"
-                        VerticalOptions="Center" />
-                    <Label Text="{u:I18n LoginOrCreateNewAccount}"
-                           StyleClass="text-lg"
-                           HorizontalTextAlignment="Center">
-                    </Label>
-                    <StackLayout Spacing="5">
-                        <Button Text="{u:I18n LogIn}"
-                                StyleClass="btn-primary"
-                                Clicked="LogIn_Clicked" />
-                        <Button Text="{u:I18n CreateAccount}"
-                                Clicked="Register_Clicked" />
-                        <Button Text="{u:I18n LogInSso}"
-                                Clicked="LogInSso_Clicked" />
-                        <Button Text="{u:I18n Cancel}"
-                                IsVisible="{Binding ShowCancelButton}"
-                                Margin="0,10,0,0"
-                                Clicked="Cancel_Clicked" />
-                    </StackLayout>
-                </StackLayout>
+    <StackLayout Spacing="0" Padding="10, 5">
+        <controls:IconButton Text="{Binding Source={x:Static core:BitwardenIcons.Cog}}"
+                           StyleClass="btn-muted, btn-icon, btn-icon-platform"
+                           HorizontalOptions="Start"
+                           Clicked="Environment_Clicked"
+                           AutomationProperties.IsInAccessibleTree="True"
+                           AutomationProperties.Name="{u:I18n Options}">
+            <controls:IconButton.Margin>
+                <OnPlatform x:TypeArguments="Thickness">
+                    <On Platform="iOS" Value="0, 10, 0, 0" />
+                    <On Platform="Android" Value="0" />
+                </OnPlatform>
+            </controls:IconButton.Margin>
+        </controls:IconButton>
+        <StackLayout VerticalOptions="CenterAndExpand" Spacing="20">
+            <Image
+                x:Name="_logo"
+                Source="logo.png"
+                VerticalOptions="Center" />
+            <Label Text="{u:I18n LoginOrCreateNewAccount}"
+                   StyleClass="text-lg"
+                   HorizontalTextAlignment="Center"></Label>
+            <StackLayout Spacing="5">
+                <Button Text="{u:I18n LogIn}" 
+                        StyleClass="btn-primary"
+                        Clicked="LogIn_Clicked" />
+                <Button Text="{u:I18n CreateAccount}"
+                        Clicked="Register_Clicked" />
+                <Button Text="{u:I18n LogInSso}"
+                        Clicked="LogInSso_Clicked" />
             </StackLayout>
-        </ResourceDictionary>
-    </ContentPage.Resources>
-
-    <AbsoluteLayout
-        x:Name="_absLayout"
-        VerticalOptions="FillAndExpand"
-        HorizontalOptions="FillAndExpand">
-        <ContentView
-            x:Name="_mainContent"
-            AbsoluteLayout.LayoutFlags="All"
-            AbsoluteLayout.LayoutBounds="0, 0, 1, 1">
-        </ContentView>
-
-        <controls:AccountSwitchingOverlayView
-            x:Name="_accountListOverlay"
-            AbsoluteLayout.LayoutBounds="0, 0, 1, 1"
-            AbsoluteLayout.LayoutFlags="All"
-            MainPage="{Binding Source={x:Reference _page}}"
-            BindingContext="{Binding AccountSwitchingOverlayViewModel}"/>
-    </AbsoluteLayout>
+        </StackLayout>
+    </StackLayout>
 
 </pages:BaseContentPage>

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

@@ -1,9 +1,9 @@
-using System;
-using System.Threading.Tasks;
-using Bit.App.Models;
+using Bit.App.Models;
 using Bit.App.Utilities;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
+using System;
+using System.Threading.Tasks;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -12,10 +12,13 @@ namespace Bit.App.Pages
     {
         private readonly HomeViewModel _vm;
         private readonly AppOptions _appOptions;
+        private IMessagingService _messagingService;
         private IBroadcasterService _broadcasterService;
 
         public HomePage(AppOptions appOptions = null)
         {
+            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
+            _messagingService.Send("showStatusBar", false);
             _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
             _appOptions = appOptions;
             InitializeComponent();
@@ -26,16 +29,6 @@ namespace Bit.App.Pages
             _vm.StartSsoLoginAction = () => Device.BeginInvokeOnMainThread(async () => await StartSsoLoginAsync());
             _vm.StartEnvironmentAction = () => Device.BeginInvokeOnMainThread(async () => await StartEnvironmentAsync());
             UpdateLogo();
-
-            if (_appOptions?.IosExtension ?? false)
-            {
-                _vm.ShowCancelButton = true;
-            }
-
-            if (_appOptions?.HideAccountSwitcher ?? false)
-            {
-                ToolbarItems.Remove(_accountAvatar);
-            }
         }
 
         public async Task DismissRegisterPageAndLogInAsync(string email)
@@ -44,16 +37,10 @@ namespace Bit.App.Pages
             await Navigation.PushModalAsync(new NavigationPage(new LoginPage(email, _appOptions)));
         }
 
-        protected override async void OnAppearing()
+        protected override void OnAppearing()
         {
             base.OnAppearing();
-            _mainContent.Content = _mainLayout;
-            _accountAvatar?.OnAppearing();
-
-            if (!_appOptions?.HideAccountSwitcher ?? false)
-            {
-                _vm.AvatarImageSource = await GetAvatarImageSourceAsync();
-            }
+            _messagingService.Send("showStatusBar", false);
             _broadcasterService.Subscribe(nameof(HomePage), async (message) =>
             {
                 if (message.Command == "updatedTheme")
@@ -66,21 +53,10 @@ namespace Bit.App.Pages
             });
         }
 
-        protected override bool OnBackButtonPressed()
-        {
-            if (_accountListOverlay.IsVisible)
-            {
-                _accountListOverlay.HideAsync().FireAndForget();
-                return true;
-            }
-            return false;
-        }
-
         protected override void OnDisappearing()
         {
             base.OnDisappearing();
             _broadcasterService.Unsubscribe(nameof(HomePage));
-            _accountAvatar?.OnDisappearing();
         }
 
         private void UpdateLogo()
@@ -88,7 +64,7 @@ namespace Bit.App.Pages
             _logo.Source = !ThemeManager.UsingLightTheme ? "logo_white.png" : "logo.png";
         }
         
-        private void Cancel_Clicked(object sender, EventArgs e)
+        private void Close_Clicked(object sender, EventArgs e)
         {
             if (DoOnce())
             {
@@ -148,7 +124,6 @@ namespace Bit.App.Pages
         
         private async Task StartEnvironmentAsync()
         {
-            await _accountListOverlay.HideAsync();
             var page = new EnvironmentPage();
             await Navigation.PushModalAsync(new NavigationPage(page));
         }

src/App/Pages/Accounts/HomePageViewModel.cs

@@ -1,39 +1,15 @@
 using System;
-using Bit.App.Controls;
 using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
 
 namespace Bit.App.Pages
 {
     public class HomeViewModel : BaseViewModel
     {
-        private readonly IStateService _stateService;
-        private readonly IMessagingService _messagingService;
-
-        private bool _showCancelButton;
-
         public HomeViewModel()
         {
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
-            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
-            var logger = ServiceContainer.Resolve<ILogger>("logger");
-
             PageTitle = AppResources.Bitwarden;
-
-            AccountSwitchingOverlayViewModel = new AccountSwitchingOverlayViewModel(_stateService, _messagingService, logger)
-            {
-                AllowActiveAccountSelection = true
-            };
         }
-
-        public bool ShowCancelButton
-        {
-            get => _showCancelButton;
-            set => SetProperty(ref _showCancelButton, value);
-        }
-
-        public AccountSwitchingOverlayViewModel AccountSwitchingOverlayViewModel { get; }
+        
         public Action StartLoginAction { get; set; }
         public Action StartRegisterAction { get; set; }
         public Action StartSsoLoginAction { get; set; }

src/App/Pages/Accounts/LockPage.xaml

@@ -7,26 +7,12 @@
     xmlns:controls="clr-namespace:Bit.App.Controls"
     xmlns:u="clr-namespace:Bit.App.Utilities"
     x:DataType="pages:LockPageViewModel"
-    x:Name="_page"
     Title="{Binding PageTitle}">
 
     <ContentPage.BindingContext>
         <pages:LockPageViewModel />
     </ContentPage.BindingContext>
 
-    <ContentPage.ToolbarItems>
-        <controls:ExtendedToolbarItem
-                x:Name="_accountAvatar"
-                x:Key="accountAvatar"
-                IconImageSource="{Binding AvatarImageSource}"
-                Command="{Binding Source={x:Reference _accountListOverlay}, Path=ToggleVisibililtyCommand}"
-                Order="Primary"
-                Priority="-1"
-                UseOriginalImage="True"
-                AutomationProperties.IsInAccessibleTree="True"
-                AutomationProperties.Name="{u:I18n Account}" />
-    </ContentPage.ToolbarItems>
-    
     <ContentPage.Resources>
         <ResourceDictionary>
             <u:InverseBoolConverter x:Key="inverseBool" />
@@ -39,136 +25,119 @@
                 x:Name="_logOut"
                 Clicked="LogOut_Clicked"
                 Order="Secondary"/>
-
-            <ScrollView x:Name="_mainLayout" x:Key="mainLayout">
-                <StackLayout Spacing="20">
-                    <StackLayout StyleClass="box">
-                        <Grid
-                            StyleClass="box-row"
-                            IsVisible="{Binding PinLock}"
-                            Padding="0, 10, 0, 0">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <Label
-                                Text="{u:I18n PIN}"
-                                StyleClass="box-label"
-                                Grid.Row="0"
-                                Grid.Column="0" />
-                            <controls:MonoEntry
-                                x:Name="_pin"
-                                Text="{Binding Pin}"
-                                StyleClass="box-value"
-                                Keyboard="Numeric"
-                                IsSpellCheckEnabled="False"
-                                IsTextPredictionEnabled="False"
-                                IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
-                                Grid.Row="1"
-                                Grid.Column="0"
-                                ReturnType="Go"
-                                ReturnCommand="{Binding SubmitCommand}" />
-                            <controls:IconButton
-                                StyleClass="box-row-button, box-row-button-platform"
-                                Text="{Binding ShowPasswordIcon}"
-                                Command="{Binding TogglePasswordCommand}"
-                                Grid.Row="0"
-                                Grid.Column="1"
-                                Grid.RowSpan="2"
-                                AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n ToggleVisibility}" />
-                        </Grid>
-                        <Grid
-                            x:Name="_passwordGrid"
-                            StyleClass="box-row"
-                            IsVisible="{Binding PinLock, Converter={StaticResource inverseBool}}"
-                            Padding="0, 10, 0, 0">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <Label
-                                Text="{u:I18n MasterPassword}"
-                                StyleClass="box-label"
-                                Grid.Row="0"
-                                Grid.Column="0" />
-                            <controls:MonoEntry
-                                x:Name="_masterPassword"
-                                Text="{Binding MasterPassword}"
-                                StyleClass="box-value"
-                                IsSpellCheckEnabled="False"
-                                IsTextPredictionEnabled="False"
-                                IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
-                                Grid.Row="1"
-                                Grid.Column="0"
-                                ReturnType="Go"
-                                ReturnCommand="{Binding SubmitCommand}" />
-                            <controls:IconButton
-                                StyleClass="box-row-button, box-row-button-platform"
-                                Text="{Binding ShowPasswordIcon}"
-                                Command="{Binding TogglePasswordCommand}"
-                                Grid.Row="0"
-                                Grid.Column="1"
-                                Grid.RowSpan="2"
-                                AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n ToggleVisibility}" />
-                        </Grid>
-                        <StackLayout
-                            StyleClass="box-row"
-                            Padding="0, 10, 0, 0">
-                            <Label
-                                Text="{Binding LockedVerifyText}"
-                                StyleClass="box-footer-label" />
-                            <Label
-                                Text="{Binding LoggedInAsText}"
-                                StyleClass="box-footer-label"
-                                Margin="0, 10, 0, 0" />
-                        </StackLayout>
-                    </StackLayout>
-                    <StackLayout Padding="10, 0">
-                        <Label
-                            Text="{u:I18n BiometricInvalidated}"
-                            StyleClass="box-footer-label,text-danger,text-bold"
-                            IsVisible="{Binding BiometricIntegrityValid, Converter={StaticResource inverseBool}}" />
-                        <Button Text="{Binding BiometricButtonText}" Clicked="Biometric_Clicked"
-                                IsVisible="{Binding BiometricButtonVisible}">
-                        </Button>
-                        <Button
-                            x:Name="_unlockButton"
-                            Text="{u:I18n Unlock}"
-                            StyleClass="btn-primary"
-                            Clicked="Unlock_Clicked" />
-                    </StackLayout>
-                </StackLayout>
-            </ScrollView>
         </ResourceDictionary>
     </ContentPage.Resources>
 
-    <AbsoluteLayout
-        x:Name="_absLayout"
-        VerticalOptions="FillAndExpand"
-        HorizontalOptions="FillAndExpand">
-        <ContentView
-            x:Name="_mainContent"
-            AbsoluteLayout.LayoutFlags="All"
-            AbsoluteLayout.LayoutBounds="0, 0, 1, 1">
-        </ContentView>
+    <ContentPage.ToolbarItems>
+    </ContentPage.ToolbarItems>
 
-        <controls:AccountSwitchingOverlayView
-            x:Name="_accountListOverlay"
-            AbsoluteLayout.LayoutBounds="0, 0, 1, 1"
-            AbsoluteLayout.LayoutFlags="All"
-            MainPage="{Binding Source={x:Reference _page}}"
-            BindingContext="{Binding AccountSwitchingOverlayViewModel}"/>
-        
-    </AbsoluteLayout>
+    <ScrollView>
+        <StackLayout Spacing="20">
+            <StackLayout StyleClass="box">
+                <Grid
+                    StyleClass="box-row"
+                    IsVisible="{Binding PinLock}"
+                    Padding="0, 10, 0, 0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Label
+                        Text="{u:I18n PIN}"
+                        StyleClass="box-label"
+                        Grid.Row="0"
+                        Grid.Column="0" />
+                    <controls:MonoEntry
+                        x:Name="_pin"
+                        Text="{Binding Pin}"
+                        StyleClass="box-value"
+                        Keyboard="Numeric"
+                        IsSpellCheckEnabled="False"
+                        IsTextPredictionEnabled="False"
+                        IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        ReturnType="Go"
+                        ReturnCommand="{Binding SubmitCommand}" />
+                    <controls:IconButton
+                        StyleClass="box-row-button, box-row-button-platform"
+                        Text="{Binding ShowPasswordIcon}"
+                        Command="{Binding TogglePasswordCommand}"
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        Grid.RowSpan="2"
+                        AutomationProperties.IsInAccessibleTree="True"
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
+                </Grid>
+                <Grid
+                    x:Name="_passwordGrid"
+                    StyleClass="box-row"
+                    IsVisible="{Binding PinLock, Converter={StaticResource inverseBool}}"
+                    Padding="0, 10, 0, 0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Label
+                        Text="{u:I18n MasterPassword}"
+                        StyleClass="box-label"
+                        Grid.Row="0"
+                        Grid.Column="0" />
+                    <controls:MonoEntry
+                        x:Name="_masterPassword"
+                        Text="{Binding MasterPassword}"
+                        StyleClass="box-value"
+                        IsSpellCheckEnabled="False"
+                        IsTextPredictionEnabled="False"
+                        IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        ReturnType="Go"
+                        ReturnCommand="{Binding SubmitCommand}" />
+                    <controls:IconButton
+                        StyleClass="box-row-button, box-row-button-platform"
+                        Text="{Binding ShowPasswordIcon}"
+                        Command="{Binding TogglePasswordCommand}"
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        Grid.RowSpan="2"
+                        AutomationProperties.IsInAccessibleTree="True"
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
+                </Grid>
+                <StackLayout
+                    StyleClass="box-row"
+                    Padding="0, 10, 0, 0">
+                    <Label
+                    Text="{Binding LockedVerifyText}"
+                    StyleClass="box-footer-label" />
+                    <Label
+                        Text="{Binding LoggedInAsText}"
+                        StyleClass="box-footer-label"
+                        Margin="0, 10, 0, 0" />
+                </StackLayout>
+            </StackLayout>
+            <StackLayout Padding="10, 0">
+                <Label
+                    Text="{u:I18n BiometricInvalidated}"
+                    StyleClass="box-footer-label,text-danger,text-bold"
+                    IsVisible="{Binding BiometricIntegrityValid, Converter={StaticResource inverseBool}}" />
+                <Button Text="{Binding BiometricButtonText}" Clicked="Biometric_Clicked"
+                        IsVisible="{Binding BiometricButtonVisible}"></Button>
+                <Button
+                    x:Name="_unlockButton"
+                    Text="{u:I18n Unlock}"
+                    StyleClass="btn-primary"
+                    Clicked="Unlock_Clicked" />
+            </StackLayout>
+        </StackLayout>
+    </ScrollView>
 
 </pages:BaseContentPage>

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

@@ -1,9 +1,10 @@
-using System;
-using System.Threading.Tasks;
-using Bit.App.Models;
+using Bit.App.Models;
 using Bit.App.Resources;
-using Bit.App.Utilities;
+using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
+using System;
+using System.Threading.Tasks;
+using Bit.App.Utilities;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -61,14 +62,7 @@ namespace Bit.App.Pages
             {
                 return;
             }
-
             _appeared = true;
-            _mainContent.Content = _mainLayout;
-
-            _accountAvatar?.OnAppearing();
-
-            _vm.AvatarImageSource = await GetAvatarImageSourceAsync();
-
             await _vm.InitAsync();
             if (!_vm.BiometricLock)
             {
@@ -99,23 +93,6 @@ namespace Bit.App.Pages
             }
         }
 
-        protected override bool OnBackButtonPressed()
-        {
-            if (_accountListOverlay.IsVisible)
-            {
-                _accountListOverlay.HideAsync().FireAndForget();
-                return true;
-            }
-            return false;
-        }
-
-        protected override void OnDisappearing()
-        {
-            base.OnDisappearing();
-
-            _accountAvatar?.OnDisappearing();
-        }
-
         private void Unlock_Clicked(object sender, EventArgs e)
         {
             if (DoOnce())
@@ -130,7 +107,6 @@ namespace Bit.App.Pages
 
         private async void LogOut_Clicked(object sender, EventArgs e)
         {
-            await _accountListOverlay.HideAsync();
             if (DoOnce())
             {
                 await _vm.LogOutAsync();
@@ -147,8 +123,6 @@ namespace Bit.App.Pages
 
         private async void More_Clicked(object sender, System.EventArgs e)
         {
-            await _accountListOverlay.HideAsync();
-
             if (!DoOnce())
             {
                 return;

src/App/Pages/Accounts/LockPageViewModel.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Threading.Tasks;
 using Bit.App.Abstractions;
-using Bit.App.Controls;
 using Bit.App.Resources;
 using Bit.App.Utilities;
 using Bit.Core;
@@ -11,6 +10,9 @@ using Bit.Core.Models.Domain;
 using Bit.Core.Models.Request;
 using Bit.Core.Utilities;
 using Xamarin.Forms;
+#if !FDROID
+using Microsoft.AppCenter.Crashes;
+#endif
 
 namespace Bit.App.Pages
 {
@@ -21,12 +23,14 @@ namespace Bit.App.Pages
         private readonly IDeviceActionService _deviceActionService;
         private readonly IVaultTimeoutService _vaultTimeoutService;
         private readonly ICryptoService _cryptoService;
+        private readonly IStorageService _storageService;
+        private readonly IUserService _userService;
         private readonly IMessagingService _messagingService;
+        private readonly IStorageService _secureStorageService;
         private readonly IEnvironmentService _environmentService;
         private readonly IStateService _stateService;
         private readonly IBiometricService _biometricService;
         private readonly IKeyConnectorService _keyConnectorService;
-        private readonly ILogger _logger;
 
         private string _email;
         private bool _showPassword;
@@ -38,8 +42,7 @@ namespace Bit.App.Pages
         private string _biometricButtonText;
         private string _loggedInAsText;
         private string _lockedVerifyText;
-        private bool _isPinProtected;
-        private bool _isPinProtectedWithKey;
+        private Tuple<bool, bool> _pinSet;
 
         public LockPageViewModel()
         {
@@ -48,22 +51,18 @@ namespace Bit.App.Pages
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
             _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
             _cryptoService = ServiceContainer.Resolve<ICryptoService>("cryptoService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
+            _userService = ServiceContainer.Resolve<IUserService>("userService");
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
+            _secureStorageService = ServiceContainer.Resolve<IStorageService>("secureStorageService");
             _environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
             _stateService = ServiceContainer.Resolve<IStateService>("stateService");
             _biometricService = ServiceContainer.Resolve<IBiometricService>("biometricService");
             _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
-            _logger = ServiceContainer.Resolve<ILogger>("logger");
 
             PageTitle = AppResources.VerifyMasterPassword;
             TogglePasswordCommand = new Command(TogglePassword);
             SubmitCommand = new Command(async () => await SubmitAsync());
-
-            AccountSwitchingOverlayViewModel = new AccountSwitchingOverlayViewModel(_stateService, _messagingService, _logger)
-            {
-                AllowAddAccountRow = true,
-                AllowActiveAccountSelection = true
-            };
         }
 
         public bool ShowPassword
@@ -123,8 +122,6 @@ namespace Bit.App.Pages
             set => SetProperty(ref _lockedVerifyText, value);
         }
 
-        public AccountSwitchingOverlayViewModel AccountSwitchingOverlayViewModel { get; }
-
         public Command SubmitCommand { get; }
         public Command TogglePasswordCommand { get; }
         public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
@@ -134,9 +131,8 @@ namespace Bit.App.Pages
 
         public async Task InitAsync()
         {
-            (_isPinProtected, _isPinProtectedWithKey) = await _vaultTimeoutService.IsPinLockSetAsync();
-            PinLock = (_isPinProtected && await _stateService.GetPinProtectedKeyAsync() != null) ||
-                      _isPinProtectedWithKey;
+            _pinSet = await _vaultTimeoutService.IsPinLockSetAsync();
+            PinLock = (_pinSet.Item1 && _vaultTimeoutService.PinProtectedKey != null) || _pinSet.Item2;
             BiometricLock = await _vaultTimeoutService.IsBiometricLockSetAsync() && await _cryptoService.HasKeyAsync();
 
             // Users with key connector and without biometric or pin has no MP to unlock with
@@ -146,14 +142,16 @@ namespace Bit.App.Pages
                 await _vaultTimeoutService.LogOutAsync();
                 return;
             }
-            _email = await _stateService.GetEmailAsync();
+            _email = await _userService.GetEmailAsync();
             if (string.IsNullOrWhiteSpace(_email))
             {
                 await _vaultTimeoutService.LogOutAsync();
-                _logger.Exception(new NullReferenceException("Email not found in storage"));
+#if !FDROID
+                Crashes.TrackError(new NullReferenceException("Email not found in storage"));
+#endif
                 return;
             }
-            var webVault = _environmentService.GetWebVaultUrl(true);
+            var webVault = _environmentService.GetWebVaultUrl();
             if (string.IsNullOrWhiteSpace(webVault))
             {
                 webVault = "https://bitwarden.com";
@@ -217,21 +215,21 @@ namespace Bit.App.Pages
             }
 
             ShowPassword = false;
-            var kdf = await _stateService.GetKdfTypeAsync();
-            var kdfIterations = await _stateService.GetKdfIterationsAsync();
+            var kdf = await _userService.GetKdfAsync();
+            var kdfIterations = await _userService.GetKdfIterationsAsync();
 
             if (PinLock)
             {
                 var failed = true;
                 try
                 {
-                    if (_isPinProtected)
+                    if (_pinSet.Item1)
                     {
                         var key = await _cryptoService.MakeKeyFromPinAsync(Pin, _email,
                             kdf.GetValueOrDefault(KdfType.PBKDF2_SHA256), kdfIterations.GetValueOrDefault(5000),
-                            await _stateService.GetPinProtectedKeyAsync());
+                            _vaultTimeoutService.PinProtectedKey);
                         var encKey = await _cryptoService.GetEncKeyAsync(key);
-                        var protectedPin = await _stateService.GetProtectedPinAsync();
+                        var protectedPin = await _storageService.GetAsync<string>(Constants.ProtectedPin);
                         var decPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), encKey);
                         failed = decPin != Pin;
                         if (!failed)
@@ -298,14 +296,14 @@ namespace Bit.App.Pages
                 }
                 if (passwordValid)
                 {
-                    if (_isPinProtected)
+                    if (_pinSet.Item1)
                     {
-                        var protectedPin = await _stateService.GetProtectedPinAsync();
+                        var protectedPin = await _storageService.GetAsync<string>(Constants.ProtectedPin);
                         var encKey = await _cryptoService.GetEncKeyAsync(key);
                         var decPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), encKey);
                         var pinKey = await _cryptoService.MakePinKeyAysnc(decPin, _email,
                             kdf.GetValueOrDefault(KdfType.PBKDF2_SHA256), kdfIterations.GetValueOrDefault(5000));
-                        await _stateService.SetPinProtectedKeyAsync(await _cryptoService.EncryptAsync(key.Key, pinKey));
+                        _vaultTimeoutService.PinProtectedKey = await _cryptoService.EncryptAsync(key.Key, pinKey);
                     }
                     MasterPassword = string.Empty;
                     await AppHelpers.ResetInvalidUnlockAttemptsAsync();
@@ -371,7 +369,7 @@ namespace Bit.App.Pages
                     page.MasterPasswordEntry.Focus();
                 }
             });
-            await _stateService.SetBiometricLockedAsync(!success);
+            _vaultTimeoutService.BiometricLocked = !success;
             if (success)
             {
                 await DoContinueAsync();
@@ -390,7 +388,9 @@ namespace Bit.App.Pages
 
         private async Task DoContinueAsync()
         {
-            await _stateService.SetBiometricLockedAsync(false);
+            _vaultTimeoutService.BiometricLocked = false;
+            var disableFavicon = await _storageService.GetAsync<bool?>(Constants.DisableFaviconKey);
+            await _stateService.SaveAsync(Constants.DisableFaviconKey, disableFavicon.GetValueOrDefault());
             _messagingService.Send("unlocked");
             UnlockedAction?.Invoke();
         }

src/App/Pages/Accounts/LoginPage.xaml

@@ -7,26 +7,12 @@
     xmlns:controls="clr-namespace:Bit.App.Controls"
     xmlns:u="clr-namespace:Bit.App.Utilities"
     x:DataType="pages:LoginPageViewModel"
-    x:Name="_page"
     Title="{Binding PageTitle}">
     
     <ContentPage.BindingContext>
         <pages:LoginPageViewModel />
     </ContentPage.BindingContext>
 
-    <ContentPage.ToolbarItems>
-        <controls:ExtendedToolbarItem
-                x:Name="_accountAvatar"
-                x:Key="accountAvatar"
-                IconImageSource="{Binding AvatarImageSource}"
-                Command="{Binding Source={x:Reference _accountListOverlay}, Path=ToggleVisibililtyCommand}"
-                Order="Primary"
-                Priority="-1"
-                UseOriginalImage="True"
-                AutomationProperties.IsInAccessibleTree="True"
-                AutomationProperties.Name="{u:I18n Account}" />
-    </ContentPage.ToolbarItems>
-
     <ContentPage.Resources>
         <ResourceDictionary>
             <u:InverseBoolConverter x:Key="inverseBool" />
@@ -38,101 +24,69 @@
                 x:Key="getPasswordHint"
                 x:Name="_getPasswordHint"
                 Clicked="Hint_Clicked" 
-                Order="Secondary" />
-            <ToolbarItem Text="{u:I18n RemoveAccount}"
-                x:Key="removeAccount"
-                x:Name="_removeAccount"
-                Clicked="RemoveAccount_Clicked" 
-                Order="Secondary" />
-
-            <ScrollView x:Name="_mainLayout" x:Key="mainLayout">
-                <StackLayout Spacing="20">
-                    <StackLayout StyleClass="box">
-                        <StackLayout StyleClass="box-row">
-                            <Label
-                                Text="{u:I18n EmailAddress}"
-                                StyleClass="box-label" />
-                            <Entry
-                                x:Name="_email"
-                                Text="{Binding Email}"
-                                Keyboard="Email"
-                                StyleClass="box-value">
-                                <VisualStateManager.VisualStateGroups>
-                                    <VisualStateGroup x:Name="CommonStates">
-                                        <VisualState x:Name="Disabled">
-                                            <VisualState.Setters>
-                                                <Setter Property="TextColor" Value="{DynamicResource MutedColor}" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-                                    </VisualStateGroup>
-                                </VisualStateManager.VisualStateGroups>
-                                </Entry>
-                        </StackLayout>
-                        <Grid StyleClass="box-row">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <Label
-                                Text="{u:I18n MasterPassword}"
-                                StyleClass="box-label"
-                                Grid.Row="0"
-                                Grid.Column="0" />
-                            <controls:MonoEntry
-                                x:Name="_masterPassword"
-                                Text="{Binding MasterPassword}"
-                                StyleClass="box-value"
-                                IsSpellCheckEnabled="False"
-                                IsTextPredictionEnabled="False"
-                                IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
-                                Grid.Row="1"
-                                Grid.Column="0"
-                                ReturnType="Go"
-                                ReturnCommand="{Binding LogInCommand}" />
-                            <controls:IconButton
-                                StyleClass="box-row-button, box-row-button-platform"
-                                Text="{Binding ShowPasswordIcon}"
-                                Command="{Binding TogglePasswordCommand}"
-                                Grid.Row="0"
-                                Grid.Column="1"
-                                Grid.RowSpan="2"
-                                AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n ToggleVisibility}" />
-                        </Grid>
-                    </StackLayout>
-                    <StackLayout Padding="10, 0">
-                        <Button Text="{u:I18n LogIn}" 
-                                StyleClass="btn-primary"
-                                Clicked="LogIn_Clicked" />
-                        <Button Text="{u:I18n Cancel}"
-                                IsVisible="{Binding ShowCancelButton}"
-                                Clicked="Cancel_Clicked" />
-                    </StackLayout>
-                </StackLayout>
-            </ScrollView>
+                Order="Secondary"/>
         </ResourceDictionary>
     </ContentPage.Resources>
-    
-    <AbsoluteLayout
-        x:Name="_absLayout"
-        VerticalOptions="FillAndExpand"
-        HorizontalOptions="FillAndExpand">
-        <ContentView
-            x:Name="_mainContent"
-            AbsoluteLayout.LayoutFlags="All"
-            AbsoluteLayout.LayoutBounds="0, 0, 1, 1">
-        </ContentView>
 
-        <controls:AccountSwitchingOverlayView
-            x:Name="_accountListOverlay"
-            AbsoluteLayout.LayoutBounds="0, 0, 1, 1"
-            AbsoluteLayout.LayoutFlags="All"
-            MainPage="{Binding Source={x:Reference _page}}"
-            BindingContext="{Binding AccountSwitchingOverlayViewModel}"/>
-    </AbsoluteLayout>
+    <ContentPage.ToolbarItems>
+        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
+    </ContentPage.ToolbarItems>
+
+    <ScrollView>
+        <StackLayout Spacing="20">
+            <StackLayout StyleClass="box">
+                <StackLayout StyleClass="box-row">
+                    <Label
+                        Text="{u:I18n EmailAddress}"
+                        StyleClass="box-label" />
+                    <Entry
+                        x:Name="_email"
+                        Text="{Binding Email}"
+                        Keyboard="Email"
+                        StyleClass="box-value" />
+                </StackLayout>
+                <Grid StyleClass="box-row">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Label
+                        Text="{u:I18n MasterPassword}"
+                        StyleClass="box-label"
+                        Grid.Row="0"
+                        Grid.Column="0" />
+                    <controls:MonoEntry
+                        x:Name="_masterPassword"
+                        Text="{Binding MasterPassword}"
+                        StyleClass="box-value"
+                        IsSpellCheckEnabled="False"
+                        IsTextPredictionEnabled="False"
+                        IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        ReturnType="Go"
+                        ReturnCommand="{Binding LogInCommand}" />
+                    <controls:IconButton
+                        StyleClass="box-row-button, box-row-button-platform"
+                        Text="{Binding ShowPasswordIcon}"
+                        Command="{Binding TogglePasswordCommand}"
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        Grid.RowSpan="2"
+                        AutomationProperties.IsInAccessibleTree="True"
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
+                </Grid>
+            </StackLayout>
+            <StackLayout Padding="10, 0">
+                <Button Text="{u:I18n LogIn}" 
+                        StyleClass="btn-primary"
+                        Clicked="LogIn_Clicked" />
+            </StackLayout>
+        </StackLayout>
+    </ScrollView>
 
 </pages:BaseContentPage>

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

@@ -1,15 +1,18 @@
-using System;
-using System.Threading.Tasks;
-using Bit.App.Models;
+using Bit.App.Models;
 using Bit.App.Resources;
-using Bit.App.Utilities;
+using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
+using System;
+using System.Threading.Tasks;
+using Bit.App.Utilities;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
     public partial class LoginPage : BaseContentPage
     {
+        private readonly IMessagingService _messagingService;
+        private readonly IStorageService _storageService;
         private readonly LoginPageViewModel _vm;
         private readonly AppOptions _appOptions;
 
@@ -17,6 +20,9 @@ namespace Bit.App.Pages
 
         public LoginPage(string email = null, AppOptions appOptions = null)
         {
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
+            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
+            _messagingService.Send("showStatusBar", true);
             _appOptions = appOptions;
             InitializeComponent();
             _vm = BindingContext as LoginPageViewModel;
@@ -27,19 +33,15 @@ namespace Bit.App.Pages
                 () => Device.BeginInvokeOnMainThread(async () => await UpdateTempPasswordAsync());
             _vm.CloseAction = async () =>
             {
-                await _accountListOverlay.HideAsync();
+                _messagingService.Send("showStatusBar", false);
                 await Navigation.PopModalAsync();
             };
-            if (!string.IsNullOrWhiteSpace(email))
-            {
-                _email.IsEnabled = false;
-            }
-            else
-            {
-                _vm.ShowCancelButton = true;
-            }
             _vm.Email = email;
             MasterPasswordEntry = _masterPassword;
+            if (Device.RuntimePlatform == Device.Android)
+            {
+                ToolbarItems.RemoveAt(0);
+            }
 
             _email.ReturnType = ReturnType.Next;
             _email.ReturnCommand = new Command(() => _masterPassword.Focus());
@@ -52,21 +54,6 @@ namespace Bit.App.Pages
             {
                 ToolbarItems.Add(_getPasswordHint);
             }
-
-            if (Device.RuntimePlatform == Device.Android && !_email.IsEnabled)
-            {
-                ToolbarItems.Add(_removeAccount);
-            }
-
-            if (_appOptions?.IosExtension ?? false)
-            {
-                _vm.ShowCancelButton = true;
-            }
-
-            if (_appOptions?.HideAccountSwitcher ?? false)
-            {
-                ToolbarItems.Remove(_accountAvatar);
-            }
         }
 
         public Entry MasterPasswordEntry { get; set; }
@@ -74,13 +61,6 @@ namespace Bit.App.Pages
         protected override async void OnAppearing()
         {
             base.OnAppearing();
-            _mainContent.Content = _mainLayout;
-            _accountAvatar?.OnAppearing();
-
-            if (!_appOptions?.HideAccountSwitcher ?? false)
-            {
-                _vm.AvatarImageSource = await GetAvatarImageSourceAsync();
-            }
             await _vm.InitAsync();
             if (!_inputFocused)
             {
@@ -89,28 +69,11 @@ namespace Bit.App.Pages
             }
         }
 
-        protected override bool OnBackButtonPressed()
-        {
-            if (_accountListOverlay.IsVisible)
-            {
-                _accountListOverlay.HideAsync().FireAndForget();
-                return true;
-            }
-            return false;
-        }
-
-        protected override void OnDisappearing()
-        {
-            base.OnDisappearing();
-
-            _accountAvatar?.OnDisappearing();
-        }
-
         private async void LogIn_Clicked(object sender, EventArgs e)
         {
             if (DoOnce())
             {
-                await _vm.LogInAsync(true, _email.IsEnabled);
+                await _vm.LogInAsync();
             }
         }
 
@@ -122,16 +85,7 @@ namespace Bit.App.Pages
             }
         }
 
-        private async void RemoveAccount_Clicked(object sender, EventArgs e)
-        {
-            await _accountListOverlay.HideAsync();
-            if (DoOnce())
-            {
-                await _vm.RemoveAccountAsync();
-            }
-        }
-
-        private void Cancel_Clicked(object sender, EventArgs e)
+        private void Close_Clicked(object sender, EventArgs e)
         {
             if (DoOnce())
             {
@@ -141,25 +95,18 @@ namespace Bit.App.Pages
 
         private async void More_Clicked(object sender, System.EventArgs e)
         {
-            await _accountListOverlay.HideAsync();
             if (!DoOnce())
             {
                 return;
             }
 
-            var buttons = _email.IsEnabled ? new[] { AppResources.GetPasswordHint }
-                : new[] { AppResources.GetPasswordHint, AppResources.RemoveAccount };
-            var selection = await DisplayActionSheet(AppResources.Options,
-                AppResources.Cancel, null, buttons);
+            var selection = await DisplayActionSheet(AppResources.Options, 
+                AppResources.Cancel, null, AppResources.GetPasswordHint);
 
             if (selection == AppResources.GetPasswordHint)
             {
                 await Navigation.PushModalAsync(new NavigationPage(new HintPage()));
             }
-            else if (selection == AppResources.RemoveAccount)
-            {
-                await _vm.RemoveAccountAsync();
-            }
         }
 
         private async Task StartTwoFactorAsync()

src/App/Pages/Accounts/LoginPageViewModel.cs

@@ -1,31 +1,31 @@
-using System;
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
-using Bit.App.Controls;
+using Bit.App.Abstractions;
 using Bit.App.Resources;
-using Bit.App.Utilities;
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Exceptions;
 using Bit.Core.Utilities;
+using System;
+using System.Threading.Tasks;
+using Bit.App.Utilities;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
     public class LoginPageViewModel : CaptchaProtectedViewModel
     {
+        private const string Keys_RememberedEmail = "rememberedEmail";
+        private const string Keys_RememberEmail = "rememberEmail";
+
         private readonly IDeviceActionService _deviceActionService;
         private readonly IAuthService _authService;
         private readonly ISyncService _syncService;
+        private readonly IStorageService _storageService;
         private readonly IPlatformUtilsService _platformUtilsService;
         private readonly IStateService _stateService;
         private readonly IEnvironmentService _environmentService;
         private readonly II18nService _i18nService;
-        private readonly IMessagingService _messagingService;
-        private readonly ILogger _logger;
 
         private bool _showPassword;
-        private bool _showCancelButton;
         private string _email;
         private string _masterPassword;
 
@@ -34,22 +34,15 @@ namespace Bit.App.Pages
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
             _authService = ServiceContainer.Resolve<IAuthService>("authService");
             _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
             _stateService = ServiceContainer.Resolve<IStateService>("stateService");
             _environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
             _i18nService = ServiceContainer.Resolve<II18nService>("i18nService");
-            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
-            _logger = ServiceContainer.Resolve<ILogger>("logger");
 
             PageTitle = AppResources.Bitwarden;
             TogglePasswordCommand = new Command(TogglePassword);
             LogInCommand = new Command(async () => await LogInAsync());
-
-            AccountSwitchingOverlayViewModel = new AccountSwitchingOverlayViewModel(_stateService, _messagingService, _logger)
-            {
-                AllowAddAccountRow = true,
-                AllowActiveAccountSelection = true
-            };
         }
 
         public bool ShowPassword
@@ -62,12 +55,6 @@ namespace Bit.App.Pages
                 });
         }
 
-        public bool ShowCancelButton
-        {
-            get => _showCancelButton;
-            set => SetProperty(ref _showCancelButton, value);
-        }
-        
         public string Email
         {
             get => _email;
@@ -80,11 +67,10 @@ namespace Bit.App.Pages
             set => SetProperty(ref _masterPassword, value);
         }
 
-        public AccountSwitchingOverlayViewModel AccountSwitchingOverlayViewModel { get; }
-
         public Command LogInCommand { get; }
         public Command TogglePasswordCommand { get; }
         public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
+        public bool RememberEmail { get; set; }
         public Action StartTwoFactorAction { get; set; }
         public Action LogInSuccessAction { get; set; }
         public Action UpdateTempPasswordAction { get; set; }
@@ -99,11 +85,13 @@ namespace Bit.App.Pages
         {
             if (string.IsNullOrWhiteSpace(Email))
             {
-                Email = await _stateService.GetRememberedEmailAsync();
+                Email = await _storageService.GetAsync<string>(Keys_RememberedEmail);
             }
+            var rememberEmail = await _storageService.GetAsync<bool?>(Keys_RememberEmail);
+            RememberEmail = rememberEmail.GetValueOrDefault(true);
         }
 
-        public async Task LogInAsync(bool showLoading = true, bool checkForExistingAccount = false)
+        public async Task LogInAsync(bool showLoading = true)
         {
             if (Xamarin.Essentials.Connectivity.NetworkAccess == Xamarin.Essentials.NetworkAccess.None)
             {
@@ -135,27 +123,20 @@ namespace Bit.App.Pages
             ShowPassword = false;
             try
             {
-                if (checkForExistingAccount)
-                {
-                    var userId = await _stateService.GetUserIdAsync(Email);
-                    if (!string.IsNullOrWhiteSpace(userId))
-                    {
-                        var userEnvUrls = await _stateService.GetEnvironmentUrlsAsync(userId);
-                        if (userEnvUrls?.Base == _environmentService.BaseUrl)
-                        {
-                            await PromptToSwitchToExistingAccountAsync(userId);
-                            return;
-                        }
-                    }
-                }
-
                 if (showLoading)
                 {
                     await _deviceActionService.ShowLoadingAsync(AppResources.LoggingIn);
                 }
 
                 var response = await _authService.LogInAsync(Email, MasterPassword, _captchaToken);
-                await _stateService.SetRememberedEmailAsync(Email);
+                if (RememberEmail)
+                {
+                    await _storageService.SaveAsync(Keys_RememberedEmail, Email);
+                }
+                else
+                {
+                    await _storageService.RemoveAsync(Keys_RememberedEmail);
+                }
                 await AppHelpers.ResetInvalidUnlockAttemptsAsync();
 
                 if (response.CaptchaNeeded)
@@ -182,6 +163,8 @@ namespace Bit.App.Pages
                 }
                 else
                 {
+                    var disableFavicon = await _storageService.GetAsync<bool?>(Constants.DisableFaviconKey);
+                    await _stateService.SaveAsync(Constants.DisableFaviconKey, disableFavicon.GetValueOrDefault());
                     var task = Task.Run(async () => await _syncService.FullSyncAsync(true));
                     LogInSuccessAction?.Invoke();
                 }
@@ -206,34 +189,5 @@ namespace Bit.App.Pages
             entry.Focus();
             entry.CursorPosition = String.IsNullOrEmpty(MasterPassword) ? 0 : MasterPassword.Length;
         }
-
-        public async Task RemoveAccountAsync()
-        {
-            try
-            {
-                var confirmed = await _platformUtilsService.ShowDialogAsync(AppResources.RemoveAccountConfirmation,
-                    AppResources.RemoveAccount, AppResources.Yes, AppResources.Cancel);
-                if (confirmed)
-                {
-                    _messagingService.Send("logout");
-                }
-            }
-            catch (Exception e)
-            {
-                _logger.Exception(e);
-            }
-        }
-
-        private async Task PromptToSwitchToExistingAccountAsync(string userId)
-        {
-            var switchToAccount = await _platformUtilsService.ShowDialogAsync(
-                AppResources.SwitchToAlreadyAddedAccountConfirmation,
-                AppResources.AccountAlreadyAdded, AppResources.Yes, AppResources.Cancel);
-            if (switchToAccount)
-            {
-                await _stateService.SetActiveUserAsync(userId);
-                _messagingService.Send("switchedAccount");
-            }
-        }
     }
 }

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

@@ -10,6 +10,8 @@ namespace Bit.App.Pages
 {
     public partial class LoginSsoPage : BaseContentPage
     {
+        private readonly IStorageService _storageService;
+        private readonly IMessagingService _messagingService;
         private readonly IVaultTimeoutService _vaultTimeoutService;
         private readonly LoginSsoPageViewModel _vm;
         private readonly AppOptions _appOptions;
@@ -18,7 +20,10 @@ namespace Bit.App.Pages
 
         public LoginSsoPage(AppOptions appOptions = null)
         {
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
+            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
             _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
+            _messagingService.Send("showStatusBar", true);
             _appOptions = appOptions;
             InitializeComponent();
             _vm = BindingContext as LoginSsoPageViewModel;
@@ -31,6 +36,7 @@ namespace Bit.App.Pages
                 () => Device.BeginInvokeOnMainThread(async () => await UpdateTempPasswordAsync());
             _vm.CloseAction = async () =>
             {
+                _messagingService.Send("showStatusBar", false);
                 await Navigation.PopModalAsync();
             };
             if (Device.RuntimePlatform == Device.Android)

src/App/Pages/Accounts/LoginSsoPageViewModel.cs

@@ -1,5 +1,6 @@
 using Bit.App.Abstractions;
 using Bit.App.Resources;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 using System;
@@ -15,12 +16,16 @@ namespace Bit.App.Pages
 {
     public class LoginSsoPageViewModel : BaseViewModel
     {
+        private const string Keys_RememberedOrgIdentifier = "rememberedOrgIdentifier";
+        private const string Keys_RememberOrgIdentifier = "rememberOrgIdentifier";
+
         private readonly IDeviceActionService _deviceActionService;
         private readonly IAuthService _authService;
         private readonly ISyncService _syncService;
         private readonly IApiService _apiService;
         private readonly IPasswordGenerationService _passwordGenerationService;
         private readonly ICryptoFunctionService _cryptoFunctionService;
+        private readonly IStorageService _storageService;
         private readonly IPlatformUtilsService _platformUtilsService;
         private readonly IStateService _stateService;
 
@@ -35,6 +40,7 @@ namespace Bit.App.Pages
             _passwordGenerationService =
                 ServiceContainer.Resolve<IPasswordGenerationService>("passwordGenerationService");
             _cryptoFunctionService = ServiceContainer.Resolve<ICryptoFunctionService>("cryptoFunctionService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
             _stateService = ServiceContainer.Resolve<IStateService>("stateService");
 
@@ -49,6 +55,7 @@ namespace Bit.App.Pages
         }
 
         public Command LogInCommand { get; }
+        public bool RememberOrgIdentifier { get; set; }
         public Action StartTwoFactorAction { get; set; }
         public Action StartSetPasswordAction { get; set; }
         public Action SsoAuthSuccessAction { get; set; }
@@ -59,8 +66,10 @@ namespace Bit.App.Pages
         {
             if (string.IsNullOrWhiteSpace(OrgIdentifier))
             {
-                OrgIdentifier = await _stateService.GetRememberedOrgIdentifierAsync();
+                OrgIdentifier = await _storageService.GetAsync<string>(Keys_RememberedOrgIdentifier);
             }
+            var rememberOrgIdentifier = await _storageService.GetAsync<bool?>(Keys_RememberOrgIdentifier);
+            RememberOrgIdentifier = rememberOrgIdentifier.GetValueOrDefault(true);
         }
 
         public async Task LogInAsync()
@@ -161,7 +170,14 @@ namespace Bit.App.Pages
             {
                 var response = await _authService.LogInSsoAsync(code, codeVerifier, redirectUri, orgId);
                 await AppHelpers.ResetInvalidUnlockAttemptsAsync();
-                await _stateService.SetRememberedOrgIdentifierAsync(OrgIdentifier);
+                if (RememberOrgIdentifier)
+                {
+                    await _storageService.SaveAsync(Keys_RememberedOrgIdentifier, OrgIdentifier);
+                }
+                else
+                {
+                    await _storageService.RemoveAsync(Keys_RememberedOrgIdentifier);
+                }
                 await _deviceActionService.HideLoadingAsync();
                 if (response.TwoFactor)
                 {
@@ -177,6 +193,8 @@ namespace Bit.App.Pages
                 }
                 else
                 {
+                    var disableFavicon = await _storageService.GetAsync<bool?>(Constants.DisableFaviconKey);
+                    await _stateService.SaveAsync(Constants.DisableFaviconKey, disableFavicon.GetValueOrDefault());
                     var task = Task.Run(async () => await _syncService.FullSyncAsync(true));
                     SsoAuthSuccessAction?.Invoke();
                 }

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

@@ -1,4 +1,6 @@
-using System;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+using System;
 using System.Threading.Tasks;
 using Xamarin.Forms;
 
@@ -6,18 +8,22 @@ namespace Bit.App.Pages
 {
     public partial class RegisterPage : BaseContentPage
     {
+        private readonly IMessagingService _messagingService;
         private readonly RegisterPageViewModel _vm;
 
         private bool _inputFocused;
 
         public RegisterPage(HomePage homePage)
         {
+            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
+            _messagingService.Send("showStatusBar", true);
             InitializeComponent();
             _vm = BindingContext as RegisterPageViewModel;
             _vm.Page = this;
             _vm.RegistrationSuccess = () => Device.BeginInvokeOnMainThread(async () => await RegistrationSuccessAsync(homePage));
             _vm.CloseAction = async () =>
             {
+                _messagingService.Send("showStatusBar", false);
                 await Navigation.PopModalAsync();
             };
             MasterPasswordEntry = _masterPassword;

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

@@ -1,4 +1,6 @@
-using System;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+using System;
 using System.Threading.Tasks;
 using Bit.App.Models;
 using Bit.App.Utilities;
@@ -8,11 +10,14 @@ namespace Bit.App.Pages
 {
     public partial class SetPasswordPage : BaseContentPage
     {
+        private readonly IMessagingService _messagingService;
         private readonly SetPasswordPageViewModel _vm;
         private readonly AppOptions _appOptions;
 
         public SetPasswordPage(AppOptions appOptions = null, string orgIdentifier = null)
         {
+            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
+            _messagingService.Send("showStatusBar", true);
             _appOptions = appOptions;
             InitializeComponent();
             _vm = BindingContext as SetPasswordPageViewModel;
@@ -21,6 +26,7 @@ namespace Bit.App.Pages
                 () => Device.BeginInvokeOnMainThread(async () => await SetPasswordSuccessAsync());
             _vm.CloseAction = async () =>
             {
+                _messagingService.Send("showStatusBar", false);
                 await Navigation.PopModalAsync();
             };
             _vm.OrgIdentifier = orgIdentifier;

src/App/Pages/Accounts/SetPasswordPageViewModel.cs

@@ -7,6 +7,7 @@ using Bit.Core.Models.Request;
 using Bit.Core.Utilities;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
@@ -23,7 +24,7 @@ namespace Bit.App.Pages
         private readonly IApiService _apiService;
         private readonly ICryptoService _cryptoService;
         private readonly IPlatformUtilsService _platformUtilsService;
-        private readonly IStateService _stateService;
+        private readonly IUserService _userService;
         private readonly IPolicyService _policyService;
         private readonly IPasswordGenerationService _passwordGenerationService;
         private readonly II18nService _i18nService;
@@ -40,7 +41,7 @@ namespace Bit.App.Pages
             _apiService = ServiceContainer.Resolve<IApiService>("apiService");
             _cryptoService = ServiceContainer.Resolve<ICryptoService>("cryptoService");
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _userService = ServiceContainer.Resolve<IUserService>("userService");
             _policyService = ServiceContainer.Resolve<IPolicyService>("policyService");
             _passwordGenerationService =
                 ServiceContainer.Resolve<IPasswordGenerationService>("passwordGenerationService");
@@ -159,7 +160,7 @@ namespace Bit.App.Pages
 
             var kdf = KdfType.PBKDF2_SHA256;
             var kdfIterations = 100000;
-            var email = await _stateService.GetEmailAsync();
+            var email = await _userService.GetEmailAsync();
             var key = await _cryptoService.MakeKeyAsync(MasterPassword, email, kdf, kdfIterations);
             var masterPasswordHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.ServerAuthorization);
             var localMasterPasswordHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.LocalAuthorization);
@@ -196,8 +197,8 @@ namespace Bit.App.Pages
                 await _deviceActionService.ShowLoadingAsync(AppResources.CreatingAccount);
                 // Set Password and relevant information
                 await _apiService.SetPasswordAsync(request);
-                await _stateService.SetKdfTypeAsync(kdf);
-                await _stateService.SetKdfIterationsAsync(kdfIterations);
+                await _userService.SetInformationAsync(await _userService.GetUserIdAsync(),
+                    await _userService.GetEmailAsync(), kdf, kdfIterations);
                 await _cryptoService.SetKeyAsync(key);
                 await _cryptoService.SetKeyHashAsync(localMasterPasswordHash);
                 await _cryptoService.SetEncKeyAsync(encKey.Item2.EncryptedString);
@@ -216,7 +217,7 @@ namespace Bit.App.Pages
                     {
                         ResetPasswordKey = encryptedKey.EncryptedString
                     };
-                    var userId = await _stateService.GetActiveUserIdAsync();
+                    var userId = await _userService.GetUserIdAsync();
                     // Enroll user
                     await _apiService.PutOrganizationUserResetPasswordEnrollmentAsync(OrgId, userId, resetRequest);
                 }
@@ -289,7 +290,7 @@ namespace Bit.App.Pages
 
         private async Task<List<string>> GetPasswordStrengthUserInput()
         {
-            var email = await _stateService.GetEmailAsync();
+            var email = await _userService.GetEmailAsync();
             List<string> userInput = null;
             var atPosition = email.IndexOf('@');
             if (atPosition > -1)

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

@@ -14,6 +14,8 @@ namespace Bit.App.Pages
     {
         private readonly IBroadcasterService _broadcasterService;
         private readonly IMessagingService _messagingService;
+        private readonly IStorageService _storageService;
+        private readonly IVaultTimeoutService _vaultTimeoutService;
         private readonly AppOptions _appOptions;
 
         private TwoFactorPageViewModel _vm;
@@ -28,8 +30,10 @@ namespace Bit.App.Pages
             _authingWithSso = authingWithSso ?? false;
             _appOptions = appOptions;
             _orgIdentifier = orgIdentifier;
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
             _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
+            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
             _vm = BindingContext as TwoFactorPageViewModel;
             _vm.Page = this;
             _vm.StartSetPasswordAction = () =>

src/App/Pages/Accounts/TwoFactorPageViewModel.cs

@@ -1,5 +1,6 @@
 using Bit.App.Abstractions;
 using Bit.App.Resources;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
@@ -17,18 +18,18 @@ using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
-    public class TwoFactorPageViewModel : CaptchaProtectedViewModel
+    public class TwoFactorPageViewModel : BaseViewModel
     {
         private readonly IDeviceActionService _deviceActionService;
         private readonly IAuthService _authService;
         private readonly ISyncService _syncService;
+        private readonly IStorageService _storageService;
         private readonly IApiService _apiService;
         private readonly IPlatformUtilsService _platformUtilsService;
         private readonly IEnvironmentService _environmentService;
         private readonly IMessagingService _messagingService;
         private readonly IBroadcasterService _broadcasterService;
         private readonly IStateService _stateService;
-        private readonly II18nService _i18nService;
 
         private TwoFactorProviderType? _selectedProviderType;
         private string _totpInstruction;
@@ -42,13 +43,13 @@ namespace Bit.App.Pages
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
             _authService = ServiceContainer.Resolve<IAuthService>("authService");
             _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
             _apiService = ServiceContainer.Resolve<IApiService>("apiService");
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
             _environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
             _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
-            _i18nService = ServiceContainer.Resolve<II18nService>("i18nService");
+            _stateService = ServiceContainer.Resolve<IStateService>("stateService"); 
 
             PageTitle = AppResources.TwoStepLogin;
             SubmitCommand = new Command(async () => await SubmitAsync());
@@ -113,11 +114,6 @@ namespace Bit.App.Pages
         public Action StartSetPasswordAction { get; set; }
         public Action CloseAction { get; set; }
         public Action UpdateTempPasswordAction { get; set; }
-        
-        protected override II18nService i18nService => _i18nService;
-        protected override IEnvironmentService environmentService => _environmentService;
-        protected override IDeviceActionService deviceActionService => _deviceActionService;
-        protected override IPlatformUtilsService platformUtilsService => _platformUtilsService;
 
         public void Init()
         {
@@ -292,24 +288,11 @@ namespace Bit.App.Pages
                 {
                     await _deviceActionService.ShowLoadingAsync(AppResources.Validating);
                 }
-                var result = await _authService.LogInTwoFactorAsync(SelectedProviderType.Value, Token, _captchaToken, Remember);
-                
-                if (result.CaptchaNeeded)
-                {
-                    if (await HandleCaptchaAsync(result.CaptchaSiteKey))
-                    {
-                        await SubmitAsync(false);
-                        _captchaToken = null;
-                    }
-                    return;
-                }
-                _captchaToken = null;
-                
+                var result = await _authService.LogInTwoFactorAsync(SelectedProviderType.Value, Token, Remember);
                 var task = Task.Run(() => _syncService.FullSyncAsync(true));
                 await _deviceActionService.HideLoadingAsync();
                 _messagingService.Send("listenYubiKeyOTP", false);
                 _broadcasterService.Unsubscribe(nameof(TwoFactorPage));
-                
                 if (_authingWithSso && result.ResetMasterPassword)
                 {
                     StartSetPasswordAction?.Invoke();
@@ -320,12 +303,13 @@ namespace Bit.App.Pages
                 } 
                 else
                 {
+                    var disableFavicon = await _storageService.GetAsync<bool?>(Constants.DisableFaviconKey);
+                    await _stateService.SaveAsync(Constants.DisableFaviconKey, disableFavicon.GetValueOrDefault());
                     TwoFactorAuthSuccessAction?.Invoke();
                 }
             }
             catch (ApiException e)
             {
-                _captchaToken = null;
                 await _deviceActionService.HideLoadingAsync();
                 if (e?.Error != null)
                 {

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

@@ -19,6 +19,9 @@ namespace Bit.App.Pages
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
             
+            // Service Use
+            _messagingService.Send("showStatusBar", true);
+            
             // Binding
             InitializeComponent();
             _pageName = string.Concat(nameof(UpdateTempPasswordPage), "_", DateTime.UtcNow.Ticks);

src/App/Pages/Accounts/UpdateTempPasswordPageViewModel.cs

@@ -43,9 +43,9 @@ namespace Bit.App.Pages
             }
             
             // Retrieve details for key generation
-            var kdf = await _stateService.GetKdfTypeAsync();
-            var kdfIterations = await _stateService.GetKdfIterationsAsync();
-            var email = await _stateService.GetEmailAsync();
+            var kdf = await _userService.GetKdfAsync();
+            var kdfIterations = await _userService.GetKdfIterationsAsync();
+            var email = await _userService.GetEmailAsync();
             
             // Create new key and hash new password
             var key = await _cryptoService.MakeKeyAsync(MasterPassword, email, kdf, kdfIterations);

src/App/Pages/Accounts/VerificationCodeViewModel.cs

@@ -1,16 +1,19 @@
 using System;
-using System.Threading.Tasks;
-using System.Windows.Input;
 using Bit.App.Abstractions;
 using Bit.App.Resources;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+using System.Threading.Tasks;
+using Bit.Core.Exceptions;
+using Xamarin.Forms;
+using Xamarin.CommunityToolkit.ObjectModel;
+using System.Windows.Input;
 using Bit.App.Utilities;
 using Bit.Core;
-using Bit.Core.Abstractions;
 using Bit.Core.Enums;
-using Bit.Core.Exceptions;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Forms;
+#if !FDROID
+using Microsoft.AppCenter.Crashes;
+#endif
 
 namespace Bit.App.Pages
 {
@@ -21,7 +24,6 @@ namespace Bit.App.Pages
         private readonly IUserVerificationService _userVerificationService;
         private readonly IApiService _apiService;
         private readonly IVerificationActionsFlowHelper _verificationActionsFlowHelper;
-        private readonly ILogger _logger;
 
         private bool _showPassword;
         private string _secret, _mainActionText, _sendCodeStatus;
@@ -33,7 +35,6 @@ namespace Bit.App.Pages
             _userVerificationService = ServiceContainer.Resolve<IUserVerificationService>("userVerificationService");
             _apiService = ServiceContainer.Resolve<IApiService>("apiService");
             _verificationActionsFlowHelper = ServiceContainer.Resolve<IVerificationActionsFlowHelper>("verificationActionsFlowHelper");
-            _logger = ServiceContainer.Resolve<ILogger>("logger");
 
             PageTitle = AppResources.VerificationCode;
             
@@ -117,7 +118,9 @@ namespace Bit.App.Pages
             }
             catch (Exception ex)
             {
-                _logger.Exception(ex);
+#if !FDROID
+                Crashes.TrackError(ex);
+#endif
                 await _deviceActionService.HideLoadingAsync();
                 SendCodeStatus = AppResources.AnErrorOccurredWhileSendingAVerificationCodeToYourEmailPleaseTryAgain;
             }
@@ -168,7 +171,9 @@ namespace Bit.App.Pages
             }
             catch (Exception ex)
             {
-                _logger.Exception(ex);
+#if !FDROID
+                Crashes.TrackError(ex);
+#endif
                 await _deviceActionService.HideLoadingAsync();
             }
         }

src/App/Pages/BaseContentPage.cs

@@ -1,10 +1,10 @@
-using System;
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
-using Bit.App.Controls;
-using Bit.App.Utilities;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
+using System;
+using System.Threading.Tasks;
+using Bit.App.Abstractions;
+using Bit.App.Utilities;
 using Xamarin.Forms;
 using Xamarin.Forms.PlatformConfiguration;
 using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
@@ -13,7 +13,7 @@ namespace Bit.App.Pages
 {
     public class BaseContentPage : ContentPage
     {
-        private IStateService _stateService;
+        private IStorageService _storageService;
         private IDeviceActionService _deviceActionService;
 
         protected int ShowModalAnimationDelay = 400;
@@ -32,16 +32,16 @@ namespace Bit.App.Pages
 
         public bool IsThemeDirty { get; set; }
 
-        protected async override void OnAppearing()
+        protected override void OnAppearing()
         {
             base.OnAppearing();
-            
+
             if (IsThemeDirty)
             {
                 UpdateOnThemeChanged();
             }
-            
-            await SaveActivityAsync();
+
+            SaveActivity();
         }
 
         public bool DoOnce(Action action = null, int milliseconds = 1000)
@@ -56,12 +56,6 @@ namespace Bit.App.Pages
             return true;
         }
 
-        public virtual Task UpdateOnThemeChanged()
-        {
-            IsThemeDirty = false;
-            return Task.CompletedTask;
-        }
-
         protected void SetActivityIndicator(ContentView targetView = null)
         {
             var indicator = new ActivityIndicator
@@ -120,25 +114,11 @@ namespace Bit.App.Pages
             });
         }
 
-        protected async Task<bool> ShowAccountSwitcherAsync()
-        {
-            return await _stateService.GetActiveUserIdAsync() != null;
-        }
-
-        protected async Task<AvatarImageSource> GetAvatarImageSourceAsync(bool useCurrentActiveAccount = true)
-        {
-            if (useCurrentActiveAccount)
-            {
-                return new AvatarImageSource(await _stateService.GetNameAsync(), await _stateService.GetEmailAsync());
-            }
-            return new AvatarImageSource();
-        }
-
         private void SetServices()
         {
-            if (_stateService == null)
+            if (_storageService == null)
             {
-                _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+                _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
             }
             if (_deviceActionService == null)
             {
@@ -146,10 +126,16 @@ namespace Bit.App.Pages
             }
         }
 
-        private async Task SaveActivityAsync()
+        private void SaveActivity()
         {
             SetServices();
-            await _stateService.SetLastActiveTimeAsync(_deviceActionService.GetActiveTime());
+            _storageService.SaveAsync(Constants.LastActiveTimeKey, _deviceActionService.GetActiveTime());
+        }
+
+        public virtual Task UpdateOnThemeChanged()
+        {
+            IsThemeDirty = false;
+            return Task.CompletedTask;
         }
     }
 }

src/App/Pages/BaseViewModel.cs

@@ -1,5 +1,4 @@
-using Bit.App.Controls;
-using Bit.Core.Utilities;
+using Bit.Core.Utilities;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -7,7 +6,6 @@ namespace Bit.App.Pages
     public abstract class BaseViewModel : ExtendedViewModel
     {
         private string _pageTitle = string.Empty;
-        private AvatarImageSource _avatar;
 
         public string PageTitle
         {
@@ -15,12 +13,6 @@ namespace Bit.App.Pages
             set => SetProperty(ref _pageTitle, value);
         }
 
-        public AvatarImageSource AvatarImageSource
-        {
-            get => _avatar ?? new AvatarImageSource();
-            set => SetProperty(ref _avatar, value);
-        }
-
         public ContentPage Page { get; set; }
     }
 }

src/App/Pages/CaptchaProtectedViewModel.cs

@@ -27,11 +27,13 @@ namespace Bit.App.Pages
                 captchaRequiredText = AppResources.CaptchaRequired,
             });
 
-            var url = environmentService.GetWebVaultUrl() +
-                      "/captcha-mobile-connector.html?" +
-                      "data=" + data +
-                      "&parent=" + Uri.EscapeDataString(callbackUri) +
-                      "&v=1";
+            var url = environmentService.GetWebVaultUrl();
+            if (url == null)
+            {
+                url = "https://vault.bitwarden.com";
+            }
+            url += "/captcha-mobile-connector.html?" + "data=" + data +
+                "&parent=" + Uri.EscapeDataString(callbackUri) + "&v=1";
 
             WebAuthenticatorResult authResult = null;
             bool cancelled = false;

src/App/Pages/Generator/GeneratorHistoryPageViewModel.cs

@@ -4,6 +4,9 @@ using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Models.Domain;
 using Bit.Core.Utilities;
+#if !FDROID
+using Microsoft.AppCenter.Crashes;
+#endif
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -13,7 +16,6 @@ namespace Bit.App.Pages
         private readonly IPlatformUtilsService _platformUtilsService;
         private readonly IPasswordGenerationService _passwordGenerationService;
         private readonly IClipboardService _clipboardService;
-        private readonly ILogger _logger;
 
         private bool _showNoData;
 
@@ -22,7 +24,6 @@ namespace Bit.App.Pages
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
             _passwordGenerationService = ServiceContainer.Resolve<IPasswordGenerationService>("passwordGenerationService");
             _clipboardService = ServiceContainer.Resolve<IClipboardService>("clipboardService");
-            _logger = ServiceContainer.Resolve<ILogger>("logger");
 
             PageTitle = AppResources.PasswordHistory;
             History = new ExtendedObservableCollection<GeneratedPasswordHistory>();
@@ -69,7 +70,9 @@ namespace Bit.App.Pages
             }
             catch (System.Exception ex)
             {
-                _logger.Exception(ex);
+#if !FDROID
+                Crashes.TrackError(ex);
+#endif
             }
         }
     }

src/App/Pages/Generator/GeneratorPage.xaml

@@ -36,255 +36,251 @@
         </ResourceDictionary>
     </ContentPage.Resources>
 
-    <!--WORKAROUND: Wrapped in a ContentView to fix bottom screen but when using large font size on Android.
-        Check when https://github.com/xamarin/Xamarin.Forms/pull/15076 is released that may fix this without wrapping
-        in ContentView.-->
-    <ContentView>
-        <ScrollView Padding="0, 0, 0, 20">
-            <StackLayout Spacing="0" Padding="0">
-                <StackLayout StyleClass="box">
-                    <Grid IsVisible="{Binding IsPolicyInEffect}"
-                          Margin="0, 12, 0, 0"
-                          RowSpacing="0"
-                          ColumnSpacing="0">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="*" />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <Frame Padding="10"
-                               Margin="0"
-                               HasShadow="False"
-                               BackgroundColor="Transparent"
-                               BorderColor="Accent">
-                            <Label
-                                Text="{u:I18n PasswordGeneratorPolicyInEffect}"
-                                StyleClass="text-muted, text-sm, text-bold"
-                                HorizontalTextAlignment="Center" />
-                        </Frame>
-                    </Grid>
-                    <controls:MonoLabel
-                        x:Name="lblPassword"
-                        StyleClass="text-lg, text-html"
-                        Text="{Binding ColoredPassword, Mode=OneWay}"
-                        Margin="0, 20"
-                        HorizontalTextAlignment="Center"
-                        HorizontalOptions="CenterAndExpand"
-                        LineBreakMode="CharacterWrap" />
-                    <Button Text="{u:I18n RegeneratePassword}"
-                            StyleClass="btn-primary"
-                            HorizontalOptions="FillAndExpand"
-                            Clicked="Regenerate_Clicked"></Button>
-                    <Button Text="{u:I18n CopyPassword}"
-                            HorizontalOptions="FillAndExpand"
-                            Clicked="Copy_Clicked"></Button>
+    <ScrollView Padding="0, 0, 0, 20">
+        <StackLayout Spacing="0" Padding="0">
+            <StackLayout StyleClass="box">
+                <Grid IsVisible="{Binding IsPolicyInEffect}"
+                      Margin="0, 12, 0, 0"
+                      RowSpacing="0"
+                      ColumnSpacing="0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Frame Padding="10"
+                           Margin="0"
+                           HasShadow="False"
+                           BackgroundColor="Transparent"
+                           BorderColor="Accent">
+                        <Label
+                            Text="{u:I18n PasswordGeneratorPolicyInEffect}"
+                            StyleClass="text-muted, text-sm, text-bold"
+                            HorizontalTextAlignment="Center" />
+                    </Frame>
+                </Grid>
+                <controls:MonoLabel
+                    x:Name="lblPassword"
+                    StyleClass="text-lg, text-html"
+                    Text="{Binding ColoredPassword, Mode=OneWay}"
+                    Margin="0, 20"
+                    HorizontalTextAlignment="Center"
+                    HorizontalOptions="CenterAndExpand"
+                    LineBreakMode="CharacterWrap" />
+                <Button Text="{u:I18n RegeneratePassword}"
+                        StyleClass="btn-primary"
+                        HorizontalOptions="FillAndExpand"
+                        Clicked="Regenerate_Clicked"></Button>
+                <Button Text="{u:I18n CopyPassword}"
+                        HorizontalOptions="FillAndExpand"
+                        Clicked="Copy_Clicked"></Button>
+            </StackLayout>
+            <StackLayout StyleClass="box">
+                <StackLayout StyleClass="box-row-header">
+                    <Label Text="{u:I18n Options, Header=True}"
+                           StyleClass="box-header, box-header-platform" />
                 </StackLayout>
-                <StackLayout StyleClass="box">
-                    <StackLayout StyleClass="box-row-header">
-                        <Label Text="{u:I18n Options, Header=True}"
-                               StyleClass="box-header, box-header-platform" />
+                <StackLayout StyleClass="box-row, box-row-input">
+                    <Label
+                        Text="{u:I18n Type}"
+                        StyleClass="box-label" />
+                    <Picker
+                        x:Name="_typePicker"
+                        ItemsSource="{Binding TypeOptions, Mode=OneTime}"
+                        SelectedIndex="{Binding TypeSelectedIndex}"
+                        StyleClass="box-value" />
+                </StackLayout>
+                <StackLayout Spacing="0"
+                             Padding="0"
+                             IsVisible="{Binding IsPassword, Converter={StaticResource inverseBool}}">
+                    <StackLayout StyleClass="box-row, box-row-stepper">
+                        <Label
+                            Text="{u:I18n NumberOfWords}"
+                            StyleClass="box-label-regular"
+                            VerticalOptions="FillAndExpand"
+                            VerticalTextAlignment="Center" />
+                        <Label
+                            Text="{Binding NumWords}"
+                            StyleClass="box-sub-label"
+                            HorizontalOptions="FillAndExpand"
+                            HorizontalTextAlignment="End"
+                            VerticalOptions="FillAndExpand"
+                            VerticalTextAlignment="Center" />
+                        <controls:ExtendedStepper
+                            Value="{Binding NumWords}"
+                            Maximum="20"
+                            Minimum="3"
+                            Increment="1" />
                     </StackLayout>
+                    <BoxView StyleClass="box-row-separator" />
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
-                            Text="{u:I18n Type}"
+                            Text="{u:I18n WordSeparator}"
                             StyleClass="box-label" />
-                        <Picker
-                            x:Name="_typePicker"
-                            ItemsSource="{Binding TypeOptions, Mode=OneTime}"
-                            SelectedIndex="{Binding TypeSelectedIndex}"
+                        <Entry
+                            Text="{Binding WordSeparator}"
+                            IsSpellCheckEnabled="False"
+                            IsTextPredictionEnabled="False"
                             StyleClass="box-value" />
                     </StackLayout>
-                    <StackLayout Spacing="0"
-                                 Padding="0"
-                                 IsVisible="{Binding IsPassword, Converter={StaticResource inverseBool}}">
-                        <StackLayout StyleClass="box-row, box-row-stepper">
-                            <Label
-                                Text="{u:I18n NumberOfWords}"
-                                StyleClass="box-label-regular"
-                                VerticalOptions="FillAndExpand"
-                                VerticalTextAlignment="Center" />
-                            <Label
-                                Text="{Binding NumWords}"
-                                StyleClass="box-sub-label"
-                                HorizontalOptions="FillAndExpand"
-                                HorizontalTextAlignment="End"
-                                VerticalOptions="FillAndExpand"
-                                VerticalTextAlignment="Center" />
-                            <controls:ExtendedStepper
-                                Value="{Binding NumWords}"
-                                Maximum="20"
-                                Minimum="3"
-                                Increment="1" />
-                        </StackLayout>
-                        <BoxView StyleClass="box-row-separator" />
-                        <StackLayout StyleClass="box-row, box-row-input">
-                            <Label
-                                Text="{u:I18n WordSeparator}"
-                                StyleClass="box-label" />
-                            <Entry
-                                Text="{Binding WordSeparator}"
-                                IsSpellCheckEnabled="False"
-                                IsTextPredictionEnabled="False"
-                                StyleClass="box-value" />
-                        </StackLayout>
-                        <StackLayout StyleClass="box-row, box-row-switch">
-                            <Label
-                                Text="{u:I18n Capitalize}"
-                                StyleClass="box-label-regular"
-                                HorizontalOptions="StartAndExpand" />
-                            <Switch
-                                IsToggled="{Binding Capitalize}"
-                                IsEnabled="{Binding EnforcedPolicyOptions.Capitalize,
-                                    Converter={StaticResource inverseBool}}"
-                                StyleClass="box-value"
-                                HorizontalOptions="End" />
-                        </StackLayout>
-                        <BoxView StyleClass="box-row-separator" />
-                        <StackLayout StyleClass="box-row, box-row-switch">
-                            <Label
-                                Text="{u:I18n IncludeNumber}"
-                                StyleClass="box-label-regular"
-                                HorizontalOptions="StartAndExpand" />
-                            <Switch
-                                IsToggled="{Binding IncludeNumber}"
-                                IsEnabled="{Binding EnforcedPolicyOptions.IncludeNumber,
-                                    Converter={StaticResource inverseBool}}"
-                                StyleClass="box-value"
-                                HorizontalOptions="End" />
-                        </StackLayout>
+                    <StackLayout StyleClass="box-row, box-row-switch">
+                        <Label
+                            Text="{u:I18n Capitalize}"
+                            StyleClass="box-label-regular"
+                            HorizontalOptions="StartAndExpand" />
+                        <Switch
+                            IsToggled="{Binding Capitalize}"
+                            IsEnabled="{Binding EnforcedPolicyOptions.Capitalize,
+                                Converter={StaticResource inverseBool}}"
+                            StyleClass="box-value"
+                            HorizontalOptions="End" />
                     </StackLayout>
-                    <StackLayout Spacing="0" Padding="0" IsVisible="{Binding IsPassword}">
-                        <StackLayout StyleClass="box-row, box-row-slider">
-                            <Label
-                                Text="{u:I18n Length}"
-                                StyleClass="box-label-regular"
-                                VerticalOptions="CenterAndExpand" />
-                            <Label
-                                Text="{Binding Length}"
-                                StyleClass="box-sub-label"
-                                VerticalOptions="CenterAndExpand"
-                                HorizontalTextAlignment="End"
-                                WidthRequest="50" />
-                            <controls:ExtendedSlider
-                                DragCompleted="LengthSlider_DragCompleted"
-                                Value="{Binding Length}"
-                                AutomationProperties.HelpText="{Binding Length}"
-                                StyleClass="box-value"
-                                VerticalOptions="CenterAndExpand"
-                                HorizontalOptions="FillAndExpand"
-                                Maximum="128"
-                                Minimum="5" />
-                        </StackLayout>
-                        <BoxView StyleClass="box-row-separator" />
-                        <StackLayout StyleClass="box-row, box-row-switch">
-                            <Label
-                                Text="A-Z"
-                                StyleClass="box-label-regular"
-                                HorizontalOptions="StartAndExpand" />
-                            <Switch
-                                IsToggled="{Binding Uppercase}"
-                                IsEnabled="{Binding EnforcedPolicyOptions.UseUppercase,
-                                    Converter={StaticResource inverseBool}}"
-                                StyleClass="box-value"
-                                HorizontalOptions="End" />
-                        </StackLayout>
-                        <BoxView StyleClass="box-row-separator" />
-                        <StackLayout StyleClass="box-row, box-row-switch">
-                            <Label
-                                Text="a-z"
-                                StyleClass="box-label-regular"
-                                HorizontalOptions="StartAndExpand" />
-                            <Switch
-                                IsToggled="{Binding Lowercase}"
-                                IsEnabled="{Binding EnforcedPolicyOptions.UseLowercase,
-                                    Converter={StaticResource inverseBool}}"
-                                StyleClass="box-value"
-                                HorizontalOptions="End" />
-                        </StackLayout>
-                        <BoxView StyleClass="box-row-separator" />
-                        <StackLayout StyleClass="box-row, box-row-switch">
-                            <Label
-                                Text="0-9"
-                                StyleClass="box-label-regular"
-                                HorizontalOptions="StartAndExpand" />
-                            <Switch
-                                IsToggled="{Binding Number}"
-                                IsEnabled="{Binding EnforcedPolicyOptions.UseNumbers,
-                                    Converter={StaticResource inverseBool}}"
-                                StyleClass="box-value"
-                                HorizontalOptions="End" />
-                        </StackLayout>
-                        <BoxView StyleClass="box-row-separator" />
-                        <StackLayout StyleClass="box-row, box-row-switch">
-                            <Label
-                                Text="!@#$%^&amp;*"
-                                StyleClass="box-label-regular"
-                                HorizontalOptions="StartAndExpand" />
-                            <Switch
-                                IsToggled="{Binding Special}"
-                                IsEnabled="{Binding EnforcedPolicyOptions.UseSpecial,
-                                    Converter={StaticResource inverseBool}}"
-                                StyleClass="box-value"
-                                HorizontalOptions="End" />
-                        </StackLayout>
-                        <BoxView StyleClass="box-row-separator" />
-                        <StackLayout StyleClass="box-row, box-row-stepper">
-                            <Label
-                                Text="{u:I18n MinNumbers}"
-                                StyleClass="box-label-regular"
-                                VerticalOptions="FillAndExpand"
-                                VerticalTextAlignment="Center" />
-                            <Label
-                                Text="{Binding MinNumber}"
-                                StyleClass="box-sub-label"
-                                HorizontalOptions="FillAndExpand"
-                                HorizontalTextAlignment="End"
-                                VerticalOptions="FillAndExpand"
-                                VerticalTextAlignment="Center" />
-                            <controls:ExtendedStepper
-                                Value="{Binding MinNumber}"
-                                Maximum="5"
-                                Minimum="0"
-                                Increment="1" />
-                        </StackLayout>
-                        <BoxView StyleClass="box-row-separator" />
-                        <StackLayout StyleClass="box-row, box-row-stepper">
-                            <Label
-                                Text="{u:I18n MinSpecial}"
-                                StyleClass="box-label-regular"
-                                VerticalOptions="FillAndExpand"
-                                VerticalTextAlignment="Center" />
-                            <Label
-                                Text="{Binding MinSpecial}"
-                                StyleClass="box-sub-label"
-                                HorizontalOptions="FillAndExpand"
-                                HorizontalTextAlignment="End"
-                                VerticalOptions="FillAndExpand"
-                                VerticalTextAlignment="Center" />
-                            <controls:ExtendedStepper
-                                Value="{Binding MinSpecial}"
-                                Maximum="5"
-                                Minimum="0"
-                                Increment="1" />
-                        </StackLayout>
-                        <BoxView StyleClass="box-row-separator" />
-                        <StackLayout StyleClass="box-row, box-row-switch">
-                            <Label
-                                Text="{u:I18n AvoidAmbiguousCharacters}"
-                                StyleClass="box-label-regular"
-                                HorizontalOptions="StartAndExpand" />
-                            <Switch
-                                IsToggled="{Binding AvoidAmbiguous}"
-                                StyleClass="box-value"
-                                HorizontalOptions="End" />
-                        </StackLayout>
-                        <BoxView StyleClass="box-row-separator" />
+                    <BoxView StyleClass="box-row-separator" />
+                    <StackLayout StyleClass="box-row, box-row-switch">
+                        <Label
+                            Text="{u:I18n IncludeNumber}"
+                            StyleClass="box-label-regular"
+                            HorizontalOptions="StartAndExpand" />
+                        <Switch
+                            IsToggled="{Binding IncludeNumber}"
+                            IsEnabled="{Binding EnforcedPolicyOptions.IncludeNumber,
+                                Converter={StaticResource inverseBool}}"
+                            StyleClass="box-value"
+                            HorizontalOptions="End" />
                     </StackLayout>
                 </StackLayout>
+                <StackLayout Spacing="0" Padding="0" IsVisible="{Binding IsPassword}">
+                    <StackLayout StyleClass="box-row, box-row-slider">
+                        <Label
+                            Text="{u:I18n Length}"
+                            StyleClass="box-label-regular"
+                            VerticalOptions="CenterAndExpand" />
+                        <Label
+                            Text="{Binding Length}"
+                            StyleClass="box-sub-label"
+                            WidthRequest="30"
+                            VerticalOptions="CenterAndExpand"
+                            HorizontalTextAlignment="End" />
+                        <controls:ExtendedSlider
+                            DragCompleted="LengthSlider_DragCompleted"
+                            Value="{Binding Length}"
+                            AutomationProperties.HelpText="{Binding Length}"
+                            StyleClass="box-value"
+                            VerticalOptions="CenterAndExpand"
+                            HorizontalOptions="FillAndExpand"
+                            Maximum="128"
+                            Minimum="5" />
+                    </StackLayout>
+                    <BoxView StyleClass="box-row-separator" />
+                    <StackLayout StyleClass="box-row, box-row-switch">
+                        <Label
+                            Text="A-Z"
+                            StyleClass="box-label-regular"
+                            HorizontalOptions="StartAndExpand" />
+                        <Switch
+                            IsToggled="{Binding Uppercase}"
+                            IsEnabled="{Binding EnforcedPolicyOptions.UseUppercase,
+                                Converter={StaticResource inverseBool}}"
+                            StyleClass="box-value"
+                            HorizontalOptions="End" />
+                    </StackLayout>
+                    <BoxView StyleClass="box-row-separator" />
+                    <StackLayout StyleClass="box-row, box-row-switch">
+                        <Label
+                            Text="a-z"
+                            StyleClass="box-label-regular"
+                            HorizontalOptions="StartAndExpand" />
+                        <Switch
+                            IsToggled="{Binding Lowercase}"
+                            IsEnabled="{Binding EnforcedPolicyOptions.UseLowercase,
+                                Converter={StaticResource inverseBool}}"
+                            StyleClass="box-value"
+                            HorizontalOptions="End" />
+                    </StackLayout>
+                    <BoxView StyleClass="box-row-separator" />
+                    <StackLayout StyleClass="box-row, box-row-switch">
+                        <Label
+                            Text="0-9"
+                            StyleClass="box-label-regular"
+                            HorizontalOptions="StartAndExpand" />
+                        <Switch
+                            IsToggled="{Binding Number}"
+                            IsEnabled="{Binding EnforcedPolicyOptions.UseNumbers,
+                                Converter={StaticResource inverseBool}}"
+                            StyleClass="box-value"
+                            HorizontalOptions="End" />
+                    </StackLayout>
+                    <BoxView StyleClass="box-row-separator" />
+                    <StackLayout StyleClass="box-row, box-row-switch">
+                        <Label
+                            Text="!@#$%^&amp;*"
+                            StyleClass="box-label-regular"
+                            HorizontalOptions="StartAndExpand" />
+                        <Switch
+                            IsToggled="{Binding Special}"
+                            IsEnabled="{Binding EnforcedPolicyOptions.UseSpecial,
+                                Converter={StaticResource inverseBool}}"
+                            StyleClass="box-value"
+                            HorizontalOptions="End" />
+                    </StackLayout>
+                    <BoxView StyleClass="box-row-separator" />
+                    <StackLayout StyleClass="box-row, box-row-stepper">
+                        <Label
+                            Text="{u:I18n MinNumbers}"
+                            StyleClass="box-label-regular"
+                            VerticalOptions="FillAndExpand"
+                            VerticalTextAlignment="Center" />
+                        <Label
+                            Text="{Binding MinNumber}"
+                            StyleClass="box-sub-label"
+                            HorizontalOptions="FillAndExpand"
+                            HorizontalTextAlignment="End"
+                            VerticalOptions="FillAndExpand"
+                            VerticalTextAlignment="Center" />
+                        <controls:ExtendedStepper
+                            Value="{Binding MinNumber}"
+                            Maximum="5"
+                            Minimum="0"
+                            Increment="1" />
+                    </StackLayout>
+                    <BoxView StyleClass="box-row-separator" />
+                    <StackLayout StyleClass="box-row, box-row-stepper">
+                        <Label
+                            Text="{u:I18n MinSpecial}"
+                            StyleClass="box-label-regular"
+                            VerticalOptions="FillAndExpand"
+                            VerticalTextAlignment="Center" />
+                        <Label
+                            Text="{Binding MinSpecial}"
+                            StyleClass="box-sub-label"
+                            HorizontalOptions="FillAndExpand"
+                            HorizontalTextAlignment="End"
+                            VerticalOptions="FillAndExpand"
+                            VerticalTextAlignment="Center" />
+                        <controls:ExtendedStepper
+                            Value="{Binding MinSpecial}"
+                            Maximum="5"
+                            Minimum="0"
+                            Increment="1" />
+                    </StackLayout>
+                    <BoxView StyleClass="box-row-separator" />
+                    <StackLayout StyleClass="box-row, box-row-switch">
+                        <Label
+                            Text="{u:I18n AvoidAmbiguousCharacters}"
+                            StyleClass="box-label-regular"
+                            HorizontalOptions="StartAndExpand" />
+                        <Switch
+                            IsToggled="{Binding AvoidAmbiguous}"
+                            StyleClass="box-value"
+                            HorizontalOptions="End" />
+                    </StackLayout>
+                    <BoxView StyleClass="box-row-separator" />
+                </StackLayout>
             </StackLayout>
-        </ScrollView>
-    </ContentView>
+        </StackLayout>
+    </ScrollView>
+
 </pages:BaseContentPage>

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

@@ -7,6 +7,9 @@ using Bit.App.Utilities;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
+#if !FDROID
+using Microsoft.AppCenter.Crashes;
+#endif
 using Xamarin.Forms;
 using Xamarin.Forms.PlatformConfiguration;
 using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
@@ -18,7 +21,6 @@ namespace Bit.App.Pages
     {
         private readonly IBroadcasterService _broadcasterService;
         private readonly IVaultTimeoutService _vaultTimeoutService;
-        private readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
 
         private AppOptions _appOptions;
         private SendAddEditPageViewModel _vm;
@@ -53,10 +55,9 @@ namespace Bit.App.Pages
                 _vm.SegmentedButtonFontSize = 13;
                 _vm.SegmentedButtonMargins = new Thickness(0, 10, 0, 0);
                 _vm.EditorMargins = new Thickness(0, 5, 0, 0);
-                // Review this when https://github.com/bitwarden/mobile/pull/1454 workaround can be reverted
-                //_btnOptions.WidthRequest = 70;
-                //_btnOptionsDown.WidthRequest = 30;
-                //_btnOptionsUp.WidthRequest = 30;
+                _btnOptions.WidthRequest = 70;
+                _btnOptionsDown.WidthRequest = 30;
+                _btnOptionsUp.WidthRequest = 30;
             }
             else if (Device.RuntimePlatform == Device.iOS)
             {
@@ -130,7 +131,9 @@ namespace Bit.App.Pages
             }
             catch (Exception ex)
             {
-                _logger.Value.Exception(ex);
+#if !FDROID
+                Crashes.TrackError(ex);
+#endif
                 await CloseAsync();
             }
         }

src/App/Pages/Send/SendAddEditPageViewModel.cs

@@ -10,6 +10,9 @@ using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
+#if !FDROID
+using Microsoft.AppCenter.Crashes;
+#endif
 using Xamarin.Essentials;
 using Xamarin.Forms;
 
@@ -20,9 +23,8 @@ namespace Bit.App.Pages
         private readonly IDeviceActionService _deviceActionService;
         private readonly IPlatformUtilsService _platformUtilsService;
         private readonly IMessagingService _messagingService;
-        private readonly IStateService _stateService;
+        private readonly IUserService _userService;
         private readonly ISendService _sendService;
-        private readonly ILogger _logger;
         private bool _sendEnabled;
         private bool _canAccessPremium;
         private bool _emailVerified;
@@ -54,10 +56,8 @@ namespace Bit.App.Pages
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _userService = ServiceContainer.Resolve<IUserService>("userService");
             _sendService = ServiceContainer.Resolve<ISendService>("sendService");
-            _logger = ServiceContainer.Resolve<ILogger>("logger");
-
             TogglePasswordCommand = new Command(TogglePassword);
 
             TypeOptions = new List<KeyValuePair<string, SendType>>
@@ -235,8 +235,8 @@ namespace Bit.App.Pages
         public async Task InitAsync()
         {
             PageTitle = EditMode ? AppResources.EditSend : AppResources.AddSend;
-            _canAccessPremium = await _stateService.CanAccessPremiumAsync();
-            _emailVerified = await _stateService.GetEmailVerifiedAsync();
+            _canAccessPremium = await _userService.CanAccessPremiumAsync();
+            _emailVerified = await _userService.GetEmailVerifiedAsync();
             SendEnabled = ! await AppHelpers.IsSendDisabledByPolicyAsync();
             DisableHideEmail = await AppHelpers.IsHideEmailDisabledByPolicyAsync();
             SendOptionsPolicyInEffect = SendEnabled && DisableHideEmail;
@@ -455,7 +455,9 @@ namespace Bit.App.Pages
             catch (Exception ex)
             {
                 await _deviceActionService.HideLoadingAsync();
-                _logger.Exception(ex);
+#if !FDROID
+                Crashes.TrackError(ex);
+#endif
                 await _platformUtilsService.ShowDialogAsync(AppResources.AnErrorHasOccurred);
             }
             return false;

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

@@ -1,6 +0,0 @@
-namespace Bit.App.Pages
-{
-    public interface ISendGroupingsPageListItem
-    {
-    }
-}

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

@@ -54,8 +54,7 @@
                     <controls:IconLabel Text="{Binding Icon, Mode=OneWay}"
                                       HorizontalOptions="Start"
                                       VerticalOptions="Center"
-                                      StyleClass="list-icon, list-icon-platform"
-                                      ShouldUpdateFontSizeDynamicallyForAccesibility="True">
+                                      StyleClass="list-icon, list-icon-platform">
                         <controls:IconLabel.Effects>
                             <effects:FixedSizeEffect />
                         </controls:IconLabel.Effects>
@@ -73,29 +72,7 @@
                 </controls:ExtendedStackLayout>
             </DataTemplate>
 
-            <DataTemplate
-                x:Key="headerTemplate"
-                x:DataType="pages:SendGroupingsPageHeaderListItem">
-                <StackLayout
-                    Spacing="0" Padding="0" VerticalOptions="FillAndExpand"
-                    StyleClass="list-row-header-container, list-row-header-container-platform">
-                    <BoxView
-                        StyleClass="list-section-separator-top, list-section-separator-top-platform" />
-                    <StackLayout StyleClass="list-row-header, list-row-header-platform">
-                        <Label
-                            Text="{Binding Title}"
-                            StyleClass="list-header, list-header-platform" />
-                        <Label
-                            Text="{Binding ItemCount}"
-                            StyleClass="list-header-sub" />
-                    </StackLayout>
-                    <BoxView
-                        StyleClass="list-section-separator-bottom, list-section-separator-bottom-platform" />
-                </StackLayout>
-	        </DataTemplate>
-
             <pages:SendGroupingsPageListItemSelector x:Key="sendListItemDataTemplateSelector"
-                                                     HeaderTemplate="{StaticResource headerTemplate}"
                                                      SendTemplate="{StaticResource sendTemplate}"
                                                      GroupTemplate="{StaticResource sendGroupTemplate}" />
 
@@ -136,9 +113,33 @@
                         ItemsSource="{Binding GroupedSends}"
                         VerticalOptions="FillAndExpand"
                         ItemTemplate="{StaticResource sendListItemDataTemplateSelector}"
+                        IsGrouped="True"
                         SelectionMode="Single"
                         SelectionChanged="RowSelected"
-                        StyleClass="list, list-platform" />
+                        StyleClass="list, list-platform">
+
+                        <CollectionView.GroupHeaderTemplate>
+                            <DataTemplate x:DataType="pages:SendGroupingsPageListGroup">
+                                <StackLayout
+                                    Spacing="0" Padding="0" VerticalOptions="FillAndExpand"
+                                    StyleClass="list-row-header-container, list-row-header-container-platform">
+                                    <BoxView
+                                        StyleClass="list-section-separator-top, list-section-separator-top-platform"
+                                        IsVisible="{Binding First, Converter={StaticResource inverseBool}}" />
+                                    <StackLayout StyleClass="list-row-header, list-row-header-platform">
+                                        <Label
+                                            Text="{Binding Name}"
+                                            StyleClass="list-header, list-header-platform" />
+                                        <Label
+                                            Text="{Binding ItemCount}"
+                                            StyleClass="list-header-sub" />
+                                    </StackLayout>
+                                    <BoxView
+                                        StyleClass="list-section-separator-bottom, list-section-separator-bottom-platform" />
+                                </StackLayout>
+                            </DataTemplate>
+                        </CollectionView.GroupHeaderTemplate>
+                    </controls:ExtendedCollectionView>
                 </RefreshView>
             </StackLayout>
         </ResourceDictionary>

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

@@ -1,14 +0,0 @@
-namespace Bit.App.Pages
-{
-    public class SendGroupingsPageHeaderListItem : ISendGroupingsPageListItem
-    {
-        public SendGroupingsPageHeaderListItem(string title, string itemCount)
-        {
-            Title = title;
-            ItemCount = itemCount;
-        }
-
-        public string Title { get; }
-        public string ItemCount { get;  }
-    }
-}

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

@@ -5,7 +5,7 @@ using Bit.Core.Models.View;
 
 namespace Bit.App.Pages
 {
-    public class SendGroupingsPageListItem : ISendGroupingsPageListItem
+    public class SendGroupingsPageListItem
     {
         private string _icon;
         private string _name;

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

@@ -4,17 +4,11 @@ namespace Bit.App.Pages
 {
     public class SendGroupingsPageListItemSelector : DataTemplateSelector
     {
-        public DataTemplate HeaderTemplate { get; set; }
         public DataTemplate SendTemplate { get; set; }
         public DataTemplate GroupTemplate { get; set; }
 
         protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
         {
-            if (item is SendGroupingsPageHeaderListItem)
-            {
-                return HeaderTemplate;
-            }
-
             if (item is SendGroupingsPageListItem listItem)
             {
                 return listItem.Send != null ? SendTemplate : GroupTemplate;

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

@@ -10,7 +10,6 @@ using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Essentials;
 using Xamarin.Forms;
 using DeviceType = Bit.Core.Enums.DeviceType;
@@ -33,23 +32,25 @@ namespace Bit.App.Pages
 
         private readonly ISendService _sendService;
         private readonly ISyncService _syncService;
-        private readonly IStateService _stateService;
+        private readonly IUserService _userService;
         private readonly IVaultTimeoutService _vaultTimeoutService;
         private readonly IDeviceActionService _deviceActionService;
         private readonly IPlatformUtilsService _platformUtilsService;
+        private readonly IStorageService _storageService;
 
         public SendGroupingsPageViewModel()
         {
             _sendService = ServiceContainer.Resolve<ISendService>("sendService");
             _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _userService = ServiceContainer.Resolve<IUserService>("userService");
             _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
 
             Loading = true;
             PageTitle = AppResources.Send;
-            GroupedSends = new ObservableRangeCollection<ISendGroupingsPageListItem>();
+            GroupedSends = new ExtendedObservableCollection<SendGroupingsPageListGroup>();
             RefreshCommand = new Command(async () =>
             {
                 Refreshing = true;
@@ -104,7 +105,7 @@ namespace Bit.App.Pages
             get => _showList;
             set => SetProperty(ref _showList, value);
         }
-        public ObservableRangeCollection<ISendGroupingsPageListItem> GroupedSends { get; set; }
+        public ExtendedObservableCollection<SendGroupingsPageListGroup> GroupedSends { get; set; }
         public Command RefreshCommand { get; set; }
         public Command<SendView> SendOptionsCommand { get; set; }
         public bool LoadedOnce { get; set; }
@@ -115,7 +116,7 @@ namespace Bit.App.Pages
             {
                 return;
             }
-            var authed = await _stateService.IsAuthenticatedAsync();
+            var authed = await _userService.IsAuthenticatedAsync();
             if (!authed)
             {
                 return;
@@ -124,7 +125,7 @@ namespace Bit.App.Pages
             {
                 return;
             }
-            if (await _stateService.GetSyncOnRefreshAsync() && Refreshing && !SyncRefreshing)
+            if (await _storageService.GetAsync<bool>(Constants.SyncOnRefreshKey) && Refreshing && !SyncRefreshing)
             {
                 SyncRefreshing = true;
                 await _syncService.FullSyncAsync(false);
@@ -176,49 +177,7 @@ namespace Bit.App.Pages
                         MainPage ? AppResources.AllSends : AppResources.Sends, sendsListItems.Count,
                         uppercaseGroupNames, !MainPage));
                 }
-
-                // TODO: refactor this
-                if (Device.RuntimePlatform == Device.Android
-                    ||
-                    GroupedSends.Any())
-                {
-                    var items = new List<ISendGroupingsPageListItem>();
-                    foreach (var itemGroup in groupedSends)
-                    {
-                        items.Add(new SendGroupingsPageHeaderListItem(itemGroup.Name, itemGroup.ItemCount));
-                        items.AddRange(itemGroup);
-                    }
-
-                    GroupedSends.ReplaceRange(items);
-                }
-                else
-                {
-                    // HACK: we need this on iOS, so that it doesn't crash when adding coming from an empty list
-                    var first = true;
-                    var items = new List<ISendGroupingsPageListItem>();
-                    foreach (var itemGroup in groupedSends)
-                    {
-                        if (!first)
-                        {
-                            items.Add(new SendGroupingsPageHeaderListItem(itemGroup.Name, itemGroup.ItemCount));
-                        }
-                        else
-                        {
-                            first = false;
-                        }
-                        items.AddRange(itemGroup);
-                    }
-
-                    if (groupedSends.Any())
-                    {
-                        GroupedSends.ReplaceRange(new List<ISendGroupingsPageListItem> { new SendGroupingsPageHeaderListItem(groupedSends[0].Name, groupedSends[0].ItemCount) });
-                        GroupedSends.AddRange(items);
-                    }
-                    else
-                    {
-                        GroupedSends.Clear();
-                    }
-                }
+                GroupedSends.ResetWithRange(groupedSends);
             }
             finally
             {

src/App/Pages/Settings/AutofillServicesPageViewModel.cs

@@ -2,6 +2,7 @@
 using Bit.App.Abstractions;
 using Bit.App.Resources;
 using Bit.App.Services;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 
@@ -10,7 +11,7 @@ namespace Bit.App.Pages
     public class AutofillServicesPageViewModel : BaseViewModel
     {
         private readonly IDeviceActionService _deviceActionService;
-        private readonly IStateService _stateService;
+        private readonly IStorageService _storageService;
         private readonly MobileI18nService _i18nService;
         
         private bool _autofillServiceToggled;
@@ -22,7 +23,7 @@ namespace Bit.App.Pages
         public AutofillServicesPageViewModel()
         {
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
             _i18nService = ServiceContainer.Resolve<II18nService>("i18nService") as MobileI18nService;
             PageTitle = AppResources.AutofillServices;
         }
@@ -151,7 +152,7 @@ namespace Bit.App.Pages
         
         public async Task InitAsync()
         {
-            InlineAutofillToggled = await _stateService.GetInlineAutofillEnabledAsync() ?? true;
+            InlineAutofillToggled = await _storageService.GetAsync<bool?>(Constants.InlineAutofillEnabledKey) ?? true;
             _inited = true;
         }
 
@@ -201,7 +202,7 @@ namespace Bit.App.Pages
         {
             if (_inited)
             {
-                await _stateService.SetInlineAutofillEnabledAsync(InlineAutofillToggled);
+                await _storageService.SaveAsync(Constants.InlineAutofillEnabledKey, InlineAutofillToggled);
             }
         }
     }

src/App/Pages/Settings/ExportVaultPageViewModel.cs

@@ -1,14 +1,17 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
 using Bit.App.Abstractions;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.Utilities;
 using Bit.Core;
+#if !FDROID
+using Microsoft.AppCenter.Crashes;
+#endif
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -23,7 +26,6 @@ namespace Bit.App.Pages
         private readonly IKeyConnectorService _keyConnectorService;
         private readonly IUserVerificationService _userVerificationService;
         private readonly IApiService _apiService;
-        private readonly ILogger _logger;
 
         private int _fileFormatSelectedIndex;
         private string _exportWarningMessage;
@@ -46,7 +48,6 @@ namespace Bit.App.Pages
             _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
             _userVerificationService = ServiceContainer.Resolve<IUserVerificationService>("userVerificationService");
             _apiService = ServiceContainer.Resolve<IApiService>("apiService");
-            _logger = ServiceContainer.Resolve<ILogger>("logger");
 
             PageTitle = AppResources.ExportVault;
             TogglePasswordCommand = new Command(TogglePassword);
@@ -188,7 +189,9 @@ namespace Bit.App.Pages
                 ClearResult();
                 await _platformUtilsService.ShowDialogAsync(_i18nService.T("ExportVaultFailure"));
                 System.Diagnostics.Debug.WriteLine(">>> {0}: {1}", ex.GetType(), ex.StackTrace);
-                _logger.Exception(ex);
+#if !FDROID
+                Crashes.TrackError(ex);
+#endif
             }
         }
 

src/App/Pages/Settings/ExtensionPageViewModel.cs

@@ -7,7 +7,12 @@ namespace Bit.App.Pages
 {
     public class ExtensionPageViewModel : BaseViewModel
     {
+        private const string StartedKey = "appExtensionStarted";
+        private const string ActivatedKey = "appExtensionActivated";
+
         private readonly IMessagingService _messagingService;
+        private readonly IStorageService _storageService;
+        private readonly IPlatformUtilsService _platformUtilsService;
 
         private bool _started;
         private bool _activated;
@@ -15,6 +20,8 @@ namespace Bit.App.Pages
         public ExtensionPageViewModel()
         {
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
+            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
             PageTitle = AppResources.AppExtension;
         }
 
@@ -45,8 +52,10 @@ namespace Bit.App.Pages
 
         public async Task InitAsync()
         {
-            Started = false;
-            Activated = false;
+            var started = await _storageService.GetAsync<bool?>(StartedKey);
+            var activated = await _storageService.GetAsync<bool?>(ActivatedKey);
+            Started = started.GetValueOrDefault();
+            Activated = activated.GetValueOrDefault();
         }
 
         public void ShowExtension()

src/App/Pages/Settings/OptionsPageViewModel.cs

@@ -1,4 +1,5 @@
-using Bit.App.Resources;
+using Bit.App.Abstractions;
+using Bit.App.Resources;
 using Bit.App.Utilities;
 using Bit.Core;
 using Bit.Core.Abstractions;
@@ -12,6 +13,9 @@ namespace Bit.App.Pages
 {
     public class OptionsPageViewModel : BaseViewModel
     {
+        private readonly IDeviceActionService _deviceActionService;
+        private readonly IPlatformUtilsService _platformUtilsService;
+        private readonly IStorageService _storageService;
         private readonly ITotpService _totpService;
         private readonly IStateService _stateService;
         private readonly IMessagingService _messagingService;
@@ -30,6 +34,9 @@ namespace Bit.App.Pages
 
         public OptionsPageViewModel()
         {
+            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
             _totpService = ServiceContainer.Resolve<ITotpService>("totpService");
             _stateService = ServiceContainer.Resolve<IStateService>("stateService");
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
@@ -159,17 +166,19 @@ namespace Bit.App.Pages
 
         public async Task InitAsync()
         {
-            AutofillDisableSavePrompt = (await _stateService.GetAutofillDisableSavePromptAsync()).GetValueOrDefault();
-            var blacklistedUrisList = await _stateService.GetAutofillBlacklistedUrisAsync();
+            AutofillDisableSavePrompt = (await _storageService.GetAsync<bool?>(
+                Constants.AutofillDisableSavePromptKey)).GetValueOrDefault();
+            var blacklistedUrisList = await _storageService.GetAsync<List<string>>(
+                Constants.AutofillBlacklistedUrisKey);
             AutofillBlacklistedUris = blacklistedUrisList != null ? string.Join(", ", blacklistedUrisList) : null;
             DisableAutoTotpCopy = !(await _totpService.IsAutoCopyEnabledAsync());
-            DisableFavicon = (await _stateService.GetDisableFaviconAsync()).GetValueOrDefault();
-            var theme = await _stateService.GetThemeAsync();
+            DisableFavicon = (await _storageService.GetAsync<bool?>(Constants.DisableFaviconKey)).GetValueOrDefault();
+            var theme = await _storageService.GetAsync<string>(Constants.ThemeKey);
             ThemeSelectedIndex = ThemeOptions.FindIndex(k => k.Key == theme);
-            var defaultUriMatch = await _stateService.GetDefaultUriMatchAsync();
+            var defaultUriMatch = await _storageService.GetAsync<int?>(Constants.DefaultUriMatch);
             UriMatchSelectedIndex = defaultUriMatch == null ? 0 :
                 UriMatchOptions.FindIndex(k => (int?)k.Key == defaultUriMatch);
-            var clearClipboard = await _stateService.GetClearClipboardAsync();
+            var clearClipboard = await _storageService.GetAsync<int?>(Constants.ClearClipboardKey);
             ClearClipboardSelectedIndex = ClearClipboardOptions.FindIndex(k => k.Key == clearClipboard);
             _inited = true;
         }
@@ -178,7 +187,7 @@ namespace Bit.App.Pages
         {
             if (_inited)
             {
-                await _stateService.SetDisableAutoTotpCopyAsync(DisableAutoTotpCopy);
+                await _storageService.SaveAsync(Constants.DisableAutoTotpCopyKey, DisableAutoTotpCopy);
             }
         }
 
@@ -186,7 +195,8 @@ namespace Bit.App.Pages
         {
             if (_inited)
             {
-                await _stateService.SetDisableFaviconAsync(DisableFavicon);
+                await _storageService.SaveAsync(Constants.DisableFaviconKey, DisableFavicon);
+                await _stateService.SaveAsync(Constants.DisableFaviconKey, DisableFavicon);
             }
         }
 
@@ -194,7 +204,8 @@ namespace Bit.App.Pages
         {
             if (_inited && ClearClipboardSelectedIndex > -1)
             {
-                await _stateService.SetClearClipboardAsync(ClearClipboardOptions[ClearClipboardSelectedIndex].Key);
+                await _storageService.SaveAsync(Constants.ClearClipboardKey,
+                    ClearClipboardOptions[ClearClipboardSelectedIndex].Key);
             }
         }
 
@@ -203,8 +214,8 @@ namespace Bit.App.Pages
             if (_inited && ThemeSelectedIndex > -1)
             {
                 var theme = ThemeOptions[ThemeSelectedIndex].Key;
-                await _stateService.SetThemeAsync(theme);
-                ThemeManager.SetTheme(Application.Current.Resources);
+                await _storageService.SaveAsync(Constants.ThemeKey, theme);
+                ThemeManager.SetTheme(Device.RuntimePlatform == Device.Android, Application.Current.Resources);
                 _messagingService.Send("updatedTheme");
             }
         }
@@ -213,7 +224,8 @@ namespace Bit.App.Pages
         {
             if (_inited && UriMatchSelectedIndex > -1)
             {
-                await _stateService.SetDefaultUriMatchAsync((int?)UriMatchOptions[UriMatchSelectedIndex].Key);
+                await _storageService.SaveAsync(Constants.DefaultUriMatch,
+                    (int?)UriMatchOptions[UriMatchSelectedIndex].Key);
             }
         }
 
@@ -221,7 +233,7 @@ namespace Bit.App.Pages
         {
             if (_inited)
             {
-                await _stateService.SetAutofillDisableSavePromptAsync(AutofillDisableSavePrompt);
+                await _storageService.SaveAsync(Constants.AutofillDisableSavePromptKey, AutofillDisableSavePrompt);
             }
         }
 
@@ -231,7 +243,7 @@ namespace Bit.App.Pages
             {
                 if (string.IsNullOrWhiteSpace(AutofillBlacklistedUris))
                 {
-                    await _stateService.SetAutofillBlacklistedUrisAsync(null);
+                    await _storageService.RemoveAsync(Constants.AutofillBlacklistedUrisKey);
                     AutofillBlacklistedUris = null;
                     return;
                 }
@@ -253,7 +265,7 @@ namespace Bit.App.Pages
                         }
                         urisList.Add(cleanedUri);
                     }
-                    await _stateService.SetAutofillBlacklistedUrisAsync(urisList);
+                    await _storageService.SaveAsync(Constants.AutofillBlacklistedUrisKey, urisList);
                     AutofillBlacklistedUris = string.Join(", ", urisList);
                 }
                 catch { }

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

@@ -1,6 +0,0 @@
-namespace Bit.App.Pages
-{
-    public interface ISettingsPageListItem
-    {
-    }
-}

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

@@ -82,26 +82,8 @@
                 </controls:ExtendedStackLayout>
 	        </DataTemplate>
 
-            <DataTemplate
-                x:Key="headerTemplate"
-                x:DataType="pages:SettingsPageHeaderListItem">
-                <StackLayout
-                    Padding="0" Spacing="0" VerticalOptions="FillAndExpand"
-                    StyleClass="list-row-header-container, list-row-header-container-platform">
-                    <BoxView
-                        StyleClass="list-section-separator-top, list-section-separator-top-platform" />
-                    <StackLayout StyleClass="list-row-header, list-row-header-platform">
-                        <Label
-                            Text="{Binding Title}"
-                            StyleClass="list-header, list-header-platform" />
-                    </StackLayout>
-                    <BoxView StyleClass="list-section-separator-bottom, list-section-separator-bottom-platform" />
-                </StackLayout>
-	        </DataTemplate>
-
             <pages:SettingsPageListItemSelector
                 x:Key="listItemDataTemplateSelector"
-                HeaderTemplate="{StaticResource headerTemplate}"
                 RegularTemplate="{StaticResource regularTemplate}"
                 TimePickerTemplate="{StaticResource timePickerTemplate}" />
         </ResourceDictionary>
@@ -111,8 +93,28 @@
         ItemsSource="{Binding GroupedItems}"
         VerticalOptions="FillAndExpand"
         ItemTemplate="{StaticResource listItemDataTemplateSelector}"
+        IsGrouped="True"
         SelectionMode="Single"
         SelectionChanged="RowSelected"
-        StyleClass="list, list-platform" />
+        StyleClass="list, list-platform">
+
+        <CollectionView.GroupHeaderTemplate>
+            <DataTemplate x:DataType="pages:SettingsPageListGroup">
+                <StackLayout
+                    Padding="0" Spacing="0" VerticalOptions="FillAndExpand"
+                    StyleClass="list-row-header-container, list-row-header-container-platform">
+                    <BoxView
+                        StyleClass="list-section-separator-top, list-section-separator-top-platform"
+                        IsVisible="{Binding First, Converter={StaticResource inverseBool}}" />
+                    <StackLayout StyleClass="list-row-header, list-row-header-platform">
+                        <Label
+                            Text="{Binding Name}"
+                            StyleClass="list-header, list-header-platform" />
+                    </StackLayout>
+                    <BoxView StyleClass="list-section-separator-bottom, list-section-separator-bottom-platform" />
+                </StackLayout>
+            </DataTemplate>
+        </CollectionView.GroupHeaderTemplate>
+    </controls:ExtendedCollectionView>
 
 </pages:BaseContentPage>

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

@@ -1,12 +0,0 @@
-namespace Bit.App.Pages
-{
-    public class SettingsPageHeaderListItem : ISettingsPageListItem
-    {
-        public SettingsPageHeaderListItem(string title)
-        {
-            Title = title;
-        }
-
-        public string Title { get; }
-    }
-}

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

@@ -1,11 +1,12 @@
 using System;
 using Bit.App.Resources;
 using Bit.App.Utilities;
+using System.Collections.Generic;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
-    public class SettingsPageListItem : ISettingsPageListItem
+    public class SettingsPageListItem
     {
         public string Icon { get; set; }
         public string Name { get; set; }

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

@@ -4,19 +4,21 @@ namespace Bit.App.Pages
 {
     public class SettingsPageListItemSelector : DataTemplateSelector
     {
-        public DataTemplate HeaderTemplate { get; set; }
         public DataTemplate RegularTemplate { get; set; }
         public DataTemplate TimePickerTemplate { get; set; }
 
         protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
         {
-            if (item is SettingsPageHeaderListItem)
-            {
-                return HeaderTemplate;
-            }
             if (item is SettingsPageListItem listItem)
             {
-                return listItem.ShowTimeInput ? TimePickerTemplate : RegularTemplate;
+                if (listItem.ShowTimeInput)
+                {
+                    return TimePickerTemplate;
+                }
+                else
+                {
+                    return RegularTemplate;
+                }
             }
             return null;
         }

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

@@ -1,5 +1,6 @@
 using Bit.App.Abstractions;
 using Bit.App.Resources;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 using System;
@@ -10,7 +11,6 @@ using Bit.Core.Enums;
 using Bit.Core.Models.Domain;
 using Xamarin.Forms;
 using ZXing.Client.Result;
-using Xamarin.CommunityToolkit.ObjectModel;
 
 namespace Bit.App.Pages
 {
@@ -18,11 +18,12 @@ namespace Bit.App.Pages
     {
         private readonly IPlatformUtilsService _platformUtilsService;
         private readonly ICryptoService _cryptoService;
-        private readonly IStateService _stateService;
+        private readonly IUserService _userService;
         private readonly IDeviceActionService _deviceActionService;
         private readonly IEnvironmentService _environmentService;
         private readonly IMessagingService _messagingService;
         private readonly IVaultTimeoutService _vaultTimeoutService;
+        private readonly IStorageService _storageService;
         private readonly ISyncService _syncService;
         private readonly IBiometricService _biometricService;
         private readonly IPolicyService _policyService;
@@ -54,11 +55,11 @@ namespace Bit.App.Pages
                 new KeyValuePair<string, int?>(AppResources.Never, null),
                 new KeyValuePair<string, int?>(AppResources.Custom, CustomVaultTimeoutValue),
             };
-        private List<KeyValuePair<string, VaultTimeoutAction>> _vaultTimeoutActions =
-            new List<KeyValuePair<string, VaultTimeoutAction>>
+        private List<KeyValuePair<string, string>> _vaultTimeoutActions =
+            new List<KeyValuePair<string, string>>
             {
-                new KeyValuePair<string, VaultTimeoutAction>(AppResources.Lock, VaultTimeoutAction.Lock),
-                new KeyValuePair<string, VaultTimeoutAction>(AppResources.LogOut, VaultTimeoutAction.Logout),
+                new KeyValuePair<string, string>(AppResources.Lock, "lock"),
+                new KeyValuePair<string, string>(AppResources.LogOut, "logOut"),
             };
 
         private Policy _vaultTimeoutPolicy;
@@ -68,11 +69,12 @@ namespace Bit.App.Pages
         {
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
             _cryptoService = ServiceContainer.Resolve<ICryptoService>("cryptoService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _userService = ServiceContainer.Resolve<IUserService>("userService");
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
             _environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
             _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
             _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
             _biometricService = ServiceContainer.Resolve<IBiometricService>("biometricService");
             _policyService = ServiceContainer.Resolve<IPolicyService>("policyService");
@@ -80,11 +82,11 @@ namespace Bit.App.Pages
             _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
             _clipboardService = ServiceContainer.Resolve<IClipboardService>("clipboardService");
 
-            GroupedItems = new ObservableRangeCollection<ISettingsPageListItem>();
+            GroupedItems = new ExtendedObservableCollection<SettingsPageListGroup>();
             PageTitle = AppResources.Settings;
         }
 
-        public ObservableRangeCollection<ISettingsPageListItem> GroupedItems { get; set; }
+        public ExtendedObservableCollection<SettingsPageListGroup> GroupedItems { get; set; }
 
         public async Task InitAsync()
         {
@@ -110,7 +112,7 @@ namespace Bit.App.Pages
 
             _vaultTimeout = await _vaultTimeoutService.GetVaultTimeout();
             _vaultTimeoutDisplayValue = _vaultTimeouts.FirstOrDefault(o => o.Value == _vaultTimeout).Key;
-            var action = await _stateService.GetVaultTimeoutActionAsync() ?? VaultTimeoutAction.Lock;
+            var action = await _storageService.GetAsync<string>(Constants.VaultTimeoutActionKey) ?? "lock";
             _vaultTimeoutActionDisplayValue = _vaultTimeoutActions.FirstOrDefault(o => o.Value == action).Key;
             var pinSet = await _vaultTimeoutService.IsPinLockSetAsync();
             _pin = pinSet.Item1 || pinSet.Item2;
@@ -134,10 +136,10 @@ namespace Bit.App.Pages
 
 #if DEBUG
             var pushNotificationsRegistered = ServiceContainer.Resolve<IPushNotificationService>("pushNotificationService").IsRegisteredForPush;
-            var pnServerRegDate = await _stateService.GetPushLastRegistrationDateAsync();
-            var pnServerError = await _stateService.GetPushInstallationRegistrationErrorAsync();
+            var pnServerRegDate = await _storageService.GetAsync<DateTime>(Constants.PushLastRegistrationDateKey);
+            var pnServerError = await _storageService.GetAsync<string>(Constants.PushInstallationRegistrationError);
 
-            var pnServerRegDateMessage = default(DateTime) == pnServerRegDate ? "-" : $"{pnServerRegDate.GetValueOrDefault().ToShortDateString()}-{pnServerRegDate.GetValueOrDefault().ToShortTimeString()} UTC";
+            var pnServerRegDateMessage = default(DateTime) == pnServerRegDate ? "-" : $"{pnServerRegDate.ToShortDateString()}-{pnServerRegDate.ToShortTimeString()} UTC";
             var errorMessage = string.IsNullOrEmpty(pnServerError) ? string.Empty : $"Push Notifications Server Registration error: {pnServerError}";
 
             var text = string.Format("© Bitwarden Inc. 2015-{0}\n\n{1}\nPush Notifications registered:{2}\nPush Notifications Server Last Date :{3}\n{4}", DateTime.Now.Year, debugText, pushNotificationsRegistered, pnServerRegDateMessage, errorMessage);
@@ -163,7 +165,7 @@ namespace Bit.App.Pages
             List<string> fingerprint;
             try
             {
-                fingerprint = await _cryptoService.GetFingerprintAsync(await _stateService.GetActiveUserIdAsync());
+                fingerprint = await _cryptoService.GetFingerprintAsync(await _userService.GetUserIdAsync());
             }
             catch (Exception e) when (e.Message == "No public key available.")
             {
@@ -191,7 +193,12 @@ namespace Bit.App.Pages
 
         public void WebVault()
         {
-            _platformUtilsService.LaunchUri(_environmentService.GetWebVaultUrl());
+            var url = _environmentService.GetWebVaultUrl();
+            if (url == null)
+            {
+                url = "https://vault.bitwarden.com";
+            }
+            _platformUtilsService.LaunchUri(url);
         }
 
         public async Task ShareAsync()
@@ -210,7 +217,7 @@ namespace Bit.App.Pages
                 AppResources.TwoStepLogin, AppResources.Yes, AppResources.Cancel);
             if (confirmed)
             {
-                _platformUtilsService.LaunchUri($"{_environmentService.GetWebVaultUrl()}/#/settings");
+                _platformUtilsService.LaunchUri("https://bitwarden.com/help/setup-two-step-login/");
             }
         }
 
@@ -220,7 +227,7 @@ namespace Bit.App.Pages
                 AppResources.ChangeMasterPassword, AppResources.Yes, AppResources.Cancel);
             if (confirmed)
             {
-                _platformUtilsService.LaunchUri($"{_environmentService.GetWebVaultUrl()}/#/settings");
+                _platformUtilsService.LaunchUri("https://bitwarden.com/help/master-password/#change-your-master-password");
             }
         }
 
@@ -336,9 +343,9 @@ namespace Bit.App.Pages
                             AppResources.Yes, AppResources.No);
                     }
 
-                    var kdf = await _stateService.GetKdfTypeAsync();
-                    var kdfIterations = await _stateService.GetKdfIterationsAsync();
-                    var email = await _stateService.GetEmailAsync();
+                    var kdf = await _userService.GetKdfAsync();
+                    var kdfIterations = await _userService.GetKdfIterationsAsync();
+                    var email = await _userService.GetEmailAsync();
                     var pinKey = await _cryptoService.MakePinKeyAysnc(pin, email,
                         kdf.GetValueOrDefault(Core.Enums.KdfType.PBKDF2_SHA256),
                         kdfIterations.GetValueOrDefault(5000));
@@ -348,12 +355,12 @@ namespace Bit.App.Pages
                     if (masterPassOnRestart)
                     {
                         var encPin = await _cryptoService.EncryptAsync(pin);
-                        await _stateService.SetProtectedPinAsync(encPin.EncryptedString);
-                        await _stateService.SetPinProtectedKeyAsync(pinProtectedKey);
+                        await _storageService.SaveAsync(Constants.ProtectedPin, encPin.EncryptedString);
+                        _vaultTimeoutService.PinProtectedKey = pinProtectedKey;
                     }
                     else
                     {
-                        await _stateService.SetPinProtectedAsync(pinProtectedKey.EncryptedString);
+                        await _storageService.SaveAsync(Constants.PinProtectedKey, pinProtectedKey.EncryptedString);
                     }
                 }
                 else
@@ -388,13 +395,13 @@ namespace Bit.App.Pages
             if (_biometric)
             {
                 await _biometricService.SetupBiometricAsync();
-                await _stateService.SetBiometricUnlockAsync(true);
+                await _storageService.SaveAsync(Constants.BiometricUnlockKey, true);
             }
             else
             {
-                await _stateService.SetBiometricUnlockAsync(null);
+                await _storageService.RemoveAsync(Constants.BiometricUnlockKey);
             }
-            await _stateService.SetBiometricLockedAsync(false);
+            _vaultTimeoutService.BiometricLocked = false;
             await _cryptoService.ToggleKeyAsync();
             BuildList();
         }
@@ -502,9 +509,7 @@ namespace Bit.App.Pages
                 new SettingsPageListItem { Name = AppResources.RateTheApp },
                 new SettingsPageListItem { Name = AppResources.DeleteAccount }
             };
-
-            // TODO: improve this. Leaving this as is to reduce error possibility on the hotfix.
-            var settingsListGroupItems = new List<SettingsPageListGroup>()
+            GroupedItems.ResetWithRange(new List<SettingsPageListGroup>
             {
                 new SettingsPageListGroup(autofillItems, AppResources.Autofill, doUpper, true),
                 new SettingsPageListGroup(manageItems, AppResources.Manage, doUpper),
@@ -512,50 +517,7 @@ namespace Bit.App.Pages
                 new SettingsPageListGroup(accountItems, AppResources.Account, doUpper),
                 new SettingsPageListGroup(toolsItems, AppResources.Tools, doUpper),
                 new SettingsPageListGroup(otherItems, AppResources.Other, doUpper)
-            };
-
-            // TODO: refactor this
-            if (Device.RuntimePlatform == Device.Android
-                ||
-                GroupedItems.Any())
-            {
-                var items = new List<ISettingsPageListItem>();
-                foreach (var itemGroup in settingsListGroupItems)
-                {
-                    items.Add(new SettingsPageHeaderListItem(itemGroup.Name));
-                    items.AddRange(itemGroup);
-                }
-
-                GroupedItems.ReplaceRange(items);
-            }
-            else
-            {
-                // HACK: we need this on iOS, so that it doesn't crash when adding coming from an empty list
-                var first = true;
-                var items = new List<ISettingsPageListItem>();
-                foreach (var itemGroup in settingsListGroupItems)
-                {
-                    if (!first)
-                    {
-                        items.Add(new SettingsPageHeaderListItem(itemGroup.Name));
-                    }
-                    else
-                    {
-                        first = false;
-                    }
-                    items.AddRange(itemGroup);
-                }
-
-                if (settingsListGroupItems.Any())
-                {
-                    GroupedItems.ReplaceRange(new List<ISettingsPageListItem> { new SettingsPageHeaderListItem(settingsListGroupItems[0].Name) });
-                    GroupedItems.AddRange(items);
-                }
-                else
-                {
-                    GroupedItems.Clear();
-                }
-            }
+            });
         }
 
         private bool IncludeLinksWithSubscriptionInfo()
@@ -567,7 +529,7 @@ namespace Bit.App.Pages
             return true;
         }
 
-        private VaultTimeoutAction GetVaultTimeoutActionFromKey(string key)
+        private string GetVaultTimeoutActionFromKey(string key)
         {
             return _vaultTimeoutActions.FirstOrDefault(o => o.Key == key).Value;
         }

src/App/Pages/Settings/SyncPageViewModel.cs

@@ -1,5 +1,6 @@
 using Bit.App.Abstractions;
 using Bit.App.Resources;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Exceptions;
 using Bit.Core.Utilities;
@@ -11,7 +12,7 @@ namespace Bit.App.Pages
     {
         private readonly IDeviceActionService _deviceActionService;
         private readonly IPlatformUtilsService _platformUtilsService;
-        private readonly IStateService _stateService;
+        private readonly IStorageService _storageService;
         private readonly ISyncService _syncService;
         private readonly ILocalizeService _localizeService;
 
@@ -23,7 +24,7 @@ namespace Bit.App.Pages
         {
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
             _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
             _localizeService = ServiceContainer.Resolve<ILocalizeService>("localizeService");
 
@@ -51,7 +52,7 @@ namespace Bit.App.Pages
         public async Task InitAsync()
         {
             await SetLastSyncAsync();
-            EnableSyncOnRefresh = await _stateService.GetSyncOnRefreshAsync();
+            EnableSyncOnRefresh = await _storageService.GetAsync<bool>(Constants.SyncOnRefreshKey);
             _inited = true;
         }
 
@@ -59,7 +60,7 @@ namespace Bit.App.Pages
         {
             if (_inited)
             {
-                await _stateService.SetSyncOnRefreshAsync(_syncOnRefresh);
+                await _storageService.SaveAsync(Constants.SyncOnRefreshKey, _syncOnRefresh);
             }
         }
 

src/App/Pages/TabsPage.cs

@@ -2,7 +2,6 @@
 using Bit.App.Models;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
-using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
 using Xamarin.Forms;
 
@@ -46,7 +45,7 @@ namespace Bit.App.Pages
             var settingsPage = new NavigationPage(new SettingsPage(this))
             {
                 Title = AppResources.Settings,
-                IconImageSource = "cog_settings.png"
+                IconImageSource = "cog.png"
             };
             Children.Add(settingsPage);
 
@@ -103,13 +102,8 @@ namespace Bit.App.Pages
         {
             if (CurrentPage is NavigationPage navPage)
             {
-                if (_groupingsPage?.RootPage is GroupingsPage groupingsPage)
-                {
-                    await groupingsPage.HideAccountSwitchingOverlayAsync();
-                }
-
                 _messagingService.Send("updatedTheme");
-                if (navPage.RootPage is GroupingsPage)
+                if (navPage.RootPage is GroupingsPage groupingsPage)
                 {
                     // Load something?
                 }
@@ -123,13 +117,5 @@ namespace Bit.App.Pages
                 }
             }
         }
-
-        public void OnPageReselected()
-        {
-            if (_groupingsPage?.RootPage is GroupingsPage groupingsPage)
-            {
-                groupingsPage.HideAccountSwitchingOverlayAsync().FireAndForget();
-            }
-        }
     }
 }

src/App/Pages/Vault/AddEditPage.xaml

@@ -338,7 +338,7 @@
                         <Entry
                             x:Name="_identityFirstNameEntry"
                             Text="{Binding Cipher.Identity.FirstName}"
-                            StyleClass="box-value,capitalize-word-input"/>
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -347,7 +347,7 @@
                         <Entry
                             x:Name="_identityMiddleNameEntry"
                             Text="{Binding Cipher.Identity.MiddleName}"
-                            StyleClass="box-value,capitalize-word-input" />
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -356,7 +356,7 @@
                         <Entry
                             x:Name="_identityLastNameEntry"
                             Text="{Binding Cipher.Identity.LastName}"
-                            StyleClass="box-value,capitalize-word-input" />
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -420,7 +420,6 @@
                         <Entry
                             x:Name="_identityPhoneEntry"
                             Text="{Binding Cipher.Identity.Phone}"
-                            Keyboard="Telephone"
                             StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
@@ -457,7 +456,7 @@
                         <Entry
                             x:Name="_identityCityEntry"
                             Text="{Binding Cipher.Identity.City}"
-                            StyleClass="box-value,capitalize-sentence-input" />
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -466,7 +465,7 @@
                         <Entry
                             x:Name="_identityStateEntry"
                             Text="{Binding Cipher.Identity.State}"
-                            StyleClass="box-value,capitalize-sentence-input" />
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -484,7 +483,7 @@
                         <Entry
                             x:Name="_identityCountryEntry"
                             Text="{Binding Cipher.Identity.Country}"
-                            StyleClass="box-value,capitalize-sentence-input" />
+                            StyleClass="box-value" />
                     </StackLayout>
                 </StackLayout>
             </StackLayout>

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

@@ -2,6 +2,7 @@
 using Bit.App.Models;
 using Bit.App.Resources;
 using Bit.App.Utilities;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
@@ -17,7 +18,7 @@ namespace Bit.App.Pages
     public partial class AddEditPage : BaseContentPage
     {
         private readonly AppOptions _appOptions;
-        private readonly IStateService _stateService;
+        private readonly IStorageService _storageService;
         private readonly IDeviceActionService _deviceActionService;
         private readonly IVaultTimeoutService _vaultTimeoutService;
         private readonly IKeyConnectorService _keyConnectorService;
@@ -37,7 +38,7 @@ namespace Bit.App.Pages
             bool cloneMode = false,
             ViewPage viewPage = null)
         {
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
             _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
             _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
@@ -332,10 +333,10 @@ namespace Bit.App.Pages
                 {
                     return;
                 }
-                var addLoginShown = await _stateService.GetAddSitePromptShownAsync();
+                var addLoginShown = await _storageService.GetAsync<bool?>(Constants.AddSitePromptShownKey);
                 if (_vm.Cipher.Type == CipherType.Login && !_fromAutofill && !addLoginShown.GetValueOrDefault())
                 {
-                    await _stateService.SetAddSitePromptShownAsync(true);
+                    await _storageService.SaveAsync(Constants.AddSitePromptShownKey, true);
                     if (Device.RuntimePlatform == Device.iOS)
                     {
                         if (_deviceActionService.SystemMajorVersion() < 12)