Removed grouping from Settings to fix a crash on iOS 15.4

(cherry picked from commit a9be659e27)

.config/dotnet-tools.json

@@ -1,12 +0,0 @@
-{
-  "version": 1,
-  "isRoot": true,
-  "tools": {
-    "dotnet-format": {
-      "version": "5.1.250801",
-      "commands": [
-        "dotnet-format"
-      ]
-    }
-  }
-}

.editorconfig

@@ -6,7 +6,6 @@ root = true
 # Don't use tabs for indentation.
 [*]
 indent_style = space
-end_of_line = lf
 # (Please don't specify an indent_size here; that has too many unintended consequences.)
 
 # Code files

.git-blame-ignore-revs

@@ -1,2 +0,0 @@
-# .NET format https://github.com/bitwarden/mobile/pull/1738
-04539af2a66668b6e85476d5cf318c9150ec4357

.gitattributes

@@ -1,7 +1,7 @@
 ###############################################################################
 # Set default behavior to automatically normalize line endings.
 ###############################################################################
-* text=auto eol=lf
+* text=auto
 
 ###############################################################################
 # Set default behavior for command prompt diff.

.github/PULL_REQUEST_TEMPLATE.md

@@ -21,8 +21,12 @@
 
 
 
+## Testing requirements
+<!--What functionality requires testing by QA? This includes testing new behavior and regression testing-->
+
+
+
 ## Before you submit
-- [ ] I have checked for formatting errors (`dotnet tool run dotnet-format --check`) (required)
 - [ ] I have added **unit tests** where it makes sense to do so (encouraged but not required)
 - [ ] This change requires a **documentation update** (notify the documentation team)
 - [ ] This change has particular **deployment requirements** (notify the DevOps team)

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

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

.github/workflows/build.yml

@@ -6,10 +6,6 @@ on:
     branches-ignore:
       - 'l10n_master'
       - 'gh-pages'
-    paths-ignore:
-      - '.github/workflows/**'
-  workflow_dispatch:
-    inputs: {}
 
 jobs:
   cloc:
@@ -17,7 +13,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout repo
-        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
 
       - name: Set up CLOC
         run: |
@@ -36,7 +32,7 @@ jobs:
       hotfix_branch_exists: ${{ steps.branch-check.outputs.hotfix_branch_exists }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
 
       - name: Check if special branches exist
         id: branch-check
@@ -60,13 +56,8 @@ jobs:
     runs-on: windows-2019
     needs: setup
     steps:
-      - name: Setup NuGet
-        uses: nuget/setup-nuget@b2bc17b761a1d88cab755a776c7922eb26eefbfa  # v1.0.6
-        with:
-          nuget-version: 5.9.0
-
       - name: Set up MSBuild
-        uses: microsoft/setup-msbuild@ab534842b4bdf384b8aaf93765dc6f721d9f5fab
+        uses: microsoft/setup-msbuild@c26a08ba26249b81327e26f6ef381897b6a8754d  # v1
 
       - name: Print environment
         run: |
@@ -77,7 +68,7 @@ jobs:
           echo "GitHub event: $GITHUB_EVENT"
 
       - name: Checkout repo
-        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
 
       - name: Decrypt secrets
         env:
@@ -110,14 +101,6 @@ jobs:
       - name: Restore packages
         run: nuget restore
 
-      - name: Restore tools
-        run: dotnet tool restore
-        shell: pwsh
-
-      - name: Verify Format
-        run: dotnet tool run dotnet-format --check
-        shell: pwsh
-
       - name: Run Core tests
         run: dotnet test test/Core.Test/Core.Test.csproj
 
@@ -180,14 +163,14 @@ jobs:
         shell: pwsh
 
       - name: Upload Play Store .aab artifact
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
+        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700  # v2.2.4
         with:
           name: com.x8bit.bitwarden.aab
           path: ./com.x8bit.bitwarden.aab
           if-no-files-found: error
 
       - name: Upload Play Store .apk artifact
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
+        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700  # v2.2.4
         with:
           name: com.x8bit.bitwarden.apk
           path: ./com.x8bit.bitwarden.apk
@@ -214,13 +197,8 @@ jobs:
     name: F-Droid Build
     runs-on: windows-2019
     steps:
-      - name: Setup NuGet
-        uses: nuget/setup-nuget@b2bc17b761a1d88cab755a776c7922eb26eefbfa  # v1.0.6
-        with:
-          nuget-version: 5.9.0
-
       - name: Set up MSBuild
-        uses: microsoft/setup-msbuild@ab534842b4bdf384b8aaf93765dc6f721d9f5fab
+        uses: microsoft/setup-msbuild@c26a08ba26249b81327e26f6ef381897b6a8754d  # v1
 
       - name: Print environment
         run: |
@@ -231,7 +209,7 @@ jobs:
           echo "GitHub event: $GITHUB_EVENT"
 
       - name: Checkout repo
-        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
 
       - name: Decrypt secrets
         env:
@@ -259,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");
 
@@ -315,16 +292,16 @@ jobs:
           $xml.Save($androidPath);
 
           Write-Output "########################################"
-          Write-Output "##### Uninstall from Core.csproj"
+          Write-Output "##### Uninstall from App.csproj"
           Write-Output "########################################"
 
           $xml=New-Object XML;
-          $xml.Load($corePath);
+          $xml.Load($appPath);
 
           $appCenterNode=$xml.SelectSingleNode("/Project/ItemGroup/PackageReference[@Include='Microsoft.AppCenter.Crashes']");
           $appCenterNode.ParentNode.RemoveChild($appCenterNode);
 
-          $xml.Save($corePath);
+          $xml.Save($appPath);
         shell: pwsh
 
       - name: Restore packages
@@ -366,7 +343,7 @@ jobs:
         shell: pwsh
 
       - name: Upload F-Droid .apk artifact
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
+        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700  # v2.2.4
         with:
           name: com.x8bit.bitwarden-fdroid.apk
           path: ./com.x8bit.bitwarden-fdroid.apk
@@ -378,11 +355,6 @@ jobs:
     runs-on: macos-11
     needs: setup
     steps:
-      - name: Setup NuGet
-        uses: nuget/setup-nuget@b2bc17b761a1d88cab755a776c7922eb26eefbfa  # v1.0.6
-        with:
-          nuget-version: 5.9.0
-
       - name: Print environment
         run: |
           nuget help | grep Version
@@ -392,16 +364,16 @@ jobs:
           echo "GitHub event: $GITHUB_EVENT"
 
       - name: Checkout repo
-        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
 
       - name: Login to Azure - Prod Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf
+        uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
         with:
           creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: Azure/get-keyvault-secrets@b5c723b9ac7870c022b8c35befe620b7009b336f
+        uses: Azure/get-keyvault-secrets@80ccd3fafe5662407cc2e55f202ee34bfff8c403
         with:
           keyvault: "bitwarden-prod-kv"
           secrets: "appcenter-ios-token"
@@ -423,8 +395,7 @@ jobs:
           gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
             --output $HOME/secrets/dist_extension.mobileprovision ./.github/secrets/dist_extension.mobileprovision.gpg
           gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
-            --output $HOME/secrets/dist_share_extension.mobileprovision \
-            ./.github/secrets/dist_share_extension.mobileprovision.gpg
+            --output $HOME/secrets/dist_share_extension.mobileprovision ./.github/secrets/dist_share_extension.mobileprovision.gpg
         shell: bash
 
       - name: Increment version
@@ -520,7 +491,7 @@ jobs:
             -exportOptionsPlist $EXPORT_OPTIONS_PATH
         shell: bash
 
-      - name: Copy all dSYMs files to upload
+      - name: Copy all dSYMs files to upload 
         run: |
           ARCHIVE_DSYMS_PATH="$HOME/Library/Developer/Xcode/Archives/*/*.xcarchive/dSYMs"
           EXPORT_PATH="./bitwarden-export"
@@ -529,7 +500,7 @@ jobs:
         shell: bash
 
       - name: Upload App Store .ipa & dSYMs artifacts
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
+        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700  # v2.2.4
         with:
           name: Bitwarden iOS
           path: |
@@ -539,12 +510,15 @@ jobs:
 
       - name: Install AppCenter CLI
         if: |
-          (github.ref == 'refs/heads/master'
-            && 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'
-        run: npm install -g appcenter-cli
+            (github.ref == 'refs/heads/master'
+              && 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'
+        uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+      - run: npm install -g appcenter-cli
 
       - name: Upload dSYMs to App Center
         if: |
@@ -555,7 +529,8 @@ jobs:
             || github.ref == 'refs/heads/hotfix-rc'
         env:
           APPCENTER_IOS_TOKEN: ${{ steps.retrieve-secrets.outputs.appcenter-ios-token }}
-        run: appcenter crashes upload-symbols -a bitwarden/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
@@ -586,22 +561,22 @@ jobs:
       _CROWDIN_PROJECT_ID: "269690"
     steps:
       - name: Checkout repo
-        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
 
       - name: Login to Azure
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf
+        uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
         with:
           creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: Azure/get-keyvault-secrets@b5c723b9ac7870c022b8c35befe620b7009b336f
+        uses: Azure/get-keyvault-secrets@80ccd3fafe5662407cc2e55f202ee34bfff8c403
         with:
           keyvault: "bitwarden-prod-kv"
           secrets: "crowdin-api-token"
 
       - name: Upload Sources
-        uses: crowdin/github-action@9237b4cb361788dfce63feb2e2f15c09e2fe7415
+        uses: crowdin/github-action@e39093fd75daae7859c68eded4b43d42ec78d8ea  # v1.3.2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
@@ -648,21 +623,21 @@ jobs:
           fi
 
       - name: Login to Azure - Prod Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf
+        uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
         if: failure()
         with:
           creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: Azure/get-keyvault-secrets@b5c723b9ac7870c022b8c35befe620b7009b336f
+        uses: Azure/get-keyvault-secrets@80ccd3fafe5662407cc2e55f202ee34bfff8c403
         if: failure()
         with:
           keyvault: "bitwarden-prod-kv"
           secrets: "devops-alerts-slack-webhook-url"
 
       - name: Notify Slack on failure
-        uses: act10ns/slack@da3191ebe2e67f49b46880b4633f5591a96d1d33
+        uses: act10ns/slack@e4e71685b9b239384b0f676a63c32367f59c2522  # v1.2.2
         if: failure()
         env:
           SLACK_WEBHOOK_URL: ${{ steps.retrieve-secrets.outputs.devops-alerts-slack-webhook-url }}

.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,12 +12,6 @@ on:
         options:
           - Initial Release
           - Redeploy
-          - Dry Run
-      fdroid_publish:
-        description: 'Publish to f-droid store'
-        required: true
-        default: true
-        type: boolean
 
 jobs:
   release:
@@ -27,7 +21,6 @@ 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
             echo "==================================="
@@ -37,15 +30,30 @@ jobs:
           fi
 
       - name: Checkout repo
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
 
-      - name: Check Release Version
-        id: version
-        uses: bitwarden/gh-actions/release-version-check@8f055ef543c7433c967a1b9b04a0f230923233bb
-        with:
-          release-type: ${{ github.event.inputs.release_type }}
-          project-type: xamarin
-          file: src/Android/Properties/AndroidManifest.xml
+      - name: Retrieve Mobile release version
+        id: retrieve-mobile-version
+        run: |
+          ver=$(sed -E -n '/^<manifest/s/^.*[ ]android:versionName="([^"]+)".*$/\1/p' ./src/Android/Properties/AndroidManifest.xml | tr -d '"')
+          echo "::set-output name=mobile_version::${ver}"
+        shell: bash
+
+      - name: Check to make sure Mobile release version has been bumped
+        if: ${{ github.event.inputs.release_type == 'Initial Release' }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          latest_ver=$(hub release -L 1 -f '%T')
+          latest_ver=${latest_ver:1}
+          echo "Latest version: $latest_ver"
+          ver=${{ steps.retrieve-mobile-version.outputs.mobile_version }}
+          echo "Version: $ver"
+          if [ "$latest_ver" = "$ver" ]; then
+            echo "Version has not been bumped!"
+            exit 1
+          fi
+        shell: bash
 
       - name: Get branch name
         id: branch
@@ -54,7 +62,7 @@ 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
@@ -64,16 +72,15 @@ jobs:
         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"
           commit: ${{ github.sha }}
-          tag: v${{ steps.version.outputs.version }}
-          name: Version ${{ steps.version.outputs.version }}
+          tag: v${{ steps.retrieve-mobile-version.outputs.mobile_version }}
+          name: Version ${{ steps.retrieve-mobile-version.outputs.mobile_version }}
           body: "<insert release notes here>"
           token: ${{ secrets.GITHUB_TOKEN }}
           draft: true
@@ -83,13 +90,12 @@ jobs:
     name: F-Droid Release
     runs-on: ubuntu-20.04
     needs: release
-    if: inputs.fdroid_publish
     steps:
       - name: Checkout repo
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0
+        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
@@ -97,7 +103,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'
 
@@ -161,5 +167,4 @@ jobs:
           cd $GITHUB_WORKSPACE
 
       - name: Deploy to gh-pages
-        if: github.event.inputs.release_type != 'Dry Run'
         run: npm run deploy

.github/workflows/stale-bot.yml

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

.github/workflows/version-bump.yml

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

.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

CONTRIBUTING.md

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

README.md

@@ -12,26 +12,20 @@ The Bitwarden mobile application is written in C# with Xamarin Android, Xamarin
 
 # Build/Run
 
-Please refer to the [Mobile section](https://contributing.bitwarden.com/mobile/) of the [Contributing Documentation](https://contributing.bitwarden.com/) for build instructions, recommended tooling, code style tips, and lots of other great information to get you started.
+**Requirements**
 
-# We're Hiring!
+- [Visual Studio](https://visualstudio.microsoft.com/)
+- [Xamarin](https://docs.microsoft.com/en-us/xamarin/get-started/installation/?pivots=windows)
 
-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.
+**Run the app**
+
+- Open the solution file in Visual Studio.
+- Restore the nuget packages.
+- Build and run the app.
 
 # Contribute
 
-Code contributions are welcome! Please commit any pull requests against the `master` branch. Learn more about how to contribute by reading the [Contributing Guidelines](https://contributing.bitwarden.com/contributing/). Check out the [Contributing Documentation](https://contributing.bitwarden.com/) for how to get started with your first contribution.
+Code contributions are welcome! Visual Studio with Xamarin is required to work on this project. Please commit any pull requests against the `master` branch.
+Learn more about how to contribute by reading the [`CONTRIBUTING.md`](CONTRIBUTING.md) file.
 
 Security audits and feedback are welcome. Please open an issue or email us privately if the report is sensitive in nature. You can read our security policy in the [`SECURITY.md`](SECURITY.md) file.
-
-### Dotnet-format
-
-We recently migrated to using dotnet-format as code formatter. All previous branches will need to updated to avoid large merge conflicts using the following steps:
-
-1. Check out your local Branch
-2. Run `git merge e0efcfbe45b2a27c73e9593bfd7a71fad2aa7a35`
-3. Resolve any merge conflicts, commit.
-4. Run `dotnet tool run dotnet-format`
-5. Commit
-6. Run `git merge -Xours 04539af2a66668b6e85476d5cf318c9150ec4357`
-7. Push

SECURITY.md

@@ -1,11 +1,39 @@
-Bitwarden believes that working with security researchers across the globe is crucial to keeping our users safe. If you believe you've found a security issue in our product or service, we encourage you to please submit a report through our [HackerOne Program](https://hackerone.com/bitwarden/). We welcome working with you to resolve the issue promptly. Thanks in advance!
+Bitwarden believes that working with security researchers across the globe is crucial to keeping our
+users safe. If you believe you've found a security issue in our product or service, we encourage you to
+notify us. We welcome working with you to resolve the issue promptly. Thanks in advance!
 
 # Disclosure Policy
 
-- Let us know as soon as possible upon discovery of a potential security issue, and we'll make every effort to quickly resolve the issue.
-- Provide us a reasonable amount of time to resolve the issue before any disclosure to the public or a third-party. We may publicly disclose the issue before resolving it, if appropriate.
-- Make a good faith effort to avoid privacy violations, destruction of data, and interruption or degradation of our service. Only interact with accounts you own or with explicit permission of the account holder.
-- If you would like to encrypt your report, please use the PGP key with long ID `0xDE6887086F892325FEC04CC0D847525B6931381F` (available in the public keyserver pool).
+- Let us know as soon as possible upon discovery of a potential security issue, and we'll make every
+  effort to quickly resolve the issue.
+- Provide us a reasonable amount of time to resolve the issue before any disclosure to the public or a
+  third-party. We may publicly disclose the issue before resolving it, if appropriate. 
+- Make a good faith effort to avoid privacy violations, destruction of data, and interruption or
+  degradation of our service. Only interact with accounts you own or with explicit permission of the
+  account holder.
+- If you would like to encrypt your report, please use the PGP key with long ID
+  `0xDE6887086F892325FEC04CC0D847525B6931381F` (available in the public keyserver pool).
+
+# In-scope
+
+- Security issues in any current release of Bitwarden. This includes the web vault, browser extension,
+  and mobile apps (iOS and Android). Product downloads are available at https://bitwarden.com. Source
+  code is available at https://github.com/bitwarden.
+
+# Exclusions
+
+The following bug classes are out-of scope:
+
+- Bugs that are already reported on any of Bitwarden's issue trackers (https://github.com/bitwarden),
+  or that we already know of. Note that some of our issue tracking is private.
+- Issues in an upstream software dependency (ex: Xamarin, ASP.NET) which are already reported to the
+  upstream maintainer.
+- Attacks requiring physical access to a user's device.
+- Self-XSS
+- Issues related to software or protocols not under Bitwarden's control
+- Vulnerabilities in outdated versions of Bitwarden
+- Missing security best practices that do not directly lead to a vulnerability
+- Issues that do not have any impact on the general public
 
 While researching, we'd like to ask you to refrain from:
 
@@ -14,8 +42,4 @@ While researching, we'd like to ask you to refrain from:
 - Social engineering (including phishing) of Bitwarden staff or contractors
 - Any physical attempts against Bitwarden property or data centers
 
-# We want to help you!
-
-If you have something that you feel is close to exploitation, or if you'd like some information regarding the internal API, or generally have any questions regarding the app that would help in your efforts, please email us at https://bitwarden.com/contact and ask for that information. As stated above, Bitwarden wants to help you find issues, and is more than willing to help.
-
 Thank you for helping keep Bitwarden and our users safe!

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

src/Android/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.3</Version>
+      <Version>1.7.0</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Firebase.Messaging">
       <Version>122.0.0</Version>
@@ -145,12 +145,12 @@
     <Compile Include="Tiles\GeneratorTileService.cs" />
     <Compile Include="Tiles\MyVaultTileService.cs" />
     <Compile Include="Utilities\AndroidHelpers.cs" />
+    <Compile Include="Utilities\AppCenterHelper.cs" />
     <Compile Include="Utilities\ThemeHelpers.cs" />
     <Compile Include="WebAuthCallbackActivity.cs" />
     <Compile Include="Renderers\SelectableLabelRenderer.cs" />
     <Compile Include="Services\ClipboardService.cs" />
     <Compile Include="Utilities\IntentExtensions.cs" />
-    <Compile Include="Renderers\CustomPageRenderer.cs" />
   </ItemGroup>
   <ItemGroup>
     <AndroidAsset Include="Assets\bwi-font.ttf" />
@@ -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",
@@ -73,7 +71,6 @@ namespace Bit.Droid.Autofill
             "com.google.android.apps.chrome",
             "com.google.android.apps.chrome_dev",
             "com.google.android.captiveportallogin",
-            "com.iode.firefox",
             "com.jamal2367.styx",
             "com.kiwibrowser.browser",
             "com.kiwibrowser.browser.dev",
@@ -87,7 +84,6 @@ namespace Bit.Droid.Autofill
             "com.naver.whale",
             "com.opera.browser",
             "com.opera.browser.beta",
-            "com.opera.gx",
             "com.opera.mini.native",
             "com.opera.mini.native.beta",
             "com.opera.touch",

src/Android/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");
 
@@ -64,26 +64,21 @@ namespace Bit.Droid
             Intent?.Validate();
 
             base.OnCreate(savedInstanceState);
-
-            _deviceActionService.SetScreenCaptureAllowedAsync().FireAndForget(_ =>
+            if (!CoreHelpers.InDebugMode())
             {
                 Window.AddFlags(Android.Views.WindowManagerFlags.Secure);
-            });
-
-            ServiceContainer.Resolve<ILogger>("logger").InitAsync();
-
-            var toplayout = Window?.DecorView?.RootView;
-            if (toplayout != null)
-            {
-                toplayout.FilterTouchesWhenObscured = true;
             }
 
+#if !FDROID
+            var appCenterHelper = new AppCenterHelper(_appIdService, _userService);
+            var appCenterTask = appCenterHelper.InitAsync();
+#endif
+
             Xamarin.Essentials.Platform.Init(this, savedInstanceState);
             Xamarin.Forms.Forms.Init(this, savedInstanceState);
             _appOptions = GetOptions();
             LoadApplication(new App.App(_appOptions));
 
-
             _broadcasterService.Subscribe(_activityKey, (message) =>
             {
                 if (message.Command == "startEventTimer")
@@ -380,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

@@ -12,6 +12,7 @@ using Bit.Core.Abstractions;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Bit.Droid.Services;
+using Bit.Droid.Utilities;
 using Plugin.CurrentActivity;
 using Plugin.Fingerprint;
 using Xamarin.Android.Net;
@@ -19,8 +20,6 @@ using System.Net.Http;
 using System.Net;
 using Bit.App.Utilities;
 using Bit.App.Pages;
-using Bit.App.Utilities.AccountManagement;
-using Bit.App.Controls;
 #if !FDROID
 using Android.Gms.Security;
 #endif
@@ -54,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(
@@ -63,16 +61,6 @@ namespace Bit.Droid
                     ServiceContainer.Resolve<IPasswordRepromptService>("passwordRepromptService"),
                     ServiceContainer.Resolve<ICryptoService>("cryptoService"));
                 ServiceContainer.Register<IVerificationActionsFlowHelper>("verificationActionsFlowHelper", verificationActionsFlowHelper);
-
-                var accountsManager = new AccountsManager(
-                    ServiceContainer.Resolve<IBroadcasterService>("broadcasterService"),
-                    ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService"),
-                    ServiceContainer.Resolve<IStorageService>("secureStorageService"),
-                    ServiceContainer.Resolve<IStateService>("stateService"),
-                    ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService"),
-                    ServiceContainer.Resolve<IAuthService>("authService"),
-                    ServiceContainer.Resolve<ILogger>("logger"));
-                ServiceContainer.Register<IAccountsManager>("accountsManager", accountsManager);
             }
 #if !FDROID
             if (Build.VERSION.SdkInt <= BuildVersionCodes.Kitkat)
@@ -99,15 +87,7 @@ namespace Bit.Droid
 
         private void RegisterLocalServices()
         {
-            ServiceContainer.Register<INativeLogService>("nativeLogService", new AndroidLogService());
-#if FDROID
-            var logger = new StubLogger();
-#elif DEBUG
-            var logger = DebugLogger.Instance;
-#else
-            var logger = Logger.Instance;
-#endif
-            ServiceContainer.Register("logger", logger);
+            ServiceContainer.Register<ILogService>("logService", new AndroidLogService());
 
             // Note: This might cause a race condition. Investigate more.
             Task.Run(() =>
@@ -127,23 +107,19 @@ namespace Bit.Droid
             var documentsPath = System.Environment.GetFolderPath(System.Environment.SpecialFolder.Personal);
             var liteDbStorage = new LiteDbStorageService(Path.Combine(documentsPath, "bitwarden.db"));
             var localizeService = new LocalizeService();
-            var broadcasterService = new BroadcasterService(logger);
+            var broadcasterService = new BroadcasterService();
             var messagingService = new MobileBroadcasterMessagingService(broadcasterService);
             var i18nService = new MobileI18nService(localizeService.GetCurrentCultureInfo());
             var secureStorageService = new SecureStorageService();
             var cryptoPrimitiveService = new CryptoPrimitiveService();
             var mobileStorageService = new MobileStorageService(preferencesStorage, liteDbStorage);
-            var stateService = new StateService(mobileStorageService, secureStorageService, messagingService);
-            var stateMigrationService =
-                new StateMigrationService(liteDbStorage, preferencesStorage, secureStorageService);
-            var clipboardService = new ClipboardService(stateService);
-            var deviceActionService = new DeviceActionService(clipboardService, stateService, messagingService,
+            var deviceActionService = new DeviceActionService(mobileStorageService, messagingService,
                 broadcasterService, () => ServiceContainer.Resolve<IEventService>("eventService"));
-            var platformUtilsService = new MobilePlatformUtilsService(deviceActionService, clipboardService,
-                messagingService, broadcasterService);
+            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);
@@ -153,16 +129,13 @@ 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", clipboardService);
+            ServiceContainer.Register<IClipboardService>("clipboardService", new ClipboardService(mobileStorageService));
             ServiceContainer.Register<IDeviceActionService>("deviceActionService", deviceActionService);
             ServiceContainer.Register<IPlatformUtilsService>("platformUtilsService", platformUtilsService);
             ServiceContainer.Register<IBiometricService>("biometricService", biometricService);
             ServiceContainer.Register<ICryptoFunctionService>("cryptoFunctionService", cryptoFunctionService);
             ServiceContainer.Register<ICryptoService>("cryptoService", cryptoService);
             ServiceContainer.Register<IPasswordRepromptService>("passwordRepromptService", passwordRepromptService);
-            ServiceContainer.Register<IAvatarImageSourcePool>("avatarImageSourcePool", new AvatarImageSourcePool());
 
             // Push
 #if FDROID
@@ -175,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
@@ -191,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="2022.6.2" 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.3" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
 
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30"/>
 
@@ -12,7 +12,7 @@
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
   <uses-permission android:name="com.samsung.android.providers.context.permission.WRITE_USE_APP_FEATURE_SURVEY"/>
-  <uses-permission android:name="android.permission.VIBRATE" />
+
   <uses-feature android:name="android.hardware.camera" android:required="false"/>
   <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
 

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

@@ -1,31 +0,0 @@
-using System;
-using Android.App;
-using Android.Content;
-using AndroidX.AppCompat.Widget;
-using Bit.App.Resources;
-using Bit.Droid.Renderers;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(ContentPage), typeof(CustomPageRenderer))]
-namespace Bit.Droid.Renderers
-{
-    public class CustomPageRenderer : PageRenderer
-    {
-        public CustomPageRenderer(Context context) : base(context)
-        {
-        }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<Page> e)
-        {
-            base.OnElementChanged(e);
-
-            Activity context = (Activity)this.Context;
-            var toolbar = context.FindViewById<Toolbar>(Resource.Id.toolbar);
-            if(toolbar != null)
-            {
-                toolbar.NavigationContentDescription = AppResources.TapToGoBack;
-            }
-        }
-    }
-}

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/mipmap-anydpi-v26/ic_launcher.xml

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

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

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

src/Android/Resources/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"/>
@@ -77,9 +71,6 @@
   <compatibility-package
     android:name="com.google.android.captiveportallogin"
     android:maxLongVersionCode="10000000000"/>
-  <compatibility-package
-    android:name="com.iode.firefox"
-    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.jamal2367.styx"
     android:maxLongVersionCode="10000000000"/>
@@ -119,9 +110,6 @@
   <compatibility-package
     android:name="com.opera.browser.beta"
     android:maxLongVersionCode="10000000000"/>
-  <compatibility-package
-    android:name="com.opera.gx"
-    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.opera.mini.native"
     android:maxLongVersionCode="10000000000"/>

src/Android/Services/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/BiometricService.cs

@@ -1,10 +1,11 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 using Android.OS;
 using Android.Security.Keystore;
 using Bit.Core.Abstractions;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
 using Java.Security;
 using Javax.Crypto;
 
@@ -42,22 +43,23 @@ namespace Bit.Droid.Services
 
         public Task<bool> ValidateIntegrityAsync(string bioIntegrityKey = null)
         {
+            // bioIntegrityKey used in iOS only
             if (Build.VERSION.SdkInt < BuildVersionCodes.M)
             {
                 return Task.FromResult(true);
             }
 
+            _keystore.Load(null);
+            IKey key = _keystore.GetKey(KeyName, null);
+            Cipher cipher = Cipher.GetInstance(Transformation);
+
+            if (key == null || cipher == null)
+            {
+                return Task.FromResult(true);
+            }
+
             try
             {
-                _keystore.Load(null);
-                var key = _keystore.GetKey(KeyName, null);
-                var cipher = Cipher.GetInstance(Transformation);
-
-                if (key == null || cipher == null)
-                {
-                    return Task.FromResult(true);
-                }
-
                 cipher.Init(CipherMode.EncryptMode, key);
             }
             catch (KeyPermanentlyInvalidatedException e)
@@ -73,7 +75,6 @@ namespace Bit.Droid.Services
             catch (InvalidKeyException e)
             {
                 // Fallback for old bitwarden users without a key
-                LoggerHelper.LogEvenIfCantBeResolved(e);
                 CreateKey();
             }
 
@@ -94,11 +95,10 @@ namespace Bit.Droid.Services
                 keyGen.Init(keyGenSpec);
                 keyGen.GenerateKey();
             }
-            catch (Exception e)
+            catch
             {
                 // Catch silently to allow biometrics to function on devices that are in a state where key generation
                 // is not functioning
-                LoggerHelper.LogEvenIfCantBeResolved(e);
             }
         }
     }

src/Android/Services/ClipboardService.cs

@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Android.App;
 using Android.Content;
-using Android.OS;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Droid.Receivers;
 using Plugin.CurrentActivity;
@@ -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,
@@ -26,47 +26,11 @@ namespace Bit.Droid.Services
                                            PendingIntentFlags.UpdateCurrent));
         }
 
-        public async Task CopyTextAsync(string text, int expiresInMs = -1, bool isSensitive = true)
+        public async Task CopyTextAsync(string text, int expiresInMs = -1)
         {
-            try
-            {
-                 // Xamarin.Essentials.Clipboard currently doesn't support the IS_SENSITIVE flag for API 33+
-                if ((int)Build.VERSION.SdkInt < 33)
-                {
-                    await Clipboard.SetTextAsync(text);
-                }
-                else
-                {
-                    CopyToClipboard(text, isSensitive);
-                }
+            await Clipboard.SetTextAsync(text);
 
-                await ClearClipboardAlarmAsync(expiresInMs);
-            }
-            catch (Java.Lang.SecurityException ex) when (ex.Message.Contains("does not belong to"))
-            {
-                // #1962 Just ignore, the content is copied either way but there is some app interfiering in the process
-                // that the OS catches and just throws this exception.
-            }
-        }
-
-        public bool IsCopyNotificationHandledByPlatform()
-        {
-            // Android 13+ provides built-in notification when text is copied to the clipboard
-            return (int)Build.VERSION.SdkInt >= 33;
-        }
-
-        private void CopyToClipboard(string text, bool isSensitive = true)
-        {
-            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-            var clipboardManager = activity.GetSystemService(
-                Context.ClipboardService) as Android.Content.ClipboardManager;
-            var clipData = ClipData.NewPlainText("bitwarden", text);
-            if (isSensitive)
-            {
-                clipData.Description.Extras ??= new PersistableBundle();
-                clipData.Description.Extras.PutBoolean("android.content.extra.IS_SENSITIVE", true);
-            }
-            clipboardManager.PrimaryClip = clipData;
+            await ClearClipboardAlarmAsync(expiresInMs);
         }
 
         private async Task ClearClipboardAlarmAsync(int expiresInMs = -1)
@@ -75,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,8 +35,7 @@ namespace Bit.Droid.Services
 {
     public class DeviceActionService : IDeviceActionService
     {
-        private readonly IClipboardService _clipboardService;
-        private readonly IStateService _stateService;
+        private readonly IStorageService _storageService;
         private readonly IMessagingService _messagingService;
         private readonly IBroadcasterService _broadcasterService;
         private readonly Func<IEventService> _eventServiceFunc;
@@ -48,14 +47,12 @@ namespace Bit.Droid.Services
         private string _userAgent;
 
         public DeviceActionService(
-            IClipboardService clipboardService,
-            IStateService stateService,
+            IStorageService storageService,
             IMessagingService messagingService,
             IBroadcasterService broadcasterService,
             Func<IEventService> eventServiceFunc)
         {
-            _clipboardService = clipboardService;
-            _stateService = stateService;
+            _storageService = storageService;
             _messagingService = messagingService;
             _broadcasterService = broadcasterService;
             _eventServiceFunc = eventServiceFunc;
@@ -336,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) { }
         }
@@ -677,7 +674,7 @@ namespace Bit.Droid.Services
             else
             {
                 var data = new Intent();
-                if (cipher?.Login == null)
+                if (cipher == null)
                 {
                     data.PutExtra("canceled", "true");
                 }
@@ -737,11 +734,6 @@ namespace Bit.Droid.Services
             return Accessibility.AccessibilityHelpers.OverlayPermitted();
         }
 
-        public bool HasAutofillService()
-        {
-            return true;
-        }
-
         public void OpenAccessibilityOverlayPermissionSettings()
         {
             var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
@@ -924,45 +916,27 @@ 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");
                     var totp = await totpService.GetCodeAsync(cipher.Login.Totp);
                     if (totp != null)
                     {
-                        await _clipboardService.CopyTextAsync(totp);
+                        CopyToClipboard(totp);
                     }
                 }
             }
         }
 
-        public float GetSystemFontSizeScale()
+        private void CopyToClipboard(string text)
         {
-            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
-        }
-
-        public async Task SetScreenCaptureAllowedAsync()
-        {
-            if (CoreHelpers.ForceScreenCaptureEnabled())
-            {
-                return;
-            }
-
-            var activity = CrossCurrentActivity.Current?.Activity;
-            if (await _stateService.GetScreenCaptureAllowedAsync())
-            {
-                activity.RunOnUiThread(() => activity.Window.ClearFlags(WindowManagerFlags.Secure));
-                return;
-            }
-            activity.RunOnUiThread(() => activity.Window.AddFlags(WindowManagerFlags.Secure));
+            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
+            var clipboardManager = activity.GetSystemService(
+                Context.ClipboardService) as Android.Content.ClipboardManager;
+            clipboardManager.PrimaryClip = ClipData.NewPlainText("bitwarden", text);
         }
     }
 }

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

@@ -0,0 +1,58 @@
+#if !FDROID
+using Bit.Core.Abstractions;
+using System.Threading.Tasks;
+using Microsoft.AppCenter;
+using Microsoft.AppCenter.Crashes;
+using Newtonsoft.Json;
+
+namespace Bit.Droid.Utilities
+{
+    public class AppCenterHelper
+    {
+        private const string AppSecret = "d3834185-b4a6-4347-9047-b86c65293d42";
+
+        private readonly IAppIdService _appIdService;
+        private readonly IUserService _userService;
+
+        private string _userId;
+        private string _appId;
+        
+        public AppCenterHelper(
+            IAppIdService appIdService,
+            IUserService userService)
+        {
+            _appIdService = appIdService;
+            _userService = userService;
+        }
+
+        public async Task InitAsync()
+        {
+            _userId = await _userService.GetUserIdAsync();
+            _appId = await _appIdService.GetAppIdAsync();
+            
+            AppCenter.Start(AppSecret, typeof(Crashes));
+            AppCenter.SetUserId(_userId);
+            
+            Crashes.GetErrorAttachments = (ErrorReport report) =>
+            {
+                return new ErrorAttachmentLog[]
+                {
+                    ErrorAttachmentLog.AttachmentWithText(Description, "crshdesc.txt"),
+                };
+            };
+        }
+
+        public string Description
+        {
+            get
+            {
+                return JsonConvert.SerializeObject(new
+                {
+                    AppId = _appId,
+                    UserId = _userId
+                }, Formatting.Indented);
+            }
+        }
+    }
+}
+#endif

src/Android/Utilities/ThemeHelpers.cs

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

src/App/Abstractions/IAccountsManager.cs

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

src/App/Abstractions/IAccountsManagerHost.cs

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

src/App/Abstractions/IDeviceActionService.cs

@@ -1,6 +1,6 @@
-using System.Threading.Tasks;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Models.View;
+using System.Threading.Tasks;
 
 namespace Bit.App.Abstractions
 {
@@ -35,7 +35,6 @@ namespace Bit.App.Abstractions
         void Background();
         bool AutofillAccessibilityServiceRunning();
         bool AutofillAccessibilityOverlayPermitted();
-        bool HasAutofillService();
         bool AutofillServiceEnabled();
         void DisableAutofillService();
         bool AutofillServicesEnabled();
@@ -46,8 +45,5 @@ namespace Bit.App.Abstractions
         long GetActiveTime();
         void CloseMainApp();
         bool SupportsFido2();
-        float GetSystemFontSizeScale();
-        Task OnAccountSwitchCompleteAsync();
-        Task SetScreenCaptureAllowedAsync();
     }
 }

src/App/Abstractions/IPasswordRepromptService.cs

@@ -7,7 +7,7 @@ namespace Bit.App.Abstractions
         string[] ProtectedFields { get; }
 
         Task<bool> ShowPasswordPromptAsync();
-
+        
         Task<(string password, bool valid)> ShowPasswordPromptAndGetItAsync();
 
         Task<bool> Enabled();

src/App/Abstractions/IPushNotificationListenerService.cs

@@ -1,5 +1,5 @@
-using System.Threading.Tasks;
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
+using System.Threading.Tasks;
 
 namespace Bit.App.Abstractions
 {

src/App/App.csproj

@@ -13,14 +13,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Plugin.Fingerprint" Version="2.1.5" />
-    <PackageReference Include="SkiaSharp.Views.Forms" Version="2.80.3" />
-    <PackageReference Include="Xamarin.CommunityToolkit" Version="2.0.2" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
+    <PackageReference Include="Microsoft.AppCenter.Crashes" Version="4.4.0" />
+    <PackageReference Include="Plugin.Fingerprint" Version="2.1.4" />
+    <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.2478" />
+    <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>
@@ -121,19 +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\" />
-    <Folder Include="Utilities\AccountManagement\" />
-    <Folder Include="Controls\DateTime\" />
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Remove="Pages\Accounts\AccountsPopupPage.xaml" />
+    <EmbeddedResource Update="Controls\CipherViewCell\CipherViewCell.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
   </ItemGroup>
 
   <ItemGroup>
@@ -160,6 +158,12 @@
     </Compile>
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Update="Styles\Base.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Resources\AppResources.cs.Designer.cs">
       <DependentUpon>AppResources.cs.resx</DependentUpon>
@@ -412,8 +416,5 @@
   <ItemGroup>
     <None Remove="Behaviors\" />
     <None Remove="Xamarin.CommunityToolkit" />
-    <None Remove="Controls\AccountSwitchingOverlay\" />
-    <None Remove="Utilities\AccountManagement\" />
-    <None Remove="Controls\DateTime\" />
   </ItemGroup>
 </Project>

src/App/App.xaml.cs

@@ -1,25 +1,24 @@
-using System;
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
+using Bit.App.Abstractions;
 using Bit.App.Models;
 using Bit.App.Pages;
 using Bit.App.Resources;
 using Bit.App.Services;
 using Bit.App.Utilities;
-using Bit.App.Utilities.AccountManagement;
+using Bit.Core;
 using Bit.Core.Abstractions;
-using Bit.Core.Enums;
-using Bit.Core.Models.Data;
-using Bit.Core.Services;
 using Bit.Core.Utilities;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 
 [assembly: XamlCompilation(XamlCompilationOptions.Compile)]
 namespace Bit.App
 {
-    public partial class App : Application, IAccountsManagerHost
+    public partial class App : Application
     {
+        private readonly IUserService _userService;
         private readonly IBroadcasterService _broadcasterService;
         private readonly IMessagingService _messagingService;
         private readonly IStateService _stateService;
@@ -27,9 +26,9 @@ 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;
-        private readonly IAccountsManager _accountsManager;
 
         private static bool _isResumed;
 
@@ -41,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");
@@ -48,103 +48,113 @@ 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");
-            _accountsManager = ServiceContainer.Resolve<IAccountsManager>("accountsManager");
-
-            _accountsManager.Init(() => Options, this);
 
             Bootstrap();
             _broadcasterService.Subscribe(nameof(App), async (message) =>
             {
-                try
+                if (message.Command == "showDialog")
                 {
-                    if (message.Command == "showDialog")
+                    var details = message.Data as DialogDetails;
+                    var confirmed = true;
+                    var confirmText = string.IsNullOrWhiteSpace(details.ConfirmText) ?
+                        AppResources.Ok : details.ConfirmText;
+                    Device.BeginInvokeOnMainThread(async () =>
                     {
-                        var details = message.Data as DialogDetails;
-                        var confirmed = true;
-                        var confirmText = string.IsNullOrWhiteSpace(details.ConfirmText) ?
-                            AppResources.Ok : details.ConfirmText;
-                        Device.BeginInvokeOnMainThread(async () =>
+                        if (!string.IsNullOrWhiteSpace(details.CancelText))
                         {
-                            if (!string.IsNullOrWhiteSpace(details.CancelText))
-                            {
-                                confirmed = await Current.MainPage.DisplayAlert(details.Title, details.Text, confirmText,
-                                    details.CancelText);
-                            }
-                            else
-                            {
-                                await Current.MainPage.DisplayAlert(details.Title, details.Text, confirmText);
-                            }
-                            _messagingService.Send("showDialogResolve", new Tuple<int, bool>(details.DialogId, confirmed));
-                        });
-                    }
-                    else if (message.Command == "resumed")
-                    {
-                        if (Device.RuntimePlatform == Device.iOS)
-                        {
-                            ResumedAsync().FireAndForget();
+                            confirmed = await Current.MainPage.DisplayAlert(details.Title, details.Text, confirmText,
+                                details.CancelText);
                         }
-                    }
-                    else if (message.Command == "slept")
-                    {
-                        if (Device.RuntimePlatform == Device.iOS)
+                        else
                         {
-                            await SleptAsync();
+                            await Current.MainPage.DisplayAlert(details.Title, details.Text, confirmText);
                         }
-                    }
-                    else if (message.Command == "migrated")
+                        _messagingService.Send("showDialogResolve", new Tuple<int, bool>(details.DialogId, confirmed));
+                    });
+                }
+                else if (message.Command == "locked")
+                {
+                    await LockedAsync(!(message.Data as bool?).GetValueOrDefault());
+                }
+                else if (message.Command == "lockVault")
+                {
+                    await _vaultTimeoutService.LockAsync(true);
+                }
+                else if (message.Command == "logout")
+                {
+                    Device.BeginInvokeOnMainThread(async () =>
+                        await LogOutAsync((message.Data as bool?).GetValueOrDefault()));
+                }
+                else if (message.Command == "loggedOut")
+                {
+                    // Clean up old migrated key if they ever log out.
+                    await _secureStorageService.RemoveAsync("oldKey");
+                }
+                else if (message.Command == "resumed")
+                {
+                    if (Device.RuntimePlatform == Device.iOS)
                     {
-                        await Task.Delay(1000);
-                        await _accountsManager.NavigateOnAccountChangeAsync();
-                    }
-                    else if (message.Command == "popAllAndGoToTabGenerator" ||
-                        message.Command == "popAllAndGoToTabMyVault" ||
-                        message.Command == "popAllAndGoToTabSend" ||
-                        message.Command == "popAllAndGoToAutofillCiphers")
-                    {
-                        Device.BeginInvokeOnMainThread(async () =>
-                        {
-                            if (Current.MainPage is TabsPage tabsPage)
-                            {
-                                while (tabsPage.Navigation.ModalStack.Count > 0)
-                                {
-                                    await tabsPage.Navigation.PopModalAsync(false);
-                                }
-                                if (message.Command == "popAllAndGoToAutofillCiphers")
-                                {
-                                    Current.MainPage = new NavigationPage(new AutofillCiphersPage(Options));
-                                }
-                                else if (message.Command == "popAllAndGoToTabMyVault")
-                                {
-                                    Options.MyVaultTile = false;
-                                    tabsPage.ResetToVaultPage();
-                                }
-                                else if (message.Command == "popAllAndGoToTabGenerator")
-                                {
-                                    Options.GeneratorTile = false;
-                                    tabsPage.ResetToGeneratorPage();
-                                }
-                                else if (message.Command == "popAllAndGoToTabSend")
-                                {
-                                    tabsPage.ResetToSendPage();
-                                }
-                            }
-                        });
-                    }
-                    else if (message.Command == "convertAccountToKeyConnector")
-                    {
-                        Device.BeginInvokeOnMainThread(async () =>
-                        {
-                            await Application.Current.MainPage.Navigation.PushModalAsync(
-                                new NavigationPage(new RemoveMasterPasswordPage()));
-                        });
+                        ResumedAsync().FireAndForget();
                     }
                 }
-                catch (Exception ex)
+                else if (message.Command == "slept")
                 {
-                    LoggerHelper.LogEvenIfCantBeResolved(ex);
+                    if (Device.RuntimePlatform == Device.iOS)
+                    {
+                        await SleptAsync();
+                    }
                 }
+                else if (message.Command == "migrated")
+                {
+                    await Task.Delay(1000);
+                    await SetMainPageAsync();
+                }
+                else if (message.Command == "popAllAndGoToTabGenerator" ||
+                    message.Command == "popAllAndGoToTabMyVault" ||
+                    message.Command == "popAllAndGoToTabSend" ||
+                    message.Command == "popAllAndGoToAutofillCiphers")
+                {
+                    Device.BeginInvokeOnMainThread(async () =>
+                    {
+                        if (Current.MainPage is TabsPage tabsPage)
+                        {
+                            while (tabsPage.Navigation.ModalStack.Count > 0)
+                            {
+                                await tabsPage.Navigation.PopModalAsync(false);
+                            }
+                            if (message.Command == "popAllAndGoToAutofillCiphers")
+                            {
+                                Current.MainPage = new NavigationPage(new AutofillCiphersPage(Options));
+                            }
+                            else if (message.Command == "popAllAndGoToTabMyVault")
+                            {
+                                Options.MyVaultTile = false;
+                                tabsPage.ResetToVaultPage();
+                            }
+                            else if (message.Command == "popAllAndGoToTabGenerator")
+                            {
+                                Options.GeneratorTile = false;
+                                tabsPage.ResetToGeneratorPage();
+                            }
+                            else if (message.Command == "popAllAndGoToTabSend")
+                            {
+                                tabsPage.ResetToSendPage();
+                            }
+                        }
+                    });
+                }
+                else if (message.Command == "convertAccountToKeyConnector")
+                {
+                    Device.BeginInvokeOnMainThread(async () =>
+                    {
+                        await Application.Current.MainPage.Navigation.PushModalAsync(
+                            new NavigationPage(new RemoveMasterPasswordPage()));
+                    });
+                }
+
             });
         }
 
@@ -158,7 +168,7 @@ namespace Bit.App
             if (string.IsNullOrWhiteSpace(Options.Uri))
             {
                 var updated = await AppHelpers.PerformUpdateTasksAsync(_syncService, _deviceActionService,
-                    _stateService);
+                    _storageService);
                 if (!updated)
                 {
                     SyncIfNeeded();
@@ -182,12 +192,9 @@ namespace Bit.App
                 var isLocked = await _vaultTimeoutService.IsLockedAsync();
                 if (!isLocked)
                 {
-                    await _stateService.SetLastActiveTimeAsync(_deviceActionService.GetActiveTime());
-                }
-                if (!SetTabsPageFromAutofill(isLocked))
-                {
-                    ClearAutofillUri();
+                    await _storageService.SaveAsync(Constants.LastActiveTimeKey, _deviceActionService.GetActiveTime());
                 }
+                SetTabsPageFromAutofill(isLocked);
                 await SleptAsync();
             }
         }
@@ -210,7 +217,6 @@ namespace Bit.App
 
         private async Task ResumedAsync()
         {
-            await _stateService.CheckExtensionActiveUserAndSwitchIfNeededAsync();
             await _vaultTimeoutService.CheckVaultTimeoutAsync();
             _messagingService.Send("startEventTimer");
             await UpdateThemeAsync();
@@ -227,7 +233,7 @@ namespace Bit.App
         {
             await Device.InvokeOnMainThreadAsync(() =>
             {
-                ThemeManager.SetTheme(Current.Resources);
+                ThemeManager.SetTheme(Device.RuntimePlatform == Device.Android, Current.Resources);
                 _messagingService.Send("updatedTheme");
             });
         }
@@ -240,24 +246,61 @@ namespace Bit.App
             new System.Globalization.UmAlQuraCalendar();
         }
 
+        private async Task LogOutAsync(bool expired)
+        {
+            await AppHelpers.LogOutAsync();
+            _authService.LogOut(() =>
+            {
+                Current.MainPage = new HomePage();
+                if (expired)
+                {
+                    _platformUtilsService.ShowToast("warning", null, AppResources.LoginExpired);
+                }
+            });
+        }
+
+        private async Task SetMainPageAsync()
+        {
+            var authed = await _userService.IsAuthenticatedAsync();
+            if (authed)
+            {
+                if (await _vaultTimeoutService.IsLockedAsync())
+                {
+                    Current.MainPage = new NavigationPage(new LockPage(Options));
+                }
+                else if (Options.FromAutofillFramework && Options.SaveType.HasValue)
+                {
+                    Current.MainPage = new NavigationPage(new AddEditPage(appOptions: Options));
+                }
+                else if (Options.Uri != null)
+                {
+                    Current.MainPage = new NavigationPage(new AutofillCiphersPage(Options));
+                }
+                else if (Options.CreateSend != null)
+                {
+                    Current.MainPage = new NavigationPage(new SendAddEditPage(Options));
+                }
+                else
+                {
+                    Current.MainPage = new TabsPage(Options);
+                }
+            }
+            else
+            {
+                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());
             }
         }
 
-        private void ClearAutofillUri()
-        {
-            if (Device.RuntimePlatform == Device.Android && !string.IsNullOrWhiteSpace(Options.Uri))
-            {
-                Options.Uri = null;
-            }
-        }
-
-        private bool SetTabsPageFromAutofill(bool isLocked)
+        private void SetTabsPageFromAutofill(bool isLocked)
         {
             if (Device.RuntimePlatform == Device.Android && !string.IsNullOrWhiteSpace(Options.Uri) &&
                 !Options.FromAutofillFramework)
@@ -277,9 +320,7 @@ namespace Bit.App
                         }
                     });
                 });
-                return true;
             }
-            return false;
         }
 
         private void Prime()
@@ -295,13 +336,13 @@ 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));
-            _accountsManager.NavigateOnAccountChangeAsync().FireAndForget();
+            Current.MainPage = new HomePage();
+            var mainPageTask = SetMainPageAsync();
             ServiceContainer.Resolve<MobilePlatformUtilsService>("platformUtilsService").Init();
         }
 
@@ -322,8 +363,17 @@ namespace Bit.App
             });
         }
 
-        public async Task SetPreviousPageInfoAsync()
+        private async Task LockedAsync(bool autoPromptBiometric)
         {
+            await _stateService.PurgeAsync();
+            if (autoPromptBiometric && Device.RuntimePlatform == Device.iOS)
+            {
+                var vaultTimeout = await _storageService.GetAsync<int?>(Constants.VaultTimeoutKey);
+                if (vaultTimeout == 0)
+                {
+                    autoPromptBiometric = false;
+                }
+            }
             PreviousPageInfo lastPageBeforeLock = null;
             if (Current.MainPage is TabbedPage tabbedPage && tabbedPage.Navigation.ModalStack.Count > 0)
             {
@@ -348,45 +398,9 @@ namespace Bit.App
                     }
                 }
             }
-            await _stateService.SetPreviousPageInfoAsync(lastPageBeforeLock);
-        }
-
-        public void Navigate(NavigationTarget navTarget, INavigationParams navParams)
-        {
-            switch (navTarget)
-            {
-                case NavigationTarget.HomeLogin:
-                    Current.MainPage = new NavigationPage(new HomePage(Options));
-                    break;
-                case NavigationTarget.Login:
-                    if (navParams is LoginNavigationParams loginParams)
-                    {
-                        Current.MainPage = new NavigationPage(new LoginPage(loginParams.Email, Options));
-                    }
-                    break;
-                case NavigationTarget.Lock:
-                    if (navParams is LockNavigationParams lockParams)
-                    {
-                        Current.MainPage = new NavigationPage(new LockPage(Options, lockParams.AutoPromptBiometric));
-                    }
-                    else
-                    {
-                        Current.MainPage = new NavigationPage(new LockPage(Options));
-                    }
-                    break;
-                case NavigationTarget.Home:
-                    Current.MainPage = new TabsPage(Options);
-                    break;
-                case NavigationTarget.AddEditCipher:
-                    Current.MainPage = new NavigationPage(new AddEditPage(appOptions: Options));
-                    break;
-                case NavigationTarget.AutofillCiphers:
-                    Current.MainPage = new NavigationPage(new AutofillCiphersPage(Options));
-                    break;
-                case NavigationTarget.SendAddEdit:
-                    Current.MainPage = new NavigationPage(new SendAddEditPage(Options));
-                    break;
-            }
+            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,194 +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 bool LongPressAccountEnabled { get; set; } = true;
-
-        public Action AfterHide { get; set; }
-
-        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;
-
-                AfterHide?.Invoke();
-            });
-        }
-
-        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 (!LongPressAccountEnabled || !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,89 +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; }
-
-        public bool FromIOSExtension { get; set; }
-
-        private async Task SelectAccountAsync(AccountViewCellViewModel item)
-        {
-            if (!item.AccountView.IsAccount)
-            {
-                _messagingService.Send(AccountsManagerMessageCommands.ADD_ACCOUNT);
-                return;
-            }
-
-            if (!item.AccountView.IsActive)
-            {
-                await _stateService.SetActiveUserAsync(item.AccountView.UserId);
-                _messagingService.Send(AccountsManagerMessageCommands.SWITCHED_ACCOUNT);
-                if (FromIOSExtension)
-                {
-                    await _stateService.SaveExtensionActiveUserIdToStorageAsync(item.AccountView.UserId);
-                }
-            }
-            else if (AllowActiveAccountSelection)
-            {
-                _messagingService.Send(AccountsManagerMessageCommands.SWITCHED_ACCOUNT);
-            }
-        }
-
-        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 System.Windows.Input;
-using Bit.Core.Models.View;
-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,94 +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 = ServiceContainer.Resolve<IAvatarImageSourcePool>("avatarImageSourcePool")
-                                                ?.GetOrCreateAvatar(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/AuthenticatorViewCell/AuthenticatorViewCell.xaml

@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<controls:ExtendedGrid xmlns="http://xamarin.com/schemas/2014/forms"
-                       xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-                       x:Class="Bit.App.Controls.AuthenticatorViewCell"
-                       xmlns:controls="clr-namespace:Bit.App.Controls"
-                       xmlns:pages="clr-namespace:Bit.App.Pages"
-                       xmlns:u="clr-namespace:Bit.App.Utilities"
-                       xmlns:ff="clr-namespace:FFImageLoading.Forms;assembly=FFImageLoading.Forms"
-                       xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
-                       StyleClass="list-row, list-row-platform"
-                       HorizontalOptions="FillAndExpand"
-                       x:DataType="pages:GroupingsPageTOTPListItem"
-                       ColumnDefinitions="40,*,40,Auto,40"
-                       RowSpacing="0"
-                       Padding="0,10,0,0"
-                       RowDefinitions="*,*">
-
-    <Grid.Resources>
-        <u:IconGlyphConverter x:Key="iconGlyphConverter" />
-        <u:InverseBoolConverter x:Key="inverseBool" />
-    </Grid.Resources>
-
-    <controls:IconLabel
-        Grid.Column="0"
-        HorizontalOptions="Center"
-        VerticalOptions="Center"
-        StyleClass="list-icon, list-icon-platform"
-        Grid.RowSpan="2"
-        IsVisible="{Binding ShowIconImage, Converter={StaticResource inverseBool}}"
-        Text="{Binding Cipher, Converter={StaticResource iconGlyphConverter}}"
-        AutomationProperties.IsInAccessibleTree="False" />
-
-    <ff:CachedImage
-        Grid.Column="0"
-        BitmapOptimizations="True"
-        ErrorPlaceholder="login.png"
-        LoadingPlaceholder="login.png"
-        HorizontalOptions="Center"
-        VerticalOptions="Center"
-        WidthRequest="22"
-        HeightRequest="22"
-        Grid.RowSpan="2"
-        IsVisible="{Binding ShowIconImage}"
-        Source="{Binding IconImageSource, Mode=OneTime}"
-        AutomationProperties.IsInAccessibleTree="False" />
-
-    <Label
-        LineBreakMode="TailTruncation"
-        Grid.Column="1"
-        Grid.Row="0"
-        VerticalTextAlignment="Center"
-        VerticalOptions="Fill"
-        StyleClass="list-title, list-title-platform"
-        Text="{Binding Cipher.Name}" />
-
-    <Label
-        LineBreakMode="TailTruncation"
-        Grid.Column="1"
-        Grid.Row="1"
-        VerticalTextAlignment="Center"
-        VerticalOptions="Fill"
-        StyleClass="list-subtitle, list-subtitle-platform"
-        Text="{Binding Cipher.SubTitle}" />
-
-    <controls:CircularProgressbarView
-        Progress="{Binding Progress}"
-        Grid.Row="0"
-        Grid.Column="2"
-        Grid.RowSpan="2"
-        HorizontalOptions="Fill"
-        VerticalOptions="CenterAndExpand" />
-
-    <Label
-        Text="{Binding TotpSec, Mode=OneWay}"
-        Style="{DynamicResource textTotp}"
-        Grid.Row="0"
-        Grid.Column="2"
-        Grid.RowSpan="2"
-        StyleClass="text-sm"
-        HorizontalTextAlignment="Center"
-        HorizontalOptions="Fill"
-        VerticalTextAlignment="Center"
-        VerticalOptions="Fill" />
-    
-    <StackLayout
-        Grid.Row="0"
-        Grid.Column="3"
-        Margin="3,0,2,0"
-        Spacing="5"
-        Grid.RowSpan="2"
-        Orientation="Horizontal"
-        HorizontalOptions="Fill"
-        VerticalOptions="Fill">
-
-        <controls:MonoLabel
-            Text="{Binding TotpCodeFormattedStart, Mode=OneWay}"
-            Style="{DynamicResource textTotp}"
-            StyleClass="text-lg"
-            HorizontalTextAlignment="Center"
-            VerticalTextAlignment="Center"
-            HorizontalOptions="Center"
-            VerticalOptions="FillAndExpand" />
-        
-        <controls:MonoLabel
-            Text="{Binding TotpCodeFormattedEnd, Mode=OneWay}"
-            Style="{DynamicResource textTotp}"
-            StyleClass="text-lg"
-            HorizontalTextAlignment="Center"
-            VerticalTextAlignment="Center"
-            HorizontalOptions="Center"
-            VerticalOptions="FillAndExpand" />
-    </StackLayout>
-
-    <controls:IconButton
-        StyleClass="box-row-button, box-row-button-platform"
-        Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
-        Command="{Binding CopyCommand}"
-        CommandParameter="LoginTotp"
-        Grid.Row="0"
-        Grid.Column="4"
-        Grid.RowSpan="2"
-        Padding="0,0,1,0"
-        HorizontalOptions="Center"
-        VerticalOptions="Center"
-        AutomationProperties.IsInAccessibleTree="True"
-        AutomationProperties.Name="{u:I18n CopyTotp}" />
-</controls:ExtendedGrid>

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

@@ -1,67 +0,0 @@
-using System;
-using Bit.App.Pages;
-using Bit.App.Utilities;
-using Bit.Core.Models.View;
-using Bit.Core.Utilities;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public partial class AuthenticatorViewCell : ExtendedGrid
-    {
-        public static readonly BindableProperty CipherProperty = BindableProperty.Create(
-            nameof(Cipher), typeof(CipherView), typeof(AuthenticatorViewCell), default(CipherView), BindingMode.TwoWay);
-
-        public static readonly BindableProperty WebsiteIconsEnabledProperty = BindableProperty.Create(
-            nameof(WebsiteIconsEnabled), typeof(bool?), typeof(AuthenticatorViewCell));
-
-        public static readonly BindableProperty TotpSecProperty = BindableProperty.Create(
-            nameof(TotpSec), typeof(long), typeof(AuthenticatorViewCell));
-
-        public AuthenticatorViewCell()
-        {
-            InitializeComponent();
-        }
-
-        public Command CopyCommand { get; set; }
-
-        public CipherView Cipher
-        {
-            get => GetValue(CipherProperty) as CipherView;
-            set => SetValue(CipherProperty, value);
-        }
-
-        public bool? WebsiteIconsEnabled
-        {
-            get => (bool)GetValue(WebsiteIconsEnabledProperty);
-            set => SetValue(WebsiteIconsEnabledProperty, value);
-        }
-
-        public long TotpSec
-        {
-            get => (long)GetValue(TotpSecProperty);
-            set => SetValue(TotpSecProperty, value);
-        }
-
-        public bool ShowIconImage
-        {
-            get => WebsiteIconsEnabled ?? false
-                && !string.IsNullOrWhiteSpace(Cipher.Login?.Uri)
-                && IconImageSource != null;
-        }
-
-        private string _iconImageSource = string.Empty;
-        public string IconImageSource
-        {
-            get
-            {
-                if (_iconImageSource == string.Empty) // default value since icon source can return null
-                {
-                    _iconImageSource = IconImageHelper.GetLoginIconImage(Cipher);
-                }
-                return _iconImageSource;
-            }
-
-        }
-    }
-}

src/App/Controls/AvatarImageSource.cs

@@ -1,175 +0,0 @@
-using System;
-using System.IO;
-using System.Text;
-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;
-            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;
-
-            using (var bitmap = new SKBitmap(size * 2,
-                size * 2,
-                SKImageInfo.PlatformColorType,
-                SKAlphaType.Premul))
-            {
-                using (var canvas = new SKCanvas(bitmap))
-                {
-                    canvas.Clear(SKColors.Transparent);
-                    using (var paint = new SKPaint
-                    {
-                        IsAntialias = true,
-                        Style = SKPaintStyle.Fill,
-                        StrokeJoin = SKStrokeJoin.Miter,
-                        Color = SKColor.Parse(bgColor.ToHex())
-                    })
-                    {
-                        var midX = canvas.LocalClipBounds.Size.ToSizeI().Width / 2;
-                        var midY = canvas.LocalClipBounds.Size.ToSizeI().Height / 2;
-                        var radius = midX - midX / 5;
-
-                        using (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;
-                            using (var textPaint = new SKPaint
-                            {
-                                IsAntialias = true,
-                                Style = SKPaintStyle.Fill,
-                                Color = SKColor.Parse(textColor.ToHex()),
-                                TextSize = textSize,
-                                TextAlign = SKTextAlign.Center,
-                                Typeface = typeface
-                            })
-                            {
-                                var rect = new SKRect();
-                                textPaint.MeasureText(chars, ref rect);
-                                canvas.DrawText(chars, midX, midY + rect.Height / 2, textPaint);
-
-                                using (var img = SKImage.FromBitmap(bitmap))
-                                {
-                                    var data = img.Encode(SKEncodedImageFormat.Png, 100);
-                                    return data?.AsStream(true);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        private string GetFirstLetters(string data, int charCount)
-        {
-            var sanitizedData = data.Trim();
-            var parts = sanitizedData.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
-
-            if (parts.Length > 1 && charCount <= 2)
-            {
-                var text = string.Empty;
-                for (var i = 0; i < charCount; i++)
-                {
-                    text += parts[i][0];
-                }
-                return text;
-            }
-            if (sanitizedData.Length > 2)
-            {
-                return sanitizedData.Substring(0, 2);
-            }
-            return sanitizedData;
-        }
-
-        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/AvatarImageSourcePool.cs

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

src/App/Controls/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" />
@@ -108,7 +104,7 @@
     <controls:MiButton
         Grid.Row="0"
         Grid.Column="2"
-        Text="{Binding Source={x:Static core:BitwardenIcons.ViewCellMenu}}"
+        Text="&#xe5d3;"
         StyleClass="list-row-button, list-row-button-platform, btn-disabled"
         Clicked="MoreButton_Clicked"
         VerticalOptions="CenterAndExpand"
@@ -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/CircularProgressbarView.cs

@@ -1,139 +0,0 @@
-using System;
-using System.Runtime.CompilerServices;
-using SkiaSharp;
-using SkiaSharp.Views.Forms;
-using Xamarin.Essentials;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public class CircularProgressbarView : SKCanvasView
-    {
-        private Circle _circle;
-
-        public static readonly BindableProperty ProgressProperty = BindableProperty.Create(
-            nameof(Progress), typeof(double), typeof(CircularProgressbarView), propertyChanged: OnProgressChanged);
-
-        public static readonly BindableProperty RadiusProperty = BindableProperty.Create(
-            nameof(Radius), typeof(float), typeof(CircularProgressbarView), 15f);
-
-        public static readonly BindableProperty StrokeWidthProperty = BindableProperty.Create(
-            nameof(StrokeWidth), typeof(float), typeof(CircularProgressbarView), 3f);
-
-        public static readonly BindableProperty ProgressColorProperty = BindableProperty.Create(
-            nameof(ProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.Default);
-
-        public static readonly BindableProperty EndingProgressColorProperty = BindableProperty.Create(
-            nameof(EndingProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.Default);
-
-        public static readonly BindableProperty BackgroundProgressColorProperty = BindableProperty.Create(
-            nameof(BackgroundProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.Default);
-
-        public double Progress
-        {
-            get { return (double)GetValue(ProgressProperty); }
-            set { SetValue(ProgressProperty, value); }
-        }
-
-        public float Radius
-        {
-            get => (float)GetValue(RadiusProperty);
-            set => SetValue(RadiusProperty, value);
-        }
-        public float StrokeWidth
-        {
-            get => (float)GetValue(StrokeWidthProperty);
-            set => SetValue(StrokeWidthProperty, value);
-        }
-
-        public Color ProgressColor
-        {
-            get => (Color)GetValue(ProgressColorProperty);
-            set => SetValue(ProgressColorProperty, value);
-        }
-
-        public Color EndingProgressColor
-        {
-            get => (Color)GetValue(EndingProgressColorProperty);
-            set => SetValue(EndingProgressColorProperty, value);
-        }
-
-        public Color BackgroundProgressColor
-        {
-            get => (Color)GetValue(BackgroundProgressColorProperty);
-            set => SetValue(BackgroundProgressColorProperty, value);
-        }
-
-        private static void OnProgressChanged(BindableObject bindable, object oldvalue, object newvalue)
-        {
-            var context = bindable as CircularProgressbarView;
-            context.InvalidateSurface();
-        }
-
-        protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
-        {
-            base.OnPropertyChanged(propertyName);
-            if (propertyName == nameof(Progress))
-            {
-                _circle = new Circle(Radius * (float)DeviceDisplay.MainDisplayInfo.Density, (info) => new SKPoint((float)info.Width / 2, (float)info.Height / 2));
-            }
-        }
-
-        protected override void OnPaintSurface(SKPaintSurfaceEventArgs e)
-        {
-            base.OnPaintSurface(e);
-            if (_circle != null)
-            {
-                _circle.CalculateCenter(e.Info);
-                e.Surface.Canvas.Clear();
-                DrawCircle(e.Surface.Canvas, _circle, StrokeWidth * (float)DeviceDisplay.MainDisplayInfo.Density, BackgroundProgressColor.ToSKColor());
-                DrawArc(e.Surface.Canvas, _circle, () => (float)Progress, StrokeWidth * (float)DeviceDisplay.MainDisplayInfo.Density, ProgressColor.ToSKColor(), EndingProgressColor.ToSKColor());
-            }
-        }
-
-        private void DrawCircle(SKCanvas canvas, Circle circle, float strokewidth, SKColor color)
-        {
-            canvas.DrawCircle(circle.Center, circle.Redius,
-                new SKPaint()
-                {
-                    StrokeWidth = strokewidth,
-                    Color = color,
-                    IsStroke = true,
-                    IsAntialias = true
-                });
-        }
-
-        private void DrawArc(SKCanvas canvas, Circle circle, Func<float> progress, float strokewidth, SKColor color, SKColor progressEndColor)
-        {
-            var progressValue = progress();
-            var angle = progressValue * 3.6f;
-            canvas.DrawArc(circle.Rect, 270, angle, false,
-                new SKPaint()
-                {
-                    StrokeWidth = strokewidth,
-                    Color = progressValue < 20f ? progressEndColor : color,
-                    IsStroke = true,
-                    IsAntialias = true
-                });
-        }
-    }
-
-    public class Circle
-    {
-        private readonly Func<SKImageInfo, SKPoint> _centerFunc;
-
-        public Circle(float redius, Func<SKImageInfo, SKPoint> centerFunc)
-        {
-            _centerFunc = centerFunc;
-            Redius = redius;
-        }
-        public SKPoint Center { get; set; }
-        public float Redius { get; set; }
-        public SKRect Rect => new SKRect(Center.X - Redius, Center.Y - Redius, Center.X + Redius, Center.Y + Redius);
-
-        public void CalculateCenter(SKImageInfo argsInfo)
-        {
-            Center = _centerFunc(argsInfo);
-        }
-    }
-}

src/App/Controls/DateTime/DateTimePicker.xaml

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

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

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

src/App/Controls/DateTime/DateTimeViewModel.cs

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

src/App/Controls/ExtendedCollectionView.cs

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

src/App/Controls/ExtendedStepper.cs

@@ -6,7 +6,7 @@ namespace Bit.App.Controls
     {
         public static readonly BindableProperty StepperBackgroundColorProperty = BindableProperty.Create(
             nameof(StepperBackgroundColor), typeof(Color), typeof(ExtendedStepper), Color.Default);
-
+        
         public static readonly BindableProperty StepperForegroundColorProperty = BindableProperty.Create(
             nameof(StepperForegroundColor), typeof(Color), typeof(ExtendedStepper), Color.Default);
 
@@ -15,7 +15,7 @@ namespace Bit.App.Controls
             get => (Color)GetValue(StepperBackgroundColorProperty);
             set => SetValue(StepperBackgroundColorProperty, value);
         }
-
+        
         public Color StepperForegroundColor
         {
             get => (Color)GetValue(StepperForegroundColorProperty);

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">
@@ -122,7 +121,7 @@
     <controls:MiButton
         Grid.Row="0"
         Grid.Column="2"
-        Text="{Binding Source={x:Static core:BitwardenIcons.ViewCellMenu}}"
+        Text="&#xe5d3;"
         IsVisible="{Binding ShowOptions, Mode=OneWay}"
         StyleClass="list-row-button, list-row-button-platform, btn-disabled"
         Clicked="MoreButton_Clicked"

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

@@ -1,7 +1,5 @@
-using System;
-using Bit.App.Abstractions;
+using System;
 using Bit.Core.Models.View;
-using Bit.Core.Utilities;
 using Xamarin.Forms;
 
 namespace Bit.App.Controls
@@ -13,16 +11,13 @@ namespace Bit.App.Controls
 
         public static readonly BindableProperty ButtonCommandProperty = BindableProperty.Create(
             nameof(ButtonCommand), typeof(Command<SendView>), typeof(SendViewCell));
-
+        
         public static readonly BindableProperty ShowOptionsProperty = BindableProperty.Create(
             nameof(ShowOptions), typeof(bool), typeof(SendViewCell), true, BindingMode.OneWay);
 
         public SendViewCell()
         {
             InitializeComponent();
-
-            var deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
-            _iconColumn.Width = new GridLength(40 * deviceActionService.GetSystemFontSizeScale(), GridUnitType.Absolute);
         }
 
         public SendView Send

src/App/Effects/FabShadowEffect.cs

@@ -4,8 +4,8 @@ namespace Bit.App.Effects
 {
     public class FabShadowEffect : RoutingEffect
     {
-        public FabShadowEffect()
-            : base("Bitwarden.FabShadowEffect")
+        public FabShadowEffect() 
+            : base("Bitwarden.FabShadowEffect") 
         { }
     }
 }

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

@@ -1,12 +1,12 @@
-using System.Collections.Generic;
+using Bit.App.Resources;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+using System.Collections.Generic;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Bit.App.Abstractions;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
 using Bit.Core.Models.Domain;
-using Bit.Core.Utilities;
 using Xamarin.Essentials;
 
 namespace Bit.App.Pages
@@ -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");
@@ -46,11 +46,7 @@ namespace Bit.App.Pages
         {
             get => _showPassword;
             set => SetProperty(ref _showPassword, value,
-                additionalPropertyNames: new[]
-                {
-                    nameof(ShowPasswordIcon),
-                    nameof(PasswordVisibilityAccessibilityText)
-                });
+                additionalPropertyNames: new[] { nameof(ShowPasswordIcon) });
         }
 
         public bool IsPolicyInEffect
@@ -70,9 +66,8 @@ namespace Bit.App.Pages
             get => _policy;
             set => SetProperty(ref _policy, value);
         }
-
+        
         public string ShowPasswordIcon => ShowPassword ? "" : "";
-        public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
         public string MasterPassword { get; set; }
         public string ConfirmMasterPassword { get; set; }
         public string Hint { get; set; }
@@ -89,7 +84,7 @@ namespace Bit.App.Pages
                 await CheckPasswordPolicy();
             }
         }
-
+        
         private async Task CheckPasswordPolicy()
         {
             Policy = await _policyService.GetMasterPasswordPolicyOptions();
@@ -171,13 +166,13 @@ namespace Bit.App.Pages
                     AppResources.AnErrorHasOccurred, AppResources.Ok);
                 return false;
             }
-
+            
             return true;
         }
 
         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

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

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

@@ -1,8 +1,8 @@
-using System;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+using System;
 using System.Threading.Tasks;
 using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -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,10 +35,19 @@ namespace Bit.App.Pages
             _vm.SubmitSuccessAction = () => Device.BeginInvokeOnMainThread(async () => await SubmitSuccessAsync());
             _vm.CloseAction = async () =>
             {
+                _messagingService.Send("showStatusBar", false);
                 await Navigation.PopModalAsync();
             };
         }
 
+        private async void Submit_Clicked(object sender, EventArgs e)
+        {
+            if (DoOnce())
+            {
+                await _vm.SubmitAsync();
+            }
+        }
+
         private async Task SubmitSuccessAsync()
         {
             _platformUtilsService.ShowToast("success", null, AppResources.EnvironmentSaved);

src/App/Pages/Accounts/EnvironmentPageViewModel.cs

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

src/App/Pages/Accounts/HintPageViewModel.cs

@@ -1,9 +1,9 @@
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
+using Bit.App.Abstractions;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Exceptions;
 using Bit.Core.Utilities;
+using System.Threading.Tasks;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages

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,17 +37,11 @@ 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();
-            }
-            _broadcasterService.Subscribe(nameof(HomePage), (message) =>
+            _messagingService.Send("showStatusBar", false);
+            _broadcasterService.Subscribe(nameof(HomePage), async (message) =>
             {
                 if (message.Command == "updatedTheme")
                 {
@@ -66,29 +53,18 @@ 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()
         {
             _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())
             {
@@ -117,7 +93,7 @@ namespace Bit.App.Pages
                 _vm.StartRegisterAction();
             }
         }
-
+        
         private async Task StartRegisterAsync()
         {
             var page = new RegisterPage(this);
@@ -145,10 +121,9 @@ namespace Bit.App.Pages
                 _vm.StartEnvironmentAction();
             }
         }
-
+        
         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,138 +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}" 
-                                AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"/>
-                        </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}"
-                                AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
-                        </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
@@ -25,6 +26,8 @@ namespace Bit.App.Pages
             _vm = BindingContext as LockPageViewModel;
             _vm.Page = this;
             _vm.UnlockedAction = () => Device.BeginInvokeOnMainThread(async () => await UnlockedAsync());
+            MasterPasswordEntry = _masterPassword;
+            PinEntry = _pin;
 
             if (Device.RuntimePlatform == Device.iOS)
             {
@@ -36,17 +39,8 @@ namespace Bit.App.Pages
             }
         }
 
-        public Entry SecretEntry
-        {
-            get
-            {
-                if (_vm?.PinLock ?? false)
-                {
-                    return _pin;
-                }
-                return _masterPassword;
-            }
-        }
+        public Entry MasterPasswordEntry { get; set; }
+        public Entry PinEntry { get; set; }
 
         public async Task PromptBiometricAfterResumeAsync()
         {
@@ -68,21 +62,18 @@ namespace Bit.App.Pages
             {
                 return;
             }
-
             _appeared = true;
-            _mainContent.Content = _mainLayout;
-
-            _accountAvatar?.OnAppearing();
-
-            _vm.AvatarImageSource = await GetAvatarImageSourceAsync();
-
             await _vm.InitAsync();
-
-            _vm.FocusSecretEntry += PerformFocusSecretEntry;
-
             if (!_vm.BiometricLock)
             {
-                RequestFocus(SecretEntry);
+                if (_vm.PinLock)
+                {
+                    RequestFocus(PinEntry);
+                }
+                else
+                {
+                    RequestFocus(MasterPasswordEntry);
+                }
             }
             else
             {
@@ -102,35 +93,6 @@ namespace Bit.App.Pages
             }
         }
 
-        private void PerformFocusSecretEntry(int? cursorPosition)
-        {
-            Device.BeginInvokeOnMainThread(() =>
-            {
-                SecretEntry.Focus();
-                if (cursorPosition.HasValue)
-                {
-                    SecretEntry.CursorPosition = cursorPosition.Value;
-                }
-            });
-        }
-
-        protected override bool OnBackButtonPressed()
-        {
-            if (_accountListOverlay.IsVisible)
-            {
-                _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())
@@ -145,7 +107,6 @@ namespace Bit.App.Pages
 
         private async void LogOut_Clicked(object sender, EventArgs e)
         {
-            await _accountListOverlay.HideAsync();
             if (DoOnce())
             {
                 await _vm.LogOutAsync();
@@ -162,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;
@@ -10,8 +9,10 @@ using Bit.Core.Enums;
 using Bit.Core.Models.Domain;
 using Bit.Core.Models.Request;
 using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.Helpers;
 using Xamarin.Forms;
+#if !FDROID
+using Microsoft.AppCenter.Crashes;
+#endif
 
 namespace Bit.App.Pages
 {
@@ -22,13 +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 readonly WeakEventManager<int?> _secretEntryFocusWeakEventManager = new WeakEventManager<int?>();
 
         private string _email;
         private bool _showPassword;
@@ -40,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()
         {
@@ -50,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
@@ -74,8 +71,7 @@ namespace Bit.App.Pages
             set => SetProperty(ref _showPassword, value,
                 additionalPropertyNames: new string[]
                 {
-                    nameof(ShowPasswordIcon),
-                    nameof(PasswordVisibilityAccessibilityText),
+                    nameof(ShowPasswordIcon)
                 });
         }
 
@@ -126,26 +122,17 @@ 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;
-        public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
         public string MasterPassword { get; set; }
         public string Pin { get; set; }
         public Action UnlockedAction { get; set; }
-        public event Action<int?> FocusSecretEntry
-        {
-            add => _secretEntryFocusWeakEventManager.AddEventHandler(value);
-            remove => _secretEntryFocusWeakEventManager.RemoveEventHandler(value);
-        }
 
         public async Task InitAsync()
         {
-            (_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
@@ -155,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";
@@ -226,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)
@@ -281,7 +270,7 @@ namespace Bit.App.Pages
                 var key = await _cryptoService.MakeKeyAsync(MasterPassword, _email, kdf, kdfIterations);
                 var storedKeyHash = await _cryptoService.GetKeyHashAsync();
                 var passwordValid = false;
-
+                
                 if (storedKeyHash != null)
                 {
                     passwordValid = await _cryptoService.CompareAndUpdateKeyHashAsync(MasterPassword, key);
@@ -307,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();
@@ -353,8 +342,11 @@ namespace Bit.App.Pages
         public void TogglePassword()
         {
             ShowPassword = !ShowPassword;
-            var secret = PinLock ? Pin : MasterPassword;
-            _secretEntryFocusWeakEventManager.RaiseEvent(string.IsNullOrEmpty(secret) ? 0 : secret.Length, nameof(FocusSecretEntry));
+            var page = (Page as LockPage);
+            var entry = PinLock ? page.PinEntry : page.MasterPasswordEntry;
+            var str = PinLock ? Pin : MasterPassword;
+            entry.Focus();
+            entry.CursorPosition = String.IsNullOrEmpty(str) ? 0 : str.Length;
         }
 
         public async Task PromptBiometricAsync()
@@ -365,9 +357,19 @@ namespace Bit.App.Pages
                 return;
             }
             var success = await _platformUtilsService.AuthenticateBiometricAsync(null,
-                PinLock ? AppResources.PIN : AppResources.MasterPassword,
-                () => _secretEntryFocusWeakEventManager.RaiseEvent((int?)null, nameof(FocusSecretEntry)));
-            await _stateService.SetBiometricLockedAsync(!success);
+            PinLock ? AppResources.PIN : AppResources.MasterPassword, () =>
+            {
+                var page = Page as LockPage;
+                if (PinLock)
+                {
+                    page.PinEntry.Focus();
+                }
+                else
+                {
+                    page.MasterPasswordEntry.Focus();
+                }
+            });
+            _vaultTimeoutService.BiometricLocked = !success;
             if (success)
             {
                 await DoContinueAsync();
@@ -386,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,102 +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}"
-                                AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"/>
-                        </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()
@@ -177,7 +124,7 @@ namespace Bit.App.Pages
             var previousPage = await AppHelpers.ClearPreviousPage();
             Application.Current.MainPage = new TabsPage(_appOptions, previousPage);
         }
-
+        
         private async Task UpdateTempPasswordAsync()
         {
             var page = new UpdateTempPasswordPage();

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
@@ -58,17 +51,10 @@ namespace Bit.App.Pages
             set => SetProperty(ref _showPassword, value,
                 additionalPropertyNames: new string[]
                 {
-                    nameof(ShowPasswordIcon),
-                    nameof(PasswordVisibilityAccessibilityText)
+                    nameof(ShowPasswordIcon)
                 });
         }
 
-        public bool ShowCancelButton
-        {
-            get => _showCancelButton;
-            set => SetProperty(ref _showCancelButton, value);
-        }
-
         public string Email
         {
             get => _email;
@@ -81,12 +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 string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
+        public bool RememberEmail { get; set; }
         public Action StartTwoFactorAction { get; set; }
         public Action LogInSuccessAction { get; set; }
         public Action UpdateTempPasswordAction { get; set; }
@@ -101,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)
             {
@@ -137,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)
@@ -184,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();
                 }
@@ -208,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

@@ -1,15 +1,17 @@
-using System;
-using System.Threading.Tasks;
-using Bit.App.Models;
-using Bit.App.Utilities;
+using Bit.App.Models;
 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 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)
@@ -99,7 +105,7 @@ namespace Bit.App.Pages
             var page = new SetPasswordPage(_appOptions, _vm.OrgIdentifier);
             await Navigation.PushModalAsync(new NavigationPage(page));
         }
-
+        
         private async Task UpdateTempPasswordAsync()
         {
             var page = new UpdateTempPasswordPage();

src/App/Pages/Accounts/LoginSsoPageViewModel.cs

@@ -1,13 +1,14 @@
-using System;
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
+using Bit.App.Abstractions;
 using Bit.App.Resources;
-using Bit.App.Utilities;
+using Bit.Core;
 using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+using System;
+using System.Threading.Tasks;
+using Bit.App.Utilities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Domain;
-using Bit.Core.Utilities;
 using Xamarin.Essentials;
 using Xamarin.Forms;
 
@@ -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()
@@ -81,12 +90,10 @@ namespace Bit.App.Pages
             }
 
             await _deviceActionService.ShowLoadingAsync(AppResources.LoggingIn);
-            string ssoToken;
 
             try
             {
-                var response = await _apiService.PreValidateSso(OrgIdentifier);
-                ssoToken = response.Token;
+                await _apiService.PreValidateSso(OrgIdentifier);
             }
             catch (ApiException e)
             {
@@ -114,8 +121,7 @@ namespace Bit.App.Pages
                       "response_type=code&scope=api%20offline_access&" +
                       "state=" + state + "&code_challenge=" + codeChallenge + "&" +
                       "code_challenge_method=S256&response_mode=query&" +
-                      "domain_hint=" + Uri.EscapeDataString(OrgIdentifier) + "&" +
-                      "ssoToken=" + Uri.EscapeDataString(ssoToken);
+                      "domain_hint=" + Uri.EscapeDataString(OrgIdentifier);
 
             WebAuthenticatorResult authResult = null;
             try
@@ -164,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)
                 {
@@ -173,13 +186,15 @@ namespace Bit.App.Pages
                 else if (response.ResetMasterPassword)
                 {
                     StartSetPasswordAction?.Invoke();
-                }
+                } 
                 else if (response.ForcePasswordReset)
                 {
                     UpdateTempPasswordAction?.Invoke();
                 }
                 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

@@ -68,8 +68,7 @@
                         Grid.Column="1"
                         Grid.RowSpan="2"
                         AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n ToggleVisibility}" 
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"/>
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                 </Grid>
                 <Label
                     Text="{u:I18n MasterPasswordDescription}"
@@ -107,8 +106,7 @@
                         Grid.Column="1"
                         Grid.RowSpan="2"
                         AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                 </Grid>
                 <StackLayout StyleClass="box-row">
                     <Label

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;
@@ -55,7 +61,7 @@ namespace Bit.App.Pages
                 await _vm.SubmitAsync();
             }
         }
-
+        
         private async Task RegistrationSuccessAsync(HomePage homePage)
         {
             if (homePage != null)

src/App/Pages/Accounts/RegisterPageViewModel.cs

@@ -1,14 +1,14 @@
-using System;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Abstractions;
+using Bit.App.Abstractions;
 using Bit.App.Resources;
-using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Request;
 using Bit.Core.Utilities;
+using System;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using Bit.Core;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -39,7 +39,7 @@ namespace Bit.App.Pages
             SubmitCommand = new Command(async () => await SubmitAsync());
             ShowTerms = !_platformUtilsService.IsSelfHost();
         }
-
+        
         public ICommand PoliciesClickCommand => new Command<string>((url) =>
         {
             _platformUtilsService.LaunchUri(url);
@@ -51,30 +51,28 @@ namespace Bit.App.Pages
             set => SetProperty(ref _showPassword, value,
                 additionalPropertyNames: new string[]
                 {
-                    nameof(ShowPasswordIcon),
-                    nameof(PasswordVisibilityAccessibilityText)
+                    nameof(ShowPasswordIcon)
                 });
         }
-
+        
         public bool AcceptPolicies
         {
             get => _acceptPolicies;
             set => SetProperty(ref _acceptPolicies, value);
         }
-
+        
         public Thickness SwitchMargin
         {
-            get => Device.RuntimePlatform == Device.Android
-                ? new Thickness(0, 0, 0, 0)
+            get => Device.RuntimePlatform == Device.Android 
+                ? new Thickness(0, 0, 0, 0) 
                 : new Thickness(0, 0, 10, 0);
         }
-
+        
         public bool ShowTerms { get; set; }
         public Command SubmitCommand { get; }
         public Command TogglePasswordCommand { get; }
         public Command ToggleConfirmPasswordCommand { get; }
         public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
-        public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
         public string Name { get; set; }
         public string Email { get; set; }
         public string MasterPassword { get; set; }
@@ -138,7 +136,7 @@ namespace Bit.App.Pages
             }
 
             // TODO: Password strength check?
-
+            
             if (showLoading)
             {
                 await _deviceActionService.ShowLoadingAsync(AppResources.CreatingAccount);

src/App/Pages/Accounts/SetPasswordPage.xaml

@@ -107,8 +107,7 @@
                         Grid.Column="1"
                         Grid.RowSpan="2"
                         AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                 </Grid>
                 <Label
                     Text="{u:I18n MasterPasswordDescription}"
@@ -146,8 +145,7 @@
                         Grid.Column="1"
                         Grid.RowSpan="2"
                         AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                 </Grid>
                 <StackLayout StyleClass="box-row">
                     <Label

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

@@ -1,17 +1,18 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
+using Bit.App.Abstractions;
 using Bit.App.Resources;
-using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Domain;
 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;
+using Bit.Core;
+using Bit.Core.Models.Domain;
 using Xamarin.Essentials;
 using Xamarin.Forms;
 
@@ -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");
@@ -55,11 +56,7 @@ namespace Bit.App.Pages
         {
             get => _showPassword;
             set => SetProperty(ref _showPassword, value,
-                additionalPropertyNames: new[]
-                {
-                    nameof(ShowPasswordIcon),
-                    nameof(PasswordVisibilityAccessibilityText)
-                });
+                additionalPropertyNames: new[] { nameof(ShowPasswordIcon) });
         }
 
         public bool IsPolicyInEffect
@@ -67,7 +64,7 @@ namespace Bit.App.Pages
             get => _isPolicyInEffect;
             set => SetProperty(ref _isPolicyInEffect, value);
         }
-
+        
         public bool ResetPasswordAutoEnroll
         {
             get => _resetPasswordAutoEnroll;
@@ -90,7 +87,6 @@ namespace Bit.App.Pages
         public Command TogglePasswordCommand { get; }
         public Command ToggleConfirmPasswordCommand { get; }
         public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
-        public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
         public string MasterPassword { get; set; }
         public string ConfirmMasterPassword { get; set; }
         public string Hint { get; set; }
@@ -164,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);
@@ -201,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);
@@ -219,14 +215,13 @@ namespace Bit.App.Pages
                     // Request
                     var resetRequest = new OrganizationUserResetPasswordEnrollmentRequest
                     {
-                        ResetPasswordKey = encryptedKey.EncryptedString,
-                        MasterPasswordHash = masterPasswordHash,
+                        ResetPasswordKey = encryptedKey.EncryptedString
                     };
-                    var userId = await _stateService.GetActiveUserIdAsync();
+                    var userId = await _userService.GetUserIdAsync();
                     // Enroll user
                     await _apiService.PutOrganizationUserResetPasswordEnrollmentAsync(OrgId, userId, resetRequest);
                 }
-
+                
                 await _deviceActionService.HideLoadingAsync();
                 SetPasswordSuccessAction?.Invoke();
             }
@@ -295,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

@@ -1,11 +1,11 @@
-using System;
-using System.Threading.Tasks;
-using Bit.App.Controls;
+using Bit.App.Controls;
 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
@@ -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 = () =>
@@ -47,8 +51,7 @@ namespace Bit.App.Pages
             if (Device.RuntimePlatform == Device.iOS)
             {
                 ToolbarItems.Add(_moreItem);
-            }
-            else
+            } else
             {
                 ToolbarItems.Add(_useAnotherTwoStepMethod);
             }
@@ -93,8 +96,7 @@ namespace Bit.App.Pages
                 if (_vm.TotpMethod)
                 {
                     RequestFocus(_totpEntry);
-                }
-                else if (_vm.YubikeyMethod)
+                } else if (_vm.YubikeyMethod)
                 {
                     RequestFocus(_yubikeyTokenEntry);
                 }
@@ -189,7 +191,7 @@ namespace Bit.App.Pages
             var page = new SetPasswordPage(_appOptions, _orgIdentifier);
             await Navigation.PushModalAsync(new NavigationPage(page));
         }
-
+        
         private async Task UpdateTempPasswordAsync()
         {
             var page = new UpdateTempPasswordPage();

src/App/Pages/Accounts/TwoFactorPageViewModel.cs

@@ -1,35 +1,35 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
+using Bit.App.Abstractions;
 using Bit.App.Resources;
-using Bit.App.Utilities;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Request;
 using Bit.Core.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
+using Bit.App.Utilities;
 using Newtonsoft.Json;
 using Xamarin.Essentials;
 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 readonly IAppIdService _appIdService;
 
         private TwoFactorProviderType? _selectedProviderType;
         private string _totpInstruction;
@@ -43,14 +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");
-            _appIdService = ServiceContainer.Resolve<IAppIdService>("appIdService");
+            _stateService = ServiceContainer.Resolve<IStateService>("stateService"); 
 
             PageTitle = AppResources.TwoStepLogin;
             SubmitCommand = new Command(async () => await SubmitAsync());
@@ -116,11 +115,6 @@ namespace Bit.App.Pages
         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()
         {
             if ((!_authService.AuthingWithSso() && !_authService.AuthingWithPassword()) ||
@@ -294,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();
@@ -319,15 +300,16 @@ namespace Bit.App.Pages
                 else if (result.ForcePasswordReset)
                 {
                     UpdateTempPasswordAction?.Invoke();
-                }
+                } 
                 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)
                 {
@@ -382,8 +364,7 @@ namespace Bit.App.Pages
                 var request = new TwoFactorEmailRequest
                 {
                     Email = _authService.Email,
-                    MasterPasswordHash = _authService.MasterPasswordHash,
-                    DeviceIdentifier = await _appIdService.GetAppIdAsync()
+                    MasterPasswordHash = _authService.MasterPasswordHash
                 };
                 await _apiService.PostTwoFactorEmailAsync(request);
                 if (showLoading)

src/App/Pages/Accounts/UpdateTempPasswordPage.xaml

@@ -105,8 +105,7 @@
                         Grid.Column="1"
                         Grid.RowSpan="2"
                         AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                 </Grid>
             </StackLayout>
             <StackLayout StyleClass="box">
@@ -141,8 +140,7 @@
                         Grid.Column="1"
                         Grid.RowSpan="2"
                         AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                 </Grid>
                 <StackLayout StyleClass="box-row">
                     <Label