Bumped version to 2023.8.0 (#2725)

Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>
(cherry picked from commit 7ec5c8ccfd)

.github/CODEOWNERS

@@ -1,37 +0,0 @@
-# Please sort lines alphabetically, this will ensure we don't accidentally add duplicates.
-#
-# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
-
-# The following owners will be the default owners for everything in the repo.
-# Unless a later match takes precedence
-# @bitwarden/tech-leads
-
-@bitwarden/dept-development-mobile
-
-## Auth team files ##
-
-## Platform team files ##
-appIcons @bitwarden/team-platform-dev
-build.cake @bitwarden/team-platform-dev
-
-## Vault team files ##
-src/watchOS @bitwarden/team-vault-dev
-
-## Tools team files ##
-src/Core/Services/EmailForwarders @bitwarden/team-tools-dev
-
-## Crowdin Sync files ##
-src/App/Resources @bitwarden/team-tools-dev
-src/watchOS/bitwarden/bitwarden\ WatchKit\ Extension/Localization @bitwarden/team-tools-dev
-store/apple @bitwarden/team-tools-dev
-store/google @bitwarden/team-tools-dev
-
-## Locales ## 
-src/App/Resources/AppResources.Designer.cs
-src/App/Resources/AppResources.resx
-src/watchOS/bitwarden/bitwarden\ WatchKit\ Extension/Localization/en.lproj
-store/apple/en
-store/google/en
-
-## Utils ##
-store/google/Publisher

.github/workflows/build.yml

@@ -9,14 +9,15 @@ on:
     paths-ignore:
       - ".github/workflows/**"
   workflow_dispatch:
+    inputs: {}
 
 jobs:
   cloc:
     name: CLOC
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
 
       - name: Set up CLOC
         run: |
@@ -29,13 +30,13 @@ jobs:
 
   setup:
     name: Setup
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     outputs:
       rc_branch_exists: ${{ steps.branch-check.outputs.rc_branch_exists }}
       hotfix_branch_exists: ${{ steps.branch-check.outputs.hotfix_branch_exists }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
         with:
           submodules: 'true'
 
@@ -53,6 +54,7 @@ jobs:
           else
             echo "hotfix_branch_exists=0" >> $GITHUB_OUTPUT
           fi
+        shell: bash
 
 
   android:
@@ -80,12 +82,25 @@ jobs:
       - name: Setup Windows builder
         run: choco install checksum --no-progress
 
-      - name: Install Microsoft OpenJDK 11
+      - name: Work Around for broken Windows 2022 Runner Image
         run: |
-          choco install microsoft-openjdk11 --no-progress
-          Write-Output "JAVA_HOME=$(Get-ChildItem -Path 'C:\Program Files\Microsoft\jdk*' | Select -First 1 -ExpandProperty FullName)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          Write-Output "Java Home: $env:JAVA_HOME"
-
+          Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
+          $InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
+          $componentsToAdd = @(
+            "Component.Xamarin"
+          )
+          [string]$workloadArgs = $componentsToAdd | ForEach-Object {" --add " +  $_}
+          $Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"",$workloadArgs, '--quiet', '--norestart', '--nocache')
+          $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
+          if ($process.ExitCode -eq 0)
+          {
+              Write-Host "components have been successfully added"
+          }
+          else
+          {
+              Write-Host "components were not installed"
+              exit 1
+          }
       - name: Print environment
         run: |
           nuget help | grep Version
@@ -95,10 +110,9 @@ jobs:
           echo "GitHub event: $GITHUB_EVENT"
 
       - name: Checkout repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
         with:
           fetch-depth: 0
-
       - name: Decrypt secrets
         env:
           DECRYPT_FILE_PASSWORD: ${{ secrets.DECRYPT_FILE_PASSWORD }}
@@ -112,7 +126,6 @@ jobs:
           gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
             --output $HOME/secrets/play_creds.json ./.github/secrets/play_creds.json.gpg
         shell: bash
-
       - name: Decrypt secrets - Google Services
         if: ${{ matrix.variant == 'prod' }}
         env:
@@ -121,7 +134,6 @@ jobs:
           gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
             --output ./src/Android/google-services.json ./.github/secrets/google-services.json.gpg
         shell: bash
-
       - name: Increment version
         run: |
           BUILD_NUMBER=$((3000 + $GITHUB_RUN_NUMBER))
@@ -139,12 +151,15 @@ jobs:
 
       - 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 --logger "trx;LogFileName=test-results.trx"
+        shell: pwsh
 
       - name: Report test results
         uses: dorny/test-reporter@c9b3d0e2bd2a4e96aaf424dbaa31c46b42318226 # v1.6.0
@@ -171,6 +186,8 @@ jobs:
           Write-Output "########################################"
           msbuild "$($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj")" "/p:Configuration=$configuration"
 
+        shell: pwsh
+
       - name: Sign Android Build
         env:
           PLAY_KEYSTORE_PASSWORD: ${{ secrets.PLAY_KEYSTORE_PASSWORD }}
@@ -217,10 +234,10 @@ jobs:
           $signedApkDestPath = $($env:GITHUB_WORKSPACE + "/$($packageName).apk");
 
           Copy-Item $signedApkPath $signedApkDestPath
-
+        shell: pwsh
       - name: Upload Prod .aab artifact
         if: ${{ matrix.variant == 'prod' }}
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
         with:
           name: com.x8bit.bitwarden.aab
           path: ./com.x8bit.bitwarden.aab
@@ -228,7 +245,7 @@ jobs:
 
       - name: Upload Prod .apk artifact
         if: ${{ matrix.variant == 'prod' }}
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
         with:
           name: com.x8bit.bitwarden.apk
           path: ./com.x8bit.bitwarden.apk
@@ -236,7 +253,7 @@ jobs:
 
       - name: Upload Other .apk artifact
         if: ${{ matrix.variant != 'prod' }}
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
         with:
           name: com.x8bit.bitwarden.${{ matrix.variant }}.apk
           path: ./com.x8bit.bitwarden.${{ matrix.variant }}.apk
@@ -256,7 +273,7 @@ jobs:
 
       - name: Upload .apk sha file for prod
         if: ${{ matrix.variant == 'prod' }}
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
         with:
           name: bw-android-apk-sha256.txt
           path: ./bw-android-apk-sha256.txt
@@ -264,14 +281,14 @@ jobs:
 
       - name: Upload .apk sha file for other
         if: ${{ matrix.variant != 'prod' }}
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
         with:
           name: bw-android-${{ matrix.variant }}-apk-sha256.txt
           path: ./bw-android-${{ matrix.variant }}-apk-sha256.txt
           if-no-files-found: error
 
       - name: Deploy to Play Store
-        if: ${{ matrix.variant == 'prod' && (( github.ref == 'refs/heads/main'
+        if: ${{ matrix.variant == 'prod' && (( 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)
@@ -301,11 +318,25 @@ jobs:
       - name: Setup Windows builder
         run: choco install checksum --no-progress
 
-      - name: Install Microsoft OpenJDK 11
+      - name: Work Around for broken Windows 2022 Runner Image
         run: |
-          choco install microsoft-openjdk11 --no-progress
-          Write-Output "JAVA_HOME=$(Get-ChildItem -Path 'C:\Program Files\Microsoft\jdk*' | Select -First 1 -ExpandProperty FullName)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          Write-Output "Java Home: $env:JAVA_HOME"
+          Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
+          $InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
+          $componentsToAdd = @(
+            "Component.Xamarin"
+          )
+          [string]$workloadArgs = $componentsToAdd | ForEach-Object {" --add " +  $_}
+          $Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"",$workloadArgs, '--quiet', '--norestart', '--nocache')
+          $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
+          if ($process.ExitCode -eq 0)
+          {
+              Write-Host "components have been successfully added"
+          }
+          else
+          {
+              Write-Host "components were not installed"
+              exit 1
+          }
 
       - name: Print environment
         run: |
@@ -316,7 +347,7 @@ jobs:
           echo "GitHub event: $GITHUB_EVENT"
 
       - name: Checkout repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
 
       - name: Decrypt secrets
         env:
@@ -410,6 +441,7 @@ jobs:
           $appCenterNode.ParentNode.RemoveChild($appCenterNode);
 
           $xml.Save($corePath);
+        shell: pwsh
 
       - name: Restore packages
         run: nuget restore
@@ -423,6 +455,7 @@ jobs:
           Write-Output "########################################"
 
           msbuild "$($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj")" "/p:Configuration=$configuration"
+        shell: pwsh
 
       - name: Sign for F-Droid
         env:
@@ -446,9 +479,10 @@ jobs:
           $signedApkDestPath = $($env:GITHUB_WORKSPACE + "/com.x8bit.bitwarden-fdroid.apk");
 
           Copy-Item $signedApkPath $signedApkDestPath
+        shell: pwsh
 
       - name: Upload F-Droid .apk artifact
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
         with:
           name: com.x8bit.bitwarden-fdroid.apk
           path: ./com.x8bit.bitwarden-fdroid.apk
@@ -460,7 +494,7 @@ jobs:
             -t sha256 | Out-File -Encoding ASCII ./bw-fdroid-apk-sha256.txt
 
       - name: Upload F-Droid sha file
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
         with:
           name: bw-fdroid-apk-sha256.txt
           path: ./bw-fdroid-apk-sha256.txt
@@ -486,21 +520,28 @@ jobs:
           echo "GitHub event: $GITHUB_EVENT"
 
       - name: Checkout repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
         with:
           submodules: 'true'
 
       - name: Login to Azure - CI Subscription
-        uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.6
+        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
         with:
           creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
-        with:
-          keyvault: "bitwarden-ci"
-          secrets: "appcenter-ios-token"
+        env:
+          KEYVAULT: bitwarden-ci
+          SECRETS: |
+            appcenter-ios-token
+        run: |
+          for i in ${SECRETS//,/ }
+          do
+            VALUE=$(az keyvault secret show --vault-name $KEYVAULT --name $i --query value --output tsv)
+            echo "::add-mask::$VALUE"
+            echo "$i=$VALUE" >> $GITHUB_OUTPUT
+          done
 
       - name: Decrypt secrets
         env:
@@ -529,6 +570,7 @@ jobs:
             ./.github/secrets/dist_watch_app_extension.mobileprovision.gpg
           gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
             --output ./src/watchOS/bitwarden/GoogleService-Info.plist ./.github/secrets/GoogleService-Info.plist.gpg
+        shell: bash
 
       - name: Increment version
         run: |
@@ -544,6 +586,8 @@ jobs:
           perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.ShareExtension/Info.plist
           cd src/watchOS/bitwarden
           agvtool new-version -all  $BUILD_NUMBER
+          cd ../../..
+        shell: bash
 
       - name: Update Entitlements
         run: |
@@ -552,6 +596,7 @@ jobs:
           echo "########################################"
 
           perl -0777 -pi.bak -e 's/<key>aps-environment<\/key>\s*<string>development<\/string>/<key>aps-environment<\/key>\n\t<string>production<\/string>/' ./src/iOS/Entitlements.plist
+        shell: bash
 
       - name: Set up Keychain
         env:
@@ -568,6 +613,7 @@ jobs:
           security import ~/secrets/iphone-distribution-cert.p12 -k build.keychain -P $DIST_CERT_PASSWORD \
             -T /usr/bin/codesign -T /usr/bin/security
           security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $KEYCHAIN_PASSWORD build.keychain
+        shell: bash
 
       - name: Set up provisioning profiles
         run: |
@@ -598,6 +644,7 @@ jobs:
 
           WATCH_APP_EXTENSION_UUID=$(grep UUID -A1 -a $WATCH_APP_EXTENSION_PROFILE_PATH | grep -io "[-A-F0-9]\{36\}")
           cp $WATCH_APP_EXTENSION_PROFILE_PATH "$PROFILES_DIR_PATH/$WATCH_APP_EXTENSION_UUID.mobileprovision"
+        shell: bash
 
       - name: Bulid WatchApp
         run: |
@@ -610,6 +657,7 @@ jobs:
           echo "########################################"
           echo "##### Done"
           echo "########################################"
+        shell: bash
 
       - name: Restore packages
         run: nuget restore
@@ -619,22 +667,6 @@ jobs:
           $configuration = "AppStore";
           $platform = "iPhone";
 
-          Write-Output "########################################"
-          Write-Output "##### Archive $configuration Configuration for $platform Platform"
-          Write-Output "########################################"
-          msbuild "$($env:GITHUB_WORKSPACE + "/src/iOS/iOS.csproj")" "/p:Platform=$platform" `
-            "/p:Configuration=$configuration" "/p:ArchiveOnBuild=true" "/t:`"Build`""
-
-          Write-Output "########################################"
-          Write-Output "##### Done"
-          Write-Output "########################################"
-        shell: pwsh
-
-      - name: Archive Build for Mobile Automation
-        run: |
-          $configuration = "Release";
-          $platform = "iPhoneSimulator";
-
           Write-Output "########################################"
           Write-Output "##### Archive $configuration Configuration for $platform Platform"
           Write-Output "########################################"
@@ -655,14 +687,7 @@ jobs:
 
           xcodebuild -exportArchive -archivePath $ARCHIVE_PATH -exportPath $EXPORT_PATH \
             -exportOptionsPlist $EXPORT_OPTIONS_PATH
-
-      - name: Export .app for Automation CI
-        run: |
-          ARCHIVE_PATH="./src/iOS/bin/iPhoneSimulator/Release/BitwardeniOS.app"
-          EXPORT_PATH="./bitwarden-export"
-
-          zip -r -q BitwardeniOS.app.zip $ARCHIVE_PATH
-          mv BitwardeniOS.app.zip $EXPORT_PATH
+        shell: bash
 
       - name: Copy all dSYMs files to upload
         run: |
@@ -675,9 +700,10 @@ jobs:
           cp -r -v $ARCHIVE_DSYMS_PATH $EXPORT_PATH
           mkdir $WATCH_DSYMS_EXPORT_PATH
           cp -r -v $WATCH_ARCHIVE_DSYMS_PATH $WATCH_DSYMS_EXPORT_PATH
+        shell: bash
 
       - name: Upload App Store .ipa & dSYMs artifacts
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
         with:
           name: Bitwarden iOS
           path: |
@@ -685,16 +711,9 @@ jobs:
             ./bitwarden-export/dSYMs/*.*
           if-no-files-found: error
 
-      - name: Upload .app file for Automation CI
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
-        with:
-          name: BitwardeniOS.app.zip
-          path: ./bitwarden-export/BitwardeniOS.app.zip
-          if-no-files-found: error
-
       - name: Install AppCenter CLI
         if: |
-          (github.ref == 'refs/heads/main'
+          (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)
@@ -703,7 +722,7 @@ jobs:
 
       - name: Upload dSYMs to App Center
         if: |
-          (github.ref == 'refs/heads/main'
+          (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)
@@ -711,24 +730,27 @@ jobs:
         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
+        shell: bash
 
       - name: Upload Watch dSYMs to Firebase Crashlytics
         if: |
-          (github.ref == 'refs/heads/main'
+          (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: |
+
           echo "########################################"
           echo "##### Uploading Watch dSYMs to Firebase"
           echo "########################################"
 
           find "$HOME/Library/Developer/XCode/DerivedData" -name "upload-symbols" -exec chmod +x {} \; -exec {} -gsp "./src/watchOS/bitwarden/GoogleService-Info.plist" -p ios "./bitwarden-export/Watch_dSYMs" \;
+        shell: bash
 
       - name: Deploy to App Store
         if: |
-          (github.ref == 'refs/heads/main'
+          (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)
@@ -739,33 +761,41 @@ jobs:
         run: |
           xcrun altool --upload-app --type ios --file "./bitwarden-export/Bitwarden.ipa" \
               --username "$APPLE_ID_USERNAME" --password "$APPLE_ID_PASSWORD"
+        shell: bash
 
 
   crowdin-push:
     name: Crowdin Push
-    if: github.ref == 'refs/heads/main'
+    if: github.ref == 'refs/heads/master'
     needs:
       - android
       - f-droid
       - ios
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     env:
       _CROWDIN_PROJECT_ID: "269690"
     steps:
       - name: Checkout repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
 
       - name: Login to Azure - CI Subscription
-        uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.6
+        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
         with:
           creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
-        with:
-          keyvault: "bitwarden-ci"
-          secrets: "crowdin-api-token"
+        env:
+          KEYVAULT: bitwarden-ci
+          SECRETS: |
+            crowdin-api-token
+        run: |
+          for i in ${SECRETS//,/ }
+          do
+            VALUE=$(az keyvault secret show --vault-name $KEYVAULT --name $i --query value --output tsv)
+            echo "::add-mask::$VALUE"
+            echo "$i=$VALUE" >> $GITHUB_OUTPUT
+          done
 
       - name: Upload Sources
         uses: crowdin/github-action@965d501f160af7b1f88aed4c29154b0caf1e94b9 # v1.9.0
@@ -774,7 +804,7 @@ jobs:
           CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
         with:
           config: crowdin.yml
-          crowdin_branch_name: main 
+          crowdin_branch_name: master
           upload_sources: true
           upload_translations: false
 
@@ -782,7 +812,7 @@ jobs:
   check-failures:
     name: Check for failures
     if: always()
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs:
       - cloc
       - android
@@ -792,7 +822,7 @@ jobs:
     steps:
       - name: Check if any job failed
         if: |
-          (github.ref == 'refs/heads/main')
+          (github.ref == 'refs/heads/master')
           || (github.ref == 'refs/heads/rc')
           || (github.ref == 'refs/heads/hotfix-rc')
         env:
@@ -815,18 +845,25 @@ jobs:
           fi
 
       - name: Login to Azure - CI Subscription
-        uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.6
+        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
         if: failure()
         with:
           creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
         if: failure()
-        with:
-          keyvault: "bitwarden-ci"
-          secrets: "devops-alerts-slack-webhook-url"
+        env:
+          KEYVAULT: bitwarden-ci
+          SECRETS: |
+            devops-alerts-slack-webhook-url
+        run: |
+          for i in ${SECRETS//,/ }
+          do
+            VALUE=$(az keyvault secret show --vault-name $KEYVAULT --name $i --query value --output tsv)
+            echo "::add-mask::$VALUE"
+            echo "$i=$VALUE" >> $GITHUB_OUTPUT
+          done
 
       - name: Notify Slack on failure
         uses: act10ns/slack@ed1309ab9862e57e9e583e51c7889486b9a00b0f # v2.0.0

.github/workflows/crowdin-pull.yml

@@ -18,13 +18,13 @@ jobs:
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
 
       - name: Login to Azure - CI Subscription
-        uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.6
+        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
         with:
           creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
+        uses: bitwarden/gh-actions/get-keyvault-secrets@34ecb67b2a357795dc893549df0795e7383ff50f
         with:
           keyvault: "bitwarden-ci"
           secrets: "crowdin-api-token, github-gpg-private-key, github-gpg-private-key-passphrase"
@@ -36,7 +36,7 @@ jobs:
           CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
         with:
           config: crowdin.yml
-          crowdin_branch_name: main
+          crowdin_branch_name: master
           upload_sources: false
           upload_translations: false
           download_translations: true

.github/workflows/pr-labeler.yml

@@ -12,6 +12,6 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/labeler@ac9175f8a1f3625fd0d4fb234536d26811351594  # v4.3.0
+      - uses: actions/labeler@ba790c862c380240c6d5e7427be5ace9a05c754b  # v4.0.3
         with:
           sync-labels: true

.github/workflows/release.yml

@@ -38,11 +38,11 @@ jobs:
           fi
 
       - name: Checkout repo
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
 
       - name: Check Release Version
         id: version
-        uses: bitwarden/gh-actions/release-version-check@main
+        uses: bitwarden/gh-actions/release-version-check@34ecb67b2a357795dc893549df0795e7383ff50f
         with:
           release-type: ${{ github.event.inputs.release_type }}
           project-type: xamarin
@@ -80,14 +80,14 @@ jobs:
         with:
           workflow: build.yml
           workflow_conclusion: success
-          branch: main
+          branch: master
 
       - name: Prep Bitwarden iOS release asset
         run: zip -r Bitwarden\ iOS.zip Bitwarden\ iOS
 
       - name: Create release
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: ncipollo/release-action@6c75be85e571768fa31b40abf38de58ba0397db5  # v1.13.0
+        uses: ncipollo/release-action@40bb172bd05f266cf9ba4ff965cb61e9ee5f6d01  # v1.9.0
         with:
           artifacts: "./com.x8bit.bitwarden.aab/com.x8bit.bitwarden.aab,
                       ./com.x8bit.bitwarden.apk/com.x8bit.bitwarden.apk,
@@ -126,7 +126,7 @@ jobs:
     if: inputs.fdroid_publish
     steps:
       - name: Checkout repo
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
 
       - name: Download F-Droid .apk artifact
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
@@ -143,13 +143,13 @@ jobs:
         with:
           workflow: build.yml
           workflow_conclusion: success
-          branch: main
+          branch: master
           name: com.x8bit.bitwarden-fdroid.apk
 
       - name: Set up Node
-        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d  # v3.8.1
+        uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561  # v2.5.1
         with:
-          node-version: '16.x'
+          node-version: '10.x'
 
       - name: Set up F-Droid server
         run: |

.github/workflows/stale-bot.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: 'Run stale action'
-        uses: actions/stale@f7176fd3007623b69d27091f9b9d4ab7995f0a06  # v5.2.1
+        uses: actions/stale@3cc123766321e9f15a6676375c154ccffb12a358  # v5.0.0
         with:
           stale-issue-label: 'needs-reply'
           stale-pr-label: 'needs-changes'
@@ -27,4 +27,4 @@ jobs:
 
             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 main branch before requesting another review.
+            Please make sure to resolve any conflicts with the master branch before requesting another review.

.github/workflows/version-auto-bump.yml

@@ -14,7 +14,7 @@ jobs:
       version_number: ${{ steps.version.outputs.new-version }}
     steps:
       - name: Checkout Branch
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
 
       - name: Calculate bumped version
         id: version
@@ -35,6 +35,7 @@ jobs:
     name: Bump version to ${{ needs.setup.outputs.version_number }}
     needs: setup
     uses: ./.github/workflows/version-bump.yml
+    secrets:
+      AZURE_PROD_KV_CREDENTIALS: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
     with:
       version_number: ${{ needs.setup.outputs.version_number }}
-    secrets: inherit

.github/workflows/version-bump.yml

@@ -1,45 +1,43 @@
 ---
 name: Version Bump
-run-name: Version Bump - v${{ inputs.version_number }}
 
 on:
   workflow_dispatch:
     inputs:
       version_number:
-        description: "New version (example: '2024.1.0')"
+        description: "New Version"
+        required: true
+  workflow_call:
+    inputs:
+      version_number:
+        required: true
+        type: string
+    secrets:
+      AZURE_PROD_KV_CREDENTIALS:
         required: true
-      cut_rc_branch:
-        description: "Cut RC branch?"
-        default: true
-        type: boolean
 
 jobs:
   bump_version:
-    name: "Bump Version to v${{ inputs.version_number }}"
-    runs-on: ubuntu-22.04
+    name: "Create version_bump_${{ github.event.inputs.version_number }} branch"
+    runs-on: ubuntu-20.04
     steps:
+      - name: Checkout Branch
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+
       - name: Login to Azure - CI Subscription
-        uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7
+        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
         with:
          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
+        uses: bitwarden/gh-actions/get-keyvault-secrets@34ecb67b2a357795dc893549df0795e7383ff50f
         with:
           keyvault: "bitwarden-ci"
-          secrets: "github-gpg-private-key,
-            github-gpg-private-key-passphrase,
-            github-pat-bitwarden-devops-bot-repo-scope"
-
-      - name: Checkout Branch
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
-        with:
-          ref: main
-          repository: bitwarden/mobile
+          secrets: "github-gpg-private-key, github-gpg-private-key-passphrase"
 
       - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@d6f3f49f3345e29369fe57596a3ca8f94c4d2ca7 # v5.4.0
+        uses: crazy-max/ghaction-import-gpg@111c56156bcc6918c056dbef52164cfa583dc549 # v5.2.0
         with:
           gpg_private_key: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key }}
           passphrase: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key-passphrase }}
@@ -47,68 +45,37 @@ jobs:
           git_commit_gpgsign: true
 
       - name: Create Version Branch
-        id: create-branch
-        run: |
-          NAME=version_bump_${{ github.ref_name }}_${{ inputs.version_number }}
-          git switch -c $NAME
-          echo "name=$NAME" >> $GITHUB_OUTPUT
-
-      - name: Install xmllint
-        run: sudo apt install -y libxml2-utils
-
-      - name: Verify input version
-        env:
-          NEW_VERSION: ${{ inputs.version_number }}
-        run: |
-          CURRENT_VERSION=$(xmllint --xpath '
-            string(/manifest/@*[local-name()="versionName" 
-              and namespace-uri()="http://schemas.android.com/apk/res/android"])
-            ' src/Android/Properties/AndroidManifest.xml)
-
-          # Error if version has not changed.
-          if [[ "$NEW_VERSION" == "$CURRENT_VERSION" ]]; then
-            echo "Version has not changed."
-            exit 1
-          fi
-
-          # Check if version is newer.
-          printf '%s\n' "${CURRENT_VERSION}" "${NEW_VERSION}" | sort -C -V
-          if [ $? -eq 0 ]; then
-            echo "Version check successful."
-          else
-            echo "Version check failed."
-            exit 1
-          fi
+        run: git switch -c version_bump_${{ github.event.inputs.version_number }}
 
       - name: Bump Version - Android XML
-        uses: bitwarden/gh-actions/version-bump@main
+        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
         with:
-          version: ${{ inputs.version_number }}
-          file_path: "src/Android/Properties/AndroidManifest.xml"
+          version: ${{ github.event.inputs.version_number }}
+          file_path: "./src/Android/Properties/AndroidManifest.xml"
 
       - name: Bump Version - iOS.Autofill
-        uses: bitwarden/gh-actions/version-bump@main
+        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
         with:
-          version: ${{ inputs.version_number }}
-          file_path: "src/iOS.Autofill/Info.plist"
+          version: ${{ github.event.inputs.version_number }}
+          file_path: "./src/iOS.Autofill/Info.plist"
 
       - name: Bump Version - iOS.Extension
-        uses: bitwarden/gh-actions/version-bump@main
+        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
         with:
-          version: ${{ inputs.version_number }}
-          file_path: "src/iOS.Extension/Info.plist"
+          version: ${{ github.event.inputs.version_number }}
+          file_path: "./src/iOS.Extension/Info.plist"
 
       - name: Bump Version - iOS.ShareExtension
-        uses: bitwarden/gh-actions/version-bump@main
+        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
         with:
-          version: ${{ inputs.version_number }}
-          file_path: "src/iOS.ShareExtension/Info.plist"
+          version: ${{ github.event.inputs.version_number }}
+          file_path: "./src/iOS.ShareExtension/Info.plist"
 
       - name: Bump Version - iOS
-        uses: bitwarden/gh-actions/version-bump@main
+        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
         with:
-          version: ${{ inputs.version_number }}
-          file_path: "src/iOS/Info.plist"
+          version: ${{ github.event.inputs.version_number }}
+          file_path: "./src/iOS/Info.plist"
 
       - name: Setup git
         run: |
@@ -127,24 +94,22 @@ jobs:
 
       - name: Commit files
         if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
-        run: git commit -m "Bumped version to ${{ inputs.version_number }}" -a
+        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' }}
-        env:
-          PR_BRANCH: ${{ steps.create-branch.outputs.name }}
-        run: git push -u origin $PR_BRANCH
+        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' }}
-        id: create-pr
         env:
-          GH_TOKEN: ${{ steps.retrieve-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }}
-          PR_BRANCH: ${{ steps.create-branch.outputs.name }}
-          TITLE: "Bump version to ${{ inputs.version_number }}"
+          PR_BRANCH: "version_bump_${{ github.event.inputs.version_number }}"
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          BASE_BRANCH: master
+          TITLE: "Bump version to ${{ github.event.inputs.version_number }}"
         run: |
-          PR_URL=$(gh pr create --title "$TITLE" \
-            --base "main" \
+          gh pr create --title "$TITLE" \
+            --base "$BASE" \
             --head "$PR_BRANCH" \
             --label "version update" \
             --label "automated pr" \
@@ -157,42 +122,4 @@ jobs:
               - [X] Other
 
               ## Objective
-              Automated version bump to ${{ inputs.version_number }}")
-          echo "pr_number=${PR_URL##*/}" >> $GITHUB_OUTPUT
-
-      - name: Approve PR
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PR_NUMBER: ${{ steps.create-pr.outputs.pr_number }}
-        run: gh pr review $PR_NUMBER --approve
-
-      - name: Merge PR
-        env:
-          GH_TOKEN: ${{ steps.retrieve-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }}
-          PR_NUMBER: ${{ steps.create-pr.outputs.pr_number }}
-        run: gh pr merge $PR_NUMBER --squash --auto --delete-branch
-
-  cut_rc:
-    name: Cut RC branch
-    needs: bump_version
-    if: ${{ inputs.cut_rc_branch == true }}
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout Branch
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-        with:
-          ref: main
-
-      - name: Check if RC branch exists
-        run: |
-          remote_rc_branch_check=$(git ls-remote --heads origin rc | wc -l)
-          if [[ "${remote_rc_branch_check}" -gt 0 ]]; then
-            echo "Remote RC branch exists."
-            echo "Please delete current RC branch before running again."
-            exit 1
-          fi
-
-      - name: Cut RC branch
-        run: |
-          git switch --quiet --create rc
-          git push --quiet --set-upstream origin rc
+              Automated version bump to ${{ github.event.inputs.version_number }}"

.github/workflows/workflow-linter.yml

@@ -8,4 +8,4 @@ on:
 
 jobs:
   call-workflow:
-    uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@main
+    uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@34ecb67b2a357795dc893549df0795e7383ff50f

global.json

@@ -1,7 +0,0 @@
-{
-  "sdk": {
-    "version": "7.0.400",
-    "rollForward": "latestPatch",
-    "allowPrerelease": false
-  }
-}

src/Android/Accessibility/AccessibilityHelpers.cs

@@ -107,7 +107,6 @@ namespace Bit.Droid.Accessibility
             new Browser("org.bromite.chromium", "url_bar"),
             new Browser("org.chromium.chrome", "url_bar"),
             new Browser("org.codeaurora.swe.browser", "url_bar"),
-            new Browser("org.cromite.cromite", "url_bar"),
             new Browser("org.gnu.icecat", "url_bar_title,mozac_browser_toolbar_url_view"), // 2nd = Anticipation
             new Browser("org.mozilla.fenix", "mozac_browser_toolbar_url_view"),
             new Browser("org.mozilla.fenix.nightly", "mozac_browser_toolbar_url_view"), // [DEPRECATED ENTRY]

src/Android/Android.csproj

@@ -77,21 +77,21 @@
     <PackageReference Include="Portable.BouncyCastle">
       <Version>1.9.0</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.6.1.3" />
-    <PackageReference Include="Xamarin.AndroidX.AutoFill" Version="1.1.0.18" />
-    <PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.21" />
-    <PackageReference Include="Xamarin.AndroidX.Core" Version="1.10.1.2" />
-    <PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.4.0.2" />
+    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.5.1.1" />
+    <PackageReference Include="Xamarin.AndroidX.AutoFill" Version="1.1.0.16" />
+    <PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.19" />
+    <PackageReference Include="Xamarin.AndroidX.Core" Version="1.10.0" />
+    <PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.3.1.1" />
     <PackageReference Include="Xamarin.Essentials">
-      <Version>1.8.0</Version>
+      <Version>1.7.5</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Firebase.Messaging">
-      <Version>123.1.2.2</Version>
+      <Version>123.1.1.1</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.2" />
-    <PackageReference Include="Xamarin.Google.Dagger" Version="2.46.1.2" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0" />
+    <PackageReference Include="Xamarin.Google.Dagger" Version="2.44.2.1" />
     <PackageReference Include="Xamarin.GooglePlayServices.SafetyNet">
-      <Version>118.0.1.5</Version>
+      <Version>118.0.1.3</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
@@ -245,14 +245,6 @@
       <SubType></SubType>
       <Generator></Generator>
     </AndroidResource>
-    <AndroidResource Include="Resources\drawable\empty_login_requests.xml">
-      <SubType></SubType>
-      <Generator></Generator>
-    </AndroidResource>
-    <AndroidResource Include="Resources\drawable\empty_login_requests_dark.xml">
-      <SubType></SubType>
-      <Generator></Generator>
-    </AndroidResource>
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\splash_screen.xml" />

src/Android/Autofill/AutofillHelpers.cs

@@ -20,7 +20,6 @@ using AndroidX.AutoFill.Inline.V1;
 using Bit.Core.Abstractions;
 using SaveFlags = Android.Service.Autofill.SaveFlags;
 using Bit.Droid.Utilities;
-using Bit.Core.Services;
 
 namespace Bit.Droid.Autofill
 {
@@ -128,7 +127,6 @@ namespace Bit.Droid.Autofill
             "org.bromite.chromium",
             "org.chromium.chrome",
             "org.codeaurora.swe.browser",
-            "org.cromite.cromite",
             "org.gnu.icecat",
             "org.mozilla.fenix",
             "org.mozilla.fenix.nightly",
@@ -154,9 +152,8 @@ namespace Bit.Droid.Autofill
             "androidapp://com.oneplus.applocker",
         };
 
-        public static async Task<List<FilledItem>> GetFillItemsAsync(Parser parser, ICipherService cipherService, IUserVerificationService userVerificationService)
+        public static async Task<List<FilledItem>> GetFillItemsAsync(Parser parser, ICipherService cipherService)
         {
-            var userHasMasterPassword = await userVerificationService.HasMasterPasswordAsync();
             if (parser.FieldCollection.FillableForLogin)
             {
                 var ciphers = await cipherService.GetAllDecryptedByUrlAsync(parser.Uri);
@@ -164,14 +161,14 @@ namespace Bit.Droid.Autofill
                 {
                     var allCiphers = ciphers.Item1.ToList();
                     allCiphers.AddRange(ciphers.Item2.ToList());
-                    var nonPromptCiphers = allCiphers.Where(cipher => !userHasMasterPassword || cipher.Reprompt == CipherRepromptType.None);
+                    var nonPromptCiphers = allCiphers.Where(cipher => cipher.Reprompt == CipherRepromptType.None);
                     return nonPromptCiphers.Select(c => new FilledItem(c)).ToList();
                 }
             }
             else if (parser.FieldCollection.FillableForCard)
             {
                 var ciphers = await cipherService.GetAllDecryptedAsync();
-                return ciphers.Where(c => c.Type == CipherType.Card && (!userHasMasterPassword || c.Reprompt == CipherRepromptType.None)).Select(c => new FilledItem(c)).ToList();
+                return ciphers.Where(c => c.Type == CipherType.Card && c.Reprompt == CipherRepromptType.None).Select(c => new FilledItem(c)).ToList();
             }
             return new List<FilledItem>();
         }

src/Android/Autofill/AutofillService.cs

@@ -11,7 +11,6 @@ using Android.Widget;
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
-using Bit.Core.Services;
 using Bit.Core.Utilities;
 
 namespace Bit.Droid.Autofill
@@ -27,7 +26,6 @@ namespace Bit.Droid.Autofill
         private IPolicyService _policyService;
         private IStateService _stateService;
         private LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
-        private IUserVerificationService _userVerificationService;
 
         public async override void OnFillRequest(FillRequest request, CancellationSignal cancellationSignal,
             FillCallback callback)
@@ -66,9 +64,11 @@ namespace Bit.Droid.Autofill
                 var locked = await _vaultTimeoutService.IsLockedAsync();
                 if (!locked)
                 {
-                    _cipherService ??= ServiceContainer.Resolve<ICipherService>();
-                    _userVerificationService ??=  ServiceContainer.Resolve<IUserVerificationService>();
-                    items = await AutofillHelpers.GetFillItemsAsync(parser, _cipherService, _userVerificationService);
+                    if (_cipherService == null)
+                    {
+                        _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
+                    }
+                    items = await AutofillHelpers.GetFillItemsAsync(parser, _cipherService);
                 }
 
                 // build response

src/Android/Constants.cs

@@ -3,11 +3,5 @@
     public static class Constants
     {
         public const string PACKAGE_NAME = "com.x8bit.bitwarden";
-        public const string TEMP_CAMERA_IMAGE_NAME = "temp_camera_image.jpg";
-        
-        /// <summary>
-        /// This directory must also be declared in filepaths.xml
-        /// </summary>
-        public const string TEMP_CAMERA_IMAGE_DIR = "camera_temp";
     }
 }

src/Android/MainActivity.cs

@@ -116,7 +116,7 @@ namespace Bit.Droid
                 {
                     ListenYubiKey((bool)message.Data);
                 }
-                else if (message.Command is ThemeManager.UPDATED_THEME_MESSAGE_KEY)
+                else if (message.Command == "updatedTheme")
                 {
                     Xamarin.Forms.Device.BeginInvokeOnMainThread(() => AppearanceAdjustments());
                 }
@@ -239,22 +239,18 @@ namespace Bit.Droid
                 string fileName = null;
                 if (data != null && data.Data != null)
                 {
-                    if (data.Data.ToString()?.Contains(Constants.PACKAGE_NAME) != true)
-                    {
-                        uri = data.Data;
-                        fileName = AndroidHelpers.GetFileName(ApplicationContext, uri);
-                    }
+                    uri = data.Data;
+                    fileName = AndroidHelpers.GetFileName(ApplicationContext, uri);
                 }
                 else
                 {
                     // camera
-                    var tmpDir = new Java.IO.File(FilesDir, Constants.TEMP_CAMERA_IMAGE_DIR);
-                    var file = new Java.IO.File(tmpDir, Constants.TEMP_CAMERA_IMAGE_NAME);
+                    var file = new Java.IO.File(FilesDir, "temp_camera_photo.jpg");
                     uri = FileProvider.GetUriForFile(this, "com.x8bit.bitwarden.fileprovider", file);
                     fileName = $"photo_{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.jpg";
                 }
 
-                if (uri == null || fileName == null)
+                if (uri == null)
                 {
                     return;
                 }

src/Android/MainApplication.cs

@@ -159,8 +159,7 @@ namespace Bit.Droid
             var cryptoFunctionService = new PclCryptoFunctionService(cryptoPrimitiveService);
             var cryptoService = new CryptoService(stateService, cryptoFunctionService);
             var biometricService = new BiometricService(stateService, cryptoService);
-            var userPinService = new UserPinService(stateService, cryptoService);
-            var passwordRepromptService = new MobilePasswordRepromptService(platformUtilsService, cryptoService, stateService);
+            var passwordRepromptService = new MobilePasswordRepromptService(platformUtilsService, cryptoService);
 
             ServiceContainer.Register<ISynchronousStorageService>(preferencesStorage);
             ServiceContainer.Register<IBroadcasterService>("broadcasterService", broadcasterService);
@@ -183,7 +182,6 @@ namespace Bit.Droid
             ServiceContainer.Register<ICryptoService>("cryptoService", cryptoService);
             ServiceContainer.Register<IPasswordRepromptService>("passwordRepromptService", passwordRepromptService);
             ServiceContainer.Register<IAvatarImageSourcePool>("avatarImageSourcePool", new AvatarImageSourcePool());
-            ServiceContainer.Register<IUserPinService>(userPinService);
 
             // Push
 #if FDROID

src/Android/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2023.12.1" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2023.8.0" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.NFC" />

src/Android/Resources/drawable/empty_login_requests.xml

@@ -1,41 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="200"
-    android:viewportHeight="143"
-    android:width="200dp"
-    android:height="143dp">
-    <path
-        android:pathData="M34 43H10C6.68629 43 4 45.6863 4 49V109C4 112.314 6.68629 115 10 115H34C37.3137 115 40 112.314 40 109V49C40 45.6863 37.3137 43 34 43ZM10 39C4.47715 39 0 43.4772 0 49V109C0 114.523 4.47715 119 10 119H34C39.5228 119 44 114.523 44 109V49C44 43.4772 39.5228 39 34 39H10Z"
-        android:fillType="evenOdd"
-        android:fillColor="#89929F" />
-    <path
-        android:pathData="M20.3701 47.809C20.3701 47.2567 20.8178 46.809 21.3701 46.809H22.6122C23.1645 46.809 23.6122 47.2567 23.6122 47.809C23.6122 48.3612 23.1645 48.809 22.6122 48.809H21.3701C20.8178 48.809 20.3701 48.3612 20.3701 47.809Z"
-        android:fillType="evenOdd"
-        android:fillColor="#89929F" />
-    <path
-        android:pathData="M68 120C68 119.448 68.4477 119 69 119H127C127.552 119 128 119.448 128 120C128 120.552 127.552 121 127 121H69C68.4477 121 68 120.552 68 120Z"
-        android:fillType="evenOdd"
-        android:fillColor="#89929F" />
-    <path
-        android:pathData="M87.7402 120V102.236H89.7402V120H87.7402Z"
-        android:fillType="evenOdd"
-        android:fillColor="#89929F" />
-    <path
-        android:pathData="M107.71 120V102.236H109.71V120H107.71Z"
-        android:fillType="evenOdd"
-        android:fillColor="#89929F" />
-    <path
-        android:pathData="M27 25C27 17.268 33.268 11 41 11H157C164.732 11 171 17.268 171 25V31H167V25C167 19.4772 162.523 15 157 15H41C35.4772 15 31 19.4772 31 25V41H27V25ZM42 99H127V103H42V99Z"
-        android:fillType="evenOdd"
-        android:fillColor="#89929F" />
-    <path
-        android:pathData="M35 26C35 22.134 38.134 19 42 19H156C159.866 19 163 22.134 163 26V31H161V26C161 23.2386 158.761 21 156 21H42C39.2386 21 37 23.2386 37 26V41H35V26ZM42 93H127V95H42V93Z"
-        android:fillType="evenOdd"
-        android:fillColor="#89929F" />
-    <path
-        android:pathData="M125 39C125 33.4771 129.477 29 135 29H188C193.523 29 198 33.4772 198 39V119C198 124.523 193.523 129 188 129H135C129.477 129 125 124.523 125 119V39ZM135 33C131.686 33 129 35.6863 129 39V119C129 122.314 131.686 125 135 125H188C191.314 125 194 122.314 194 119V39C194 35.6863 191.314 33 188 33H135Z"
-        android:fillType="evenOdd"
-        android:fillColor="#89929F" />
-    <path
-        android:pathData="M164 120C164 121.105 163.105 122 162 122C160.895 122 160 121.105 160 120C160 118.895 160.895 118 162 118C163.105 118 164 118.895 164 120Z"
-        android:fillColor="#89929F" />
-</vector>

src/Android/Resources/drawable/empty_login_requests_dark.xml

@@ -1,41 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="200"
-    android:viewportHeight="143"
-    android:width="200dp"
-    android:height="143dp">
-    <path
-        android:pathData="M34 43H10C6.68629 43 4 45.6863 4 49V109C4 112.314 6.68629 115 10 115H34C37.3137 115 40 112.314 40 109V49C40 45.6863 37.3137 43 34 43ZM10 39C4.47715 39 0 43.4772 0 49V109C0 114.523 4.47715 119 10 119H34C39.5228 119 44 114.523 44 109V49C44 43.4772 39.5228 39 34 39H10Z"
-        android:fillType="evenOdd"
-        android:fillColor="#A3A3A3" />
-    <path
-        android:pathData="M20.3701 47.809C20.3701 47.2567 20.8178 46.809 21.3701 46.809H22.6122C23.1645 46.809 23.6122 47.2567 23.6122 47.809C23.6122 48.3612 23.1645 48.809 22.6122 48.809H21.3701C20.8178 48.809 20.3701 48.3612 20.3701 47.809Z"
-        android:fillType="evenOdd"
-        android:fillColor="#A3A3A3" />
-    <path
-        android:pathData="M68 120C68 119.448 68.4477 119 69 119H127C127.552 119 128 119.448 128 120C128 120.552 127.552 121 127 121H69C68.4477 121 68 120.552 68 120Z"
-        android:fillType="evenOdd"
-        android:fillColor="#A3A3A3" />
-    <path
-        android:pathData="M87.7402 120V102.236H89.7402V120H87.7402Z"
-        android:fillType="evenOdd"
-        android:fillColor="#A3A3A3" />
-    <path
-        android:pathData="M107.71 120V102.236H109.71V120H107.71Z"
-        android:fillType="evenOdd"
-        android:fillColor="#A3A3A3" />
-    <path
-        android:pathData="M27 25C27 17.268 33.268 11 41 11H157C164.732 11 171 17.268 171 25V31H167V25C167 19.4772 162.523 15 157 15H41C35.4772 15 31 19.4772 31 25V41H27V25ZM42 99H127V103H42V99Z"
-        android:fillType="evenOdd"
-        android:fillColor="#A3A3A3" />
-    <path
-        android:pathData="M35 26C35 22.134 38.134 19 42 19H156C159.866 19 163 22.134 163 26V31H161V26C161 23.2386 158.761 21 156 21H42C39.2386 21 37 23.2386 37 26V41H35V26ZM42 93H127V95H42V93Z"
-        android:fillType="evenOdd"
-        android:fillColor="#A3A3A3" />
-    <path
-        android:pathData="M125 39C125 33.4771 129.477 29 135 29H188C193.523 29 198 33.4772 198 39V119C198 124.523 193.523 129 188 129H135C129.477 129 125 124.523 125 119V39ZM135 33C131.686 33 129 35.6863 129 39V119C129 122.314 131.686 125 135 125H188C191.314 125 194 122.314 194 119V39C194 35.6863 191.314 33 188 33H135Z"
-        android:fillType="evenOdd"
-        android:fillColor="#A3A3A3" />
-    <path
-        android:pathData="M164 120C164 121.105 163.105 122 162 122C160.895 122 160 121.105 160 120C160 118.895 160.895 118 162 118C163.105 118 164 118.895 164 120Z"
-        android:fillColor="#A3A3A3" />
-</vector>

src/Android/Resources/xml/autofillservice.xml

@@ -236,9 +236,6 @@
   <compatibility-package
     android:name="org.codeaurora.swe.browser"
     android:maxLongVersionCode="10000000000"/>
-  <compatibility-package
-    android:name="org.cromite.cromite"
-    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="org.gnu.icecat"
     android:maxLongVersionCode="10000000000"/>

src/Android/Resources/xml/filepaths.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <paths xmlns:android="http://schemas.android.com/apk/res/android">
   <cache-path name="cache" path="." />
-  <files-path name="temp_camera_images" path="camera_temp/" />
+  <files-path name="internal" path="." />
 </paths>

src/Android/Services/DeviceActionService.cs

@@ -547,12 +547,6 @@ namespace Bit.Droid.Services
             return true;
         }
 
-        public bool SupportsAutofillServices() => Build.VERSION.SdkInt >= BuildVersionCodes.O;
-
-        public bool SupportsInlineAutofill() => Build.VERSION.SdkInt >= BuildVersionCodes.R;
-
-        public bool SupportsDrawOver() => Build.VERSION.SdkInt >= BuildVersionCodes.M;
-
         private Intent RateIntentForUrl(string url, Activity activity)
         {
             var intent = new Intent(Intent.ActionView, Android.Net.Uri.Parse($"{url}?id={activity.PackageName}"));
@@ -607,38 +601,6 @@ namespace Bit.Droid.Services
             throw new NotImplementedException();
         }
 
-        public string GetAutofillAccessibilityDescription()
-        {
-            if (Build.VERSION.SdkInt <= BuildVersionCodes.LollipopMr1)
-            {
-                return AppResources.AccessibilityDescription;
-            }
-            if (Build.VERSION.SdkInt <= BuildVersionCodes.M)
-            {
-                return AppResources.AccessibilityDescription2;
-            }
-            if (Build.VERSION.SdkInt <= BuildVersionCodes.NMr1)
-            {
-                return AppResources.AccessibilityDescription3;
-            }
-
-            return AppResources.AccessibilityDescription4;
-        }
-
-        public string GetAutofillDrawOverDescription()
-        {
-            if (Build.VERSION.SdkInt <= BuildVersionCodes.M)
-            {
-                return AppResources.DrawOverDescription;
-            }
-            if (Build.VERSION.SdkInt <= BuildVersionCodes.NMr1)
-            {
-                return AppResources.DrawOverDescription2;
-            }
-
-            return AppResources.DrawOverDescription3;
-        }
-
         private void SetNumericKeyboardTo(EditText editText)
         {
             editText.InputType = InputTypes.ClassNumber | InputTypes.NumberFlagDecimal | InputTypes.NumberFlagSigned;

src/Android/Services/FileService.cs

@@ -190,8 +190,7 @@ namespace Bit.Droid.Services
                 {
                     try
                     {
-                        var tmpDir = new Java.IO.File(activity.FilesDir, Constants.TEMP_CAMERA_IMAGE_DIR);
-                        var file = new Java.IO.File(tmpDir, Constants.TEMP_CAMERA_IMAGE_NAME);
+                        var file = new Java.IO.File(activity.FilesDir, "temp_camera_photo.jpg");
                         if (!file.Exists())
                         {
                             file.ParentFile.Mkdirs();

src/App/Abstractions/IDeviceActionService.cs

@@ -28,9 +28,6 @@ namespace Bit.App.Abstractions
         bool SupportsNfc();
         bool SupportsCamera();
         bool SupportsFido2();
-        bool SupportsAutofillServices();
-        bool SupportsInlineAutofill();
-        bool SupportsDrawOver();
 
         bool LaunchApp(string appName);
         void RateApp();
@@ -44,7 +41,5 @@ namespace Bit.App.Abstractions
         Task SetScreenCaptureAllowedAsync();
         void OpenAppSettings();
         void CloseExtensionPopUp();
-        string GetAutofillAccessibilityDescription();
-        string GetAutofillDrawOverDescription();
     }
 }

src/App/App.csproj

@@ -16,9 +16,9 @@
     <PackageReference Include="Plugin.Fingerprint" Version="2.1.5" />
     <PackageReference Include="SkiaSharp.Views.Forms" Version="2.88.3" />
     <PackageReference Include="Xamarin.CommunityToolkit" Version="2.0.6" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.7.5" />
     <PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.11.982" />
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2612" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
     <PackageReference Include="ZXing.Net.Mobile" Version="2.4.1" />
     <PackageReference Include="ZXing.Net.Mobile.Forms" Version="2.4.1" />
     <PackageReference Include="MessagePack" Version="2.4.59" />
@@ -59,6 +59,9 @@
     <Compile Update="Pages\Settings\ExtensionPage.xaml.cs">
       <DependentUpon>ExtensionPage.xaml</DependentUpon>
     </Compile>
+    <Compile Update="Pages\Settings\AutofillServicesPage.xaml.cs">
+      <DependentUpon>AutofillServicesPage.xaml</DependentUpon>
+    </Compile>
     <Compile Update="Pages\Settings\FolderAddEditPage.xaml.cs">
       <DependentUpon>FolderAddEditPage.xaml</DependentUpon>
     </Compile>
@@ -68,6 +71,12 @@
     <Compile Update="Pages\Settings\ExportVaultPage.xaml.cs">
       <DependentUpon>ExportVaultPage.xaml</DependentUpon>
     </Compile>
+    <Compile Update="Pages\Settings\OptionsPage.xaml.cs">
+      <DependentUpon>OptionsPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Update="Pages\Settings\SyncPage.xaml.cs">
+      <DependentUpon>SyncPage.xaml</DependentUpon>
+    </Compile>
     <Compile Update="Pages\Vault\AttachmentsPage.xaml.cs">
       <DependentUpon>AttachmentsPage.xaml</DependentUpon>
     </Compile>
@@ -138,7 +147,6 @@
     <Folder Include="Controls\PasswordStrengthProgressBar\" />
     <Folder Include="Utilities\Automation\" />
     <Folder Include="Utilities\Prompts\" />
-    <Folder Include="Controls\Settings\" />
   </ItemGroup>
 
   <ItemGroup>
@@ -436,6 +444,5 @@
     <None Remove="Controls\PasswordStrengthProgressBar\" />
     <None Remove="Utilities\Automation\" />
     <None Remove="Utilities\Prompts\" />
-    <None Remove="Controls\Settings\" />
   </ItemGroup>
 </Project>

src/App/App.xaml.cs

@@ -91,7 +91,7 @@ namespace Bit.App
                             _messagingService.Send("showDialogResolve", new Tuple<int, bool>(details.DialogId, confirmed));
                         });
                     }
-                    else if (message.Command == AppHelpers.RESUMED_MESSAGE_COMMAND)
+                    else if (message.Command == "resumed")
                     {
                         if (Device.RuntimePlatform == Device.iOS)
                         {
@@ -171,11 +171,6 @@ namespace Bit.App
                                 new NavigationPage(new UpdateTempPasswordPage()));
                         });
                     }
-                    else if (message.Command == Constants.ForceSetPassword)
-                    {
-                        await Device.InvokeOnMainThreadAsync(() => Application.Current.MainPage.Navigation.PushModalAsync(
-                                new NavigationPage(new SetPasswordPage(orgIdentifier: (string)message.Data))));
-                    }
                     else if (message.Command == "syncCompleted")
                     {
                         await _configService.GetAsync(true);
@@ -370,7 +365,7 @@ namespace Bit.App
             await Device.InvokeOnMainThreadAsync(() =>
             {
                 ThemeManager.SetTheme(Current.Resources);
-                _messagingService.Send(ThemeManager.UPDATED_THEME_MESSAGE_KEY);
+                _messagingService.Send("updatedTheme");
             });
         }
 

src/App/Controls/AccountViewCell/AccountViewCellViewModel.cs

@@ -36,7 +36,7 @@ namespace Bit.App.Controls
 
         public bool ShowHostname
         {
-            get => !string.IsNullOrWhiteSpace(AccountView.Hostname);
+            get => !string.IsNullOrWhiteSpace(AccountView.Hostname) && AccountView.Hostname != "vault.bitwarden.com";
         }
 
         public bool IsActive

src/App/Controls/ExternalLinkItemView.xaml

@@ -1,29 +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:controls="clr-namespace:Bit.App.Controls"
-    x:Class="Bit.App.Controls.ExternalLinkItemView"
-    xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
-    x:Name="_contentView">
-    <ContentView.GestureRecognizers>
-        <TapGestureRecognizer Command="{Binding GoToLinkCommand, Mode=OneWay, Source={x:Reference _contentView}}" />
-    </ContentView.GestureRecognizers>
-    <StackLayout
-        Orientation="Horizontal">
-        <controls:CustomLabel
-            Text="{Binding Title, Mode=OneWay, Source={x:Reference _contentView}}"
-            HorizontalOptions="StartAndExpand"
-            LineBreakMode="TailTruncation" />
-
-        <controls:IconLabel
-            Text="{Binding Source={x:Static core:BitwardenIcons.ShareSquare}}"
-            TextColor="{DynamicResource TextColor}"
-            HorizontalOptions="End"
-            VerticalOptions="Center"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{Binding Title, Mode=OneWay, Source={x:Reference _contentView}}" />
-
-    </StackLayout>
-</ContentView>
-

src/App/Controls/ExternalLinkItemView.xaml.cs

@@ -1,31 +0,0 @@
-using System.Windows.Input;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public partial class ExternalLinkItemView : ContentView
-    {
-        public static readonly BindableProperty TitleProperty = BindableProperty.Create(
-            nameof(Title), typeof(string), typeof(ExternalLinkItemView), null, BindingMode.OneWay);
-
-        public static readonly BindableProperty GoToLinkCommandProperty = BindableProperty.Create(
-            nameof(GoToLinkCommand), typeof(ICommand), typeof(ExternalLinkItemView));
-
-        public ExternalLinkItemView()
-        {
-            InitializeComponent();
-        }
-
-        public string Title
-        {
-            get { return (string)GetValue(TitleProperty); }
-            set { SetValue(TitleProperty, value); }
-        }
-
-        public ICommand GoToLinkCommand
-        {
-            get => GetValue(GoToLinkCommandProperty) as ICommand;
-            set => SetValue(GoToLinkCommandProperty, value);
-        }
-    }
-}

src/App/Controls/Settings/BaseSettingControlView.cs

@@ -1,27 +0,0 @@
-using System.Runtime.CompilerServices;
-using Bit.App.Utilities;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public class BaseSettingItemView : ContentView
-    {
-        public static readonly BindableProperty TitleProperty = BindableProperty.Create(
-            nameof(Title), typeof(string), typeof(SwitchItemView), null);
-
-        public static readonly BindableProperty SubtitleProperty = BindableProperty.Create(
-            nameof(Subtitle), typeof(string), typeof(SwitchItemView), null);
-
-        public string Title
-        {
-            get { return (string)GetValue(TitleProperty); }
-            set { SetValue(TitleProperty, value); }
-        }
-
-        public string Subtitle
-        {
-            get { return (string)GetValue(SubtitleProperty); }
-            set { SetValue(SubtitleProperty, value); }
-        }
-    }
-}

src/App/Controls/Settings/SettingChooserItemView.xaml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<controls:BaseSettingItemView
-    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.SettingChooserItemView"
-    x:Name="_contentView"
-    ControlTemplate="{StaticResource SettingControlTemplate}">
-    <controls:BaseSettingItemView.GestureRecognizers>
-        <TapGestureRecognizer Command="{Binding ChooseCommand, Mode=OneWay, Source={x:Reference _contentView}}" />
-    </controls:BaseSettingItemView.GestureRecognizers>
-
-    <controls:CustomLabel
-        Text="{Binding DisplayValue, Source={x:Reference _contentView}}"
-        HorizontalTextAlignment="End"
-        TextColor="{DynamicResource MutedColor}"
-        StyleClass="list-sub" />
-
-</controls:BaseSettingItemView>

src/App/Controls/Settings/SettingChooserItemView.xaml.cs

@@ -1,31 +0,0 @@
-using System.Windows.Input;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public partial class SettingChooserItemView : BaseSettingItemView
-    {
-        public static readonly BindableProperty DisplayValueProperty = BindableProperty.Create(
-            nameof(DisplayValue), typeof(string), typeof(SettingChooserItemView), null);
-
-        public static readonly BindableProperty ChooseCommandProperty = BindableProperty.Create(
-            nameof(ChooseCommand), typeof(ICommand), typeof(ExternalLinkItemView));
-
-        public string DisplayValue
-        {
-            get { return (string)GetValue(DisplayValueProperty); }
-            set { SetValue(DisplayValueProperty, value); }
-        }
-
-        public SettingChooserItemView()
-        {
-            InitializeComponent();
-        }
-
-        public ICommand ChooseCommand
-        {
-            get => GetValue(ChooseCommandProperty) as ICommand;
-            set => SetValue(ChooseCommandProperty, value);
-        }
-    }
-}

src/App/Controls/Settings/SwitchItemView.xaml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<controls:BaseSettingItemView
-    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.SwitchItemView"
-    x:Name="_contentView"
-    ControlTemplate="{StaticResource SettingControlTemplate}">
-    <controls:BaseSettingItemView.GestureRecognizers>
-        <TapGestureRecognizer Tapped="ContentView_Tapped" />
-    </controls:BaseSettingItemView.GestureRecognizers>
-
-    <Switch
-        x:Name="_switch"
-        HeightRequest="20"
-        Scale="{OnPlatform iOS=0.8, Android=1}"
-        IsToggled="{Binding IsToggled, Mode=TwoWay, Source={x:Reference _contentView}}"
-        AutomationId="{Binding SwitchAutomationId, Mode=OneWay, Source={x:Reference _contentView}}"/>
-</controls:BaseSettingItemView>

src/App/Controls/Settings/SwitchItemView.xaml.cs

@@ -1,45 +0,0 @@
-using System.Windows.Input;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public partial class SwitchItemView : BaseSettingItemView
-    {
-        public static readonly BindableProperty IsToggledProperty = BindableProperty.Create(
-            nameof(IsToggled), typeof(bool), typeof(SwitchItemView), null, BindingMode.TwoWay);
-
-        public static readonly BindableProperty SwitchAutomationIdProperty = BindableProperty.Create(
-            nameof(SwitchAutomationId), typeof(string), typeof(SwitchItemView), null, BindingMode.OneWay);
-
-        public static readonly BindableProperty ToggleSwitchCommandProperty = BindableProperty.Create(
-            nameof(ToggleSwitchCommand), typeof(ICommand), typeof(ExternalLinkItemView));
-
-        public SwitchItemView()
-        {
-            InitializeComponent();
-        }
-
-        public bool IsToggled
-        {
-            get { return (bool)GetValue(IsToggledProperty); }
-            set { SetValue(IsToggledProperty, value); }
-        }
-
-        public string SwitchAutomationId
-        {
-            get { return (string)GetValue(SwitchAutomationIdProperty); }
-            set { SetValue(SwitchAutomationIdProperty, value); }
-        }
-
-        public ICommand ToggleSwitchCommand
-        {
-            get => GetValue(ToggleSwitchCommandProperty) as ICommand;
-            set => SetValue(ToggleSwitchCommandProperty, value);
-        }
-
-        void ContentView_Tapped(System.Object sender, System.EventArgs e)
-        {
-            _switch.IsToggled = !_switch.IsToggled;
-        }
-    }
-}

src/App/Pages/Accounts/EnvironmentPageViewModel.cs

@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using System.Windows.Input;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
-using Bit.Core.Enums;
+using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
 
@@ -19,25 +19,14 @@ namespace Bit.App.Pages
             _environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
 
             PageTitle = AppResources.Settings;
-            SubmitCommand = new AsyncCommand(SubmitAsync, onException: ex => OnSubmitException(ex), allowsMultipleExecutions: false);
-            Init();
-        }
-
-        public void Init()
-        {
-            if (_environmentService.SelectedRegion != Region.SelfHosted ||
-                _environmentService.BaseUrl == Region.US.BaseUrl() ||
-                _environmentService.BaseUrl == Region.EU.BaseUrl())
-            {
-                return;
-            }
-
-            BaseUrl = _environmentService.BaseUrl;
+            BaseUrl = _environmentService.BaseUrl == EnvironmentUrlData.DefaultEU.Base || EnvironmentUrlData.DefaultUS.Base == _environmentService.BaseUrl ?
+                string.Empty : _environmentService.BaseUrl;
             WebVaultUrl = _environmentService.WebVaultUrl;
             ApiUrl = _environmentService.ApiUrl;
             IdentityUrl = _environmentService.IdentityUrl;
             IconsUrl = _environmentService.IconsUrl;
             NotificationsUrls = _environmentService.NotificationsUrl;
+            SubmitCommand = new AsyncCommand(SubmitAsync, onException: ex => OnSubmitException(ex), allowsMultipleExecutions: false);
         }
 
         public ICommand SubmitCommand { get; }
@@ -57,7 +46,8 @@ namespace Bit.App.Pages
                 await Page.DisplayAlert(AppResources.AnErrorHasOccurred, AppResources.EnvironmentPageUrlsError, AppResources.Ok);
                 return;
             }
-            var urls = new Core.Models.Data.EnvironmentUrlData
+
+            var resUrls = await _environmentService.SetUrlsAsync(new Core.Models.Data.EnvironmentUrlData
             {
                 Base = BaseUrl,
                 Api = ApiUrl,
@@ -65,8 +55,7 @@ namespace Bit.App.Pages
                 WebVault = WebVaultUrl,
                 Icons = IconsUrl,
                 Notifications = NotificationsUrls
-            };
-            var resUrls = await _environmentService.SetRegionAsync(urls.Region, urls);
+            });
 
             // re-set urls since service can change them, ex: prefixing https://
             BaseUrl = resUrls.Base;

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

@@ -64,7 +64,7 @@ namespace Bit.App.Pages
             }
             _broadcasterService.Subscribe(nameof(HomePage), (message) =>
             {
-                if (message.Command is ThemeManager.UPDATED_THEME_MESSAGE_KEY)
+                if (message.Command == "updatedTheme")
                 {
                     Device.BeginInvokeOnMainThread(() =>
                     {
@@ -74,7 +74,7 @@ namespace Bit.App.Pages
             });
             try
             {
-                await _vm.UpdateEnvironmentAsync();
+                await _vm.UpdateEnvironment();
             }
             catch (Exception ex)
             {

src/App/Pages/Accounts/HomePageViewModel.cs

@@ -3,7 +3,6 @@ using System.Threading.Tasks;
 using Bit.App.Abstractions;
 using Bit.App.Controls;
 using Bit.App.Resources;
-using Bit.App.Styles;
 using Bit.App.Utilities;
 using Bit.Core;
 using Bit.Core.Abstractions;
@@ -11,12 +10,13 @@ using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;
-using BwRegion = Bit.Core.Enums.Region;
 
 namespace Bit.App.Pages
 {
     public class HomeViewModel : BaseViewModel
     {
+        private const string LOGGING_IN_ON_US = "bitwarden.com";
+        private const string LOGGING_IN_ON_EU = "bitwarden.eu";
 
         private readonly IStateService _stateService;
         private readonly IMessagingService _messagingService;
@@ -165,8 +165,8 @@ namespace Bit.App.Pages
         {
             _displayEuEnvironment = await _configService.GetFeatureFlagBoolAsync(Constants.DisplayEuEnvironmentFlag);
             var options = _displayEuEnvironment
-                    ? new string[] { BwRegion.US.Domain(), BwRegion.EU.Domain(), AppResources.SelfHosted }
-                    : new string[] { BwRegion.US.Domain(), AppResources.SelfHosted };
+                    ? new string[] { LOGGING_IN_ON_US, LOGGING_IN_ON_EU, AppResources.SelfHosted }
+                    : new string[] { LOGGING_IN_ON_US, AppResources.SelfHosted };
 
             await Device.InvokeOnMainThreadAsync(async () =>
             {
@@ -183,23 +183,35 @@ namespace Bit.App.Pages
                     return;
                 }
 
-                await _environmentService.SetRegionAsync(result == BwRegion.EU.Domain() ? BwRegion.EU : BwRegion.US);
+                await _environmentService.SetUrlsAsync(result == LOGGING_IN_ON_EU ? EnvironmentUrlData.DefaultEU : EnvironmentUrlData.DefaultUS);
                 await _configService.GetAsync(true);
                 SelectedEnvironmentName = result;
             });
         }
 
-        public async Task UpdateEnvironmentAsync()
+        public async Task UpdateEnvironment()
         {
-            var region = _environmentService.SelectedRegion;
-            if (region == BwRegion.SelfHosted)
+            var environmentsSaved = await _stateService.GetPreAuthEnvironmentUrlsAsync();
+            if (environmentsSaved == null || environmentsSaved.IsEmpty)
             {
-                SelectedEnvironmentName = AppResources.SelfHosted;
-                await _configService.GetAsync(true);
+                await _environmentService.SetUrlsAsync(EnvironmentUrlData.DefaultUS);
+                environmentsSaved = EnvironmentUrlData.DefaultUS;
+                SelectedEnvironmentName = LOGGING_IN_ON_US;
+                return;
+            }
+
+            if (environmentsSaved.Base == EnvironmentUrlData.DefaultUS.Base)
+            {
+                SelectedEnvironmentName = LOGGING_IN_ON_US;
+            }
+            else if (environmentsSaved.Base == EnvironmentUrlData.DefaultEU.Base)
+            {
+                SelectedEnvironmentName = LOGGING_IN_ON_EU;
             }
             else
             {
-                SelectedEnvironmentName = region.Domain();
+                await _configService.GetAsync(true);
+                SelectedEnvironmentName = AppResources.SelfHosted;
             }
         }
     }

src/App/Pages/Accounts/LockPageViewModel.cs

@@ -7,7 +7,6 @@ using Bit.App.Utilities;
 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.Services;
@@ -73,12 +72,11 @@ namespace Bit.App.Pages
             TogglePasswordCommand = new Command(TogglePassword);
             SubmitCommand = new Command(async () => await SubmitAsync());
 
-            AccountSwitchingOverlayViewModel =
-                new AccountSwitchingOverlayViewModel(_stateService, _messagingService, _logger)
-                {
-                    AllowAddAccountRow = true,
-                    AllowActiveAccountSelection = true
-                };
+            AccountSwitchingOverlayViewModel = new AccountSwitchingOverlayViewModel(_stateService, _messagingService, _logger)
+            {
+                AllowAddAccountRow = true,
+                AllowActiveAccountSelection = true
+            };
         }
 
         public string MasterPassword
@@ -157,12 +155,8 @@ namespace Bit.App.Pages
 
         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 PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
         public Action UnlockedAction { get; set; }
         public event Action<int?> FocusSecretEntry
         {
@@ -184,9 +178,8 @@ namespace Bit.App.Pages
             var ephemeralPinSet = await _stateService.GetPinKeyEncryptedUserKeyEphemeralAsync()
                 ?? await _stateService.GetPinProtectedKeyAsync();
             PinEnabled = (_pinStatus == PinLockType.Transient && ephemeralPinSet != null) ||
-                _pinStatus == PinLockType.Persistent;
-
-            BiometricEnabled = await IsBiometricsEnabledAsync();
+                      _pinStatus == PinLockType.Persistent;
+            BiometricEnabled = await _vaultTimeoutService.IsBiometricLockSetAsync() && await _biometricService.CanUseBiometricsUnlockAsync();
 
             // Users without MP and without biometric or pin has no MP to unlock with
             _hasMasterPassword = await _userVerificationService.HasMasterPasswordAsync();
@@ -206,8 +199,13 @@ namespace Bit.App.Pages
                 _logger.Exception(new NullReferenceException("Email not found in storage"));
                 return;
             }
-
-            LoggedInAsText = string.Format(AppResources.LoggedInAsOn, _email, _environmentService.GetCurrentDomain());
+            var webVault = _environmentService.GetWebVaultUrl(true);
+            if (string.IsNullOrWhiteSpace(webVault))
+            {
+                webVault = "https://bitwarden.com";
+            }
+            var webVaultHostname = CoreHelpers.GetHostname(webVault);
+            LoggedInAsText = string.Format(AppResources.LoggedInAsOn, _email, webVaultHostname);
             if (PinEnabled)
             {
                 PageTitle = AppResources.VerifyPIN;
@@ -216,9 +214,7 @@ namespace Bit.App.Pages
             else
             {
                 PageTitle = _hasMasterPassword ? AppResources.VerifyMasterPassword : AppResources.UnlockVault;
-                LockedVerifyText = _hasMasterPassword
-                    ? AppResources.VaultLockedMasterPassword
-                    : AppResources.VaultLockedIdentity;
+                LockedVerifyText = _hasMasterPassword ? AppResources.VaultLockedMasterPassword : AppResources.VaultLockedIdentity;
             }
 
             if (BiometricEnabled)
@@ -237,32 +233,11 @@ namespace Bit.App.Pages
                     BiometricButtonText = supportsFace ? AppResources.UseFaceIDToUnlock :
                         AppResources.UseFingerprintToUnlock;
                 }
+
             }
         }
 
         public async Task SubmitAsync()
-        {
-            ShowPassword = false;
-            try
-            {
-                var kdfConfig = await _stateService.GetActiveUserCustomDataAsync(a => new KdfConfig(a?.Profile));
-                if (PinEnabled)
-                {
-                    await UnlockWithPinAsync(kdfConfig);
-                }
-                else
-                {
-                    await UnlockWithMasterPasswordAsync(kdfConfig);
-                }
-
-            }
-            catch (LegacyUserException)
-            {
-                await HandleLegacyUserAsync();
-            }
-        }
-
-        private async Task UnlockWithPinAsync(KdfConfig kdfConfig)
         {
             if (PinEnabled && string.IsNullOrWhiteSpace(Pin))
             {
@@ -271,84 +246,6 @@ namespace Bit.App.Pages
                     AppResources.Ok);
                 return;
             }
-
-            var failed = true;
-            try
-            {
-                EncString userKeyPin;
-                EncString oldPinProtected;
-                switch (_pinStatus)
-                {
-                    case PinLockType.Persistent:
-                        {
-                            userKeyPin = await _stateService.GetPinKeyEncryptedUserKeyAsync();
-                            var oldEncryptedKey = await _stateService.GetPinProtectedAsync();
-                            oldPinProtected = oldEncryptedKey != null ? new EncString(oldEncryptedKey) : null;
-                            break;
-                        }
-                    case PinLockType.Transient:
-                        userKeyPin = await _stateService.GetPinKeyEncryptedUserKeyEphemeralAsync();
-                        oldPinProtected = await _stateService.GetPinProtectedKeyAsync();
-                        break;
-                    case PinLockType.Disabled:
-                    default:
-                        throw new Exception("Pin is disabled");
-                }
-
-                UserKey userKey;
-                if (oldPinProtected != null)
-                {
-                    userKey = await _cryptoService.DecryptAndMigrateOldPinKeyAsync(
-                        _pinStatus == PinLockType.Transient,
-                        Pin,
-                        _email,
-                        kdfConfig,
-                        oldPinProtected
-                    );
-                }
-                else
-                {
-                    userKey = await _cryptoService.DecryptUserKeyWithPinAsync(
-                        Pin,
-                        _email,
-                        kdfConfig,
-                        userKeyPin
-                    );
-                }
-
-                var protectedPin = await _stateService.GetProtectedPinAsync();
-                var decryptedPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), userKey);
-                failed = decryptedPin != Pin;
-                if (!failed)
-                {
-                    Pin = string.Empty;
-                    await AppHelpers.ResetInvalidUnlockAttemptsAsync();
-                    await SetUserKeyAndContinueAsync(userKey);
-                }
-            }
-            catch (LegacyUserException)
-            {
-                throw;
-            }
-            catch
-            {
-                failed = true;
-            }
-            if (failed)
-            {
-                var invalidUnlockAttempts = await AppHelpers.IncrementInvalidUnlockAttemptsAsync();
-                if (invalidUnlockAttempts >= 5)
-                {
-                    _messagingService.Send("logout");
-                    return;
-                }
-                await _platformUtilsService.ShowDialogAsync(AppResources.InvalidPIN,
-                    AppResources.AnErrorHasOccurred);
-            }
-        }
-
-        private async Task UnlockWithMasterPasswordAsync(KdfConfig kdfConfig)
-        {
             if (!PinEnabled && string.IsNullOrWhiteSpace(MasterPassword))
             {
                 await Page.DisplayAlert(AppResources.AnErrorHasOccurred,
@@ -357,78 +254,142 @@ namespace Bit.App.Pages
                 return;
             }
 
-            var masterKey = await _cryptoService.MakeMasterKeyAsync(MasterPassword, _email, kdfConfig);
-            if (await _cryptoService.IsLegacyUserAsync(masterKey))
-            {
-                throw new LegacyUserException();
-            }
+            ShowPassword = false;
+            var kdfConfig = await _stateService.GetActiveUserCustomDataAsync(a => new KdfConfig(a?.Profile));
 
-            var storedKeyHash = await _cryptoService.GetMasterKeyHashAsync();
-            var passwordValid = false;
-            MasterPasswordPolicyOptions enforcedMasterPasswordOptions = null;
-
-            if (storedKeyHash != null)
+            if (PinEnabled)
             {
-                // Offline unlock possible
-                passwordValid = await _cryptoService.CompareAndUpdateKeyHashAsync(MasterPassword, masterKey);
-            }
-            else
-            {
-                // Online unlock required
-                await _deviceActionService.ShowLoadingAsync(AppResources.Loading);
-                var keyHash = await _cryptoService.HashMasterKeyAsync(MasterPassword, masterKey,
-                    HashPurpose.ServerAuthorization);
-                var request = new PasswordVerificationRequest();
-                request.MasterPasswordHash = keyHash;
-
+                var failed = true;
                 try
                 {
-                    var response = await _apiService.PostAccountVerifyPasswordAsync(request);
-                    enforcedMasterPasswordOptions = response.MasterPasswordPolicy;
-                    passwordValid = true;
-                    var localKeyHash = await _cryptoService.HashMasterKeyAsync(MasterPassword, masterKey,
-                        HashPurpose.LocalAuthorization);
-                    await _cryptoService.SetMasterKeyHashAsync(localKeyHash);
+                    EncString userKeyPin = null;
+                    EncString oldPinProtected = null;
+                    if (_pinStatus == PinLockType.Persistent)
+                    {
+                        userKeyPin = await _stateService.GetPinKeyEncryptedUserKeyAsync();
+                        var oldEncryptedKey = await _stateService.GetPinProtectedAsync();
+                        oldPinProtected = oldEncryptedKey != null ? new EncString(oldEncryptedKey) : null;
+                    }
+                    else if (_pinStatus == PinLockType.Transient)
+                    {
+                        userKeyPin = await _stateService.GetPinKeyEncryptedUserKeyEphemeralAsync();
+                        oldPinProtected = await _stateService.GetPinProtectedKeyAsync();
+                    }
+
+                    UserKey userKey;
+                    if (oldPinProtected != null)
+                    {
+                        userKey = await _cryptoService.DecryptAndMigrateOldPinKeyAsync(
+                            _pinStatus == PinLockType.Transient,
+                            Pin,
+                            _email,
+                            kdfConfig,
+                            oldPinProtected
+                        );
+                    }
+                    else
+                    {
+                        userKey = await _cryptoService.DecryptUserKeyWithPinAsync(
+                            Pin,
+                            _email,
+                            kdfConfig,
+                            userKeyPin
+                        );
+                    }
+
+                    var protectedPin = await _stateService.GetProtectedPinAsync();
+                    var decryptedPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), userKey);
+                    failed = decryptedPin != Pin;
+                    if (!failed)
+                    {
+                        Pin = string.Empty;
+                        await AppHelpers.ResetInvalidUnlockAttemptsAsync();
+                        await SetUserKeyAndContinueAsync(userKey);
+                    }
                 }
-                catch (Exception e)
+                catch
                 {
-                    System.Diagnostics.Debug.WriteLine(">>> {0}: {1}", e.GetType(), e.StackTrace);
+                    failed = true;
                 }
-                await _deviceActionService.HideLoadingAsync();
-            }
-
-            if (passwordValid)
-            {
-                if (await RequirePasswordChangeAsync(enforcedMasterPasswordOptions))
+                if (failed)
                 {
-                    // Save the ForcePasswordResetReason to force a password reset after unlock
-                    await _stateService.SetForcePasswordResetReasonAsync(
-                        ForcePasswordResetReason.WeakMasterPasswordOnLogin);
-                }
-
-                MasterPassword = string.Empty;
-                await AppHelpers.ResetInvalidUnlockAttemptsAsync();
-
-                var userKey = await _cryptoService.DecryptUserKeyWithMasterKeyAsync(masterKey);
-                await _cryptoService.SetMasterKeyAsync(masterKey);
-                await SetUserKeyAndContinueAsync(userKey);
-
-                // Re-enable biometrics
-                if (BiometricEnabled & !BiometricIntegrityValid)
-                {
-                    await _biometricService.SetupBiometricAsync();
+                    var invalidUnlockAttempts = await AppHelpers.IncrementInvalidUnlockAttemptsAsync();
+                    if (invalidUnlockAttempts >= 5)
+                    {
+                        _messagingService.Send("logout");
+                        return;
+                    }
+                    await _platformUtilsService.ShowDialogAsync(AppResources.InvalidPIN,
+                        AppResources.AnErrorHasOccurred);
                 }
             }
             else
             {
-                var invalidUnlockAttempts = await AppHelpers.IncrementInvalidUnlockAttemptsAsync();
-                if (invalidUnlockAttempts >= 5)
+                var masterKey = await _cryptoService.MakeMasterKeyAsync(MasterPassword, _email, kdfConfig);
+                var storedKeyHash = await _cryptoService.GetMasterKeyHashAsync();
+                var passwordValid = false;
+                MasterPasswordPolicyOptions enforcedMasterPasswordOptions = null;
+
+                if (storedKeyHash != null)
                 {
-                    _messagingService.Send("logout");
-                    return;
+                    // Offline unlock possible
+                    passwordValid = await _cryptoService.CompareAndUpdateKeyHashAsync(MasterPassword, masterKey);
+                }
+                else
+                {
+                    // Online unlock required
+                    await _deviceActionService.ShowLoadingAsync(AppResources.Loading);
+                    var keyHash = await _cryptoService.HashMasterKeyAsync(MasterPassword, masterKey, HashPurpose.ServerAuthorization);
+                    var request = new PasswordVerificationRequest();
+                    request.MasterPasswordHash = keyHash;
+
+                    try
+                    {
+                        var response = await _apiService.PostAccountVerifyPasswordAsync(request);
+                        enforcedMasterPasswordOptions = response.MasterPasswordPolicy;
+                        passwordValid = true;
+                        var localKeyHash = await _cryptoService.HashMasterKeyAsync(MasterPassword, masterKey, HashPurpose.LocalAuthorization);
+                        await _cryptoService.SetMasterKeyHashAsync(localKeyHash);
+                    }
+                    catch (Exception e)
+                    {
+                        System.Diagnostics.Debug.WriteLine(">>> {0}: {1}", e.GetType(), e.StackTrace);
+                    }
+                    await _deviceActionService.HideLoadingAsync();
+                }
+                if (passwordValid)
+                {
+                    if (await RequirePasswordChangeAsync(enforcedMasterPasswordOptions))
+                    {
+                        // Save the ForcePasswordResetReason to force a password reset after unlock
+                        await _stateService.SetForcePasswordResetReasonAsync(
+                            ForcePasswordResetReason.WeakMasterPasswordOnLogin);
+                    }
+
+                    MasterPassword = string.Empty;
+                    await AppHelpers.ResetInvalidUnlockAttemptsAsync();
+
+                    var userKey = await _cryptoService.DecryptUserKeyWithMasterKeyAsync(masterKey);
+                    await _cryptoService.SetMasterKeyAsync(masterKey);
+                    await SetUserKeyAndContinueAsync(userKey);
+
+                    // Re-enable biometrics
+                    if (BiometricEnabled & !BiometricIntegrityValid)
+                    {
+                        await _biometricService.SetupBiometricAsync();
+                    }
+                }
+                else
+                {
+                    var invalidUnlockAttempts = await AppHelpers.IncrementInvalidUnlockAttemptsAsync();
+                    if (invalidUnlockAttempts >= 5)
+                    {
+                        _messagingService.Send("logout");
+                        return;
+                    }
+                    await _platformUtilsService.ShowDialogAsync(AppResources.InvalidMasterPassword,
+                        AppResources.AnErrorHasOccurred);
                 }
-                await _platformUtilsService.ShowDialogAsync(AppResources.InvalidMasterPassword,
-                    AppResources.AnErrorHasOccurred);
             }
         }
 
@@ -491,36 +452,25 @@ namespace Bit.App.Pages
         {
             ShowPassword = !ShowPassword;
             var secret = PinEnabled ? Pin : MasterPassword;
-            _secretEntryFocusWeakEventManager.RaiseEvent(string.IsNullOrEmpty(secret) ? 0 : secret.Length,
-                nameof(FocusSecretEntry));
+            _secretEntryFocusWeakEventManager.RaiseEvent(string.IsNullOrEmpty(secret) ? 0 : secret.Length, nameof(FocusSecretEntry));
         }
 
         public async Task PromptBiometricAsync()
         {
-            try
+            BiometricIntegrityValid = await _platformUtilsService.IsBiometricIntegrityValidAsync();
+            BiometricButtonVisible = BiometricIntegrityValid;
+            if (!BiometricEnabled || !BiometricIntegrityValid)
             {
-                BiometricIntegrityValid = await _platformUtilsService.IsBiometricIntegrityValidAsync();
-                BiometricButtonVisible = BiometricIntegrityValid;
-                if (!BiometricEnabled || !BiometricIntegrityValid)
-                {
-                    return;
-                }
-
-                var success = await _platformUtilsService.AuthenticateBiometricAsync(null,
-                    PinEnabled ? AppResources.PIN : AppResources.MasterPassword,
-                    () => _secretEntryFocusWeakEventManager.RaiseEvent((int?)null, nameof(FocusSecretEntry)),
-                    !PinEnabled && !HasMasterPassword);
-
-                await _stateService.SetBiometricLockedAsync(!success);
-                if (success)
-                {
-                    var userKey = await _cryptoService.GetBiometricUnlockKeyAsync();
-                    await SetUserKeyAndContinueAsync(userKey);
-                }
+                return;
             }
-            catch (LegacyUserException)
+            var success = await _platformUtilsService.AuthenticateBiometricAsync(null,
+                PinEnabled ? AppResources.PIN : AppResources.MasterPassword,
+                () => _secretEntryFocusWeakEventManager.RaiseEvent((int?)null, nameof(FocusSecretEntry)));
+            await _stateService.SetBiometricLockedAsync(!success);
+            if (success)
             {
-                await HandleLegacyUserAsync();
+                var userKey = await _cryptoService.GetBiometricUnlockKeyAsync();
+                await SetUserKeyAndContinueAsync(userKey);
             }
         }
 
@@ -543,29 +493,5 @@ namespace Bit.App.Pages
             _messagingService.Send("unlocked");
             UnlockedAction?.Invoke();
         }
-
-        private async Task<bool> IsBiometricsEnabledAsync()
-        {
-            try
-            {
-                return await _vaultTimeoutService.IsBiometricLockSetAsync() &&
-                   await _biometricService.CanUseBiometricsUnlockAsync();
-            }
-            catch (LegacyUserException)
-            {
-                await HandleLegacyUserAsync();
-            }
-            return false;
-        }
-
-        private async Task HandleLegacyUserAsync()
-        {
-            // Legacy users must migrate on web vault.
-            await _platformUtilsService.ShowDialogAsync(AppResources.EncryptionKeyMigrationRequiredDescriptionLong,
-                AppResources.AnErrorHasOccurred,
-                AppResources.Ok);
-            await _vaultTimeoutService.LogOutAsync();
-        }
-
     }
 }

src/App/Pages/Accounts/LoginApproveDevicePage.xaml

@@ -18,16 +18,15 @@
             <StackLayout HorizontalOptions="FillAndExpand">
                 <Label
                     StyleClass="text-md"
-                    Text="{u:I18n RememberThisDevice}" />
+                    Text="{u:I18n RememberThisDevice}"/>
                 <Label
                     StyleClass="box-sub-label"
-                    Text="{u:I18n TurnOffUsingPublicDevice}" />
+                    Text="{u:I18n TurnOffUsingPublicDevice}"/>
             </StackLayout>
             <Switch
                 Scale="0.8"
                 IsToggled="{Binding RememberThisDevice}"
-                AutomationId="RememberThisDeviceSwitch"
-                VerticalOptions="Center" />
+                VerticalOptions="Center"/>
         </StackLayout>
         <StackLayout Margin="0, 20, 0, 0">
             <Button
@@ -35,34 +34,31 @@
                 Text="{u:I18n Continue}" 
                 StyleClass="btn-primary"
                 Command="{Binding ContinueCommand}"
-                IsVisible="{Binding IsNewUser}"
-                AutomationId="ContinueButton" />
+                IsVisible="{Binding IsNewUser}"/>
             <Button
                 x:Name="_approveWithMyOtherDevice"
                 Text="{u:I18n ApproveWithMyOtherDevice}" 
                 StyleClass="btn-primary"
                 Command="{Binding ApproveWithMyOtherDeviceCommand}"
-                IsVisible="{Binding ApproveWithMyOtherDeviceEnabled}"
-                AutomationId="ApproveWithMyOtherDeviceButton" />
+                IsVisible="{Binding ApproveWithMyOtherDeviceEnabled}"/>
             <Button
                 x:Name="_requestAdminApproval"
                 Text="{u:I18n RequestAdminApproval}" 
                 StyleClass="box-button-row"
                 Command="{Binding RequestAdminApprovalCommand}"
-                IsVisible="{Binding RequestAdminApprovalEnabled}"
-                AutomationId="RequestAdminApprovalButton" />
+                IsVisible="{Binding RequestAdminApprovalEnabled}"/>
             <Button
                 x:Name="_approveWithMasterPassword"
                 Text="{u:I18n ApproveWithMasterPassword}" 
                 StyleClass="box-button-row"
                 Command="{Binding ApproveWithMasterPasswordCommand}"
-                IsVisible="{Binding ApproveWithMasterPasswordEnabled}"
-                AutomationId="ApproveWithMasterPasswordButton" />
+                IsVisible="{Binding ApproveWithMasterPasswordEnabled}"/>
             <Label
                 Text="{Binding LoggingInAsText}"
                 StyleClass="text-sm"
                 Margin="0,40,0,0"
-                AutomationId="LoggingInAsLabel" />
+                AutomationId="LoggingInAsLabel"
+                />
             <Label
                 Text="{u:I18n NotYou}"
                 StyleClass="text-md"

src/App/Pages/Accounts/LoginPageViewModel.cs

@@ -162,7 +162,7 @@ namespace Bit.App.Pages
                     Email = await _stateService.GetRememberedEmailAsync();
                 }
                 CanRemoveAccount = await _stateService.GetActiveUserEmailAsync() != Email;
-                EnvironmentDomainName = _environmentService.GetCurrentDomain();
+                EnvironmentDomainName = CoreHelpers.GetDomain((await _stateService.GetPreAuthEnvironmentUrlsAsync())?.Base);
                 IsKnownDevice = await _apiService.GetKnownDeviceAsync(Email, await _appIdService.GetAppIdAsync());
             }
             catch (ApiException apiEx) when (apiEx.Error.StatusCode == System.Net.HttpStatusCode.Unauthorized)
@@ -248,14 +248,6 @@ namespace Bit.App.Pages
 
                 await _deviceActionService.HideLoadingAsync();
 
-                if (response.RequiresEncryptionKeyMigration)
-                {
-                    // Legacy users must migrate on web vault.
-                    await _platformUtilsService.ShowDialogAsync(AppResources.EncryptionKeyMigrationRequiredDescriptionLong, AppResources.AnErrorHasOccurred,
-                        AppResources.Ok);
-                    return;
-                }
-
                 if (response.TwoFactor)
                 {
                     StartTwoFactorAction?.Invoke();

src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml

@@ -14,7 +14,7 @@
     </ContentPage.BindingContext>
 
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Close}" Command="{Binding CloseCommand}" Order="Primary" Priority="-1" x:Name="_closeItem" />
+        <ToolbarItem Text="{u:I18n Close}" Command="{Binding CloseCommand}" Order="Primary" Priority="-1" x:Name="_closeItem"/>
     </ContentPage.ToolbarItems>
 
     <ScrollView>
@@ -29,17 +29,15 @@
             <Label
                 Text="{Binding SubTitle}"
                 FontSize="Small"
-                Margin="0,0,0,10"
-                AutomationId="SubTitleLabel" />
+                Margin="0,0,0,10"/>
             <Label
                 Text="{Binding Description}"
                 FontSize="Small"
-                Margin="0,0,0,24"
-                AutomationId="DescriptionLabel" />
+                Margin="0,0,0,24"/>
             <Label
                 Text="{u:I18n FingerprintPhrase}"
                 FontSize="Small"
-                FontAttributes="Bold" />
+                FontAttributes="Bold"/>
             <controls:MonoLabel
                 FormattedText="{Binding FingerprintPhrase}"
                 FontSize="Small"
@@ -64,7 +62,7 @@
                 Color="{DynamicResource DisabledIconColor}" />
             <Label
                 Text="{Binding OtherOptions}"
-                FontSize="Small" />
+                FontSize="Small"/>
             <Label
                 Text="{u:I18n ViewAllLoginOptions}"
                 StyleClass="text-sm"

src/App/Pages/Accounts/LoginSsoPage.xaml

@@ -21,7 +21,7 @@
             <StackLayout StyleClass="box">
                 <Label Text="{u:I18n LogInSsoSummary}"
                    StyleClass="text-md"
-                   HorizontalTextAlignment="Start" />
+                   HorizontalTextAlignment="Start"></Label>
                 <StackLayout StyleClass="box-row">
                     <Label
                         Text="{u:I18n OrgIdentifier}"
@@ -32,15 +32,13 @@
                         Keyboard="Default"
                         StyleClass="box-value" 
                         ReturnType="Go"
-                        ReturnCommand="{Binding LogInCommand}" 
-                        AutomationId="OrgIdentifierEntry" />
+                        ReturnCommand="{Binding LogInCommand}" />
                 </StackLayout>
             </StackLayout>
             <StackLayout Padding="10, 0">
                 <Button Text="{u:I18n LogIn}"
                         StyleClass="btn-primary"
-                        Clicked="LogIn_Clicked"
-                        AutomationId="LogInButton" />
+                        Clicked="LogIn_Clicked"></Button>
             </StackLayout>
         </StackLayout>
     </ScrollView>

src/App/Pages/Accounts/LoginSsoPageViewModel.cs

@@ -34,7 +34,6 @@ namespace Bit.App.Pages
         private readonly ICryptoService _cryptoService;
 
         private string _orgIdentifier;
-        private bool _useEphemeralWebBrowserSession;
 
         public LoginSsoPageViewModel()
         {
@@ -146,12 +145,9 @@ namespace Bit.App.Pages
                           "ssoToken=" + Uri.EscapeDataString(ssoToken);
 
                 WebAuthenticatorResult authResult = null;
-                authResult = await WebAuthenticator.AuthenticateAsync(new WebAuthenticatorOptions()
-                {
-                    CallbackUrl = new Uri(REDIRECT_URI),
-                    Url = new Uri(url),
-                    PrefersEphemeralWebBrowserSession = _useEphemeralWebBrowserSession,
-                });
+
+                authResult = await WebAuthenticator.AuthenticateAsync(new Uri(url),
+                    new Uri(REDIRECT_URI));
 
                 var code = GetResultCode(authResult, state);
                 if (!string.IsNullOrEmpty(code))
@@ -176,8 +172,6 @@ namespace Bit.App.Pages
             {
                 // user canceled
                 await _deviceActionService.HideLoadingAsync();
-                // Workaroung for cached expired sso token PM-3551 
-                _useEphemeralWebBrowserSession = true;
             }
             catch (Exception ex)
             {
@@ -230,18 +224,19 @@ namespace Bit.App.Pages
                             StartDeviceApprovalOptionsAction?.Invoke();
                             return;
                         }
+                        // If user doesn't have a MP, but has reset password permission, they must set a MP
+                        if (!decryptOptions.HasMasterPassword &&
+                            decryptOptions.TrustedDeviceOption.HasManageResetPasswordPermission)
+                        {
+                            StartSetPasswordAction?.Invoke();
+                            return;
+                        }
                         // Update temp password only if the device is trusted and therefore has a decrypted User Key set
                         if (response.ForcePasswordReset)
                         {
                             UpdateTempPasswordAction?.Invoke();
                             return;
                         }
-                        // If user doesn't have a MP, but has reset password permission, they must set a MP
-                        if (!decryptOptions.HasMasterPassword &&
-                            decryptOptions.TrustedDeviceOption.HasManageResetPasswordPermission)
-                        {
-                            await _stateService.SetForcePasswordResetReasonAsync(ForcePasswordResetReason.TdeUserWithoutPasswordHasPasswordResetPermission);
-                        }
                         // Device is trusted and has keys, so we can decrypt
                         _syncService.FullSyncAsync(true).FireAndForget();
                         SsoAuthSuccessAction?.Invoke();

src/App/Pages/Accounts/SetPasswordPage.xaml

@@ -28,7 +28,7 @@
         <StackLayout Spacing="20">
             <StackLayout StyleClass="box">
                 <StackLayout StyleClass="box-row">
-                    <Label Text="{Binding SetMasterPasswordSummary}"
+                    <Label Text="{u:I18n SetMasterPasswordSummary}"
                        StyleClass="text-md"
                        HorizontalTextAlignment="Start"></Label>
                 </StackLayout>
@@ -51,8 +51,7 @@
                         <Label
                             Text="{u:I18n ResetPasswordAutoEnrollInviteWarning}"
                             StyleClass="text-muted, text-sm, text-bold"
-                            HorizontalTextAlignment="Start"
-                            AutomationId="ResetPasswordAutoEnrollInviteWarningLabel" />
+                            HorizontalTextAlignment="Start" />
                     </Frame>
                 </Grid>
                 <Grid IsVisible="{Binding IsPolicyInEffect}"
@@ -74,8 +73,7 @@
                         <Label
                             Text="{Binding PolicySummary}"
                             StyleClass="text-muted, text-sm, text-bold"
-                            HorizontalTextAlignment="Start"
-                            AutomationId="PolicyInEffectLabel" />
+                            HorizontalTextAlignment="Start" />
                     </Frame>
                 </Grid>
                 <Grid StyleClass="box-row">
@@ -100,8 +98,7 @@
                         IsTextPredictionEnabled="False"
                         IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                         Grid.Row="1"
-                        Grid.Column="0"
-                        AutomationId="MasterPasswordField" />
+                        Grid.Column="0" />
                     <controls:IconButton
                         StyleClass="box-row-button, box-row-button-platform"
                         Text="{Binding ShowPasswordIcon}"
@@ -111,8 +108,7 @@
                         Grid.RowSpan="2"
                         AutomationProperties.IsInAccessibleTree="True"
                         AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                        AutomationId="ToggleMasterPasswordVisibilityButton" />
+                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
                 </Grid>
                 <Label
                     Text="{u:I18n MasterPasswordDescription}"
@@ -141,8 +137,7 @@
                         IsTextPredictionEnabled="False"
                         IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                         Grid.Row="1"
-                        Grid.Column="0"
-                        AutomationId="RetypePasswordField" />
+                        Grid.Column="0" />
                     <controls:IconButton
                         StyleClass="box-row-button, box-row-button-platform"
                         Text="{Binding ShowPasswordIcon}"
@@ -152,8 +147,7 @@
                         Grid.RowSpan="2"
                         AutomationProperties.IsInAccessibleTree="True"
                         AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                        AutomationId="ToggleRetypePasswordVisibilityButton" />
+                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
                 </Grid>
                 <StackLayout StyleClass="box-row">
                     <Label
@@ -164,8 +158,7 @@
                         Text="{Binding Hint}"
                         StyleClass="box-value"
                         ReturnType="Go"
-                        ReturnCommand="{Binding SubmitCommand}"
-                        AutomationId="MasterPasswordHintLabel" />
+                        ReturnCommand="{Binding SubmitCommand}" />
                 </StackLayout>
                 <Label
                     Text="{u:I18n MasterPasswordHintDescription}"

src/App/Pages/Accounts/SetPasswordPageViewModel.cs

@@ -5,6 +5,7 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Bit.App.Abstractions;
 using Bit.App.Resources;
+using Bit.App.Utilities;
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
@@ -27,7 +28,6 @@ namespace Bit.App.Pages
         private readonly IPolicyService _policyService;
         private readonly IPasswordGenerationService _passwordGenerationService;
         private readonly II18nService _i18nService;
-        private readonly ISyncService _syncService;
 
         private bool _showPassword;
         private bool _isPolicyInEffect;
@@ -46,7 +46,6 @@ namespace Bit.App.Pages
             _passwordGenerationService =
                 ServiceContainer.Resolve<IPasswordGenerationService>("passwordGenerationService");
             _i18nService = ServiceContainer.Resolve<II18nService>("i18nService");
-            _syncService = ServiceContainer.Resolve<ISyncService>();
 
             PageTitle = AppResources.SetMasterPassword;
             TogglePasswordCommand = new Command(TogglePassword);
@@ -101,17 +100,11 @@ namespace Bit.App.Pages
         public Action CloseAction { get; set; }
         public string OrgIdentifier { get; set; }
         public string OrgId { get; set; }
-        public ForcePasswordResetReason? ForceSetPasswordReason { get; private set; }
-
-        public string SetMasterPasswordSummary => ForceSetPasswordReason == ForcePasswordResetReason.TdeUserWithoutPasswordHasPasswordResetPermission
-                                                    ? AppResources.YourOrganizationPermissionsWereUpdatedRequeringYouToSetAMasterPassword
-                                                    : AppResources.YourOrganizationRequiresYouToSetAMasterPassword;
 
         public async Task InitAsync()
         {
             await CheckPasswordPolicy();
-            ForceSetPasswordReason = await _stateService.GetForcePasswordResetReasonAsync();
-            TriggerPropertyChanged(nameof(SetMasterPasswordSummary));
+
             try
             {
                 var response = await _apiService.GetOrganizationAutoEnrollStatusAsync(OrgIdentifier);
@@ -178,7 +171,8 @@ namespace Bit.App.Pages
 
             var (newUserKey, newProtectedUserKey) = await _cryptoService.EncryptUserKeyWithMasterKeyAsync(newMasterKey,
                 await _cryptoService.GetUserKeyAsync() ?? await _cryptoService.MakeUserKeyAsync());
-            var keysRequest = await GetKeysForSetPasswordRequestAsync(newUserKey);
+
+            var (newPublicKey, newProtectedPrivateKey) = await _cryptoService.MakeKeyPairAsync(newUserKey);
             var request = new SetPasswordRequest
             {
                 MasterPasswordHash = masterPasswordHash,
@@ -189,12 +183,16 @@ namespace Bit.App.Pages
                 KdfMemory = kdfConfig.Memory,
                 KdfParallelism = kdfConfig.Parallelism,
                 OrgIdentifier = OrgIdentifier,
-                Keys = keysRequest
+                Keys = new KeysRequest
+                {
+                    PublicKey = newPublicKey,
+                    EncryptedPrivateKey = newProtectedPrivateKey.EncryptedString
+                }
             };
 
             try
             {
-                await _deviceActionService.ShowLoadingAsync(AppResources.Loading);
+                await _deviceActionService.ShowLoadingAsync(AppResources.CreatingAccount);
                 // Set Password and relevant information
                 await _apiService.SetPasswordAsync(request);
                 await _stateService.SetKdfConfigurationAsync(kdfConfig);
@@ -202,13 +200,7 @@ namespace Bit.App.Pages
                 await _cryptoService.SetMasterKeyAsync(newMasterKey);
                 await _cryptoService.SetMasterKeyHashAsync(localMasterPasswordHash);
                 await _cryptoService.SetMasterKeyEncryptedUserKeyAsync(newProtectedUserKey.EncryptedString);
-
-                // Set private key only for new JIT provisioned users in MP encryption orgs
-                // Existing TDE users will have private key set on sync or on login
-                if (keysRequest != null)
-                {
-                    await _cryptoService.SetUserPrivateKeyAsync(keysRequest.EncryptedPrivateKey);
-                }
+                await _cryptoService.SetUserPrivateKeyAsync(newProtectedPrivateKey.EncryptedString);
 
                 if (ResetPasswordAutoEnroll)
                 {
@@ -229,9 +221,6 @@ namespace Bit.App.Pages
                     await _apiService.PutOrganizationUserResetPasswordEnrollmentAsync(OrgId, userId, resetRequest);
                 }
 
-                await _stateService.SetForcePasswordResetReasonAsync(null);
-                await _stateService.SetUserHasMasterPasswordAsync(true);
-                await _syncService.FullSyncAsync(true);
                 await _deviceActionService.HideLoadingAsync();
                 SetPasswordSuccessAction?.Invoke();
             }
@@ -246,21 +235,6 @@ namespace Bit.App.Pages
             }
         }
 
-        private async Task<KeysRequest> GetKeysForSetPasswordRequestAsync(UserKey newUserKey)
-        {
-            if (ForceSetPasswordReason == ForcePasswordResetReason.TdeUserWithoutPasswordHasPasswordResetPermission)
-            {
-                return null;
-            }
-
-            var (newPublicKey, newProtectedPrivateKey) = await _cryptoService.MakeKeyPairAsync(newUserKey);
-            return new KeysRequest
-            {
-                PublicKey = newPublicKey,
-                EncryptedPrivateKey = newProtectedPrivateKey.EncryptedString
-            };
-        }
-
         public void TogglePassword()
         {
             ShowPassword = !ShowPassword;

src/App/Pages/Accounts/TwoFactorPageViewModel.cs

@@ -10,7 +10,6 @@ using Bit.App.Utilities;
 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.Services;
 using Bit.Core.Utilities;
@@ -336,18 +335,20 @@ namespace Bit.App.Pages
                             StartDeviceApprovalOptionsAction?.Invoke();
                             return;
                         }
+                        // If user doesn't have a MP, but has reset password permission, they must set a MP
+                        if (!decryptOptions.HasMasterPassword &&
+                            decryptOptions.TrustedDeviceOption.HasManageResetPasswordPermission)
+                        {
+                            StartSetPasswordAction?.Invoke();
+                            return;
+                        }
                         // Update temp password only if the device is trusted and therefore has a decrypted User Key set
                         if (result.ForcePasswordReset)
                         {
                             UpdateTempPasswordAction?.Invoke();
                             return;
                         }
-                        // If user doesn't have a MP, but has reset password permission, they must set a MP
-                        if (!decryptOptions.HasMasterPassword &&
-                            decryptOptions.TrustedDeviceOption.HasManageResetPasswordPermission)
-                        {
-                            await _stateService.SetForcePasswordResetReasonAsync(ForcePasswordResetReason.TdeUserWithoutPasswordHasPasswordResetPermission);
-                        }
+
                         // Device is trusted and has keys, so we can decrypt
                         _syncService.FullSyncAsync(true).FireAndForget();
                         await TwoFactorAuthSuccessAsync();
@@ -465,8 +466,7 @@ namespace Bit.App.Pages
                 {
                     Email = _authService.Email,
                     MasterPasswordHash = _authService.MasterPasswordHash,
-                    DeviceIdentifier = await _appIdService.GetAppIdAsync(),
-                    SsoEmail2FaSessionToken = _authService.SsoEmail2FaSessionToken
+                    DeviceIdentifier = await _appIdService.GetAppIdAsync()
                 };
                 await _apiService.PostTwoFactorEmailAsync(request);
                 if (showLoading)

src/App/Pages/Accounts/UpdateTempPasswordPage.xaml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <pages:BaseContentPage 
     xmlns="http://xamarin.com/schemas/2014/forms"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
@@ -48,8 +48,7 @@
                         <Label
                             Text="{Binding UpdateMasterPasswordWarningText }"
                             StyleClass="text-muted, text-sm, text-bold"
-                            HorizontalTextAlignment="Center"
-                            AutomationId="UpdatePasswordWarningLabel" />
+                            HorizontalTextAlignment="Center" />
                     </Frame>
                 </Grid>
                 <Grid IsVisible="{Binding IsPolicyInEffect}"
@@ -72,8 +71,7 @@
                         <Label
                             Text="{Binding PolicySummary}"
                             StyleClass="text-muted, text-sm, text-bold"
-                            HorizontalTextAlignment="Start"
-                            AutomationId="PolicySummaryLabel" />
+                            HorizontalTextAlignment="Start" />
                     </Frame>
                 </Grid>
                 <Grid StyleClass="box-row" IsVisible="{Binding RequireCurrentPassword }">
@@ -98,8 +96,7 @@
                         IsTextPredictionEnabled="False"
                         IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                         Grid.Row="1"
-                        Grid.Column="0"
-                        AutomationId="MasterPasswordField" />
+                        Grid.Column="0" />
                     <controls:IconButton
                         StyleClass="box-row-button, box-row-button-platform"
                         Text="{Binding ShowPasswordIcon}"
@@ -109,8 +106,7 @@
                         Grid.RowSpan="2"
                         AutomationProperties.IsInAccessibleTree="True"
                         AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                        AutomationId="ToggleMasterPasswordVisibilityButton" />
+                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
                 </Grid>
                 <Grid StyleClass="box-row">
                     <Grid.RowDefinitions>
@@ -134,8 +130,7 @@
                         IsTextPredictionEnabled="False"
                         IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                         Grid.Row="1"
-                        Grid.Column="0"
-                        AutomationId="NewPasswordField" />
+                        Grid.Column="0" />
                     <controls:IconButton
                         StyleClass="box-row-button, box-row-button-platform"
                         Text="{Binding ShowPasswordIcon}"
@@ -145,8 +140,7 @@
                         Grid.RowSpan="2"
                         AutomationProperties.IsInAccessibleTree="True"
                         AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                        AutomationId="NewPasswordVisibilityButton" />
+                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
                 </Grid>
             </StackLayout>
             <StackLayout StyleClass="box">
@@ -172,8 +166,7 @@
                         IsTextPredictionEnabled="False"
                         IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                         Grid.Row="1"
-                        Grid.Column="0"
-                        AutomationId="RetypePasswordField" />
+                        Grid.Column="0" />
                     <controls:IconButton
                         StyleClass="box-row-button, box-row-button-platform"
                         Text="{Binding ShowPasswordIcon}"
@@ -183,8 +176,7 @@
                         Grid.RowSpan="2"
                         AutomationProperties.IsInAccessibleTree="True"
                         AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                        AutomationId="ToggleRetypePasswordVisibilityButton" />
+                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
                 </Grid>
                 <StackLayout StyleClass="box-row">
                     <Label
@@ -195,8 +187,7 @@
                         Text="{Binding Hint}"
                         StyleClass="box-value"
                         ReturnType="Go"
-                        ReturnCommand="{Binding SubmitCommand}"
-                        AutomationId="MasterPasswordHintLabel" />
+                        ReturnCommand="{Binding SubmitCommand}" />
                 </StackLayout>
                 <Label
                     Text="{u:I18n MasterPasswordHintDescription}"

src/App/Pages/BaseContentPage.cs

@@ -150,12 +150,6 @@ namespace Bit.App.Pages
         private async Task SaveActivityAsync()
         {
             SetServices();
-            if (await _stateService.GetActiveUserIdAsync() == null)
-            {
-                // Fresh install and/or all users logged out won't have an active user, skip saving last active time
-                return;
-            }
-
             await _stateService.SetLastActiveTimeAsync(_deviceActionService.GetActiveTime());
         }
     }

src/App/Pages/BaseModalContentPage.cs

@@ -1,18 +0,0 @@
-using System;
-namespace Bit.App.Pages
-{
-    public class BaseModalContentPage : BaseContentPage
-    {
-        public BaseModalContentPage()
-        {
-        }
-
-        protected void PopModal_Clicked(object sender, EventArgs e)
-        {
-            if (DoOnce())
-            {
-                Navigation.PopModalAsync();
-            }
-        }
-    }
-}

src/App/Pages/BaseViewModel.cs

@@ -1,14 +1,11 @@
 using System;
-using System.Threading.Tasks;
-using System.Windows.Input;
 using Bit.App.Abstractions;
 using Bit.App.Controls;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Exceptions;
+using Bit.Core.Services;
 using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -50,24 +47,5 @@ namespace Bit.App.Pages
             _logger.Value.Exception(ex);
         }
 
-        protected AsyncCommand CreateDefaultAsyncCommnad(Func<Task> execute, Func<object, bool> canExecute = null)
-        {
-            return new AsyncCommand(execute,
-                canExecute,
-                ex => HandleException(ex),
-                allowsMultipleExecutions: false);
-        }
-
-        protected async Task<bool> HasConnectivityAsync()
-        {
-            if (Connectivity.NetworkAccess == NetworkAccess.None)
-            {
-                await _platformUtilsService.Value.ShowDialogAsync(
-                    AppResources.InternetConnectionRequiredMessage,
-                    AppResources.InternetConnectionRequiredTitle);
-                return false;
-            }
-            return true;
-        }
     }
 }

src/App/Pages/Generator/GeneratorPage.xaml

@@ -275,18 +275,9 @@
                             Margin="0,10,0,0"/>
                         <Entry IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.AnonAddy}}"
                             x:Name="_anonAddyDomainNameEntry"
-                            Text="{Binding AddyIoDomainName}"
+                            Text="{Binding AnonAddyDomainName}"
                             StyleClass="box-value"
                             AutomationId="AnonAddyDomainNameEntry" />
-                        <Label IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.ForwardEmail}}"
-                            Text="{u:I18n DomainNameRequiredParenthesis}"
-                            StyleClass="box-label"
-                            Margin="0,10,0,0"/>
-                        <Entry IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.ForwardEmail}}"
-                            x:Name="_forwardEmailDomainNameEntry"
-                            Text="{Binding ForwardEmailDomainName}"
-                            StyleClass="box-value"
-                            AutomationId="ForwardEmailDomainNameEntry" />
                     </StackLayout>                    
                     <!--RANDOM WORD OPTIONS-->
                     <Grid IsVisible="{Binding UsernameTypeSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:UsernameType.RandomWord}}">

src/App/Pages/Generator/GeneratorPage.xaml.cs

@@ -3,7 +3,6 @@ using System.Threading.Tasks;
 using Bit.App.Models;
 using Bit.App.Resources;
 using Bit.App.Styles;
-using Bit.App.Utilities;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 using Xamarin.Forms;
@@ -80,7 +79,7 @@ namespace Bit.App.Pages
 
             _broadcasterService.Subscribe(nameof(GeneratorPage), (message) =>
             {
-                if (message.Command is ThemeManager.UPDATED_THEME_MESSAGE_KEY)
+                if (message.Command == "updatedTheme")
                 {
                     Device.BeginInvokeOnMainThread(() => _vm.RedrawPassword());
                 }

src/App/Pages/Generator/GeneratorPageViewModel.cs

@@ -81,7 +81,6 @@ namespace Bit.App.Pages
                 ForwardedEmailServiceType.DuckDuckGo,
                 ForwardedEmailServiceType.Fastmail,
                 ForwardedEmailServiceType.FirefoxRelay,
-                ForwardedEmailServiceType.ForwardEmail,
                 ForwardedEmailServiceType.SimpleLogin
             };
 
@@ -462,8 +461,6 @@ namespace Bit.App.Pages
                         return _usernameOptions.FirefoxRelayApiAccessToken;
                     case ForwardedEmailServiceType.SimpleLogin:
                         return _usernameOptions.SimpleLoginApiKey;
-                    case ForwardedEmailServiceType.ForwardEmail:
-                        return _usernameOptions.ForwardEmailApiAccessToken;
                     default:
                         return null;
                 }
@@ -508,14 +505,6 @@ namespace Bit.App.Pages
                             changed = true;
                         }
                         break;
-
-                    case ForwardedEmailServiceType.ForwardEmail:
-                        if (_usernameOptions.ForwardEmailApiAccessToken != value)
-                        {
-                            _usernameOptions.ForwardEmailApiAccessToken = value;
-                            changed = true;
-                        }
-                        break;
                     default:
                         break;
                 }
@@ -540,7 +529,6 @@ namespace Bit.App.Pages
                     case ForwardedEmailServiceType.DuckDuckGo:
                     case ForwardedEmailServiceType.Fastmail:
                     case ForwardedEmailServiceType.SimpleLogin:
-                    case ForwardedEmailServiceType.ForwardEmail:
                         return AppResources.APIKeyRequiredParenthesis;
                     default:
                         return null;
@@ -557,7 +545,7 @@ namespace Bit.App.Pages
             set => SetProperty(ref _showForwardedEmailApiSecret, value);
         }
 
-        public string AddyIoDomainName
+        public string AnonAddyDomainName
         {
             get => _usernameOptions.AnonAddyDomainName;
             set
@@ -565,21 +553,7 @@ namespace Bit.App.Pages
                 if (_usernameOptions.AnonAddyDomainName != value)
                 {
                     _usernameOptions.AnonAddyDomainName = value;
-                    TriggerPropertyChanged(nameof(AddyIoDomainName));
-                    SaveUsernameOptionsAsync(false).FireAndForget();
-                }
-            }
-        }
-
-        public string ForwardEmailDomainName
-        {
-            get => _usernameOptions.ForwardEmailDomainName;
-            set
-            {
-                if (_usernameOptions.ForwardEmailDomainName != value)
-                {
-                    _usernameOptions.ForwardEmailDomainName = value;
-                    TriggerPropertyChanged(nameof(ForwardEmailDomainName));
+                    TriggerPropertyChanged(nameof(AnonAddyDomainName));
                     SaveUsernameOptionsAsync(false).FireAndForget();
                 }
             }
@@ -819,7 +793,7 @@ namespace Bit.App.Pages
             TriggerPropertyChanged(nameof(CapitalizeRandomWordUsername));
             TriggerPropertyChanged(nameof(ForwardedEmailApiSecret));
             TriggerPropertyChanged(nameof(ForwardedEmailApiSecretLabel));
-            TriggerPropertyChanged(nameof(AddyIoDomainName));
+            TriggerPropertyChanged(nameof(AnonAddyDomainName));
             TriggerPropertyChanged(nameof(CatchAllEmailDomain));
             TriggerPropertyChanged(nameof(ForwardedEmailServiceSelected));
             TriggerPropertyChanged(nameof(UsernameTypeSelected));
@@ -829,7 +803,6 @@ namespace Bit.App.Pages
             TriggerPropertyChanged(nameof(GeneratorTypeSelected));
             TriggerPropertyChanged(nameof(UsernameTypeDescriptionLabel));
             TriggerPropertyChanged(nameof(EmailWebsite));
-            TriggerPropertyChanged(nameof(ForwardEmailDomainName));
         }
 
         private void SetOptions()

src/App/Pages/PickerViewModel.cs

@@ -1,124 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
-
-namespace Bit.App.Pages
-{
-    public class PickerViewModel<TKey> : ExtendedViewModel
-    {
-        const string SELECTED_CHARACTER = "✓";
-
-        private readonly IDeviceActionService _deviceActionService;
-        private readonly ILogger _logger;
-        private readonly Func<TKey, Task<bool>> _onSelectionChangingAsync;
-        private readonly string _title;
-
-        public Dictionary<TKey, string> _items;
-        private TKey _selectedKey;
-        private TKey _defaultSelectedKeyIfFailsToFind;
-        private Func<TKey, Task> _afterSelectionChangedAsync;
-
-        public PickerViewModel(IDeviceActionService deviceActionService,
-            ILogger logger,
-            Func<TKey, Task<bool>> onSelectionChangingAsync,
-            string title,
-            Func<object, bool> canExecuteSelectOptionCommand = null,
-            Action<Exception> onSelectOptionCommandException = null)
-        {
-            _deviceActionService = deviceActionService;
-            _logger = logger;
-            _onSelectionChangingAsync = onSelectionChangingAsync;
-            _title = title;
-
-            SelectOptionCommand = new AsyncCommand(SelectOptionAsync, canExecuteSelectOptionCommand, onSelectOptionCommandException, allowsMultipleExecutions: false);
-        }
-
-        public AsyncCommand SelectOptionCommand { get; }
-
-        public TKey SelectedKey => _selectedKey;
-
-        public string SelectedValue
-        {
-            get
-            {
-                if (_items.TryGetValue(_selectedKey, out var option))
-                {
-                    return option;
-                }
-
-                _selectedKey = _defaultSelectedKeyIfFailsToFind;
-                return _items[_selectedKey];
-            }
-        }
-
-        public void Init(Dictionary<TKey, string> items, TKey currentSelectedKey, TKey defaultSelectedKeyIfFailsToFind, bool logIfKeyNotFound = true)
-        {
-            _items = items;
-            _defaultSelectedKeyIfFailsToFind = defaultSelectedKeyIfFailsToFind;
-
-            Select(currentSelectedKey, logIfKeyNotFound);
-        }
-
-        public void Select(TKey key, bool logIfKeyNotFound = true)
-        {
-            if (!_items.ContainsKey(key))
-            {
-                if (logIfKeyNotFound)
-                {
-                    _logger.Error($"There is no {_title} options for key: {key}");
-                }
-                key = _defaultSelectedKeyIfFailsToFind;
-            }
-
-            _selectedKey = key;
-
-            MainThread.BeginInvokeOnMainThread(() => TriggerPropertyChanged(nameof(SelectedValue)));
-        }
-
-        private async Task SelectOptionAsync()
-        {
-            var selection = await _deviceActionService.DisplayActionSheetAsync(_title,
-                AppResources.Cancel,
-                null,
-                _items.Select(o => CreateSelectableOption(o.Value, EqualityComparer<TKey>.Default.Equals(o.Key, _selectedKey)))
-                      .ToArray()
-            );
-
-            if (selection == null || selection == AppResources.Cancel)
-            {
-                return;
-            }
-
-            var sanitizedSelection = selection.Replace($"{SELECTED_CHARACTER} ", string.Empty);
-            var optionKey = _items.First(o => o.Value == sanitizedSelection).Key;
-
-            if (EqualityComparer<TKey>.Default.Equals(optionKey, _selectedKey)
-                ||
-                !await _onSelectionChangingAsync(optionKey))
-            {
-                return;
-            }
-
-            _selectedKey = optionKey;
-            TriggerPropertyChanged(nameof(SelectedValue));
-
-            if (_afterSelectionChangedAsync != null)
-            {
-                await _afterSelectionChangedAsync(_selectedKey);
-            }
-        }
-
-        public void SetAfterSelectionChanged(Func<TKey, Task> afterSelectionChangedAsync) => _afterSelectionChangedAsync = afterSelectionChangedAsync;
-
-        private string CreateSelectableOption(string option, bool selected) => selected ? ToSelectedOption(option) : option;
-
-        private string ToSelectedOption(string option) => $"{SELECTED_CHARACTER} {option}";
-    }
-}

src/App/Pages/Send/SendAddEditPage.xaml

@@ -175,7 +175,7 @@
                                     LineBreakMode="CharacterWrap"
                                     StyleClass="text-sm, text-muted"
                                     HorizontalOptions="FillAndExpand"
-                                    HorizontalTextAlignment="Start"
+                                    HorizontalTextAlignment="Center"
                                     AutomationId="SendNoFileChosenLabel" />
                                 <Label
                                     IsVisible="{Binding FileName, Converter={StaticResource notNull}}"
@@ -183,7 +183,7 @@
                                     LineBreakMode="CharacterWrap"
                                     StyleClass="text-sm, text-muted"
                                     HorizontalOptions="FillAndExpand"
-                                    HorizontalTextAlignment="Start"
+                                    HorizontalTextAlignment="Center"
                                     AutomationId="SendCurrentFileNameLabel" />
                                 <Button
                                     Text="{u:I18n ChooseFile}"
@@ -197,7 +197,7 @@
                                     Text="{u:I18n MaxFileSize}"
                                     StyleClass="text-sm, text-muted"
                                     HorizontalOptions="FillAndExpand"
-                                    HorizontalTextAlignment="Start" />
+                                    HorizontalTextAlignment="Center" />
                             </StackLayout>
                             <Label
                                 Text="{u:I18n TypeFileInfo}"
@@ -250,6 +250,20 @@
                                     AutomationId="SendHideTextByDefaultToggle" />
                             </StackLayout>
                         </StackLayout>
+                        <StackLayout
+                            StyleClass="box-row, box-row-switch">
+                            <Label
+                                Text="{Binding ShareOnSaveText}"
+                                StyleClass="box-label-regular"
+                                VerticalOptions="Center"
+                                HorizontalOptions="StartAndExpand" />
+                            <Switch
+                                IsToggled="{Binding ShareOnSave}"
+                                IsEnabled="{Binding SendEnabled}"
+                                HorizontalOptions="End"
+                                Margin="10,0,0,0"
+                                AutomationId="SendShareSendAfterSaveToggle" />
+                        </StackLayout>
                         <StackLayout
                             Orientation="Horizontal"
                             Spacing="0"

src/App/Pages/Send/SendAddEditPageViewModel.cs

@@ -127,9 +127,10 @@ namespace Bit.App.Pages
         public SendType? Type { get; set; }
         public byte[] FileData { get; set; }
         public string NewPassword { get; set; }
+        public bool ShareOnSave { get; set; }
         public bool DisableHideEmailControl { get; set; }
         public bool IsAddFromShare { get; set; }
-        public bool CopyInsteadOfShareAfterSaving { get; set; }
+        public string ShareOnSaveText => CopyInsteadOfShareAfterSaving ? AppResources.CopySendLinkOnSave : AppResources.ShareOnSave;
         public string OptionsAccessilibityText => ShowOptions ? AppResources.OptionsExpanded : AppResources.OptionsCollapsed;
         public List<KeyValuePair<string, SendType>> TypeOptions { get; }
         public List<KeyValuePair<string, string>> DeletionTypeOptions { get; }
@@ -183,6 +184,15 @@ namespace Bit.App.Pages
                 }
             }
         }
+        public bool CopyInsteadOfShareAfterSaving
+        {
+            get => _copyInsteadOfShareAfterSaving;
+            set
+            {
+                SetProperty(ref _copyInsteadOfShareAfterSaving, value);
+                TriggerPropertyChanged(nameof(ShareOnSaveText));
+            }
+        }
         public SendView Send
         {
             get => _send;
@@ -402,25 +412,34 @@ namespace Bit.App.Pages
                     _messagingService.Send("sendUpdated");
                 }
 
+                if (!ShareOnSave)
+                {
+                    _platformUtilsService.ShowToast("success", null,
+                    EditMode ? AppResources.SendUpdated : AppResources.NewSendCreated);
+                }
+
                 if (!CopyInsteadOfShareAfterSaving)
                 {
                     await CloseAsync();
                 }
 
-                var savedSend = await _sendService.GetAsync(sendId);
-                if (savedSend != null)
+                if (ShareOnSave)
                 {
-                    var savedSendView = await savedSend.DecryptAsync();
-                    if (CopyInsteadOfShareAfterSaving)
+                    var savedSend = await _sendService.GetAsync(sendId);
+                    if (savedSend != null)
                     {
-                        await AppHelpers.CopySendUrlAsync(savedSendView);
+                        var savedSendView = await savedSend.DecryptAsync();
+                        if (CopyInsteadOfShareAfterSaving)
+                        {
+                            await AppHelpers.CopySendUrlAsync(savedSendView);
 
-                        // wait so that the user sees the message before the view gets dismissed
-                        await Task.Delay(1300);
-                    }
-                    else
-                    {
-                        await AppHelpers.ShareSendUrlAsync(savedSendView);
+                            // wait so that the user sees the message before the view gets dismissed
+                            await Task.Delay(1300);
+                        }
+                        else
+                        {
+                            await AppHelpers.ShareSendUrlAsync(savedSendView);
+                        }
                     }
                 }
 

src/App/Pages/Send/SendAddOnlyPage.xaml

@@ -94,13 +94,13 @@
                             LineBreakMode="CharacterWrap"
                             StyleClass="text-sm, text-muted"
                             HorizontalOptions="FillAndExpand"
-                            HorizontalTextAlignment="Start" />
+                            HorizontalTextAlignment="Center" />
                         <Label
                             Margin="0, 5, 0, 0"
                             Text="{u:I18n MaxFileSize}"
                             StyleClass="text-sm, text-muted"
                             HorizontalOptions="FillAndExpand"
-                            HorizontalTextAlignment="Start" />
+                            HorizontalTextAlignment="Center" />
                     </StackLayout>
                 </StackLayout>
                 <StackLayout
@@ -145,6 +145,19 @@
                             Margin="10,0,0,0" />
                     </StackLayout>
                 </StackLayout>
+                <StackLayout
+                    StyleClass="box-row, box-row-switch">
+                    <Label
+                        Text="{Binding ShareOnSaveText}"
+                        StyleClass="box-label-regular"
+                        VerticalOptions="Center"
+                        HorizontalOptions="StartAndExpand" />
+                    <Switch
+                        IsToggled="{Binding ShareOnSave}"
+                        IsEnabled="{Binding SendEnabled}"
+                        HorizontalOptions="End"
+                        Margin="10,0,0,0" />
+                </StackLayout>
                 <StackLayout
                     Orientation="Horizontal"
                     Spacing="0"

src/App/Pages/Settings/AboutSettingsPage.xaml

@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<pages:BaseContentPage
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    x:DataType="pages:AboutSettingsPageViewModel"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
-    x:Class="Bit.App.Pages.AboutSettingsPage"
-    Title="{u:I18n About}">
-    
-    <ContentPage.BindingContext>
-        <pages:AboutSettingsPageViewModel />
-    </ContentPage.BindingContext>
-
-    <StackLayout>
-        <controls:SwitchItemView
-            Title="{u:I18n SubmitCrashLogs}"
-            IsToggled="{Binding ShouldSubmitCrashLogs, Mode=TwoWay}"
-            AutomationId="SubmitCrashLogsSwitch"
-            StyleClass="settings-item-view"
-            HorizontalOptions="FillAndExpand" />
-        <BoxView StyleClass="box-row-separator" />
-
-        <controls:ExternalLinkItemView
-            Title="{u:I18n BitwardenHelpCenter}"
-            GoToLinkCommand="{Binding GoToHelpCenterCommand}"
-            StyleClass="settings-external-link-item"
-            HorizontalOptions="FillAndExpand" />
-        <BoxView StyleClass="box-row-separator" />
-
-        <controls:ExternalLinkItemView
-            Title="{u:I18n ContactBitwardenSupport}"
-            GoToLinkCommand="{Binding ContactBitwardenSupportCommand}"
-            StyleClass="settings-external-link-item"
-            HorizontalOptions="FillAndExpand" />
-        <BoxView StyleClass="box-row-separator" />
-
-        <controls:ExternalLinkItemView
-            Title="{u:I18n WebVault}"
-            GoToLinkCommand="{Binding GoToWebVaultCommand}"
-            StyleClass="settings-external-link-item"
-            HorizontalOptions="FillAndExpand" />
-        <BoxView StyleClass="box-row-separator" />
-
-        <controls:ExternalLinkItemView
-            Title="{u:I18n LearnOrg}"
-            GoToLinkCommand="{Binding GoToLearnAboutOrgsCommand}"
-            StyleClass="settings-external-link-item"
-            HorizontalOptions="FillAndExpand" />
-        <BoxView StyleClass="box-row-separator" />
-
-        <controls:ExternalLinkItemView
-            Title="{u:I18n RateTheApp}"
-            GoToLinkCommand="{Binding RateTheAppCommand}"
-            StyleClass="settings-external-link-item"
-            HorizontalOptions="FillAndExpand" />
-        <BoxView StyleClass="box-row-separator" />
-
-        <StackLayout
-            Padding="16,12"
-            Orientation="Horizontal">
-            <controls:CustomLabel
-                Text="{Binding AppInfo}"
-                MaxLines="10"
-                StyleClass="box-footer-label"
-                HorizontalOptions="StartAndExpand"
-                LineBreakMode="TailTruncation" />
-
-            <controls:IconLabel
-                Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
-                TextColor="Black"
-                HorizontalOptions="End"
-                VerticalOptions="Center"
-                AutomationProperties.IsInAccessibleTree="True"
-                AutomationProperties.Name="{u:I18n CopyAppInformation}">
-                <controls:IconLabel.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding CopyAppInfoCommand}" />
-                </controls:IconLabel.GestureRecognizers>
-            </controls:IconLabel>
-
-        </StackLayout>
-    </StackLayout>
-</pages:BaseContentPage>

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

@@ -1,37 +0,0 @@
-using System;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
-
-namespace Bit.App.Pages
-{
-    public partial class AboutSettingsPage : BaseContentPage
-    {
-        private readonly AboutSettingsPageViewModel _vm;
-
-        public AboutSettingsPage()
-        {
-            InitializeComponent();
-            _vm = BindingContext as AboutSettingsPageViewModel;
-            _vm.Page = this;
-        }
-
-        protected async override void OnAppearing()
-        {
-            base.OnAppearing();
-
-            try
-            {
-                await _vm.InitAsync();
-            }
-            catch (Exception ex)
-            {
-                LoggerHelper.LogEvenIfCantBeResolved(ex);
-                ServiceContainer.Resolve<IPlatformUtilsService>().ShowToast(null, null, AppResources.AnErrorHasOccurred);
-
-                Navigation.PopAsync().FireAndForget();
-            }
-        }
-    }
-}

src/App/Pages/Settings/AboutSettingsPageViewModel.cs

@@ -1,159 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Abstractions;
-using Bit.App.Resources;
-using Bit.Core;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
-
-namespace Bit.App.Pages
-{
-    public class AboutSettingsPageViewModel : BaseViewModel
-    {
-        private readonly IPlatformUtilsService _platformUtilsService;
-        private readonly IDeviceActionService _deviceActionService;
-        private readonly ILogger _logger;
-
-        private bool _inited;
-        private bool _shouldSubmitCrashLogs;
-
-        public AboutSettingsPageViewModel()
-        {
-            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>();
-            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>();
-            _logger = ServiceContainer.Resolve<ILogger>();
-
-            var environmentService = ServiceContainer.Resolve<IEnvironmentService>();
-            var clipboardService = ServiceContainer.Resolve<IClipboardService>();
-
-            ToggleSubmitCrashLogsCommand = CreateDefaultAsyncCommnad(ToggleSubmitCrashLogsAsync);
-
-            GoToHelpCenterCommand = CreateDefaultAsyncCommnad(
-                () => LaunchUriAsync(AppResources.LearnMoreAboutHowToUseBitwardenOnTheHelpCenter,
-                                     AppResources.ContinueToHelpCenter,
-                                     ExternalLinksConstants.HELP_CENTER));
-
-            ContactBitwardenSupportCommand = CreateDefaultAsyncCommnad(
-                () => LaunchUriAsync(AppResources.ContactSupportDescriptionLong,
-                                     AppResources.ContinueToContactSupport,
-                                     ExternalLinksConstants.CONTACT_SUPPORT));
-
-            GoToWebVaultCommand = CreateDefaultAsyncCommnad(
-                () => LaunchUriAsync(AppResources.ExploreMoreFeaturesOfYourBitwardenAccountOnTheWebApp,
-                                     AppResources.ContinueToWebApp,
-                                     environmentService.GetWebVaultUrl()));
-
-            GoToLearnAboutOrgsCommand = CreateDefaultAsyncCommnad(
-                () => LaunchUriAsync(AppResources.LearnAboutOrganizationsDescriptionLong,
-                                     string.Format(AppResources.ContinueToX, ExternalLinksConstants.BITWARDEN_WEBSITE),
-                                     ExternalLinksConstants.HELP_ABOUT_ORGANIZATIONS));
-
-            RateTheAppCommand = CreateDefaultAsyncCommnad(RateAppAsync);
-
-            CopyAppInfoCommand = CreateDefaultAsyncCommnad(
-                () => clipboardService.CopyTextAsync(AppInfo));
-        }
-
-        public bool ShouldSubmitCrashLogs
-        {
-            get => _shouldSubmitCrashLogs;
-            set
-            {
-                SetProperty(ref _shouldSubmitCrashLogs, value);
-                ((ICommand)ToggleSubmitCrashLogsCommand).Execute(null);
-            }
-        }
-
-        public string AppInfo
-        {
-            get
-            {
-                var appInfo = string.Format("{0}: {1} ({2})",
-                    AppResources.Version,
-                    _platformUtilsService.GetApplicationVersion(),
-                    _deviceActionService.GetBuildNumber());
-
-                return $"© Bitwarden Inc. 2015-{DateTime.Now.Year}\n\n{appInfo}";
-            }
-        }
-
-        public AsyncCommand ToggleSubmitCrashLogsCommand { get; }
-        public ICommand GoToHelpCenterCommand { get; }
-        public ICommand ContactBitwardenSupportCommand { get; }
-        public ICommand GoToWebVaultCommand { get; }
-        public ICommand GoToLearnAboutOrgsCommand { get; }
-        public ICommand RateTheAppCommand { get; }
-        public ICommand CopyAppInfoCommand { get; }
-
-        public async Task InitAsync()
-        {
-            _shouldSubmitCrashLogs = await _logger.IsEnabled();
-
-            _inited = true;
-
-            MainThread.BeginInvokeOnMainThread(() =>
-            {
-                TriggerPropertyChanged(nameof(ShouldSubmitCrashLogs));
-                ToggleSubmitCrashLogsCommand.RaiseCanExecuteChanged();
-            });
-        }
-
-        private async Task ToggleSubmitCrashLogsAsync()
-        {
-            await _logger.SetEnabled(ShouldSubmitCrashLogs);
-            _shouldSubmitCrashLogs = await _logger.IsEnabled();
-
-            MainThread.BeginInvokeOnMainThread(() => TriggerPropertyChanged(nameof(ShouldSubmitCrashLogs)));
-        }
-
-        private async Task LaunchUriAsync(string dialogText, string dialogTitle, string uri)
-        {
-            if (await _platformUtilsService.ShowDialogAsync(dialogText, dialogTitle, AppResources.Continue, AppResources.Cancel))
-            {
-                _platformUtilsService.LaunchUri(uri);
-            }
-        }
-
-        private async Task RateAppAsync()
-        {
-            if (await _platformUtilsService.ShowDialogAsync(AppResources.RateAppDescriptionLong, AppResources.ContinueToAppStore, AppResources.Continue, AppResources.Cancel))
-            {
-                await MainThread.InvokeOnMainThreadAsync(_deviceActionService.RateApp);
-            }
-        }
-
-        /// INFO: Left here in case we need to debug push notifications
-        /// <summary>
-        /// Sets up app info plus debugging information for push notifications.
-        /// Useful when trying to solve problems regarding push notifications.
-        /// </summary>
-        /// <example>
-        /// Add an IniAsync() method to be called on view appearing, change the AppInfo to be a normal property with setter
-        /// and set the result of this method in the main thread to that property to show that in the UI.
-        /// </example>
-        //        public async Task<string> GetAppInfoForPushNotificationsDebugAsync()
-        //        {
-        //            var stateService = ServiceContainer.Resolve<IStateService>();
-
-        //            var appInfo = string.Format("{0}: {1} ({2})", AppResources.Version,
-        //                _platformUtilsService.GetApplicationVersion(), _deviceActionService.GetBuildNumber());
-
-        //#if DEBUG
-        //            var pushNotificationsRegistered = ServiceContainer.Resolve<IPushNotificationService>("pushNotificationService").IsRegisteredForPush;
-        //            var pnServerRegDate = await stateService.GetPushLastRegistrationDateAsync();
-        //            var pnServerError = await stateService.GetPushInstallationRegistrationErrorAsync();
-
-        //            var pnServerRegDateMessage = default(DateTime) == pnServerRegDate ? "-" : $"{pnServerRegDate.GetValueOrDefault().ToShortDateString()}-{pnServerRegDate.GetValueOrDefault().ToShortTimeString()} UTC";
-        //            var errorMessage = string.IsNullOrEmpty(pnServerError) ? string.Empty : $"Push Notifications Server Registration error: {pnServerError}";
-
-        //            var text = string.Format("© Bitwarden Inc. 2015-{0}\n\n{1}\nPush Notifications registered:{2}\nPush Notifications Server Last Date :{3}\n{4}", DateTime.Now.Year, appInfo, pushNotificationsRegistered, pnServerRegDateMessage, errorMessage);
-        //#else
-        //            var text = string.Format("© Bitwarden Inc. 2015-{0}\n\n{1}", DateTime.Now.Year, appInfo);
-        //#endif
-        //            return text;
-        //        }
-    }
-}

src/App/Pages/Settings/AppearanceSettingsPage.xaml

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<pages:BaseContentPage
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    x:DataType="pages:AppearanceSettingsPageViewModel"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    x:Class="Bit.App.Pages.AppearanceSettingsPage"
-    Title="{u:I18n Appearance}">
-    
-    <ContentPage.BindingContext>
-        <pages:AppearanceSettingsPageViewModel />
-    </ContentPage.BindingContext>
-
-    <ScrollView Padding="0, 0, 0, 20">
-        <StackLayout Padding="0" Spacing="5">
-            
-            <controls:SettingChooserItemView
-                Title="{u:I18n Language}"
-                Subtitle="{u:I18n LanguageChangeRequiresAppRestart}"
-                DisplayValue="{Binding LanguagePickerViewModel.SelectedValue}"
-                ChooseCommand="{Binding LanguagePickerViewModel.SelectOptionCommand}"
-                AutomationId="LanguageChooser"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand"/>
-            
-            <controls:SettingChooserItemView
-                Title="{u:I18n Theme}"
-                Subtitle="{u:I18n ThemeDescription}"
-                DisplayValue="{Binding ThemePickerViewModel.SelectedValue}"
-                ChooseCommand="{Binding ThemePickerViewModel.SelectOptionCommand}"
-                AutomationId="ThemeChooser"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand"/>
-
-            <controls:SettingChooserItemView
-                Title="{u:I18n DefaultDarkTheme}"
-                Subtitle="{u:I18n DefaultDarkThemeDescriptionLong}"
-                DisplayValue="{Binding DefaultDarkThemePickerViewModel.SelectedValue}"
-                ChooseCommand="{Binding DefaultDarkThemePickerViewModel.SelectOptionCommand}"
-                IsVisible="{Binding ShowDefaultDarkThemePicker}"
-                AutomationId="DefaultDarkThemeChooser"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand"/>
-            
-            <controls:SwitchItemView
-                Title="{u:I18n ShowWebsiteIcons}"
-                Subtitle="{u:I18n ShowWebsiteIconsDescription}"
-                IsToggled="{Binding ShowWebsiteIcons}"
-                IsEnabled="{Binding IsShowWebsiteIconsEnabled}"
-                AutomationId="ShowWebsiteIconsSwitch"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand" />
-
-        </StackLayout>
-    </ScrollView>
-</pages:BaseContentPage>

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

@@ -1,44 +0,0 @@
-using System;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
-
-namespace Bit.App.Pages
-{
-    public partial class AppearanceSettingsPage : BaseContentPage
-    {
-        private readonly AppearanceSettingsPageViewModel _vm;
-
-        public AppearanceSettingsPage()
-        {
-            InitializeComponent();
-            _vm = BindingContext as AppearanceSettingsPageViewModel;
-            _vm.Page = this;
-        }
-
-        protected async override void OnAppearing()
-        {
-            base.OnAppearing();
-
-            try
-            {
-                _vm.SubscribeEvents();
-                await _vm.InitAsync();
-            }
-            catch (Exception ex)
-            {
-                LoggerHelper.LogEvenIfCantBeResolved(ex);
-                ServiceContainer.Resolve<IPlatformUtilsService>().ShowToast(null, null, AppResources.AnErrorHasOccurred);
-
-                Navigation.PopModalAsync().FireAndForget();
-            }
-        }
-
-        protected override void OnDisappearing()
-        {
-            base.OnDisappearing();
-            _vm.UnsubscribeEvents();
-        }
-    }
-}

src/App/Pages/Settings/AppearanceSettingsPageViewModel.cs

@@ -1,203 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Abstractions;
-using Bit.App.Resources;
-using Bit.App.Utilities;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public class AppearanceSettingsPageViewModel : BaseViewModel
-    {
-        private readonly IStateService _stateService;
-        private readonly ILogger _logger;
-        private readonly II18nService _i18nService;
-        private readonly IPlatformUtilsService _platformUtilsService;
-        private readonly IMessagingService _messagingService;
-
-        private bool _inited;
-        private bool _showWebsiteIcons;
-
-        public AppearanceSettingsPageViewModel()
-        {
-            _stateService = ServiceContainer.Resolve<IStateService>();
-            _logger = ServiceContainer.Resolve<ILogger>();
-            _i18nService = ServiceContainer.Resolve<II18nService>();
-            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>();
-            _messagingService = ServiceContainer.Resolve<IMessagingService>();
-
-            var deviceActionService = ServiceContainer.Resolve<IDeviceActionService>();
-
-            LanguagePickerViewModel = new PickerViewModel<string>(
-                deviceActionService,
-                _logger,
-                OnLanguageChangingAsync,
-                AppResources.Language,
-                _ => _inited,
-                ex => HandleException(ex));
-
-            ThemePickerViewModel = new PickerViewModel<string>(
-                deviceActionService,
-                _logger,
-                key => OnThemeChangingAsync(key, DefaultDarkThemePickerViewModel.SelectedKey),
-                AppResources.Theme,
-                _ => _inited,
-                ex => HandleException(ex));
-            ThemePickerViewModel.SetAfterSelectionChanged(_ =>
-                MainThread.InvokeOnMainThreadAsync(() =>
-                {
-                    TriggerPropertyChanged(nameof(ShowDefaultDarkThemePicker));
-                }));
-
-            DefaultDarkThemePickerViewModel = new PickerViewModel<string>(
-                deviceActionService,
-                _logger,
-                key => OnThemeChangingAsync(ThemePickerViewModel.SelectedKey, key),
-                AppResources.DefaultDarkTheme,
-                _ => _inited,
-                ex => HandleException(ex));
-
-            ToggleShowWebsiteIconsCommand = CreateDefaultAsyncCommnad(ToggleShowWebsiteIconsAsync, _ => _inited);
-        }
-
-        public PickerViewModel<string> LanguagePickerViewModel { get; }
-        public PickerViewModel<string> ThemePickerViewModel { get; }
-        public PickerViewModel<string> DefaultDarkThemePickerViewModel { get; }
-
-        public bool ShowDefaultDarkThemePicker => ThemePickerViewModel.SelectedKey == string.Empty;
-
-        public bool ShowWebsiteIcons
-        {
-            get => _showWebsiteIcons;
-            set
-            {
-                if (SetProperty(ref _showWebsiteIcons, value))
-                {
-                    ((ICommand)ToggleShowWebsiteIconsCommand).Execute(null);
-                }
-            }
-        }
-
-        public bool IsShowWebsiteIconsEnabled => ToggleShowWebsiteIconsCommand.CanExecute(null);
-
-        public AsyncCommand ToggleShowWebsiteIconsCommand { get; }
-
-        public async Task InitAsync()
-        {
-            _showWebsiteIcons = !(await _stateService.GetDisableFaviconAsync() ?? false);
-            MainThread.BeginInvokeOnMainThread(() => TriggerPropertyChanged(nameof(ShowWebsiteIcons)));
-
-            InitLanguagePicker();
-            await InitThemePickerAsync();
-            await InitDefaultDarkThemePickerAsync();
-
-            _inited = true;
-
-            MainThread.BeginInvokeOnMainThread(() =>
-            {
-                ToggleShowWebsiteIconsCommand.RaiseCanExecuteChanged();
-                LanguagePickerViewModel.SelectOptionCommand.RaiseCanExecuteChanged();
-                ThemePickerViewModel.SelectOptionCommand.RaiseCanExecuteChanged();
-                DefaultDarkThemePickerViewModel.SelectOptionCommand.RaiseCanExecuteChanged();
-            });
-        }
-
-        private void InitLanguagePicker()
-        {
-            var options = new Dictionary<string, string>
-            {
-                [string.Empty] = AppResources.DefaultSystem
-            };
-            _i18nService.LocaleNames
-                .ToList()
-                .ForEach(pair => options[pair.Key] = pair.Value);
-
-            var selectedKey = _stateService.GetLocale() ?? string.Empty;
-
-            LanguagePickerViewModel.Init(options, selectedKey, string.Empty);
-        }
-
-        private async Task InitThemePickerAsync()
-        {
-            var options = new Dictionary<string, string>
-            {
-                [string.Empty] = AppResources.ThemeDefault,
-                [ThemeManager.Light] = AppResources.Light,
-                [ThemeManager.Dark] = AppResources.Dark,
-                [ThemeManager.Black] = AppResources.Black,
-                [ThemeManager.Nord] = AppResources.Nord,
-                [ThemeManager.SolarizedDark] = AppResources.SolarizedDark
-            };
-
-            var selectedKey = await _stateService.GetThemeAsync() ?? string.Empty;
-
-            ThemePickerViewModel.Init(options, selectedKey, string.Empty);
-
-            TriggerPropertyChanged(nameof(ShowDefaultDarkThemePicker));
-        }
-
-        private async Task InitDefaultDarkThemePickerAsync()
-        {
-            var options = new Dictionary<string, string>
-            {
-                [ThemeManager.Dark] = AppResources.Dark,
-                [ThemeManager.Black] = AppResources.Black,
-                [ThemeManager.Nord] = AppResources.Nord,
-                [ThemeManager.SolarizedDark] = AppResources.SolarizedDark
-            };
-
-            var selectedKey = await _stateService.GetAutoDarkThemeAsync() ?? ThemeManager.Dark;
-
-            DefaultDarkThemePickerViewModel.Init(options, selectedKey, ThemeManager.Dark);
-        }
-
-        private async Task<bool> OnLanguageChangingAsync(string selectedLanguage)
-        {
-            _stateService.SetLocale(selectedLanguage == string.Empty ? (string)null : selectedLanguage);
-
-            await _platformUtilsService.ShowDialogAsync(string.Format(AppResources.LanguageChangeXDescription, LanguagePickerViewModel.SelectedValue), AppResources.Language, AppResources.Ok);
-            return true;
-        }
-
-        private async Task<bool> OnThemeChangingAsync(string selectedTheme, string selectedDefaultDarkTheme)
-        {
-            await _stateService.SetThemeAsync(selectedTheme == string.Empty ? (string)null : selectedTheme);
-            await _stateService.SetAutoDarkThemeAsync(selectedDefaultDarkTheme == string.Empty ? (string)null : selectedDefaultDarkTheme);
-
-            await MainThread.InvokeOnMainThreadAsync(() =>
-            {
-                ThemeManager.SetTheme(Application.Current.Resources);
-                _messagingService.Send(ThemeManager.UPDATED_THEME_MESSAGE_KEY);
-            });
-            return true;
-        }
-
-        private async Task ToggleShowWebsiteIconsAsync()
-        {
-            // TODO: [PS-961] Fix negative function names
-            await _stateService.SetDisableFaviconAsync(!ShowWebsiteIcons);
-        }
-
-        private void ToggleShowWebsiteIconsCommand_CanExecuteChanged(object sender, EventArgs e)
-        {
-            TriggerPropertyChanged(nameof(IsShowWebsiteIconsEnabled));
-        }
-
-        internal void SubscribeEvents()
-        {
-            ToggleShowWebsiteIconsCommand.CanExecuteChanged += ToggleShowWebsiteIconsCommand_CanExecuteChanged;
-        }
-
-        internal void UnsubscribeEvents()
-        {
-            ToggleShowWebsiteIconsCommand.CanExecuteChanged -= ToggleShowWebsiteIconsCommand_CanExecuteChanged;
-        }
-    }
-}

src/App/Pages/Settings/AutofillServicesPage.xaml

@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<pages:BaseContentPage 
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="Bit.App.Pages.AutofillServicesPage"
+    xmlns:pages="clr-namespace:Bit.App.Pages"
+    xmlns:u="clr-namespace:Bit.App.Utilities"
+    x:DataType="pages:AutofillServicesPageViewModel"
+    Title="{Binding PageTitle}">
+    <ContentPage.BindingContext>
+        <pages:AutofillServicesPageViewModel />
+    </ContentPage.BindingContext>
+
+    <ScrollView>
+        <StackLayout Padding="0" Spacing="20">
+            <StackLayout 
+                StyleClass="box"
+                IsVisible="{Binding AutofillServiceVisible}">
+                <StackLayout StyleClass="box-row, box-row-switch">
+                    <Label
+                        Text="{u:I18n AutofillService}"
+                        StyleClass="box-label-regular"
+                        HorizontalOptions="StartAndExpand" />
+                    <RelativeLayout HorizontalOptions="End">
+                        <Switch
+                            x:Name="AutofillServiceSwitch"
+                            IsToggled="{Binding AutofillServiceToggled}"
+                            StyleClass="box-value"
+                            HorizontalOptions="End" />
+                        <Button
+                            Clicked="ToggleAutofillService"
+                            StyleClass="box-overlay"
+                            RelativeLayout.XConstraint="0"
+                            RelativeLayout.YConstraint="0"
+                            RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=AutofillServiceSwitch, Property=Width}"
+                            RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=AutofillServiceSwitch, Property=Height}" />
+                    </RelativeLayout>
+                </StackLayout>
+                <Label
+                    Text="{u:I18n AutofillServiceDescription}"
+                    StyleClass="box-footer-label, box-footer-label-switch" />
+            </StackLayout>
+            <StackLayout 
+                StyleClass="box"
+                IsVisible="{Binding InlineAutofillVisible}">
+                <StackLayout StyleClass="box-row, box-row-switch">
+                    <Label
+                        Text="{u:I18n InlineAutofill}"
+                        StyleClass="box-label-regular"
+                        IsEnabled="{Binding InlineAutofillEnabled}"
+                        HorizontalOptions="StartAndExpand" />
+                    <RelativeLayout HorizontalOptions="End">
+                        <Switch
+                            x:Name="InlineAutofillSwitch"
+                            IsEnabled="{Binding InlineAutofillEnabled}"
+                            IsToggled="{Binding InlineAutofillToggled}"
+                            StyleClass="box-value"
+                            HorizontalOptions="End" />
+                        <Button
+                            Clicked="ToggleInlineAutofill"
+                            StyleClass="box-overlay"
+                            RelativeLayout.XConstraint="0"
+                            RelativeLayout.YConstraint="0"
+                            RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=InlineAutofillSwitch, Property=Width}"
+                            RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=InlineAutofillSwitch, Property=Height}" />
+                    </RelativeLayout>
+                </StackLayout>
+                <Label
+                    Text="{u:I18n InlineAutofillDescription}"
+                    StyleClass="box-footer-label, box-footer-label-switch"
+                    IsEnabled="{Binding InlineAutofillEnabled}"/>
+            </StackLayout>
+            <StackLayout StyleClass="box">
+                <StackLayout StyleClass="box-row, box-row-switch">
+                    <Label
+                        Text="{u:I18n Accessibility}"
+                        StyleClass="box-label-regular"
+                        HorizontalOptions="StartAndExpand" />
+                    <RelativeLayout HorizontalOptions="End">
+                        <Switch
+                            x:Name="AccessibilitySwitch"
+                            IsToggled="{Binding AccessibilityToggled}"
+                            StyleClass="box-value"
+                            HorizontalOptions="End" />
+                        <Button
+                            Command="{Binding ToggleAccessibilityCommand}"
+                            StyleClass="box-overlay"
+                            RelativeLayout.XConstraint="0"
+                            RelativeLayout.YConstraint="0"
+                            RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=AccessibilitySwitch, Property=Width}"
+                            RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=AccessibilitySwitch, Property=Height}" />
+                    </RelativeLayout>
+                </StackLayout>
+                <Label
+                    Text="{Binding AccessibilityDescriptionLabel}"
+                    StyleClass="box-footer-label, box-footer-label-switch" />
+            </StackLayout>
+            <StackLayout 
+                StyleClass="box"
+                IsVisible="{Binding DrawOverVisible}">
+                <StackLayout StyleClass="box-row, box-row-switch">
+                    <Label
+                        Text="{u:I18n DrawOver}"
+                        StyleClass="box-label-regular"
+                        IsEnabled="{Binding DrawOverEnabled}"
+                        HorizontalOptions="StartAndExpand" />
+                    <RelativeLayout HorizontalOptions="End">
+                        <Switch
+                            x:Name="DrawOverSwitch"
+                            IsEnabled="{Binding DrawOverEnabled}"
+                            IsToggled="{Binding DrawOverToggled}"
+                            StyleClass="box-value"
+                            HorizontalOptions="End" />
+                        <Button
+                            Clicked="ToggleDrawOver"
+                            StyleClass="box-overlay"
+                            RelativeLayout.XConstraint="0"
+                            RelativeLayout.YConstraint="0"
+                            RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=DrawOverSwitch, Property=Width}"
+                            RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=DrawOverSwitch, Property=Height}" />
+                    </RelativeLayout>
+                </StackLayout>
+                <Label
+                    Text="{Binding DrawOverDescriptionLabel}"
+                    StyleClass="box-footer-label, box-footer-label-switch"
+                    IsEnabled="{Binding InlineAutofillEnabled}"/>
+            </StackLayout>
+        </StackLayout>
+    </ScrollView>
+
+</pages:BaseContentPage>

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

@@ -0,0 +1,66 @@
+using System;
+using Xamarin.Forms;
+
+namespace Bit.App.Pages
+{
+    public partial class AutofillServicesPage : BaseContentPage
+    {
+        private readonly AutofillServicesPageViewModel _vm;
+        private readonly SettingsPage _settingsPage;
+        private DateTime? _timerStarted = null;
+        private TimeSpan _timerMaxLength = TimeSpan.FromMinutes(5);
+
+        public AutofillServicesPage(SettingsPage settingsPage)
+        {
+            InitializeComponent();
+            _vm = BindingContext as AutofillServicesPageViewModel;
+            _vm.Page = this;
+            _settingsPage = settingsPage;
+        }
+
+        protected async override void OnAppearing()
+        {
+            await _vm.InitAsync();
+            _vm.UpdateEnabled();
+            _timerStarted = DateTime.UtcNow;
+            Device.StartTimer(new TimeSpan(0, 0, 0, 0, 500), () =>
+            {
+                if (_timerStarted == null || (DateTime.UtcNow - _timerStarted) > _timerMaxLength)
+                {
+                    return false;
+                }
+                _vm.UpdateEnabled();
+                return true;
+            });
+            base.OnAppearing();
+        }
+
+        protected override void OnDisappearing()
+        {
+            _timerStarted = null;
+            _settingsPage.BuildList();
+            base.OnDisappearing();
+        }
+
+        private void ToggleAutofillService(object sender, EventArgs e)
+        {
+            if (DoOnce())
+            {
+                _vm.ToggleAutofillService();
+            }
+        }
+
+        private void ToggleInlineAutofill(object sender, EventArgs e)
+        {
+            _vm.ToggleInlineAutofill();
+        }
+
+        private void ToggleDrawOver(object sender, EventArgs e)
+        {
+            if (DoOnce())
+            {
+                _vm.ToggleDrawOver();
+            }
+        }
+    }
+}

src/App/Pages/Settings/AutofillServicesPageViewModel.cs

@@ -0,0 +1,231 @@
+using System.Threading.Tasks;
+using System.Windows.Input;
+using Bit.App.Abstractions;
+using Bit.App.Resources;
+using Bit.App.Services;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+using Xamarin.CommunityToolkit.ObjectModel;
+
+namespace Bit.App.Pages
+{
+    public class AutofillServicesPageViewModel : BaseViewModel
+    {
+        private readonly IDeviceActionService _deviceActionService;
+        private readonly IAutofillHandler _autofillHandler;
+        private readonly IStateService _stateService;
+        private readonly MobileI18nService _i18nService;
+        private readonly IPlatformUtilsService _platformUtilsService;
+        readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
+
+        private bool _autofillServiceToggled;
+        private bool _inlineAutofillToggled;
+        private bool _accessibilityToggled;
+        private bool _drawOverToggled;
+        private bool _inited;
+
+        public AutofillServicesPageViewModel()
+        {
+            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();
+            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _i18nService = ServiceContainer.Resolve<II18nService>("i18nService") as MobileI18nService;
+            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
+            PageTitle = AppResources.AutofillServices;
+            ToggleAccessibilityCommand = new AsyncCommand(ToggleAccessibilityAsync,
+                onException: ex => _logger.Value.Exception(ex),
+                allowsMultipleExecutions: false);
+        }
+
+        #region Autofill Service
+
+        public bool AutofillServiceVisible
+        {
+            get => _deviceActionService.SystemMajorVersion() >= 26;
+        }
+
+        public bool AutofillServiceToggled
+        {
+            get => _autofillServiceToggled;
+            set => SetProperty(ref _autofillServiceToggled, value,
+                additionalPropertyNames: new string[]
+                {
+                    nameof(InlineAutofillEnabled)
+                });
+        }
+
+        #endregion
+
+        #region Inline Autofill
+
+        public bool InlineAutofillVisible
+        {
+            get => _deviceActionService.SystemMajorVersion() >= 30;
+        }
+
+        public bool InlineAutofillEnabled
+        {
+            get => AutofillServiceToggled;
+        }
+
+        public bool InlineAutofillToggled
+        {
+            get => _inlineAutofillToggled;
+            set
+            {
+                if (SetProperty(ref _inlineAutofillToggled, value))
+                {
+                    var task = UpdateInlineAutofillToggledAsync();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Accessibility
+
+        public ICommand ToggleAccessibilityCommand { get; }
+
+        public string AccessibilityDescriptionLabel
+        {
+            get
+            {
+                if (_deviceActionService.SystemMajorVersion() <= 22)
+                {
+                    // Android 5
+                    return _i18nService.T("AccessibilityDescription");
+                }
+                if (_deviceActionService.SystemMajorVersion() == 23)
+                {
+                    // Android 6
+                    return _i18nService.T("AccessibilityDescription2");
+                }
+                if (_deviceActionService.SystemMajorVersion() == 24 || _deviceActionService.SystemMajorVersion() == 25)
+                {
+                    // Android 7
+                    return _i18nService.T("AccessibilityDescription3");
+                }
+                // Android 8+
+                return _i18nService.T("AccessibilityDescription4");
+            }
+        }
+
+        public bool AccessibilityToggled
+        {
+            get => _accessibilityToggled;
+            set => SetProperty(ref _accessibilityToggled, value,
+                additionalPropertyNames: new string[]
+                {
+                    nameof(DrawOverEnabled)
+                });
+        }
+
+        #endregion
+
+        #region Draw-Over
+
+        public bool DrawOverVisible
+        {
+            get => _deviceActionService.SystemMajorVersion() >= 23;
+        }
+
+        public string DrawOverDescriptionLabel
+        {
+            get
+            {
+                if (_deviceActionService.SystemMajorVersion() <= 23)
+                {
+                    // Android 6
+                    return _i18nService.T("DrawOverDescription");
+                }
+                if (_deviceActionService.SystemMajorVersion() == 24 || _deviceActionService.SystemMajorVersion() == 25)
+                {
+                    // Android 7
+                    return _i18nService.T("DrawOverDescription2");
+                }
+                // Android 8+
+                return _i18nService.T("DrawOverDescription3");
+            }
+        }
+
+        public bool DrawOverEnabled
+        {
+            get => AccessibilityToggled;
+        }
+
+        public bool DrawOverToggled
+        {
+            get => _drawOverToggled;
+            set => SetProperty(ref _drawOverToggled, value);
+        }
+
+        #endregion
+
+        public async Task InitAsync()
+        {
+            InlineAutofillToggled = await _stateService.GetInlineAutofillEnabledAsync() ?? true;
+            _inited = true;
+        }
+
+        public void ToggleAutofillService()
+        {
+            if (!AutofillServiceToggled)
+            {
+                _deviceActionService.OpenAutofillSettings();
+            }
+            else
+            {
+                _autofillHandler.DisableAutofillService();
+            }
+        }
+
+        public void ToggleInlineAutofill()
+        {
+            if (!InlineAutofillEnabled)
+            {
+                return;
+            }
+            InlineAutofillToggled = !InlineAutofillToggled;
+        }
+
+        public async Task ToggleAccessibilityAsync()
+        {
+            if (!_autofillHandler.AutofillAccessibilityServiceRunning())
+            {
+                var accept = await _platformUtilsService.ShowDialogAsync(AppResources.AccessibilityDisclosureText,
+                    AppResources.AccessibilityServiceDisclosure, AppResources.Accept,
+                    AppResources.Decline);
+                if (!accept)
+                {
+                    return;
+                }
+            }
+            _deviceActionService.OpenAccessibilitySettings();
+        }
+
+        public void ToggleDrawOver()
+        {
+            if (!DrawOverEnabled)
+            {
+                return;
+            }
+            _deviceActionService.OpenAccessibilityOverlayPermissionSettings();
+        }
+
+        public void UpdateEnabled()
+        {
+            AutofillServiceToggled =
+                _autofillHandler.SupportsAutofillService() && _autofillHandler.AutofillServiceEnabled();
+            AccessibilityToggled = _autofillHandler.AutofillAccessibilityServiceRunning();
+            DrawOverToggled = _autofillHandler.AutofillAccessibilityOverlayPermitted();
+        }
+
+        private async Task UpdateInlineAutofillToggledAsync()
+        {
+            if (_inited)
+            {
+                await _stateService.SetInlineAutofillEnabledAsync(InlineAutofillToggled);
+            }
+        }
+    }
+}

src/App/Pages/Settings/AutofillSettingsPage.xaml

@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<pages:BaseContentPage
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    x:DataType="pages:AutofillSettingsPageViewModel"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    x:Class="Bit.App.Pages.AutofillSettingsPage"
-    Title="{u:I18n Autofill}">
-    
-    <ContentPage.BindingContext>
-        <pages:AutofillSettingsPageViewModel />
-    </ContentPage.BindingContext>
-
-     <ScrollView Padding="0, 0, 0, 20">
-        <StackLayout Padding="0" Spacing="5">
-            <controls:CustomLabel
-                Text="{u:I18n Autofill}"
-                StyleClass="settings-header" />
-
-            <controls:SwitchItemView
-                Title="{u:I18n AutofillServices}"
-                Subtitle="{u:I18n AutofillServicesExplanationLong}"
-                IsVisible="{Binding SupportsAndroidAutofillServices}"
-                IsToggled="{Binding UseAutofillServices}"
-                AutomationId="AutofillServicesSwitch"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand" />
-
-            <controls:SwitchItemView
-                Title="{u:I18n InlineAutofill}"
-                Subtitle="{u:I18n UseInlineAutofillExplanationLong}"
-                IsToggled="{Binding UseInlineAutofill}"
-                IsVisible="{Binding ShowUseInlineAutofillToggle}"
-                IsEnabled="{Binding UseAutofillServices}"
-                AutomationId="InlineAutofillSwitch"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand" />
-
-            <controls:SwitchItemView
-                Title="{u:I18n Accessibility}"
-                Subtitle="{Binding UseAccessibilityDescription}"
-                IsToggled="{Binding UseAccessibility}"
-                IsVisible="{Binding ShowUseAccessibilityToggle}"
-                AutomationId="AccessibilitySwitch"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand" />
-
-            <controls:SwitchItemView
-                Title="{u:I18n DrawOver}"
-                Subtitle="{Binding UseDrawOverDescription}"
-                IsToggled="{Binding UseDrawOver}"
-                IsVisible="{Binding ShowUseDrawOverToggle}"
-                IsEnabled="{Binding UseAccessibility}"
-                AutomationId="DrawOverSwitch"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand" />
-
-            <controls:CustomLabel
-                Text="{u:I18n PasswordAutofill}"
-                StyleClass="settings-navigatable-label"
-                IsVisible="{Binding SupportsiOSAutofill}"
-                AutomationId="PasswordAutofillLabel">
-                <Label.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding GoToPasswordAutofillCommand}" />
-                </Label.GestureRecognizers>
-            </controls:CustomLabel>
-
-            <controls:CustomLabel
-                Text="{u:I18n AppExtension}"
-                StyleClass="settings-navigatable-label"
-                IsVisible="{OnPlatform iOS=True, Android=False}"
-                AutomationId="AppExtensionLabel">
-                <Label.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding GoToAppExtensionCommand}" />
-                </Label.GestureRecognizers>
-            </controls:CustomLabel>
-
-            <BoxView StyleClass="settings-box-row-separator" />
-
-            <controls:CustomLabel
-                Text="{u:I18n AdditionalOptions}"
-                StyleClass="settings-header" />
-
-            <controls:SwitchItemView
-                Title="{u:I18n CopyTotpAutomatically}"
-                Subtitle="{u:I18n CopyTotpAutomaticallyDescription}"
-                IsToggled="{Binding CopyTotpAutomatically}"
-                AutomationId="CopyTotpAutomaticallySwitch"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand" />
-            
-            <controls:SwitchItemView
-                Title="{u:I18n AskToAddLogin}"
-                Subtitle="{u:I18n AskToAddLoginDescription}"
-                IsToggled="{Binding AskToAddLogin}"
-                IsVisible="{Binding SupportsAndroidAutofillServices}"
-                AutomationId="AskToAddLoginSwitch"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand" />
-
-            <controls:SettingChooserItemView
-                Title="{u:I18n DefaultUriMatchDetection}"
-                Subtitle="{u:I18n DefaultUriMatchDetectionDescription}"
-                DisplayValue="{Binding DefaultUriMatchDetectionPickerViewModel.SelectedValue}"
-                ChooseCommand="{Binding DefaultUriMatchDetectionPickerViewModel.SelectOptionCommand}"
-                AutomationId="DefaultUriMatchDetectionChooser"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand"/>
-
-            <StackLayout
-                Spacing="0"
-                Padding="16,12"
-                IsVisible="{Binding SupportsAndroidAutofillServices}"
-                AutomationId="BlockAutoFillView">
-                <StackLayout.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding GoToBlockAutofillUrisCommand}" />
-                </StackLayout.GestureRecognizers>
-                <controls:CustomLabel
-                    MaxLines="2"
-                    Text="{u:I18n BlockAutoFill}"
-                    HorizontalOptions="StartAndExpand"
-                    LineBreakMode="TailTruncation" />
-                <Label
-                    Text="{u:I18n AutoFillWillNotBeOfferedForTheseURIs}"
-                    StyleClass="box-footer-label, box-footer-label-switch"
-                    Margin="0,0,0,0"/>
-            </StackLayout>
-
-        </StackLayout>
-    </ScrollView>
-</pages:BaseContentPage>

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

@@ -1,37 +0,0 @@
-using System;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
-
-namespace Bit.App.Pages
-{
-    public partial class AutofillSettingsPage : BaseContentPage
-    {
-        AutofillSettingsPageViewModel _vm;
-
-        public AutofillSettingsPage()
-        {
-            InitializeComponent();
-            _vm = BindingContext as AutofillSettingsPageViewModel;
-            _vm.Page = this;
-        }
-
-        protected async override void OnAppearing()
-        {
-            base.OnAppearing();
-
-            try
-            {
-                await _vm.InitAsync();
-            }
-            catch (Exception ex)
-            {
-                LoggerHelper.LogEvenIfCantBeResolved(ex);
-                ServiceContainer.Resolve<IPlatformUtilsService>().ShowToast(null, null, AppResources.AnErrorHasOccurred);
-
-                Navigation.PopAsync().FireAndForget();
-            }
-        }
-    }
-}

src/App/Pages/Settings/AutofillSettingsPageViewModel.android.cs

@@ -1,181 +0,0 @@
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Resources;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public partial class AutofillSettingsPageViewModel
-    {
-        private bool _useAutofillServices;
-        private bool _useInlineAutofill;
-        private bool _useAccessibility;
-        private bool _useDrawOver;
-        private bool _askToAddLogin;
-
-        public bool SupportsAndroidAutofillServices => Device.RuntimePlatform == Device.Android && _deviceActionService.SupportsAutofillServices();
-
-        public bool UseAutofillServices
-        {
-            get => _useAutofillServices;
-            set
-            {
-                if (SetProperty(ref _useAutofillServices, value))
-                {
-                    ((ICommand)ToggleUseAutofillServicesCommand).Execute(null);
-                }
-            }
-        }
-
-        public bool ShowUseInlineAutofillToggle => _deviceActionService.SupportsInlineAutofill();
-
-        public bool UseInlineAutofill
-        {
-            get => _useInlineAutofill;
-            set
-            {
-                if (SetProperty(ref _useInlineAutofill, value))
-                {
-                    ((ICommand)ToggleUseInlineAutofillCommand).Execute(null);
-                }
-            }
-        }
-
-        public bool ShowUseAccessibilityToggle => Device.RuntimePlatform == Device.Android;
-
-        public string UseAccessibilityDescription => _deviceActionService.GetAutofillAccessibilityDescription();
-
-        public bool UseAccessibility
-        {
-            get => _useAccessibility;
-            set
-            {
-                if (SetProperty(ref _useAccessibility, value))
-                {
-                    ((ICommand)ToggleUseAccessibilityCommand).Execute(null);
-                }
-            }
-        }
-
-        public bool ShowUseDrawOverToggle => _deviceActionService.SupportsDrawOver();
-
-        public bool UseDrawOver
-        {
-            get => _useDrawOver;
-            set
-            {
-                if (SetProperty(ref _useDrawOver, value))
-                {
-                    ((ICommand)ToggleUseDrawOverCommand).Execute(null);
-                }
-            }
-        }
-
-        public string UseDrawOverDescription => _deviceActionService.GetAutofillDrawOverDescription();
-
-        public bool AskToAddLogin
-        {
-            get => _askToAddLogin;
-            set
-            {
-                if (SetProperty(ref _askToAddLogin, value))
-                {
-                    ((ICommand)ToggleAskToAddLoginCommand).Execute(null);
-                }
-            }
-        }
-
-        public AsyncCommand ToggleUseAutofillServicesCommand { get; private set; }
-        public AsyncCommand ToggleUseInlineAutofillCommand { get; private set; }
-        public AsyncCommand ToggleUseAccessibilityCommand { get; private set; }
-        public AsyncCommand ToggleUseDrawOverCommand { get; private set; }
-        public AsyncCommand ToggleAskToAddLoginCommand { get; private set; }
-        public ICommand GoToBlockAutofillUrisCommand { get; private set; }
-
-        private void InitAndroidCommands()
-        {
-            ToggleUseAutofillServicesCommand = CreateDefaultAsyncCommnad(() => MainThread.InvokeOnMainThreadAsync(() => ToggleUseAutofillServices()), _ => _inited);
-            ToggleUseInlineAutofillCommand = CreateDefaultAsyncCommnad(() => MainThread.InvokeOnMainThreadAsync(() => ToggleUseInlineAutofillEnabledAsync()), _ => _inited);
-            ToggleUseAccessibilityCommand = CreateDefaultAsyncCommnad(ToggleUseAccessibilityAsync, _ => _inited);
-            ToggleUseDrawOverCommand = CreateDefaultAsyncCommnad(() => MainThread.InvokeOnMainThreadAsync(() => ToggleDrawOver()), _ => _inited);
-            ToggleAskToAddLoginCommand = CreateDefaultAsyncCommnad(ToggleAskToAddLoginAsync, _ => _inited);
-            GoToBlockAutofillUrisCommand = CreateDefaultAsyncCommnad(() => Page.Navigation.PushAsync(new BlockAutofillUrisPage()));
-        }
-
-        private async Task InitAndroidAutofillSettingsAsync()
-        {
-            _useInlineAutofill = await _stateService.GetInlineAutofillEnabledAsync() ?? true;
-
-            await UpdateAndroidAutofillSettingsAsync();
-
-            await MainThread.InvokeOnMainThreadAsync(() =>
-            {
-                TriggerPropertyChanged(nameof(UseInlineAutofill));
-            });
-        }
-
-        private async Task UpdateAndroidAutofillSettingsAsync()
-        {
-            _useAutofillServices =
-                _autofillHandler.SupportsAutofillService() && _autofillHandler.AutofillServiceEnabled();
-            _useAccessibility = _autofillHandler.AutofillAccessibilityServiceRunning();
-            _useDrawOver = _autofillHandler.AutofillAccessibilityOverlayPermitted();
-            _askToAddLogin = await _stateService.GetAutofillDisableSavePromptAsync() != true;
-
-            await MainThread.InvokeOnMainThreadAsync(() =>
-            {
-                TriggerPropertyChanged(nameof(UseAutofillServices));
-                TriggerPropertyChanged(nameof(UseAccessibility));
-                TriggerPropertyChanged(nameof(UseDrawOver));
-                TriggerPropertyChanged(nameof(AskToAddLogin));
-            });
-        }
-
-        private void ToggleUseAutofillServices()
-        {
-            if (UseAutofillServices)
-            {
-                _deviceActionService.OpenAutofillSettings();
-            }
-            else
-            {
-                _autofillHandler.DisableAutofillService();
-            }
-        }
-
-        private async Task ToggleUseInlineAutofillEnabledAsync()
-        {
-            await _stateService.SetInlineAutofillEnabledAsync(UseInlineAutofill);
-        }
-
-        private async Task ToggleUseAccessibilityAsync()
-        {
-            if (!_autofillHandler.AutofillAccessibilityServiceRunning()
-                &&
-                !await _platformUtilsService.ShowDialogAsync(AppResources.AccessibilityDisclosureText, AppResources.AccessibilityServiceDisclosure,
-                    AppResources.Accept, AppResources.Decline))
-            {
-                _useAccessibility = false;
-                await MainThread.InvokeOnMainThreadAsync(() => TriggerPropertyChanged(nameof(UseAccessibility)));
-                return;
-            }
-            _deviceActionService.OpenAccessibilitySettings();
-        }
-
-        private void ToggleDrawOver()
-        {
-            if (!UseAccessibility)
-            {
-                return;
-            }
-            _deviceActionService.OpenAccessibilityOverlayPermissionSettings();
-        }
-
-        private async Task ToggleAskToAddLoginAsync()
-        {
-            await _stateService.SetAutofillDisableSavePromptAsync(!AskToAddLogin);
-        }
-    }
-}

src/App/Pages/Settings/AutofillSettingsPageViewModel.cs

@@ -1,111 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Abstractions;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Enums;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
-
-namespace Bit.App.Pages
-{
-    public partial class AutofillSettingsPageViewModel : BaseViewModel
-    {
-        private readonly IDeviceActionService _deviceActionService;
-        private readonly IAutofillHandler _autofillHandler;
-        private readonly IStateService _stateService;
-        private readonly IPlatformUtilsService _platformUtilsService;
-
-        private bool _inited;
-        private bool _copyTotpAutomatically;
-
-        public AutofillSettingsPageViewModel()
-        {
-            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>();
-            _autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();
-            _stateService = ServiceContainer.Resolve<IStateService>();
-            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>();
-
-            DefaultUriMatchDetectionPickerViewModel = new PickerViewModel<UriMatchType>(
-                _deviceActionService,
-                ServiceContainer.Resolve<ILogger>(),
-                DefaultUriMatchDetectionChangingAsync,
-                AppResources.DefaultUriMatchDetection,
-                _ => _inited,
-                ex => HandleException(ex));
-
-            ToggleCopyTotpAutomaticallyCommand = CreateDefaultAsyncCommnad(ToggleCopyTotpAutomaticallyAsync, _ => _inited);
-
-            InitAndroidCommands();
-            InitIOSCommands();
-        }
-
-        public bool CopyTotpAutomatically
-        {
-            get => _copyTotpAutomatically;
-            set
-            {
-                if (SetProperty(ref _copyTotpAutomatically, value))
-                {
-                    ((ICommand)ToggleCopyTotpAutomaticallyCommand).Execute(null);
-                }
-            }
-        }
-
-        public PickerViewModel<UriMatchType> DefaultUriMatchDetectionPickerViewModel { get; }
-
-        public AsyncCommand ToggleCopyTotpAutomaticallyCommand { get; private set; }
-
-        public async Task InitAsync()
-        {
-            await InitAndroidAutofillSettingsAsync();
-
-            _copyTotpAutomatically = await _stateService.GetDisableAutoTotpCopyAsync() != true;
-
-            await InitDefaultUriMatchDetectionPickerViewModelAsync();
-
-            _inited = true;
-
-            await MainThread.InvokeOnMainThreadAsync(() =>
-            {
-                TriggerPropertyChanged(nameof(CopyTotpAutomatically));
-
-                ToggleUseAutofillServicesCommand.RaiseCanExecuteChanged();
-                ToggleUseInlineAutofillCommand.RaiseCanExecuteChanged();
-                ToggleUseAccessibilityCommand.RaiseCanExecuteChanged();
-                ToggleUseDrawOverCommand.RaiseCanExecuteChanged();
-                DefaultUriMatchDetectionPickerViewModel.SelectOptionCommand.RaiseCanExecuteChanged();
-            });
-        }
-
-        private async Task InitDefaultUriMatchDetectionPickerViewModelAsync()
-        {
-            var options = new Dictionary<UriMatchType, string>
-            {
-                [UriMatchType.Domain] = AppResources.BaseDomain,
-                [UriMatchType.Host] = AppResources.Host,
-                [UriMatchType.StartsWith] = AppResources.StartsWith,
-                [UriMatchType.RegularExpression] = AppResources.RegEx,
-                [UriMatchType.Exact] = AppResources.Exact,
-                [UriMatchType.Never] = AppResources.Never
-            };
-
-            var defaultUriMatchDetection = ((UriMatchType?)await _stateService.GetDefaultUriMatchAsync()) ?? UriMatchType.Domain;
-
-            DefaultUriMatchDetectionPickerViewModel.Init(options, defaultUriMatchDetection, UriMatchType.Domain);
-        }
-
-        private async Task ToggleCopyTotpAutomaticallyAsync()
-        {
-            await _stateService.SetDisableAutoTotpCopyAsync(!CopyTotpAutomatically);
-        }
-
-        private async Task<bool> DefaultUriMatchDetectionChangingAsync(UriMatchType type)
-        {
-            await _stateService.SetDefaultUriMatchAsync((int?)type);
-            return true;
-        }
-    }
-}

src/App/Pages/Settings/AutofillSettingsPageViewModel.ios.cs

@@ -1,19 +0,0 @@
-using System.Windows.Input;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public partial class AutofillSettingsPageViewModel
-    {
-        public bool SupportsiOSAutofill => Device.RuntimePlatform == Device.iOS && _deviceActionService.SupportsAutofillServices();
-
-        public ICommand GoToPasswordAutofillCommand { get; private set; }
-        public ICommand GoToAppExtensionCommand { get; private set; }
-
-        private void InitIOSCommands()
-        {
-            GoToPasswordAutofillCommand = CreateDefaultAsyncCommnad(() => Page.Navigation.PushModalAsync(new NavigationPage(new AutofillPage())));
-            GoToAppExtensionCommand = CreateDefaultAsyncCommnad(() => Page.Navigation.PushModalAsync(new NavigationPage(new ExtensionPage())));
-        }
-    }
-}

src/App/Pages/Settings/ExportVaultPage.xaml

@@ -38,8 +38,7 @@
                 <Label
                     Text="{u:I18n DisablePersonalVaultExportPolicyInEffect}"
                     StyleClass="text-muted, text-sm, text-bold"
-                    HorizontalTextAlignment="Center"
-                    AutomationId="DisablePrivateVaultPolicyLabel" />
+                    HorizontalTextAlignment="Center" />
             </Frame>
             <Grid
                 RowSpacing="10"
@@ -56,8 +55,7 @@
                         SelectedIndex="{Binding FileFormatSelectedIndex}"
                         SelectedIndexChanged="FileFormat_Changed"
                         StyleClass="box-value"
-                        IsEnabled="{Binding DisablePrivateVaultPolicyEnabled, Converter={StaticResource inverseBool}}"
-                        AutomationId="FileFormatPicker" />
+                        IsEnabled="{Binding DisablePrivateVaultPolicyEnabled, Converter={StaticResource inverseBool}}" />
                 </StackLayout>
                 <StackLayout
                     StyleClass="box-row"
@@ -74,8 +72,7 @@
                         HorizontalOptions="Fill"
                         VerticalOptions="End"
                         IsEnabled="{Binding DisablePrivateVaultPolicyEnabled, Converter={StaticResource inverseBool}}"
-                        Margin="0,0,0,10"
-                        AutomationId="SendTOTPCodeButton" />
+                        Margin="0,0,0,10"/>
                 </StackLayout>
                 <Grid
                     StyleClass="box-row"
@@ -99,8 +96,7 @@
                         Grid.Row="1"
                         Grid.Column="0"
                         ReturnType="Go"
-                        ReturnCommand="{Binding ExportVaultCommand}"
-                        AutomationId="MasterPasswordEntry" />
+                        ReturnCommand="{Binding ExportVaultCommand}" />
                     <controls:IconButton
                         StyleClass="box-row-button, box-row-button-platform"
                         Text="{Binding ShowPasswordIcon}"
@@ -110,8 +106,7 @@
                         AutomationProperties.IsInAccessibleTree="True"
                         AutomationProperties.Name="{u:I18n ToggleVisibility}"
                         AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                        IsVisible="{Binding UseOTPVerification, Converter={StaticResource inverseBool}}"
-                        AutomationId="TogglePasswordVisibilityButton" />
+                        IsVisible="{Binding UseOTPVerification, Converter={StaticResource inverseBool}}"/>
                     <Label
                         Text="{u:I18n ConfirmYourIdentity}"
                         StyleClass="box-footer-label"
@@ -133,8 +128,7 @@
                     Clicked="ExportVault_Clicked"
                     HorizontalOptions="Fill"
                     VerticalOptions="End"
-                    IsEnabled="{Binding DisablePrivateVaultPolicyEnabled, Converter={StaticResource inverseBool}}"
-                    AutomationId="ExportVaultButton" />
+                    IsEnabled="{Binding DisablePrivateVaultPolicyEnabled, Converter={StaticResource inverseBool}}"/>
             </StackLayout>
         </StackLayout>
     </ScrollView>

src/App/Pages/Settings/LoginPasswordlessRequestsListPage.xaml

@@ -23,7 +23,6 @@
     <ContentPage.Resources>
         <ResourceDictionary>
             <u:DateTimeConverter x:Key="dateTime" />
-            <u:InverseBoolConverter x:Key="inverseBool" />
             <xct:ItemSelectedEventArgsConverter x:Key="ItemSelectedEventArgsConverter" />
             <controls:SelectionChangedEventArgsConverter x:Key="SelectionChangedEventArgsConverter" />
             <DataTemplate
@@ -33,8 +32,7 @@
                         Padding="10, 0"
                         RowSpacing="0"
                         RowDefinitions="*, Auto, *, 10"
-                        ColumnDefinitions="*, *"
-                        AutomationId="LoginRequestCell">
+                        ColumnDefinitions="*, *">
                         <Label
                             Text="{u:I18n FingerprintPhrase}"
                             FontSize="Small"
@@ -47,23 +45,20 @@
                             FontSize="Small"
                             Padding="0, 5, 0, 10"
                             VerticalTextAlignment="Center"
-                            TextColor="{DynamicResource FingerprintPhrase}"
-                            AutomationId="FingerprintPhraseLabel" />
+                            TextColor="{DynamicResource FingerprintPhrase}"/>
                         <Label
                             Grid.Row="2"
                             HorizontalOptions="Start"
                             HorizontalTextAlignment="Start"
                             Text="{Binding RequestDeviceType}"
-                            StyleClass="list-header-sub"
-                            AutomationId="RequestDeviceLabel" />
+                            StyleClass="list-header-sub" />
                         <Label
                             Grid.Row="2"
                             Grid.Column="1"
                             HorizontalOptions="End"
                             HorizontalTextAlignment="End"
                             Text="{Binding CreationDate, Converter={StaticResource dateTime}}"
-                            StyleClass="list-header-sub"
-                            AutomationId="RequestDateLabel" />
+                            StyleClass="list-header-sub" />
                         <BoxView
                             StyleClass="list-section-separator-top, list-section-separator-top-platform"
                             VerticalOptions="End"
@@ -81,47 +76,25 @@
                     Command="{Binding RefreshCommand}"
                     VerticalOptions="FillAndExpand"
                     BackgroundColor="{DynamicResource BackgroundColor}">
-                    <StackLayout>
-                        <Image
-                            x:Name="_emptyPlaceholder"
-                            Source="empty_login_requests"
-                            HorizontalOptions="Center"
-                            WidthRequest="160"
-                            HeightRequest="160"
-                            Margin="0,70,0,0"
-                            IsVisible="{Binding HasLoginRequests, Converter={StaticResource inverseBool}}"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n NoPendingRequests}" />
-                        <controls:CustomLabel
-                            StyleClass="box-label-regular"
-                            Text="{u:I18n NoPendingRequests}"
-                            FontAttributes="{OnPlatform iOS=Bold}"
-                            FontWeight="500"
-                            HorizontalTextAlignment="Center"
-                            Margin="14,10,14,0"/>
-                        <controls:ExtendedCollectionView
-                            ItemsSource="{Binding LoginRequests}"
-                            ItemTemplate="{StaticResource loginRequestTemplate}"
-                            SelectionMode="Single"
-                            IsVisible="{Binding HasLoginRequests}"
-                            ExtraDataForLogging="Login requests page" >
-                            <controls:ExtendedCollectionView.Behaviors>
-                                <xct:EventToCommandBehavior
-                                    EventName="SelectionChanged"
-                                    Command="{Binding AnswerRequestCommand}"
-                                    EventArgsConverter="{StaticResource SelectionChangedEventArgsConverter}" />
-                            </controls:ExtendedCollectionView.Behaviors>
-                        </controls:ExtendedCollectionView>
-                    </StackLayout>
+                    <controls:ExtendedCollectionView
+                        ItemsSource="{Binding LoginRequests}"
+                        ItemTemplate="{StaticResource loginRequestTemplate}"
+                        SelectionMode="Single"
+                        ExtraDataForLogging="Login requests page" >
+                        <controls:ExtendedCollectionView.Behaviors>
+                            <xct:EventToCommandBehavior
+                                EventName="SelectionChanged"
+                                Command="{Binding AnswerRequestCommand}"
+                                EventArgsConverter="{StaticResource SelectionChangedEventArgsConverter}" />
+                        </controls:ExtendedCollectionView.Behaviors>
+                    </controls:ExtendedCollectionView>
                 </RefreshView>
                 <controls:IconLabelButton
                         VerticalOptions="End"
                         Margin="10,0"
                         Icon="{Binding Source={x:Static core:BitwardenIcons.Trash}}"
                         Label="{u:I18n DeclineAllRequests}"
-                        ButtonCommand="{Binding DeclineAllRequestsCommand}"
-                        IsVisible="{Binding HasLoginRequests}"
-                        AutomationId="DeleteAllRequestsButton" />
+                        ButtonCommand="{Binding DeclineAllRequestsCommand}"/>
             </StackLayout>
         </ResourceDictionary>
     </ContentPage.Resources>

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

@@ -1,12 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
-using Bit.App.Utilities;
 using Bit.Core.Abstractions;
 using Bit.Core.Models.Response;
 using Bit.Core.Utilities;
-using Xamarin.Essentials;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -27,8 +24,6 @@ namespace Bit.App.Pages
         {
             base.OnAppearing();
             await LoadOnAppearedAsync(_mainLayout, false, _vm.RefreshAsync, _mainContent);
-
-            UpdatePlaceholder();
         }
 
         private async void Close_Clicked(object sender, System.EventArgs e)
@@ -38,22 +33,6 @@ namespace Bit.App.Pages
                 await Navigation.PopModalAsync();
             }
         }
-
-        public override async Task UpdateOnThemeChanged()
-        {
-            await base.UpdateOnThemeChanged();
-
-            UpdatePlaceholder();
-        }
-
-        private void UpdatePlaceholder()
-        {
-            if (Device.RuntimePlatform == Device.Android)
-            {
-                MainThread.BeginInvokeOnMainThread(() =>
-                    _emptyPlaceholder.Source = ImageSource.FromFile(ThemeManager.UsingLightTheme ? "empty_login_requests" : "empty_login_requests_dark"));
-            }
-        }
     }
 }
 

src/App/Pages/Settings/LoginPasswordlessRequestsListViewModel.cs

@@ -9,7 +9,6 @@ using Bit.Core.Abstractions;
 using Bit.Core.Models.Response;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -57,14 +56,16 @@ namespace Bit.App.Pages
             set => SetProperty(ref _isRefreshing, value);
         }
 
-        public bool HasLoginRequests => LoginRequests.Any();
-
         public async Task RefreshAsync()
         {
             try
             {
                 IsRefreshing = true;
                 LoginRequests.ReplaceRange(await _authService.GetActivePasswordlessLoginRequestsAsync());
+                if (!LoginRequests.Any())
+                {
+                    Page.Navigation.PopModalAsync().FireAndForget();
+                }
             }
             catch (Exception ex)
             {
@@ -73,7 +74,6 @@ namespace Bit.App.Pages
             finally
             {
                 IsRefreshing = false;
-                MainThread.BeginInvokeOnMainThread(() => TriggerPropertyChanged(nameof(HasLoginRequests)));
             }
         }
 
@@ -136,3 +136,4 @@ namespace Bit.App.Pages
         }
     }
 }
+

src/App/Pages/Settings/OptionsPage.xaml

@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<pages:BaseContentPage 
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="Bit.App.Pages.OptionsPage"
+    xmlns:pages="clr-namespace:Bit.App.Pages"
+    xmlns:u="clr-namespace:Bit.App.Utilities"
+    x:DataType="pages:OptionsPageViewModel"
+    Title="{Binding PageTitle}">
+
+    <ContentPage.BindingContext>
+        <pages:OptionsPageViewModel />
+    </ContentPage.BindingContext>
+
+    <ContentPage.ToolbarItems>
+        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
+    </ContentPage.ToolbarItems>
+
+    <ScrollView Padding="0, 0, 0, 20">
+        <StackLayout Padding="0" Spacing="20">
+            <StackLayout StyleClass="box">
+                <StackLayout StyleClass="box-row, box-row-input, box-row-input-options-platform">
+                    <Label
+                        Text="{u:I18n Theme}"
+                        StyleClass="box-label" />
+                    <Picker
+                        x:Name="_themePicker"
+                        ItemsSource="{Binding ThemeOptions, Mode=OneTime}"
+                        SelectedIndex="{Binding ThemeSelectedIndex}"
+                        StyleClass="box-value"
+                        AutomationId="ThemeSelectorPicker" />
+                </StackLayout>
+                <Label
+                    StyleClass="box-footer-label"
+                    Text="{u:I18n ThemeDescription}" />
+            </StackLayout>
+            <StackLayout
+                StyleClass="box"
+                IsVisible="{Binding ShowAutoDarkThemeOptions}">
+                <StackLayout StyleClass="box-row, box-row-input, box-row-input-options-platform">
+                    <Label
+                        Text="{u:I18n DefaultDarkTheme}"
+                        StyleClass="box-label" />
+                    <Picker
+                        x:Name="_autoDarkThemePicker"
+                        ItemsSource="{Binding AutoDarkThemeOptions, Mode=OneTime}"
+                        SelectedIndex="{Binding AutoDarkThemeSelectedIndex}"
+                        StyleClass="box-value"
+                        AutomationId="DefaultDarkThemePicker" />
+                </StackLayout>
+                <Label
+                    StyleClass="box-footer-label"
+                    Text="{u:I18n DefaultDarkThemeDescription}" />
+            </StackLayout>
+            <StackLayout StyleClass="box">
+                <StackLayout StyleClass="box-row, box-row-input, box-row-input-options-platform">
+                    <Label
+                        Text="{u:I18n DefaultUriMatchDetection}"
+                        StyleClass="box-label" />
+                    <Picker
+                        x:Name="_uriMatchPicker"
+                        ItemsSource="{Binding UriMatchOptions, Mode=OneTime}"
+                        SelectedIndex="{Binding UriMatchSelectedIndex}"
+                        StyleClass="box-value"
+                        AutomationId="DefaultUriMatchDetectionPicker" />
+                </StackLayout>
+                <Label
+                    Text="{u:I18n DefaultUriMatchDetectionDescription}"
+                    StyleClass="box-footer-label" />
+            </StackLayout>
+            <StackLayout StyleClass="box">
+                <StackLayout StyleClass="box-row, box-row-input, box-row-input-options-platform">
+                    <Label
+                        Text="{u:I18n ClearClipboard}"
+                        StyleClass="box-label" />
+                    <Picker
+                        x:Name="_clearClipboardPicker"
+                        ItemsSource="{Binding ClearClipboardOptions, Mode=OneTime}"
+                        SelectedIndex="{Binding ClearClipboardSelectedIndex}"
+                        StyleClass="box-value"
+                        AutomationId="ClearClipboardPicker" />
+                </StackLayout>
+                <Label
+                    Text="{u:I18n ClearClipboardDescription}"
+                    StyleClass="box-footer-label" />
+            </StackLayout>
+            <StackLayout StyleClass="box">
+                <StackLayout StyleClass="box-row, box-row-input, box-row-input-options-platform">
+                    <Label
+                        Text="{u:I18n Language}"
+                        StyleClass="box-label" />
+                    <Picker
+                        x:Name="_languagePicker"
+                        ItemsSource="{Binding LocalesOptions, Mode=OneTime}"
+                        SelectedItem="{Binding SelectedLocale}"
+                        ItemDisplayBinding="{Binding Value}"
+                        StyleClass="box-value"
+                        AutomationId="LanguagePicker" />
+                </StackLayout>
+                <Label
+                    Text="{u:I18n LanguageChangeRequiresAppRestart}"
+                    StyleClass="box-footer-label" />
+            </StackLayout>
+            <StackLayout StyleClass="box">
+                <StackLayout StyleClass="box-row, box-row-switch">
+                    <Label
+                        Text="{u:I18n CopyTotpAutomatically}"
+                        StyleClass="box-label-regular"
+                        HorizontalOptions="StartAndExpand" />
+                    <Switch
+                        IsToggled="{Binding AutoTotpCopy}"
+                        StyleClass="box-value"
+                        HorizontalOptions="End"
+                        AutomationId="CopyTotpAutomaticallyToggle" />
+                </StackLayout>
+                <Label
+                    Text="{u:I18n CopyTotpAutomaticallyDescription}"
+                    StyleClass="box-footer-label, box-footer-label-switch" />
+            </StackLayout>
+            <StackLayout StyleClass="box">
+                <StackLayout StyleClass="box-row, box-row-switch">
+                    <Label
+                        Text="{u:I18n ShowWebsiteIcons}"
+                        StyleClass="box-label-regular"
+                        HorizontalOptions="StartAndExpand" />
+                    <Switch
+                        IsToggled="{Binding Favicon}"
+                        StyleClass="box-value"
+                        HorizontalOptions="End"
+                        AutomationId="ShowWebsiteIconsToggle" />
+                </StackLayout>
+                <Label
+                    Text="{u:I18n ShowWebsiteIconsDescription}"
+                    StyleClass="box-footer-label, box-footer-label-switch" />
+            </StackLayout>
+            <StackLayout StyleClass="box" IsVisible="{Binding ShowAndroidAutofillSettings}">
+                <StackLayout StyleClass="box-row-header">
+                    <Label Text="{u:I18n AutofillService, Header=True}"
+                            StyleClass="box-header, box-header-platform" />
+                </StackLayout>
+                <StackLayout StyleClass="box-row, box-row-switch">
+                    <Label
+                        Text="{u:I18n AskToAddLogin}"
+                        StyleClass="box-label-regular"
+                        HorizontalOptions="StartAndExpand" />
+                    <Switch
+                        IsToggled="{Binding AutofillSavePrompt}"
+                        StyleClass="box-value"
+                        HorizontalOptions="End" />
+                </StackLayout>
+                <Label
+                    Text="{u:I18n AskToAddLoginDescription}"
+                    StyleClass="box-footer-label, box-footer-label-switch" />
+            </StackLayout>
+            <StackLayout StyleClass="box" IsVisible="{Binding ShowAndroidAutofillSettings}">
+                <StackLayout.GestureRecognizers>
+                    <TapGestureRecognizer Command="{Binding GoToBlockAutofillUrisCommand}" />
+                </StackLayout.GestureRecognizers>
+                <Label
+                    Text="{u:I18n BlockAutoFill}"
+                    StyleClass="box-label-regular" />
+                <Label
+                    Text="{u:I18n AutoFillWillNotBeOfferedForTheseURIs}"
+                    StyleClass="box-footer-label" />
+            </StackLayout>
+        </StackLayout>
+    </ScrollView>
+
+</pages:BaseContentPage>

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

@@ -0,0 +1,53 @@
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+using Xamarin.Forms;
+using Xamarin.Forms.PlatformConfiguration;
+using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
+
+namespace Bit.App.Pages
+{
+    public partial class OptionsPage : BaseContentPage
+    {
+        private readonly IAutofillHandler _autofillHandler;
+        private readonly OptionsPageViewModel _vm;
+
+        public OptionsPage()
+        {
+            _autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();
+            InitializeComponent();
+            _vm = BindingContext as OptionsPageViewModel;
+            _vm.Page = this;
+            _themePicker.ItemDisplayBinding = new Binding("Value");
+            _autoDarkThemePicker.ItemDisplayBinding = new Binding("Value");
+            _uriMatchPicker.ItemDisplayBinding = new Binding("Value");
+            _clearClipboardPicker.ItemDisplayBinding = new Binding("Value");
+            if (Device.RuntimePlatform == Device.Android)
+            {
+                ToolbarItems.RemoveAt(0);
+                _vm.ShowAndroidAutofillSettings = _autofillHandler.SupportsAutofillService();
+            }
+            else
+            {
+                _themePicker.On<iOS>().SetUpdateMode(UpdateMode.WhenFinished);
+                _autoDarkThemePicker.On<iOS>().SetUpdateMode(UpdateMode.WhenFinished);
+                _uriMatchPicker.On<iOS>().SetUpdateMode(UpdateMode.WhenFinished);
+                _clearClipboardPicker.On<iOS>().SetUpdateMode(UpdateMode.WhenFinished);
+                _languagePicker.On<iOS>().SetUpdateMode(UpdateMode.WhenFinished);
+            }
+        }
+
+        protected async override void OnAppearing()
+        {
+            base.OnAppearing();
+            await _vm.InitAsync();
+        }
+
+        private async void Close_Clicked(object sender, System.EventArgs e)
+        {
+            if (DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
+    }
+}

src/App/Pages/Settings/OptionsPageViewModel.cs

@@ -0,0 +1,300 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using Bit.App.Resources;
+using Bit.App.Utilities;
+using Bit.Core.Abstractions;
+using Bit.Core.Enums;
+using Bit.Core.Utilities;
+using Xamarin.CommunityToolkit.ObjectModel;
+using Xamarin.Forms;
+
+namespace Bit.App.Pages
+{
+    public class OptionsPageViewModel : BaseViewModel
+    {
+        private readonly IStateService _stateService;
+        private readonly IMessagingService _messagingService;
+        private readonly II18nService _i18nService;
+        private readonly IPlatformUtilsService _platformUtilsService;
+
+        private bool _autofillSavePrompt;
+        private bool _favicon;
+        private bool _autoTotpCopy;
+        private int _clearClipboardSelectedIndex;
+        private int _themeSelectedIndex;
+        private int _autoDarkThemeSelectedIndex;
+        private int _uriMatchSelectedIndex;
+        private KeyValuePair<string, string> _selectedLocale;
+        private bool _inited;
+        private bool _updatingAutofill;
+        private bool _showAndroidAutofillSettings;
+
+        public OptionsPageViewModel()
+        {
+            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
+            _i18nService = ServiceContainer.Resolve<II18nService>();
+            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>();
+
+            PageTitle = AppResources.Options;
+            var iosIos = Device.RuntimePlatform == Device.iOS;
+
+            ClearClipboardOptions = new List<KeyValuePair<int?, string>>
+            {
+                new KeyValuePair<int?, string>(null, AppResources.Never),
+                new KeyValuePair<int?, string>(10, AppResources.TenSeconds),
+                new KeyValuePair<int?, string>(20, AppResources.TwentySeconds),
+                new KeyValuePair<int?, string>(30, AppResources.ThirtySeconds),
+                new KeyValuePair<int?, string>(60, AppResources.OneMinute)
+            };
+            if (!iosIos)
+            {
+                ClearClipboardOptions.Add(new KeyValuePair<int?, string>(120, AppResources.TwoMinutes));
+                ClearClipboardOptions.Add(new KeyValuePair<int?, string>(300, AppResources.FiveMinutes));
+            }
+            ThemeOptions = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string, string>(null, AppResources.ThemeDefault),
+                new KeyValuePair<string, string>(ThemeManager.Light, AppResources.Light),
+                new KeyValuePair<string, string>(ThemeManager.Dark, AppResources.Dark),
+                new KeyValuePair<string, string>(ThemeManager.Black, AppResources.Black),
+                new KeyValuePair<string, string>(ThemeManager.Nord, AppResources.Nord),
+                new KeyValuePair<string, string>(ThemeManager.SolarizedDark, AppResources.SolarizedDark),
+            };
+            AutoDarkThemeOptions = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string, string>(ThemeManager.Dark, AppResources.Dark),
+                new KeyValuePair<string, string>(ThemeManager.Black, AppResources.Black),
+                new KeyValuePair<string, string>(ThemeManager.Nord, AppResources.Nord),
+                new KeyValuePair<string, string>(ThemeManager.SolarizedDark, AppResources.SolarizedDark),
+            };
+            UriMatchOptions = new List<KeyValuePair<UriMatchType?, string>>
+            {
+                new KeyValuePair<UriMatchType?, string>(UriMatchType.Domain, AppResources.BaseDomain),
+                new KeyValuePair<UriMatchType?, string>(UriMatchType.Host, AppResources.Host),
+                new KeyValuePair<UriMatchType?, string>(UriMatchType.StartsWith, AppResources.StartsWith),
+                new KeyValuePair<UriMatchType?, string>(UriMatchType.RegularExpression, AppResources.RegEx),
+                new KeyValuePair<UriMatchType?, string>(UriMatchType.Exact, AppResources.Exact),
+                new KeyValuePair<UriMatchType?, string>(UriMatchType.Never, AppResources.Never),
+            };
+            LocalesOptions = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string, string>(null, AppResources.DefaultSystem)
+            };
+            LocalesOptions.AddRange(_i18nService.LocaleNames.ToList());
+
+            GoToBlockAutofillUrisCommand = new AsyncCommand(() => Page.Navigation.PushAsync(new BlockAutofillUrisPage()),
+                onException: ex => HandleException(ex),
+                allowsMultipleExecutions: false);
+        }
+
+        public List<KeyValuePair<int?, string>> ClearClipboardOptions { get; set; }
+        public List<KeyValuePair<string, string>> ThemeOptions { get; set; }
+        public List<KeyValuePair<string, string>> AutoDarkThemeOptions { get; set; }
+        public List<KeyValuePair<UriMatchType?, string>> UriMatchOptions { get; set; }
+        public List<KeyValuePair<string, string>> LocalesOptions { get; }
+
+        public int ClearClipboardSelectedIndex
+        {
+            get => _clearClipboardSelectedIndex;
+            set
+            {
+                if (SetProperty(ref _clearClipboardSelectedIndex, value))
+                {
+                    SaveClipboardChangedAsync().FireAndForget();
+                }
+            }
+        }
+
+        public int ThemeSelectedIndex
+        {
+            get => _themeSelectedIndex;
+            set
+            {
+                if (SetProperty(ref _themeSelectedIndex, value,
+                        additionalPropertyNames: new[] { nameof(ShowAutoDarkThemeOptions) })
+                   )
+                {
+                    SaveThemeAsync().FireAndForget();
+                }
+            }
+        }
+
+        public bool ShowAutoDarkThemeOptions => ThemeOptions[ThemeSelectedIndex].Key == null;
+
+        public int AutoDarkThemeSelectedIndex
+        {
+            get => _autoDarkThemeSelectedIndex;
+            set
+            {
+                if (SetProperty(ref _autoDarkThemeSelectedIndex, value))
+                {
+                    SaveThemeAsync().FireAndForget();
+                }
+            }
+        }
+
+        public int UriMatchSelectedIndex
+        {
+            get => _uriMatchSelectedIndex;
+            set
+            {
+                if (SetProperty(ref _uriMatchSelectedIndex, value))
+                {
+                    SaveDefaultUriAsync().FireAndForget();
+                }
+            }
+        }
+
+        public KeyValuePair<string, string> SelectedLocale
+        {
+            get => _selectedLocale;
+            set
+            {
+                if (SetProperty(ref _selectedLocale, value))
+                {
+                    UpdateCurrentLocaleAsync().FireAndForget();
+                }
+            }
+        }
+
+        public bool Favicon
+        {
+            get => _favicon;
+            set
+            {
+                if (SetProperty(ref _favicon, value))
+                {
+                    UpdateFaviconAsync().FireAndForget();
+                }
+            }
+        }
+
+        public bool AutoTotpCopy
+        {
+            get => _autoTotpCopy;
+            set
+            {
+                if (SetProperty(ref _autoTotpCopy, value))
+                {
+                    UpdateAutoTotpCopyAsync().FireAndForget();
+                }
+            }
+        }
+
+        public bool AutofillSavePrompt
+        {
+            get => _autofillSavePrompt;
+            set
+            {
+                if (SetProperty(ref _autofillSavePrompt, value))
+                {
+                    UpdateAutofillSavePromptAsync().FireAndForget();
+                }
+            }
+        }
+
+        public bool ShowAndroidAutofillSettings
+        {
+            get => _showAndroidAutofillSettings;
+            set => SetProperty(ref _showAndroidAutofillSettings, value);
+        }
+
+        public ICommand GoToBlockAutofillUrisCommand { get; }
+
+        public async Task InitAsync()
+        {
+            AutofillSavePrompt = !(await _stateService.GetAutofillDisableSavePromptAsync()).GetValueOrDefault();
+
+            AutoTotpCopy = !(await _stateService.GetDisableAutoTotpCopyAsync() ?? false);
+
+            Favicon = !(await _stateService.GetDisableFaviconAsync()).GetValueOrDefault();
+
+            var theme = await _stateService.GetThemeAsync();
+            ThemeSelectedIndex = ThemeOptions.FindIndex(k => k.Key == theme);
+
+            var autoDarkTheme = await _stateService.GetAutoDarkThemeAsync() ?? "dark";
+            AutoDarkThemeSelectedIndex = AutoDarkThemeOptions.FindIndex(k => k.Key == autoDarkTheme);
+
+            var defaultUriMatch = await _stateService.GetDefaultUriMatchAsync();
+            UriMatchSelectedIndex = defaultUriMatch == null ? 0 :
+                UriMatchOptions.FindIndex(k => (int?)k.Key == defaultUriMatch);
+
+            var clearClipboard = await _stateService.GetClearClipboardAsync();
+            ClearClipboardSelectedIndex = ClearClipboardOptions.FindIndex(k => k.Key == clearClipboard);
+
+            var appLocale = _stateService.GetLocale();
+            SelectedLocale = appLocale == null ? LocalesOptions.First() : LocalesOptions.FirstOrDefault(kv => kv.Key == appLocale);
+
+            _inited = true;
+        }
+
+        private async Task UpdateAutoTotpCopyAsync()
+        {
+            if (_inited)
+            {
+                // TODO: [PS-961] Fix negative function names
+                await _stateService.SetDisableAutoTotpCopyAsync(!AutoTotpCopy);
+            }
+        }
+
+        private async Task UpdateFaviconAsync()
+        {
+            if (_inited)
+            {
+                // TODO: [PS-961] Fix negative function names
+                await _stateService.SetDisableFaviconAsync(!Favicon);
+            }
+        }
+
+        private async Task SaveClipboardChangedAsync()
+        {
+            if (_inited && ClearClipboardSelectedIndex > -1)
+            {
+                await _stateService.SetClearClipboardAsync(ClearClipboardOptions[ClearClipboardSelectedIndex].Key);
+            }
+        }
+
+        private async Task SaveThemeAsync()
+        {
+            if (_inited && ThemeSelectedIndex > -1)
+            {
+                await _stateService.SetThemeAsync(ThemeOptions[ThemeSelectedIndex].Key);
+                await _stateService.SetAutoDarkThemeAsync(AutoDarkThemeOptions[AutoDarkThemeSelectedIndex].Key);
+                ThemeManager.SetTheme(Application.Current.Resources);
+                _messagingService.Send("updatedTheme");
+            }
+        }
+
+        private async Task SaveDefaultUriAsync()
+        {
+            if (_inited && UriMatchSelectedIndex > -1)
+            {
+                await _stateService.SetDefaultUriMatchAsync((int?)UriMatchOptions[UriMatchSelectedIndex].Key);
+            }
+        }
+
+        private async Task UpdateAutofillSavePromptAsync()
+        {
+            if (_inited)
+            {
+                // TODO: [PS-961] Fix negative function names
+                await _stateService.SetAutofillDisableSavePromptAsync(!AutofillSavePrompt);
+            }
+        }
+
+        private async Task UpdateCurrentLocaleAsync()
+        {
+            if (!_inited)
+            {
+                return;
+            }
+
+            _stateService.SetLocale(SelectedLocale.Key);
+
+            await _platformUtilsService.ShowDialogAsync(string.Format(AppResources.LanguageChangeXDescription, SelectedLocale.Value), AppResources.Language, AppResources.Ok);
+        }
+    }
+}

src/App/Pages/Settings/OtherSettingsPage.xaml

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<pages:BaseContentPage
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    x:DataType="pages:OtherSettingsPageViewModel"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    x:Class="Bit.App.Pages.OtherSettingsPage"
-    Title="{u:I18n Other}">
-    
-    <ContentPage.BindingContext>
-        <pages:OtherSettingsPageViewModel />
-    </ContentPage.BindingContext>
-
-    <ContentPage.Resources>
-        <u:InverseBoolConverter x:Key="inverseBoolConverter" />
-    </ContentPage.Resources>
-
-    <ScrollView Padding="0, 0, 0, 20">
-        <StackLayout Padding="0" Spacing="5">
-            <controls:SwitchItemView
-                Title="{u:I18n EnableSyncOnRefresh}"
-                IsToggled="{Binding EnableSyncOnRefresh}"
-                Subtitle="{u:I18n EnableSyncOnRefreshDescription}"
-                AutomationId="SyncOnRefreshSwitch"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand" />
-
-            <StackLayout StyleClass="box" Margin="0,12,0,0">
-                <Button
-                    Text="{u:I18n SyncNow}"
-                    Command="{Binding SyncCommand}"
-                    AutomationId="SyncNowButton"></Button>
-                <Label
-                    Text="{Binding LastSyncDisplay}"
-                    StyleClass="text-muted, text-sm"
-                    HorizontalTextAlignment="Start"
-                    Margin="0,10"
-                    AutomationId="LastSyncLabel" />
-            </StackLayout>
-
-            <controls:SettingChooserItemView
-                Title="{u:I18n ClearClipboard}"
-                Subtitle="{u:I18n ClearClipboardDescription}"
-                DisplayValue="{Binding ClearClipboardPickerViewModel.SelectedValue}"
-                ChooseCommand="{Binding ClearClipboardPickerViewModel.SelectOptionCommand}"
-                AutomationId="ClearClipboardChooser"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand"/>
-            
-            <controls:SwitchItemView
-                Title="{u:I18n AllowScreenCapture}"
-                IsToggled="{Binding IsScreenCaptureAllowed}"
-                IsEnabled="{Binding CanToggleeScreenCaptureAllowed}"
-                IsVisible="{OnPlatform Android=True, iOS=False}"
-                AutomationId="AllowScreenCaptureSwitch"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand" />
-            
-            <controls:SwitchItemView
-                Title="{u:I18n ConnectToWatch}"
-                IsToggled="{Binding ShouldConnectToWatch}"
-                IsEnabled="{Binding CanToggleShouldConnectToWatch}"
-                IsVisible="{OnPlatform iOS=True, Android=False}"
-                AutomationId="ConnectToWatchSwitch"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand" />
-
-        </StackLayout>
-    </ScrollView>
-
-</pages:BaseContentPage>

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

@@ -1,44 +0,0 @@
-using System;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
-
-namespace Bit.App.Pages
-{
-    public partial class OtherSettingsPage : BaseContentPage
-    {
-        private OtherSettingsPageViewModel _vm;
-
-        public OtherSettingsPage()
-        {
-            InitializeComponent();
-            _vm = BindingContext as OtherSettingsPageViewModel;
-            _vm.Page = this;
-        }
-
-        protected async override void OnAppearing()
-        {
-            base.OnAppearing();
-
-            try
-            {
-                _vm.SubscribeEvents();
-                await _vm.InitAsync();
-            }
-            catch (Exception ex)
-            {
-                LoggerHelper.LogEvenIfCantBeResolved(ex);
-                ServiceContainer.Resolve<IPlatformUtilsService>().ShowToast(null, null, AppResources.AnErrorHasOccurred);
-
-                Navigation.PopAsync().FireAndForget();
-            }
-        }
-
-        protected override void OnDisappearing()
-        {
-            base.OnDisappearing();
-            _vm.UnsubscribeEvents();
-        }
-    }
-}

src/App/Pages/Settings/OtherSettingsPageViewModel.cs

@@ -1,245 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Abstractions;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public class OtherSettingsPageViewModel : BaseViewModel
-    {
-        private const int CLEAR_CLIPBOARD_NEVER_OPTION = -1;
-
-        private readonly IDeviceActionService _deviceActionService;
-        private readonly IPlatformUtilsService _platformUtilsService;
-        private readonly IStateService _stateService;
-        private readonly ISyncService _syncService;
-        private readonly ILocalizeService _localizeService;
-        private readonly IWatchDeviceService _watchDeviceService;
-        private readonly ILogger _logger;
-
-        private string _lastSyncDisplay = "--";
-        private bool _inited;
-        private bool _syncOnRefresh;
-        private bool _isScreenCaptureAllowed;
-        private bool _shouldConnectToWatch;
-
-        public OtherSettingsPageViewModel()
-        {
-            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>();
-            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>();
-            _stateService = ServiceContainer.Resolve<IStateService>();
-            _syncService = ServiceContainer.Resolve<ISyncService>();
-            _localizeService = ServiceContainer.Resolve<ILocalizeService>();
-            _watchDeviceService = ServiceContainer.Resolve<IWatchDeviceService>();
-            _logger = ServiceContainer.Resolve<ILogger>();
-
-            SyncCommand = CreateDefaultAsyncCommnad(SyncAsync, _ => _inited);
-            ToggleIsScreenCaptureAllowedCommand = CreateDefaultAsyncCommnad(ToggleIsScreenCaptureAllowedAsync, _ => _inited);
-            ToggleShouldConnectToWatchCommand = CreateDefaultAsyncCommnad(ToggleShouldConnectToWatchAsync, _ => _inited);
-
-            ClearClipboardPickerViewModel = new PickerViewModel<int>(
-                _deviceActionService,
-                _logger,
-                OnClearClipboardChangingAsync,
-                AppResources.ClearClipboard,
-                _ => _inited,
-                ex => HandleException(ex));
-        }
-
-        public bool EnableSyncOnRefresh
-        {
-            get => _syncOnRefresh;
-            set
-            {
-                if (SetProperty(ref _syncOnRefresh, value))
-                {
-                    UpdateSyncOnRefreshAsync().FireAndForget();
-                }
-            }
-        }
-
-        public string LastSyncDisplay
-        {
-            get => $"{AppResources.LastSync} {_lastSyncDisplay}";
-            set => SetProperty(ref _lastSyncDisplay, value);
-        }
-
-        public PickerViewModel<int> ClearClipboardPickerViewModel { get; }
-
-        public bool IsScreenCaptureAllowed
-        {
-            get => _isScreenCaptureAllowed;
-            set
-            {
-                if (SetProperty(ref _isScreenCaptureAllowed, value))
-                {
-                    ((ICommand)ToggleIsScreenCaptureAllowedCommand).Execute(null);
-                }
-            }
-        }
-
-        public bool CanToggleeScreenCaptureAllowed => ToggleIsScreenCaptureAllowedCommand.CanExecute(null);
-
-        public bool ShouldConnectToWatch
-        {
-            get => _shouldConnectToWatch;
-            set
-            {
-                if (SetProperty(ref _shouldConnectToWatch, value))
-                {
-                    ((ICommand)ToggleShouldConnectToWatchCommand).Execute(null);
-                }
-            }
-        }
-
-        public bool CanToggleShouldConnectToWatch => ToggleShouldConnectToWatchCommand.CanExecute(null);
-
-        public AsyncCommand SyncCommand { get; }
-        public AsyncCommand ToggleIsScreenCaptureAllowedCommand { get; }
-        public AsyncCommand ToggleShouldConnectToWatchCommand { get; }
-
-        public async Task InitAsync()
-        {
-            await SetLastSyncAsync();
-
-            EnableSyncOnRefresh = await _stateService.GetSyncOnRefreshAsync();
-
-            await InitClearClipboardAsync();
-
-            _isScreenCaptureAllowed = await _stateService.GetScreenCaptureAllowedAsync();
-            _shouldConnectToWatch = await _stateService.GetShouldConnectToWatchAsync();
-
-            _inited = true;
-
-            MainThread.BeginInvokeOnMainThread(() =>
-            {
-                TriggerPropertyChanged(nameof(IsScreenCaptureAllowed));
-                TriggerPropertyChanged(nameof(ShouldConnectToWatch));
-                SyncCommand.RaiseCanExecuteChanged();
-                ClearClipboardPickerViewModel.SelectOptionCommand.RaiseCanExecuteChanged();
-                ToggleIsScreenCaptureAllowedCommand.RaiseCanExecuteChanged();
-                ToggleShouldConnectToWatchCommand.RaiseCanExecuteChanged();
-            });
-        }
-
-        private async Task InitClearClipboardAsync()
-        {
-            var clearClipboardOptions = new Dictionary<int, string>
-            {
-                [CLEAR_CLIPBOARD_NEVER_OPTION] = AppResources.Never,
-                [10] = AppResources.TenSeconds,
-                [20] = AppResources.TwentySeconds,
-                [30] = AppResources.ThirtySeconds,
-                [60] = AppResources.OneMinute
-            };
-            if (Device.RuntimePlatform != Device.iOS)
-            {
-                clearClipboardOptions.Add(120, AppResources.TwoMinutes);
-                clearClipboardOptions.Add(300, AppResources.FiveMinutes);
-            }
-
-            var clearClipboard = await _stateService.GetClearClipboardAsync() ?? CLEAR_CLIPBOARD_NEVER_OPTION;
-
-            ClearClipboardPickerViewModel.Init(clearClipboardOptions, clearClipboard, CLEAR_CLIPBOARD_NEVER_OPTION);
-        }
-
-        public async Task UpdateSyncOnRefreshAsync()
-        {
-            if (_inited)
-            {
-                await _stateService.SetSyncOnRefreshAsync(_syncOnRefresh);
-            }
-        }
-
-        public async Task SetLastSyncAsync()
-        {
-            var last = await _syncService.GetLastSyncAsync();
-            if (last is null)
-            {
-                LastSyncDisplay = AppResources.Never;
-                return;
-            }
-
-            var localDate = last.Value.ToLocalTime();
-            LastSyncDisplay = string.Format("{0} {1}",
-                _localizeService.GetLocaleShortDate(localDate),
-                _localizeService.GetLocaleShortTime(localDate));
-        }
-
-        public async Task SyncAsync()
-        {
-            if (!await HasConnectivityAsync())
-            {
-                return;
-            }
-
-            await _deviceActionService.ShowLoadingAsync(AppResources.Syncing);
-            await _syncService.SyncPasswordlessLoginRequestsAsync();
-            var success = await _syncService.FullSyncAsync(true);
-            await _deviceActionService.HideLoadingAsync();
-            if (!success)
-            {
-                await Page.DisplayAlert(null, AppResources.SyncingFailed, AppResources.Ok);
-                return;
-            }
-
-            await SetLastSyncAsync();
-            _platformUtilsService.ShowToast("success", null, AppResources.SyncingComplete);
-        }
-
-        private async Task<bool> OnClearClipboardChangingAsync(int optionKey)
-        {
-            await _stateService.SetClearClipboardAsync(optionKey == CLEAR_CLIPBOARD_NEVER_OPTION ? (int?)null : optionKey);
-            return true;
-        }
-
-        private async Task ToggleIsScreenCaptureAllowedAsync()
-        {
-            if (IsScreenCaptureAllowed
-                &&
-                !await Page.DisplayAlert(AppResources.AllowScreenCapture, AppResources.AreYouSureYouWantToEnableScreenCapture, AppResources.Yes, AppResources.No))
-            {
-                _isScreenCaptureAllowed = !IsScreenCaptureAllowed;
-                TriggerPropertyChanged(nameof(IsScreenCaptureAllowed));
-                return;
-            }
-
-            await _stateService.SetScreenCaptureAllowedAsync(IsScreenCaptureAllowed);
-            await _deviceActionService.SetScreenCaptureAllowedAsync();
-        }
-
-        private async Task ToggleShouldConnectToWatchAsync()
-        {
-            await _watchDeviceService.SetShouldConnectToWatchAsync(ShouldConnectToWatch);
-        }
-
-        private void ToggleIsScreenCaptureAllowedCommand_CanExecuteChanged(object sender, EventArgs e)
-        {
-            TriggerPropertyChanged(nameof(CanToggleeScreenCaptureAllowed));
-        }
-
-        private void ToggleShouldConnectToWatchCommand_CanExecuteChanged(object sender, EventArgs e)
-        {
-            TriggerPropertyChanged(nameof(CanToggleShouldConnectToWatch));
-        }
-
-        internal void SubscribeEvents()
-        {
-            ToggleIsScreenCaptureAllowedCommand.CanExecuteChanged += ToggleIsScreenCaptureAllowedCommand_CanExecuteChanged;
-            ToggleShouldConnectToWatchCommand.CanExecuteChanged += ToggleShouldConnectToWatchCommand_CanExecuteChanged;
-        }
-
-        internal void UnsubscribeEvents()
-        {
-            ToggleIsScreenCaptureAllowedCommand.CanExecuteChanged -= ToggleIsScreenCaptureAllowedCommand_CanExecuteChanged;
-            ToggleShouldConnectToWatchCommand.CanExecuteChanged -= ToggleShouldConnectToWatchCommand_CanExecuteChanged;
-        }
-    }
-}

src/App/Pages/Settings/SecuritySettingsPage.xaml

@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<pages:BaseContentPage
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    x:DataType="pages:SecuritySettingsPageViewModel"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:ios="clr-namespace:Xamarin.Forms.PlatformConfiguration.iOSSpecific;assembly=Xamarin.Forms.Core"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    x:Class="Bit.App.Pages.SecuritySettingsPage"
-    Title="{u:I18n AccountSecurity}">
-    
-    <ContentPage.BindingContext>
-        <pages:SecuritySettingsPageViewModel />
-    </ContentPage.BindingContext>
-    
-    <ContentPage.Resources>
-        <u:IsNotNullConverter x:Key="isNotNullConverter" />
-    </ContentPage.Resources>
-
-    <ScrollView Padding="0, 0, 0, 20">
-        <StackLayout Padding="0" Spacing="5">
-            <controls:CustomLabel
-                Text="{u:I18n ApproveLoginRequests}"
-                StyleClass="settings-header" />
-
-            <controls:SwitchItemView
-                Title="{u:I18n UseThisDeviceToApproveLoginRequestsMadeFromOtherDevices}"
-                IsToggled="{Binding UseThisDeviceToApproveLoginRequests}"
-                AutomationId="ApproveLoginRequestsMadeFromOtherDevicesSwitch"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand" />
-
-            <controls:CustomLabel
-                Text="{u:I18n PendingLogInRequests}"
-                StyleClass="settings-navigatable-label"
-                IsVisible="{Binding UseThisDeviceToApproveLoginRequests}"
-                AutomationId="PendingLogInRequestsLabel">
-                <Label.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding GoToPendingLogInRequestsCommand}" />
-                </Label.GestureRecognizers>
-            </controls:CustomLabel>
-
-            <BoxView StyleClass="settings-box-row-separator" />
-            
-            <controls:CustomLabel
-                Text="{u:I18n UnlockOptions}"
-                StyleClass="settings-header" />
-                
-            <controls:SwitchItemView
-                Title="{Binding UnlockWithBiometricsTitle}"
-                IsToggled="{Binding CanUnlockWithBiometrics}"
-                IsVisible="{Binding UnlockWithBiometricsTitle, Converter={StaticResource isNotNullConverter}}"
-                AutomationId="CanUnlockWithBiometricsSwitch"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand" />
-
-            <controls:SwitchItemView
-                Title="{u:I18n UnlockWithPIN}"
-                IsToggled="{Binding CanUnlockWithPin}"
-                AutomationId="CanUnlockWithPinSwitch"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand" />
-            
-            <BoxView StyleClass="settings-box-row-separator" />
-            
-            <controls:CustomLabel
-                Text="{u:I18n SessionTimeout}"
-                StyleClass="settings-header" />
-            
-            <Frame
-                IsVisible="{Binding ShowVaultTimeoutPolicyInfo}"
-                Padding="10"
-                HasShadow="False"
-                BackgroundColor="Transparent"
-                BorderColor="{DynamicResource PrimaryColor}"
-                AutomationId="VaultTimeoutPolicyLabel"
-                Margin="16,5">
-                <Label
-                    Text="{Binding VaultTimeoutPolicyDescription}"
-                    StyleClass="text-muted, text-sm, text-bold"
-                    HorizontalTextAlignment="Center" />
-            </Frame>
-
-            <controls:SettingChooserItemView
-                Title="{u:I18n SessionTimeout}"
-                DisplayValue="{Binding VaultTimeoutPickerViewModel.SelectedValue}"
-                ChooseCommand="{Binding VaultTimeoutPickerViewModel.SelectOptionCommand}"
-                AutomationId="VaultTimeoutChooser"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand"/>
-
-            <controls:BaseSettingItemView
-                Title="{u:I18n Custom}"
-                IsVisible="{Binding ShowCustomVaultTimeoutPicker}"
-                AutomationId="CustomVaultTimeoutChooser"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand"
-                ControlTemplate="{StaticResource SettingControlTemplate}">
-                <TimePicker Time="{Binding CustomVaultTimeoutTime}" Format="HH:mm"
-                            FontSize="Small"
-                            TextColor="{DynamicResource MutedColor}"
-                            StyleClass="list-sub" Margin="-5"
-                            HorizontalOptions="End"
-                            ios:TimePicker.UpdateMode="WhenFinished"
-                            AutomationId="SettingCustomVaultTimeoutPicker"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{Binding CustomVaultTimeoutTimeVerbalized}"/>
-            </controls:BaseSettingItemView>
-            
-            <controls:SettingChooserItemView
-                Title="{u:I18n SessionTimeoutAction}"
-                Subtitle="{Binding SetUpUnlockMethodLabel}"
-                DisplayValue="{Binding VaultTimeoutActionPickerViewModel.SelectedValue}"
-                ChooseCommand="{Binding VaultTimeoutActionPickerViewModel.SelectOptionCommand}"
-                IsEnabled="{Binding IsVaultTimeoutActionLockAllowed}"
-                AutomationId="VaultTimeoutActionChooser"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand"/>
-            
-            <BoxView StyleClass="settings-box-row-separator" />
-            
-            <controls:CustomLabel
-                Text="{u:I18n Other}"
-                StyleClass="settings-header" />
-            
-            <controls:CustomLabel
-                Text="{u:I18n AccountFingerprintPhrase}"
-                StyleClass="settings-navigatable-label"
-                AutomationId="AccountFingerprintPhraseLabel">
-                <Label.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding ShowAccountFingerprintPhraseCommand}" />
-                </Label.GestureRecognizers>
-            </controls:CustomLabel>
-
-            <controls:ExternalLinkItemView
-                Title="{u:I18n TwoStepLogin}"
-                GoToLinkCommand="{Binding GoToTwoStepLoginCommand}"
-                StyleClass="settings-external-link-item"
-                HorizontalOptions="FillAndExpand"
-                AutomationId="TwoStepLoginLinkItemView" />
-
-            <controls:ExternalLinkItemView
-                Title="{u:I18n ChangeMasterPassword}"
-                GoToLinkCommand="{Binding GoToChangeMasterPasswordCommand}"
-                IsVisible="{Binding ShowChangeMasterPassword}"
-                StyleClass="settings-external-link-item"
-                HorizontalOptions="FillAndExpand"
-                AutomationId="ChangeMasterPasswordLinkItemView" />
-            
-            <controls:CustomLabel
-                Text="{u:I18n LockNow}"
-                IsVisible="{Binding IsVaultTimeoutActionLockAllowed}"
-                StyleClass="settings-navigatable-label"
-                AutomationId="LockNowLabel">
-                <Label.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding LockCommand}" />
-                </Label.GestureRecognizers>
-            </controls:CustomLabel>
-            
-            <controls:CustomLabel
-                Text="{u:I18n LogOut}"
-                StyleClass="settings-navigatable-label"
-                AutomationId="LogOutLabel">
-                <Label.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding LogOutCommand}" />
-                </Label.GestureRecognizers>
-            </controls:CustomLabel>
-            
-            <controls:CustomLabel
-                Text="{u:I18n DeleteAccount}"
-                StyleClass="settings-navigatable-label"
-                AutomationId="DeleteAccountLabel">
-                <Label.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding DeleteAccountCommand}" />
-                </Label.GestureRecognizers>
-            </controls:CustomLabel>
-
-        </StackLayout>
-    </ScrollView>
-</pages:BaseContentPage>

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

@@ -1,37 +0,0 @@
-using System;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
-
-namespace Bit.App.Pages
-{
-    public partial class SecuritySettingsPage : BaseContentPage
-    {
-        private SecuritySettingsPageViewModel _vm;
-
-        public SecuritySettingsPage()
-        {
-            InitializeComponent();
-            _vm = BindingContext as SecuritySettingsPageViewModel;
-            _vm.Page = this;
-        }
-
-        protected async override void OnAppearing()
-        {
-            base.OnAppearing();
-
-            try
-            {
-                await _vm.InitAsync();
-            }
-            catch (Exception ex)
-            {
-                LoggerHelper.LogEvenIfCantBeResolved(ex);
-                ServiceContainer.Resolve<IPlatformUtilsService>().ShowToast(null, null, AppResources.AnErrorHasOccurred);
-
-                Navigation.PopAsync().FireAndForget();
-            }
-        }
-    }
-}

src/App/Pages/Settings/SecuritySettingsPageViewModel.cs

@@ -1,569 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Abstractions;
-using Bit.App.Pages.Accounts;
-using Bit.App.Resources;
-using Bit.App.Utilities;
-using Bit.Core;
-using Bit.Core.Abstractions;
-using Bit.Core.Enums;
-using Bit.Core.Models.Domain;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public class SecuritySettingsPageViewModel : BaseViewModel
-    {
-        private const int NEVER_SESSION_TIMEOUT_VALUE = -2;
-        private const int CUSTOM_VAULT_TIMEOUT_VALUE = -100;
-
-        private readonly IStateService _stateService;
-        private readonly IPushNotificationService _pushNotificationService;
-        private readonly IPlatformUtilsService _platformUtilsService;
-        private readonly IDeviceActionService _deviceActionService;
-        private readonly IVaultTimeoutService _vaultTimeoutService;
-        private readonly IBiometricService _biometricsService;
-        private readonly IUserPinService _userPinService;
-        private readonly ICryptoService _cryptoService;
-        private readonly IUserVerificationService _userVerificationService;
-        private readonly IPolicyService _policyService;
-        private readonly IMessagingService _messagingService;
-        private readonly IEnvironmentService _environmentService;
-        private readonly ILogger _logger;
-
-        private bool _inited;
-        private bool _useThisDeviceToApproveLoginRequests;
-        private bool _supportsBiometric, _canUnlockWithBiometrics;
-        private bool _canUnlockWithPin;
-        private bool _hasMasterPassword;
-        private int? _maximumVaultTimeoutPolicy;
-        private string _vaultTimeoutActionPolicy;
-        private TimeSpan? _customVaultTimeoutTime;
-
-        public SecuritySettingsPageViewModel()
-        {
-            _stateService = ServiceContainer.Resolve<IStateService>();
-            _pushNotificationService = ServiceContainer.Resolve<IPushNotificationService>();
-            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>();
-            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>();
-            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>();
-            _biometricsService = ServiceContainer.Resolve<IBiometricService>();
-            _userPinService = ServiceContainer.Resolve<IUserPinService>();
-            _cryptoService = ServiceContainer.Resolve<ICryptoService>();
-            _userVerificationService = ServiceContainer.Resolve<IUserVerificationService>();
-            _policyService = ServiceContainer.Resolve<IPolicyService>();
-            _messagingService = ServiceContainer.Resolve<IMessagingService>();
-            _environmentService = ServiceContainer.Resolve<IEnvironmentService>();
-            _logger = ServiceContainer.Resolve<ILogger>();
-
-            VaultTimeoutPickerViewModel = new PickerViewModel<int>(
-                _deviceActionService,
-                _logger,
-                OnVaultTimeoutChangingAsync,
-                AppResources.SessionTimeout,
-                _ => _inited,
-                ex => HandleException(ex));
-            VaultTimeoutPickerViewModel.SetAfterSelectionChanged(_ => MainThread.InvokeOnMainThreadAsync(TriggerUpdateCustomVaultTimeoutPicker));
-
-            VaultTimeoutActionPickerViewModel = new PickerViewModel<VaultTimeoutAction>(
-                _deviceActionService,
-                _logger,
-                OnVaultTimeoutActionChangingAsync,
-                AppResources.SessionTimeoutAction,
-                _ => _inited && !HasVaultTimeoutActionPolicy && IsVaultTimeoutActionLockAllowed,
-                ex => HandleException(ex));
-
-            ToggleUseThisDeviceToApproveLoginRequestsCommand = CreateDefaultAsyncCommnad(ToggleUseThisDeviceToApproveLoginRequestsAsync, _ => _inited);
-            GoToPendingLogInRequestsCommand = CreateDefaultAsyncCommnad(() => Page.Navigation.PushModalAsync(new NavigationPage(new LoginPasswordlessRequestsListPage())));
-            ToggleCanUnlockWithBiometricsCommand = CreateDefaultAsyncCommnad(ToggleCanUnlockWithBiometricsAsync, _ => _inited);
-            ToggleCanUnlockWithPinCommand = CreateDefaultAsyncCommnad(ToggleCanUnlockWithPinAsync, _ => _inited);
-            ShowAccountFingerprintPhraseCommand = CreateDefaultAsyncCommnad(ShowAccountFingerprintPhraseAsync);
-            GoToTwoStepLoginCommand = CreateDefaultAsyncCommnad(() => GoToWebVaultSettingsAsync(AppResources.TwoStepLoginDescriptionLong, AppResources.ContinueToWebApp));
-            GoToChangeMasterPasswordCommand = CreateDefaultAsyncCommnad(() => GoToWebVaultSettingsAsync(AppResources.ChangeMasterPasswordDescriptionLong, AppResources.ContinueToWebApp));
-            LockCommand = CreateDefaultAsyncCommnad(() => _vaultTimeoutService.LockAsync(true, true));
-            LogOutCommand = CreateDefaultAsyncCommnad(LogOutAsync);
-            DeleteAccountCommand = CreateDefaultAsyncCommnad(() => Page.Navigation.PushModalAsync(new NavigationPage(new DeleteAccountPage())));
-        }
-
-        public bool UseThisDeviceToApproveLoginRequests
-        {
-            get => _useThisDeviceToApproveLoginRequests;
-            set
-            {
-                if (SetProperty(ref _useThisDeviceToApproveLoginRequests, value))
-                {
-                    ((ICommand)ToggleUseThisDeviceToApproveLoginRequestsCommand).Execute(null);
-                }
-            }
-        }
-
-        public string UnlockWithBiometricsTitle
-        {
-            get
-            {
-                if (!_supportsBiometric)
-                {
-                    return null;
-                }
-
-                var biometricName = AppResources.Biometrics;
-                if (Device.RuntimePlatform == Device.iOS)
-                {
-                    biometricName = _deviceActionService.SupportsFaceBiometric()
-                        ? AppResources.FaceID
-                        : AppResources.TouchID;
-                }
-
-                return string.Format(AppResources.UnlockWith, biometricName);
-            }
-        }
-
-        public bool CanUnlockWithBiometrics
-        {
-            get => _canUnlockWithBiometrics;
-            set
-            {
-                TriggerVaultTimeoutActionLockAllowedPropertyChanged();
-                if (SetProperty(ref _canUnlockWithBiometrics, value))
-                {
-                    ((ICommand)ToggleCanUnlockWithBiometricsCommand).Execute(null);
-                }
-            }
-        }
-
-        public bool CanUnlockWithPin
-        {
-            get => _canUnlockWithPin;
-            set
-            {
-                TriggerVaultTimeoutActionLockAllowedPropertyChanged();
-                if (SetProperty(ref _canUnlockWithPin, value))
-                {
-                    ((ICommand)ToggleCanUnlockWithPinCommand).Execute(null);
-                }
-            }
-        }
-
-        public bool IsVaultTimeoutActionLockAllowed => _hasMasterPassword || _canUnlockWithBiometrics || _canUnlockWithPin;
-
-        public string SetUpUnlockMethodLabel => IsVaultTimeoutActionLockAllowed ? null : AppResources.SetUpAnUnlockOptionToChangeYourVaultTimeoutAction;
-
-        public TimeSpan? CustomVaultTimeoutTime
-        {
-            get => _customVaultTimeoutTime;
-            set
-            {
-                var oldValue = _customVaultTimeoutTime;
-
-                if (SetProperty(ref _customVaultTimeoutTime, value, additionalPropertyNames: new string[] { nameof(CustomVaultTimeoutTimeVerbalized) }) && value.HasValue)
-                {
-                    UpdateVaultTimeoutAsync((int)value.Value.TotalMinutes)
-                        .FireAndForget(ex =>
-                        {
-                            HandleException(ex);
-                            MainThread.BeginInvokeOnMainThread(() => SetProperty(ref _customVaultTimeoutTime, oldValue));
-                        });
-                }
-                TriggerVaultTimeoutActionLockAllowedPropertyChanged();
-            }
-        }
-
-        public string CustomVaultTimeoutTimeVerbalized => CustomVaultTimeoutTime?.Verbalize(A11yExtensions.TimeSpanVerbalizationMode.HoursAndMinutes);
-
-        public bool ShowCustomVaultTimeoutPicker => VaultTimeoutPickerViewModel.SelectedKey == CUSTOM_VAULT_TIMEOUT_VALUE;
-
-        public bool ShowVaultTimeoutPolicyInfo => _maximumVaultTimeoutPolicy.HasValue || HasVaultTimeoutActionPolicy;
-
-        public string VaultTimeoutPolicyDescription
-        {
-            get
-            {
-                if (!ShowVaultTimeoutPolicyInfo)
-                {
-                    return null;
-                }
-
-                static string LocalizeTimeoutAction(string actionPolicy)
-                {
-                    return actionPolicy == Policy.ACTION_LOCK ? AppResources.Lock : AppResources.LogOut;
-                };
-
-                if (!_maximumVaultTimeoutPolicy.HasValue)
-                {
-                    return string.Format(AppResources.VaultTimeoutActionPolicyInEffect, LocalizeTimeoutAction(_vaultTimeoutActionPolicy));
-                }
-
-                var hours = Math.Floor((float)_maximumVaultTimeoutPolicy / 60);
-                var minutes = _maximumVaultTimeoutPolicy % 60;
-
-                return string.IsNullOrWhiteSpace(_vaultTimeoutActionPolicy)
-                    ? string.Format(AppResources.VaultTimeoutPolicyInEffect, hours, minutes)
-                    : string.Format(AppResources.VaultTimeoutPolicyWithActionInEffect, hours, minutes, LocalizeTimeoutAction(_vaultTimeoutActionPolicy));
-            }
-        }
-
-        public bool ShowChangeMasterPassword { get; private set; }
-
-        private int? CurrentVaultTimeout => GetRawVaultTimeoutFrom(VaultTimeoutPickerViewModel.SelectedKey);
-
-        private bool IncludeLinksWithSubscriptionInfo => Device.RuntimePlatform != Device.iOS;
-
-        private bool HasVaultTimeoutActionPolicy => !string.IsNullOrEmpty(_vaultTimeoutActionPolicy);
-
-        public PickerViewModel<int> VaultTimeoutPickerViewModel { get; }
-        public PickerViewModel<VaultTimeoutAction> VaultTimeoutActionPickerViewModel { get; }
-
-        public AsyncCommand ToggleUseThisDeviceToApproveLoginRequestsCommand { get; }
-        public ICommand GoToPendingLogInRequestsCommand { get; }
-        public AsyncCommand ToggleCanUnlockWithBiometricsCommand { get; }
-        public AsyncCommand ToggleCanUnlockWithPinCommand { get; }
-        public ICommand ShowAccountFingerprintPhraseCommand { get; }
-        public ICommand GoToTwoStepLoginCommand { get; }
-        public ICommand GoToChangeMasterPasswordCommand { get; }
-        public ICommand LockCommand { get; }
-        public ICommand LogOutCommand { get; }
-        public ICommand DeleteAccountCommand { get; }
-
-        public async Task InitAsync()
-        {
-            var decryptionOptions = await _stateService.GetAccountDecryptionOptions();
-            // set default true for backwards compatibility
-            _hasMasterPassword = decryptionOptions?.HasMasterPassword ?? true;
-            _useThisDeviceToApproveLoginRequests = await _stateService.GetApprovePasswordlessLoginsAsync();
-            _supportsBiometric = await _platformUtilsService.SupportsBiometricAsync();
-            _canUnlockWithBiometrics = await _vaultTimeoutService.IsBiometricLockSetAsync();
-            _canUnlockWithPin = await _vaultTimeoutService.GetPinLockTypeAsync() != Core.Services.PinLockType.Disabled;
-
-            await LoadPoliciesAsync();
-            await InitVaultTimeoutPickerAsync();
-            await InitVaultTimeoutActionPickerAsync();
-
-            ShowChangeMasterPassword = IncludeLinksWithSubscriptionInfo && await _userVerificationService.HasMasterPasswordAsync();
-
-            _inited = true;
-
-            MainThread.BeginInvokeOnMainThread(() =>
-            {
-                TriggerPropertyChanged(nameof(UseThisDeviceToApproveLoginRequests));
-                TriggerPropertyChanged(nameof(UnlockWithBiometricsTitle));
-                TriggerPropertyChanged(nameof(CanUnlockWithBiometrics));
-                TriggerPropertyChanged(nameof(CanUnlockWithPin));
-                TriggerPropertyChanged(nameof(ShowVaultTimeoutPolicyInfo));
-                TriggerPropertyChanged(nameof(VaultTimeoutPolicyDescription));
-                TriggerPropertyChanged(nameof(ShowChangeMasterPassword));
-                TriggerUpdateCustomVaultTimeoutPicker();
-                TriggerVaultTimeoutActionLockAllowedPropertyChanged();
-                ToggleUseThisDeviceToApproveLoginRequestsCommand.RaiseCanExecuteChanged();
-                ToggleCanUnlockWithBiometricsCommand.RaiseCanExecuteChanged();
-                ToggleCanUnlockWithPinCommand.RaiseCanExecuteChanged();
-                VaultTimeoutPickerViewModel.SelectOptionCommand.RaiseCanExecuteChanged();
-                VaultTimeoutActionPickerViewModel.SelectOptionCommand.RaiseCanExecuteChanged();
-            });
-        }
-
-        private async Task LoadPoliciesAsync()
-        {
-            if (!await _policyService.PolicyAppliesToUser(PolicyType.MaximumVaultTimeout))
-            {
-                return;
-            }
-
-            var maximumVaultTimeoutPolicy = await _policyService.FirstOrDefault(PolicyType.MaximumVaultTimeout);
-            _maximumVaultTimeoutPolicy = maximumVaultTimeoutPolicy?.GetInt(Policy.MINUTES_KEY);
-            _vaultTimeoutActionPolicy = maximumVaultTimeoutPolicy?.GetString(Policy.ACTION_KEY);
-
-            MainThread.BeginInvokeOnMainThread(VaultTimeoutActionPickerViewModel.SelectOptionCommand.RaiseCanExecuteChanged);
-        }
-
-        private async Task InitVaultTimeoutPickerAsync()
-        {
-            var options = new Dictionary<int, string>
-            {
-                [0] = AppResources.Immediately,
-                [1] = AppResources.OneMinute,
-                [5] = AppResources.FiveMinutes,
-                [15] = AppResources.FifteenMinutes,
-                [30] = AppResources.ThirtyMinutes,
-                [60] = AppResources.OneHour,
-                [240] = AppResources.FourHours,
-                [-1] = AppResources.OnRestart,
-                [NEVER_SESSION_TIMEOUT_VALUE] = AppResources.Never
-            };
-
-            if (_maximumVaultTimeoutPolicy.HasValue)
-            {
-                options = options.Where(t => t.Key >= 0 && t.Key <= _maximumVaultTimeoutPolicy.Value)
-                                 .ToDictionary(v => v.Key, v => v.Value);
-            }
-
-            options.Add(CUSTOM_VAULT_TIMEOUT_VALUE, AppResources.Custom);
-
-            var vaultTimeout = await _vaultTimeoutService.GetVaultTimeout() ?? NEVER_SESSION_TIMEOUT_VALUE;
-            VaultTimeoutPickerViewModel.Init(options, vaultTimeout, CUSTOM_VAULT_TIMEOUT_VALUE, false);
-
-            if (VaultTimeoutPickerViewModel.SelectedKey == CUSTOM_VAULT_TIMEOUT_VALUE)
-            {
-                _customVaultTimeoutTime = TimeSpan.FromMinutes(vaultTimeout);
-            }
-            TriggerVaultTimeoutActionLockAllowedPropertyChanged();
-        }
-
-        private async Task InitVaultTimeoutActionPickerAsync()
-        {
-            var options = new Dictionary<VaultTimeoutAction, string>();
-            if (IsVaultTimeoutActionLockAllowed)
-            {
-                options.Add(VaultTimeoutAction.Lock, AppResources.Lock);
-            }
-            options.Add(VaultTimeoutAction.Logout, AppResources.LogOut);
-
-            var timeoutAction = await _vaultTimeoutService.GetVaultTimeoutAction() ?? VaultTimeoutAction.Lock;
-            if (!IsVaultTimeoutActionLockAllowed && timeoutAction == VaultTimeoutAction.Lock)
-            {
-                timeoutAction = VaultTimeoutAction.Logout;
-                await _vaultTimeoutService.SetVaultTimeoutOptionsAsync(CurrentVaultTimeout, VaultTimeoutAction.Logout);
-            }
-
-            VaultTimeoutActionPickerViewModel.Init(options, timeoutAction, IsVaultTimeoutActionLockAllowed ? VaultTimeoutAction.Lock : VaultTimeoutAction.Logout);
-            TriggerVaultTimeoutActionLockAllowedPropertyChanged();
-        }
-
-        private async Task ToggleUseThisDeviceToApproveLoginRequestsAsync()
-        {
-            if (UseThisDeviceToApproveLoginRequests
-                &&
-                !await Page.DisplayAlert(AppResources.ApproveLoginRequests, AppResources.UseThisDeviceToApproveLoginRequestsMadeFromOtherDevices, AppResources.Yes, AppResources.No))
-            {
-                _useThisDeviceToApproveLoginRequests = !UseThisDeviceToApproveLoginRequests;
-                MainThread.BeginInvokeOnMainThread(() => TriggerPropertyChanged(nameof(UseThisDeviceToApproveLoginRequests)));
-                return;
-            }
-
-            await _stateService.SetApprovePasswordlessLoginsAsync(UseThisDeviceToApproveLoginRequests);
-
-            if (!UseThisDeviceToApproveLoginRequests || await _pushNotificationService.AreNotificationsSettingsEnabledAsync())
-            {
-                return;
-            }
-
-            var openAppSettingsResult = await _platformUtilsService.ShowDialogAsync(
-                AppResources.ReceivePushNotificationsForNewLoginRequests,
-                string.Empty,
-                AppResources.Settings,
-                AppResources.NoThanks
-            );
-            if (openAppSettingsResult)
-            {
-                _deviceActionService.OpenAppSettings();
-            }
-        }
-
-        private async Task ToggleCanUnlockWithBiometricsAsync()
-        {
-            if (!_canUnlockWithBiometrics)
-            {
-                MainThread.BeginInvokeOnMainThread(() => TriggerPropertyChanged(nameof(CanUnlockWithBiometrics)));
-                await UpdateVaultTimeoutActionIfNeededAsync();
-                await _biometricsService.SetCanUnlockWithBiometricsAsync(CanUnlockWithBiometrics);
-                return;
-            }
-
-            if (!_supportsBiometric
-                ||
-                !await _platformUtilsService.AuthenticateBiometricAsync(null, Device.RuntimePlatform == Device.Android ? "." : null))
-            {
-                _canUnlockWithBiometrics = false;
-                MainThread.BeginInvokeOnMainThread(() => TriggerPropertyChanged(nameof(CanUnlockWithBiometrics)));
-                return;
-            }
-
-            await _biometricsService.SetCanUnlockWithBiometricsAsync(CanUnlockWithBiometrics);
-            await InitVaultTimeoutActionPickerAsync();
-        }
-
-        public async Task ToggleCanUnlockWithPinAsync()
-        {
-            if (!_canUnlockWithPin)
-            {
-                await _vaultTimeoutService.ClearAsync();
-                await UpdateVaultTimeoutActionIfNeededAsync();
-                return;
-            }
-
-            var newPin = await _deviceActionService.DisplayPromptAync(AppResources.EnterPIN,
-                AppResources.SetPINDescription, null, AppResources.Submit, AppResources.Cancel, true);
-            if (string.IsNullOrWhiteSpace(newPin))
-            {
-                _canUnlockWithPin = false;
-                MainThread.BeginInvokeOnMainThread(() => TriggerPropertyChanged(nameof(CanUnlockWithPin)));
-                return;
-            }
-
-            var requireMasterPasswordOnRestart = await _userVerificationService.HasMasterPasswordAsync()
-                                                 &&
-                                                 await _platformUtilsService.ShowDialogAsync(AppResources.PINRequireMasterPasswordRestart,
-                                                       AppResources.UnlockWithPIN,
-                                                       AppResources.Yes,
-                                                       AppResources.No);
-
-            await _userPinService.SetupPinAsync(newPin, requireMasterPasswordOnRestart);
-            await InitVaultTimeoutActionPickerAsync();
-        }
-
-        private async Task UpdateVaultTimeoutActionIfNeededAsync()
-        {
-            TriggerVaultTimeoutActionLockAllowedPropertyChanged();
-            if (IsVaultTimeoutActionLockAllowed)
-            {
-                return;
-            }
-
-            VaultTimeoutActionPickerViewModel.Select(VaultTimeoutAction.Logout);
-            await _vaultTimeoutService.SetVaultTimeoutOptionsAsync(CurrentVaultTimeout, VaultTimeoutAction.Logout);
-            _deviceActionService.Toast(AppResources.VaultTimeoutActionChangedToLogOut);
-        }
-
-        private async Task<bool> OnVaultTimeoutChangingAsync(int newTimeout)
-        {
-            if (newTimeout == NEVER_SESSION_TIMEOUT_VALUE
-                &&
-                !await _platformUtilsService.ShowDialogAsync(AppResources.NeverLockWarning, AppResources.Warning, AppResources.Yes, AppResources.Cancel))
-
-            {
-                return false;
-            }
-
-            if (newTimeout == CUSTOM_VAULT_TIMEOUT_VALUE)
-            {
-                _customVaultTimeoutTime = TimeSpan.FromMinutes(0);
-            }
-
-            return await UpdateVaultTimeoutAsync(newTimeout);
-        }
-
-        private async Task<bool> UpdateVaultTimeoutAsync(int newTimeout)
-        {
-            var rawTimeout = GetRawVaultTimeoutFrom(newTimeout);
-
-            if (rawTimeout > _maximumVaultTimeoutPolicy)
-            {
-                await _platformUtilsService.ShowDialogAsync(AppResources.VaultTimeoutToLarge, AppResources.Warning);
-                VaultTimeoutPickerViewModel.Select(_maximumVaultTimeoutPolicy.Value, false);
-
-                if (VaultTimeoutPickerViewModel.SelectedKey == CUSTOM_VAULT_TIMEOUT_VALUE)
-                {
-                    _customVaultTimeoutTime = TimeSpan.FromMinutes(_maximumVaultTimeoutPolicy.Value);
-                }
-
-                MainThread.BeginInvokeOnMainThread(TriggerUpdateCustomVaultTimeoutPicker);
-
-                return false;
-            }
-
-            await _vaultTimeoutService.SetVaultTimeoutOptionsAsync(rawTimeout, VaultTimeoutActionPickerViewModel.SelectedKey);
-
-            await _cryptoService.RefreshKeysAsync();
-
-            return true;
-        }
-
-        private void TriggerUpdateCustomVaultTimeoutPicker()
-        {
-            TriggerPropertyChanged(nameof(ShowCustomVaultTimeoutPicker));
-            TriggerPropertyChanged(nameof(CustomVaultTimeoutTime));
-        }
-
-        private void TriggerVaultTimeoutActionLockAllowedPropertyChanged()
-        {
-            MainThread.BeginInvokeOnMainThread(() =>
-            {
-                TriggerPropertyChanged(nameof(IsVaultTimeoutActionLockAllowed));
-                TriggerPropertyChanged(nameof(SetUpUnlockMethodLabel));
-                VaultTimeoutActionPickerViewModel.SelectOptionCommand.RaiseCanExecuteChanged();
-            });
-        }
-
-        private int? GetRawVaultTimeoutFrom(int vaultTimeoutPickerKey)
-        {
-            if (vaultTimeoutPickerKey == NEVER_SESSION_TIMEOUT_VALUE)
-            {
-                return null;
-            }
-
-            if (vaultTimeoutPickerKey == CUSTOM_VAULT_TIMEOUT_VALUE
-                &&
-                CustomVaultTimeoutTime.HasValue)
-            {
-                return (int)CustomVaultTimeoutTime.Value.TotalMinutes;
-            }
-
-            return vaultTimeoutPickerKey;
-        }
-
-        private async Task<bool> OnVaultTimeoutActionChangingAsync(VaultTimeoutAction timeoutActionKey)
-        {
-            if (!string.IsNullOrEmpty(_vaultTimeoutActionPolicy))
-            {
-                // do nothing if we have a policy set
-                return false;
-            }
-
-            if (timeoutActionKey == VaultTimeoutAction.Logout
-                &&
-                !await _platformUtilsService.ShowDialogAsync(AppResources.VaultTimeoutLogOutConfirmation, AppResources.Warning, AppResources.Yes, AppResources.Cancel))
-            {
-                return false;
-            }
-
-            await _vaultTimeoutService.SetVaultTimeoutOptionsAsync(CurrentVaultTimeout, timeoutActionKey);
-            _messagingService.Send(AppHelpers.VAULT_TIMEOUT_ACTION_CHANGED_MESSAGE_COMMAND);
-            TriggerVaultTimeoutActionLockAllowedPropertyChanged();
-            return true;
-        }
-
-        private async Task ShowAccountFingerprintPhraseAsync()
-        {
-            List<string> fingerprint;
-            try
-            {
-                fingerprint = await _cryptoService.GetFingerprintAsync(await _stateService.GetActiveUserIdAsync());
-            }
-            catch (Exception e) when (e.Message == "No public key available.")
-            {
-                return;
-            }
-
-            var phrase = string.Join("-", fingerprint);
-            var text = $"{AppResources.YourAccountsFingerprint}:\n\n{phrase}";
-
-            var learnMore = await _platformUtilsService.ShowDialogAsync(text, AppResources.FingerprintPhrase,
-                AppResources.LearnMore, AppResources.Close);
-            if (learnMore)
-            {
-                _platformUtilsService.LaunchUri(ExternalLinksConstants.HELP_FINGERPRINT_PHRASE);
-            }
-        }
-
-        private async Task GoToWebVaultSettingsAsync(string dialogText, string dialogTitle)
-        {
-            if (await _platformUtilsService.ShowDialogAsync(dialogText, dialogTitle, AppResources.Continue, AppResources.Cancel))
-            {
-                _platformUtilsService.LaunchUri(string.Format(ExternalLinksConstants.WEB_VAULT_SETTINGS_FORMAT, _environmentService.GetWebVaultUrl()));
-            }
-        }
-
-        public async Task LogOutAsync()
-        {
-            if (await _platformUtilsService.ShowDialogAsync(AppResources.LogoutConfirmation, AppResources.LogOut, AppResources.Yes, AppResources.Cancel))
-            {
-                _messagingService.Send(AccountsManagerMessageCommands.LOGOUT);
-            }
-        }
-    }
-}

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

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

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

@@ -6,27 +6,118 @@
              xmlns:controls="clr-namespace:Bit.App.Controls"
              xmlns:u="clr-namespace:Bit.App.Utilities"
              x:DataType="pages:SettingsPageViewModel"
-             Title="{u:I18n Settings}"
-             x:Name="_page">
+             Title="{Binding PageTitle}">
     <ContentPage.BindingContext>
         <pages:SettingsPageViewModel />
     </ContentPage.BindingContext>
 
-    <StackLayout BindableLayout.ItemsSource="{Binding SettingsItems}">
-        <BindableLayout.ItemTemplate>
-            <DataTemplate x:DataType="pages:SettingsPageListItem">
-                <StackLayout>
-                    <StackLayout.GestureRecognizers>
-                        <TapGestureRecognizer Command="{Binding BindingContext.ExecuteSettingItemCommand, Source={x:Reference _page}}"
-                                              CommandParameter="{Binding .}"/>
-                    </StackLayout.GestureRecognizers>
-                    <controls:CustomLabel
-                        Text="{Binding Name}"
-                        StyleClass="settings-navigatable-label"
-                        AutomationId="{Binding AutomationId}" />
-                    <BoxView StyleClass="box-row-separator" />
-                </StackLayout>
+    <ContentPage.Resources>
+        <ResourceDictionary>
+            <u:InverseBoolConverter x:Key="inverseBool" />
+            <u:StringHasValueConverter x:Key="stringHasValue" />
+
+            <DataTemplate
+                x:Key="regularTemplate"
+                x:DataType="pages:SettingsPageListItem">
+                <controls:ExtendedStackLayout Orientation="Horizontal"
+                             StyleClass="list-row, list-row-platform">
+                    <Frame
+                        IsVisible="{Binding UseFrame}"
+                        Padding="10"
+                        HasShadow="False"
+                        BackgroundColor="Transparent"
+                        BorderColor="{DynamicResource PrimaryColor}">
+                        <Label
+                            Text="{Binding Name, Mode=OneWay}"
+                            StyleClass="text-muted, text-sm, text-bold"
+                            HorizontalTextAlignment="Center" />
+                    </Frame>
+                    <controls:CustomLabel IsVisible="{Binding UseFrame, Converter={StaticResource inverseBool}}"
+                           Text="{Binding Name, Mode=OneWay}"
+                           LineBreakMode="{Binding LineBreakMode}"
+                           HorizontalOptions="StartAndExpand"
+                           VerticalOptions="CenterAndExpand"
+                           StyleClass="list-title"
+                           AutomationId="{Binding AutomationIdSettingName}" />
+                    <controls:CustomLabel  Text="{Binding SubLabel, Mode=OneWay}"
+                           IsVisible="{Binding ShowSubLabel}"
+                           HorizontalOptions="End"
+                           HorizontalTextAlignment="End"
+                           VerticalOptions="CenterAndExpand"
+                           TextColor="{Binding SubLabelColor}"
+                           StyleClass="list-sub"
+                           AutomationId="{Binding AutomationIdSettingStatus}" />
+                </controls:ExtendedStackLayout>
             </DataTemplate>
-        </BindableLayout.ItemTemplate>
-    </StackLayout>
+            <DataTemplate
+                x:Key="timePickerTemplate"
+                x:DataType="pages:SettingsPageListItem">
+                <controls:ExtendedStackLayout Orientation="Horizontal"
+                             StyleClass="list-row, list-row-platform">
+                    <Frame
+                        IsVisible="{Binding UseFrame}"
+                        Padding="10"
+                        HasShadow="False"
+                        BackgroundColor="Transparent"
+                        BorderColor="{DynamicResource PrimaryColor}"
+                        AutomationId="SettingActivePolicyTextLabel">
+                        <Label
+                            Text="{Binding Name, Mode=OneWay}"
+                            StyleClass="text-muted, text-sm, text-bold"
+                            HorizontalTextAlignment="Center" />
+                    </Frame>
+                    <Label IsVisible="{Binding UseFrame, Converter={StaticResource inverseBool}}"
+                           Text="{Binding Name, Mode=OneWay}"
+                           LineBreakMode="{Binding LineBreakMode}"
+                           HorizontalOptions="StartAndExpand"
+                           VerticalOptions="CenterAndExpand"
+                           StyleClass="list-title"/>
+                    <TimePicker Time="{Binding Time}" Format="HH:mm"
+                                PropertyChanged="OnTimePickerPropertyChanged"
+                                HorizontalOptions="End"
+                                VerticalOptions="Center"
+                                FontSize="Small"
+                                TextColor="{Binding SubLabelColor}"
+                                StyleClass="list-sub" Margin="-5"
+                                AutomationId="SettingCustomVaultTimeoutPicker" />
+                    <controls:ExtendedStackLayout.GestureRecognizers>
+			            <TapGestureRecognizer Tapped="ActivateTimePicker"/>
+		            </controls:ExtendedStackLayout.GestureRecognizers>
+                </controls:ExtendedStackLayout>
+	        </DataTemplate>
+
+            <DataTemplate
+                x:Key="headerTemplate"
+                x:DataType="pages:SettingsPageHeaderListItem">
+                <StackLayout
+                    Padding="0" Spacing="0" VerticalOptions="FillAndExpand"
+                    StyleClass="list-row-header-container, list-row-header-container-platform">
+                    <BoxView
+                        StyleClass="list-section-separator-top, list-section-separator-top-platform" />
+                    <StackLayout StyleClass="list-row-header, list-row-header-platform">
+                        <Label
+                            Text="{Binding Title}"
+                            StyleClass="list-header, list-header-platform" />
+                    </StackLayout>
+                    <BoxView StyleClass="list-section-separator-bottom, list-section-separator-bottom-platform" />
+                </StackLayout>
+	        </DataTemplate>
+
+            <pages:SettingsPageListItemSelector
+                x:Key="listItemDataTemplateSelector"
+                HeaderTemplate="{StaticResource headerTemplate}"
+                RegularTemplate="{StaticResource regularTemplate}"
+                TimePickerTemplate="{StaticResource timePickerTemplate}" />
+        </ResourceDictionary>
+    </ContentPage.Resources>
+
+    <controls:ExtendedCollectionView
+        ItemsSource="{Binding GroupedItems}"
+        VerticalOptions="FillAndExpand"
+        ItemTemplate="{StaticResource listItemDataTemplateSelector}"
+        SelectionMode="Single"
+        SelectionChanged="RowSelected"
+        StyleClass="list, list-platform"
+        ExtraDataForLogging="Settings Page" />
+
 </pages:BaseContentPage>

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

@@ -1,17 +1,33 @@
-using Xamarin.Forms;
+using System;
+using System.ComponentModel;
+using System.Linq;
+using System.Threading.Tasks;
+using Bit.App.Controls;
+using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
     public partial class SettingsPage : BaseContentPage
     {
         private readonly TabsPage _tabsPage;
+        private SettingsPageViewModel _vm;
 
         public SettingsPage(TabsPage tabsPage)
         {
             _tabsPage = tabsPage;
             InitializeComponent();
-            var vm = BindingContext as SettingsPageViewModel;
-            vm.Page = this;
+            _vm = BindingContext as SettingsPageViewModel;
+            _vm.Page = this;
+        }
+
+        public async Task InitAsync()
+        {
+            await _vm.InitAsync();
+        }
+
+        public void BuildList()
+        {
+            _vm.BuildList();
         }
 
         protected override bool OnBackButtonPressed()
@@ -23,5 +39,35 @@ namespace Bit.App.Pages
             }
             return base.OnBackButtonPressed();
         }
+
+        void ActivateTimePicker(object sender, EventArgs args)
+        {
+            var stackLayout = (ExtendedStackLayout)sender;
+            SettingsPageListItem item = (SettingsPageListItem)stackLayout.BindingContext;
+            if (item.ShowTimeInput)
+            {
+                var timePicker = stackLayout.Children.Where(x => x is TimePicker).FirstOrDefault();
+                ((TimePicker)timePicker)?.Focus();
+            }
+        }
+
+        async void OnTimePickerPropertyChanged(object sender, PropertyChangedEventArgs args)
+        {
+            var s = (TimePicker)sender;
+            var time = s.Time.TotalMinutes;
+            if (s.IsFocused && args.PropertyName == "Time")
+            {
+                await _vm.VaultTimeoutAsync(false, (int)time);
+            }
+        }
+
+        private void RowSelected(object sender, SelectionChangedEventArgs e)
+        {
+            ((ExtendedCollectionView)sender).SelectedItem = null;
+            if (e.CurrentSelection?.FirstOrDefault() is SettingsPageListItem item)
+            {
+                _vm?.ExecuteSettingItemCommand.Execute(item);
+            }
+        }
     }
 }

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

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

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

@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+
+namespace Bit.App.Pages
+{
+    public class SettingsPageListGroup : List<SettingsPageListItem>
+    {
+        public SettingsPageListGroup(List<SettingsPageListItem> groupItems, string name, bool doUpper = true,
+            bool first = false)
+        {
+            AddRange(groupItems);
+            if (string.IsNullOrWhiteSpace(name))
+            {
+                Name = "-";
+            }
+            else if (doUpper)
+            {
+                Name = name.ToUpperInvariant();
+            }
+            else
+            {
+                Name = name;
+            }
+            First = first;
+        }
+
+        public bool First { get; set; }
+        public string Name { get; set; }
+    }
+}

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

@@ -1,29 +1,51 @@
 using System;
+using System.Globalization;
 using System.Threading.Tasks;
 using Bit.App.Resources;
+using Bit.App.Utilities;
 using Bit.App.Utilities.Automation;
+using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
-    public class SettingsPageListItem
+    public class SettingsPageListItem : ISettingsPageListItem
     {
-        private readonly string _nameResourceKey;
+        public string Icon { get; set; }
+        public string Name { get; set; }
+        public string SubLabel { get; set; }
+        public TimeSpan? Time { get; set; }
+        public bool UseFrame { get; set; }
+        public Func<Task> ExecuteAsync { get; set; }
 
-        public SettingsPageListItem(string nameResourceKey, Func<Task> executeAsync)
-        {
-            _nameResourceKey = nameResourceKey;
-            ExecuteAsync = executeAsync;
-        }
+        public bool SubLabelTextEnabled => SubLabel == AppResources.On;
+        public string LineBreakMode => SubLabel == null ? "TailTruncation" : "";
+        public bool ShowSubLabel => SubLabel.Length != 0;
+        public bool ShowTimeInput => Time != null;
+        public Color SubLabelColor => SubLabelTextEnabled ?
+            ThemeManager.GetResourceColor("SuccessColor") :
+            ThemeManager.GetResourceColor("MutedColor");
 
-        public string Name => AppResources.ResourceManager.GetString(_nameResourceKey);
-
-        public Func<Task> ExecuteAsync { get; }
-
-        public string AutomationId
+        public string AutomationIdSettingName
         {
             get
             {
-                return AutomationIdsHelper.AddSuffixFor(AutomationIdsHelper.ToEnglishTitleCase(_nameResourceKey), SuffixType.Cell);
+                return AutomationIdsHelper.AddSuffixFor(
+                    UseFrame ? "EnabledPolicy"
+                             : AutomationIdsHelper.ToEnglishTitleCase(Name)
+                    , SuffixType.Cell);
+            }
+        }
+
+        public string AutomationIdSettingStatus
+        {
+            get
+            {
+                if (UseFrame)
+                {
+                    return null;
+                }
+
+                return AutomationIdsHelper.AddSuffixFor(AutomationIdsHelper.ToEnglishTitleCase(Name), SuffixType.SettingValue);
             }
         }
     }

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

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

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

@@ -1,6 +1,15 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
+using Bit.App.Abstractions;
+using Bit.App.Pages.Accounts;
 using Bit.App.Resources;
+using Bit.Core.Abstractions;
+using Bit.Core.Enums;
+using Bit.Core.Models.Domain;
+using Bit.Core.Services;
+using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;
 
@@ -8,30 +17,887 @@ namespace Bit.App.Pages
 {
     public class SettingsPageViewModel : BaseViewModel
     {
+        private readonly IPlatformUtilsService _platformUtilsService;
+        private readonly ICryptoService _cryptoService;
+        private readonly IStateService _stateService;
+        private readonly IDeviceActionService _deviceActionService;
+        private readonly IAutofillHandler _autofillHandler;
+        private readonly IEnvironmentService _environmentService;
+        private readonly IMessagingService _messagingService;
+        private readonly IVaultTimeoutService _vaultTimeoutService;
+        private readonly ISyncService _syncService;
+        private readonly IBiometricService _biometricService;
+        private readonly IPolicyService _policyService;
+        private readonly ILocalizeService _localizeService;
+        private readonly IUserVerificationService _userVerificationService;
+        private readonly IClipboardService _clipboardService;
+        private readonly ILogger _loggerService;
+        private readonly IPushNotificationService _pushNotificationService;
+        private readonly IAuthService _authService;
+        private readonly IWatchDeviceService _watchDeviceService;
+        private const int CustomVaultTimeoutValue = -100;
+
+        private bool _supportsBiometric;
+        private bool _pin;
+        private bool _biometric;
+        private bool _screenCaptureAllowed;
+        private string _lastSyncDate;
+        private string _vaultTimeoutDisplayValue;
+        private string _vaultTimeoutActionDisplayValue;
+        private bool _showChangeMasterPassword;
+        private bool _reportLoggingEnabled;
+        private bool _approvePasswordlessLoginRequests;
+        private bool _shouldConnectToWatch;
+        private bool _hasMasterPassword;
+        private readonly static List<KeyValuePair<string, int?>> VaultTimeoutOptions =
+            new List<KeyValuePair<string, int?>>
+            {
+                new KeyValuePair<string, int?>(AppResources.Immediately, 0),
+                new KeyValuePair<string, int?>(AppResources.OneMinute, 1),
+                new KeyValuePair<string, int?>(AppResources.FiveMinutes, 5),
+                new KeyValuePair<string, int?>(AppResources.FifteenMinutes, 15),
+                new KeyValuePair<string, int?>(AppResources.ThirtyMinutes, 30),
+                new KeyValuePair<string, int?>(AppResources.OneHour, 60),
+                new KeyValuePair<string, int?>(AppResources.FourHours, 240),
+                new KeyValuePair<string, int?>(AppResources.OnRestart, -1),
+                new KeyValuePair<string, int?>(AppResources.Never, null),
+                new KeyValuePair<string, int?>(AppResources.Custom, CustomVaultTimeoutValue),
+            };
+        private readonly static List<KeyValuePair<string, VaultTimeoutAction>> VaultTimeoutActionOptions =
+            new List<KeyValuePair<string, VaultTimeoutAction>>
+            {
+                new KeyValuePair<string, VaultTimeoutAction>(AppResources.Lock, VaultTimeoutAction.Lock),
+                new KeyValuePair<string, VaultTimeoutAction>(AppResources.LogOut, VaultTimeoutAction.Logout),
+            };
+
+        private Policy _vaultTimeoutPolicy;
+        private int? _vaultTimeout;
+        private List<KeyValuePair<string, int?>> _vaultTimeoutOptions = VaultTimeoutOptions;
+        private List<KeyValuePair<string, VaultTimeoutAction>> _vaultTimeoutActionOptions = VaultTimeoutActionOptions;
+
         public SettingsPageViewModel()
         {
-            ExecuteSettingItemCommand = new AsyncCommand<SettingsPageListItem>(item => item.ExecuteAsync(),
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
+            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
+            _cryptoService = ServiceContainer.Resolve<ICryptoService>("cryptoService");
+            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();
+            _environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
+            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
+            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
+            _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
+            _biometricService = ServiceContainer.Resolve<IBiometricService>("biometricService");
+            _policyService = ServiceContainer.Resolve<IPolicyService>("policyService");
+            _localizeService = ServiceContainer.Resolve<ILocalizeService>("localizeService");
+            _userVerificationService = ServiceContainer.Resolve<IUserVerificationService>();
+            _clipboardService = ServiceContainer.Resolve<IClipboardService>("clipboardService");
+            _loggerService = ServiceContainer.Resolve<ILogger>("logger");
+            _pushNotificationService = ServiceContainer.Resolve<IPushNotificationService>();
+            _authService = ServiceContainer.Resolve<IAuthService>();
+            _watchDeviceService = ServiceContainer.Resolve<IWatchDeviceService>();
+            GroupedItems = new ObservableRangeCollection<ISettingsPageListItem>();
+            PageTitle = AppResources.Settings;
 
-            SettingsItems = new List<SettingsPageListItem>
-            {
-                new SettingsPageListItem(nameof(AppResources.AccountSecurity), () => NavigateToAsync(new SecuritySettingsPage())),
-                new SettingsPageListItem(nameof(AppResources.Autofill), () => NavigateToAsync(new AutofillSettingsPage())),
-                new SettingsPageListItem(nameof(AppResources.Vault), () => NavigateToAsync(new VaultSettingsPage())),
-                new SettingsPageListItem(nameof(AppResources.Appearance), () => NavigateToAsync(new AppearanceSettingsPage())),
-                new SettingsPageListItem(nameof(AppResources.Other), () => NavigateToAsync(new OtherSettingsPage())),
-                new SettingsPageListItem(nameof(AppResources.About), () => NavigateToAsync(new AboutSettingsPage()))
-            };
+            ExecuteSettingItemCommand = new AsyncCommand<SettingsPageListItem>(item => item.ExecuteAsync(), onException: _loggerService.Exception, allowsMultipleExecutions: false);
         }
 
-        public List<SettingsPageListItem> SettingsItems { get; }
+        private bool IsVaultTimeoutActionLockAllowed => _hasMasterPassword || _biometric || _pin;
+
+        public ObservableRangeCollection<ISettingsPageListItem> GroupedItems { get; set; }
 
         public IAsyncCommand<SettingsPageListItem> ExecuteSettingItemCommand { get; }
 
-        private async Task NavigateToAsync(Page page)
+        public async Task InitAsync()
         {
-            await Page.Navigation.PushAsync(page);
+            var decryptionOptions = await _stateService.GetAccountDecryptionOptions();
+            // set has true for backwards compatibility
+            _hasMasterPassword = decryptionOptions?.HasMasterPassword ?? true;
+            _supportsBiometric = await _platformUtilsService.SupportsBiometricAsync();
+            var lastSync = await _syncService.GetLastSyncAsync();
+            if (lastSync != null)
+            {
+                lastSync = lastSync.Value.ToLocalTime();
+                _lastSyncDate = string.Format("{0} {1}",
+                    _localizeService.GetLocaleShortDate(lastSync.Value),
+                    _localizeService.GetLocaleShortTime(lastSync.Value));
+            }
+
+            _vaultTimeoutPolicy = null;
+            _vaultTimeoutOptions = VaultTimeoutOptions;
+            _vaultTimeoutActionOptions = VaultTimeoutActionOptions;
+
+            _vaultTimeout = await _vaultTimeoutService.GetVaultTimeout();
+            _vaultTimeoutDisplayValue = _vaultTimeoutOptions.FirstOrDefault(o => o.Value == _vaultTimeout).Key;
+            _vaultTimeoutDisplayValue ??= _vaultTimeoutOptions.Where(o => o.Value == CustomVaultTimeoutValue).First().Key;
+
+
+            var pinSet = await _vaultTimeoutService.GetPinLockTypeAsync();
+            _pin = pinSet != PinLockType.Disabled;
+            _biometric = await _vaultTimeoutService.IsBiometricLockSetAsync();
+            var timeoutAction = await _vaultTimeoutService.GetVaultTimeoutAction() ?? VaultTimeoutAction.Lock;
+            if (!IsVaultTimeoutActionLockAllowed && timeoutAction == VaultTimeoutAction.Lock)
+            {
+                timeoutAction = VaultTimeoutAction.Logout;
+                await _vaultTimeoutService.SetVaultTimeoutOptionsAsync(_vaultTimeout, VaultTimeoutAction.Logout);
+            }
+            _vaultTimeoutActionDisplayValue = _vaultTimeoutActionOptions.FirstOrDefault(o => o.Value == timeoutAction).Key;
+
+            if (await _policyService.PolicyAppliesToUser(PolicyType.MaximumVaultTimeout))
+            {
+                // if we have a vault timeout policy, we need to filter the timeout options
+                _vaultTimeoutPolicy = (await _policyService.GetAll(PolicyType.MaximumVaultTimeout)).First();
+                var policyMinutes = _vaultTimeoutPolicy.GetInt(Policy.MINUTES_KEY);
+                _vaultTimeoutOptions = _vaultTimeoutOptions.Where(t =>
+                    t.Value <= policyMinutes &&
+                    (t.Value > 0 || t.Value == CustomVaultTimeoutValue) &&
+                    t.Value != null).ToList();
+            }
+            _screenCaptureAllowed = await _stateService.GetScreenCaptureAllowedAsync();
+
+            if (_vaultTimeoutDisplayValue == null)
+            {
+                _vaultTimeoutDisplayValue = AppResources.Custom;
+            }
+
+            _showChangeMasterPassword = IncludeLinksWithSubscriptionInfo() && await _userVerificationService.HasMasterPasswordAsync();
+            _reportLoggingEnabled = await _loggerService.IsEnabled();
+            _approvePasswordlessLoginRequests = await _stateService.GetApprovePasswordlessLoginsAsync();
+            _shouldConnectToWatch = await _stateService.GetShouldConnectToWatchAsync();
+
+            BuildList();
+        }
+
+        public async Task AboutAsync()
+        {
+            var debugText = string.Format("{0}: {1} ({2})", AppResources.Version,
+                _platformUtilsService.GetApplicationVersion(), _deviceActionService.GetBuildNumber());
+
+#if DEBUG
+            var pushNotificationsRegistered = ServiceContainer.Resolve<IPushNotificationService>("pushNotificationService").IsRegisteredForPush;
+            var pnServerRegDate = await _stateService.GetPushLastRegistrationDateAsync();
+            var pnServerError = await _stateService.GetPushInstallationRegistrationErrorAsync();
+
+            var pnServerRegDateMessage = default(DateTime) == pnServerRegDate ? "-" : $"{pnServerRegDate.GetValueOrDefault().ToShortDateString()}-{pnServerRegDate.GetValueOrDefault().ToShortTimeString()} UTC";
+            var errorMessage = string.IsNullOrEmpty(pnServerError) ? string.Empty : $"Push Notifications Server Registration error: {pnServerError}";
+
+            var text = string.Format("© Bitwarden Inc. 2015-{0}\n\n{1}\nPush Notifications registered:{2}\nPush Notifications Server Last Date :{3}\n{4}", DateTime.Now.Year, debugText, pushNotificationsRegistered, pnServerRegDateMessage, errorMessage);
+#else
+            var text = string.Format("© Bitwarden Inc. 2015-{0}\n\n{1}", DateTime.Now.Year, debugText);
+#endif
+
+            var copy = await _platformUtilsService.ShowDialogAsync(text, AppResources.Bitwarden, AppResources.Copy,
+                AppResources.Close);
+            if (copy)
+            {
+                await _clipboardService.CopyTextAsync(debugText);
+            }
+        }
+
+        public void Help()
+        {
+            _platformUtilsService.LaunchUri("https://bitwarden.com/help/");
+        }
+
+        public async Task FingerprintAsync()
+        {
+            List<string> fingerprint;
+            try
+            {
+                fingerprint = await _cryptoService.GetFingerprintAsync(await _stateService.GetActiveUserIdAsync());
+            }
+            catch (Exception e) when (e.Message == "No public key available.")
+            {
+                return;
+            }
+            var phrase = string.Join("-", fingerprint);
+            var text = string.Format("{0}:\n\n{1}", AppResources.YourAccountsFingerprint, phrase);
+            var learnMore = await _platformUtilsService.ShowDialogAsync(text, AppResources.FingerprintPhrase,
+                AppResources.LearnMore, AppResources.Close);
+            if (learnMore)
+            {
+                _platformUtilsService.LaunchUri("https://bitwarden.com/help/fingerprint-phrase/");
+            }
+        }
+
+        public void Rate()
+        {
+            _deviceActionService.RateApp();
+        }
+
+        public void Import()
+        {
+            _platformUtilsService.LaunchUri("https://bitwarden.com/help/import-data/");
+        }
+
+        public void WebVault()
+        {
+            _platformUtilsService.LaunchUri(_environmentService.GetWebVaultUrl());
+        }
+
+        public async Task ShareAsync()
+        {
+            var confirmed = await _platformUtilsService.ShowDialogAsync(AppResources.LearnOrgConfirmation,
+               AppResources.LearnOrg, AppResources.Yes, AppResources.Cancel);
+            if (confirmed)
+            {
+                _platformUtilsService.LaunchUri("https://bitwarden.com/help/about-organizations/");
+            }
+        }
+
+        public async Task TwoStepAsync()
+        {
+            var confirmed = await _platformUtilsService.ShowDialogAsync(AppResources.TwoStepLoginConfirmation,
+                AppResources.TwoStepLogin, AppResources.Yes, AppResources.Cancel);
+            if (confirmed)
+            {
+                _platformUtilsService.LaunchUri($"{_environmentService.GetWebVaultUrl()}/#/settings");
+            }
+        }
+
+        public async Task ChangePasswordAsync()
+        {
+            var confirmed = await _platformUtilsService.ShowDialogAsync(AppResources.ChangePasswordConfirmation,
+                AppResources.ChangeMasterPassword, AppResources.Yes, AppResources.Cancel);
+            if (confirmed)
+            {
+                _platformUtilsService.LaunchUri($"{_environmentService.GetWebVaultUrl()}/#/settings");
+            }
+        }
+
+        public async Task LogOutAsync()
+        {
+            var confirmed = await _platformUtilsService.ShowDialogAsync(AppResources.LogoutConfirmation,
+                AppResources.LogOut, AppResources.Yes, AppResources.Cancel);
+            if (confirmed)
+            {
+                _messagingService.Send("logout");
+            }
+        }
+
+        public async Task LockAsync()
+        {
+            await _vaultTimeoutService.LockAsync(true, true);
+        }
+
+        public async Task VaultTimeoutAsync(bool promptOptions = true, int? newTimeout = 0)
+        {
+            var oldTimeout = _vaultTimeout;
+
+            var options = _vaultTimeoutOptions.Select(
+                o => o.Key == _vaultTimeoutDisplayValue ? $"✓ {o.Key}" : o.Key).ToArray();
+            if (promptOptions)
+            {
+                var selection = await Page.DisplayActionSheet(AppResources.VaultTimeout,
+                    AppResources.Cancel, null, options);
+                if (selection == null || selection == AppResources.Cancel)
+                {
+                    return;
+                }
+                var cleanSelection = selection.Replace("✓ ", string.Empty);
+                var selectionOption = _vaultTimeoutOptions.FirstOrDefault(o => o.Key == cleanSelection);
+
+                // Check if the selected Timeout action is "Never" and if it's different from the previous selected value
+                if (selectionOption.Value == null && selectionOption.Value != oldTimeout)
+                {
+                    var confirmed = await _platformUtilsService.ShowDialogAsync(AppResources.NeverLockWarning,
+                        AppResources.Warning, AppResources.Yes, AppResources.Cancel);
+                    if (!confirmed)
+                    {
+                        return;
+                    }
+                }
+                _vaultTimeoutDisplayValue = selectionOption.Key;
+                newTimeout = selectionOption.Value;
+            }
+
+            if (_vaultTimeoutPolicy != null)
+            {
+                var maximumTimeout = _vaultTimeoutPolicy.GetInt(Policy.MINUTES_KEY);
+
+                if (newTimeout > maximumTimeout)
+                {
+                    await _platformUtilsService.ShowDialogAsync(AppResources.VaultTimeoutToLarge, AppResources.Warning);
+                    var timeout = await _vaultTimeoutService.GetVaultTimeout();
+                    _vaultTimeoutDisplayValue = _vaultTimeoutOptions.FirstOrDefault(o => o.Value == timeout).Key ??
+                                                AppResources.Custom;
+                    return;
+                }
+            }
+
+            await _vaultTimeoutService.SetVaultTimeoutOptionsAsync(newTimeout,
+                GetVaultTimeoutActionFromKey(_vaultTimeoutActionDisplayValue));
+
+            if (newTimeout != CustomVaultTimeoutValue)
+            {
+                _vaultTimeout = newTimeout;
+            }
+            if (oldTimeout != newTimeout)
+            {
+                await _cryptoService.RefreshKeysAsync();
+                await Device.InvokeOnMainThreadAsync(BuildList);
+            }
+        }
+
+        public async Task LoggerReportingAsync()
+        {
+            var options = new[]
+            {
+                    CreateSelectableOption(AppResources.Yes, _reportLoggingEnabled),
+                    CreateSelectableOption(AppResources.No, !_reportLoggingEnabled),
+            };
+
+            var selection = await Page.DisplayActionSheet(AppResources.SubmitCrashLogsDescription, AppResources.Cancel, null, options);
+
+            if (selection == null || selection == AppResources.Cancel)
+            {
+                return;
+            }
+
+            await _loggerService.SetEnabled(CompareSelection(selection, AppResources.Yes));
+            _reportLoggingEnabled = await _loggerService.IsEnabled();
+            BuildList();
+        }
+
+        public async Task ApproveLoginRequestsAsync()
+        {
+            var options = new[]
+            {
+                    CreateSelectableOption(AppResources.Yes, _approvePasswordlessLoginRequests),
+                    CreateSelectableOption(AppResources.No, !_approvePasswordlessLoginRequests),
+            };
+
+            var selection = await Page.DisplayActionSheet(AppResources.UseThisDeviceToApproveLoginRequestsMadeFromOtherDevices, AppResources.Cancel, null, options);
+
+            if (selection == null || selection == AppResources.Cancel)
+            {
+                return;
+            }
+
+            _approvePasswordlessLoginRequests = CompareSelection(selection, AppResources.Yes);
+            await _stateService.SetApprovePasswordlessLoginsAsync(_approvePasswordlessLoginRequests);
+
+            BuildList();
+
+            if (!_approvePasswordlessLoginRequests || await _pushNotificationService.AreNotificationsSettingsEnabledAsync())
+            {
+                return;
+            }
+
+            var openAppSettingsResult = await _platformUtilsService.ShowDialogAsync(AppResources.ReceivePushNotificationsForNewLoginRequests, title: string.Empty, confirmText: AppResources.Settings, cancelText: AppResources.NoThanks);
+            if (openAppSettingsResult)
+            {
+                _deviceActionService.OpenAppSettings();
+            }
+        }
+
+        public async Task VaultTimeoutActionAsync()
+        {
+            if (_vaultTimeoutPolicy != null &&
+                !string.IsNullOrEmpty(_vaultTimeoutPolicy.GetString(Policy.ACTION_KEY)))
+            {
+                // do nothing if we have a policy set
+                return;
+            }
+
+            var options = IsVaultTimeoutActionLockAllowed
+                ? _vaultTimeoutActionOptions.Select(o => CreateSelectableOption(o.Key, _vaultTimeoutActionDisplayValue == o.Key)).ToArray()
+                : _vaultTimeoutActionOptions.Where(o => o.Value == VaultTimeoutAction.Logout).Select(v => ToSelectedOption(v.Key)).ToArray();
+
+            var selection = await Page.DisplayActionSheet(AppResources.VaultTimeoutAction,
+                AppResources.Cancel, null, options);
+            if (selection == null || selection == AppResources.Cancel)
+            {
+                return;
+            }
+            var cleanSelection = selection.Replace("✓ ", string.Empty);
+            if (cleanSelection == AppResources.LogOut)
+            {
+                var confirmed = await _platformUtilsService.ShowDialogAsync(AppResources.VaultTimeoutLogOutConfirmation,
+                    AppResources.Warning, AppResources.Yes, AppResources.Cancel);
+                if (!confirmed)
+                {
+                    // Reset to lock and continue process as if lock were selected
+                    cleanSelection = AppResources.Lock;
+                }
+            }
+            var selectionOption = _vaultTimeoutActionOptions.FirstOrDefault(o => o.Key == cleanSelection);
+            var changed = _vaultTimeoutActionDisplayValue != selectionOption.Key;
+            _vaultTimeoutActionDisplayValue = selectionOption.Key;
+            await _vaultTimeoutService.SetVaultTimeoutOptionsAsync(_vaultTimeout,
+                selectionOption.Value);
+            if (changed)
+            {
+                _messagingService.Send("vaultTimeoutActionChanged");
+            }
+            BuildList();
+        }
+
+        public async Task UpdatePinAsync()
+        {
+            _pin = !_pin;
+            if (_pin)
+            {
+                var pin = await _deviceActionService.DisplayPromptAync(AppResources.EnterPIN,
+                    AppResources.SetPINDescription, null, AppResources.Submit, AppResources.Cancel, true);
+                if (!string.IsNullOrWhiteSpace(pin))
+                {
+                    var masterPassOnRestart = false;
+                    if (await _userVerificationService.HasMasterPasswordAsync())
+                    {
+                        masterPassOnRestart = await _platformUtilsService.ShowDialogAsync(
+                            AppResources.PINRequireMasterPasswordRestart, AppResources.UnlockWithPIN,
+                            AppResources.Yes, AppResources.No);
+                    }
+
+                    var kdfConfig = await _stateService.GetActiveUserCustomDataAsync(a => new KdfConfig(a?.Profile));
+                    var email = await _stateService.GetEmailAsync();
+                    var pinKey = await _cryptoService.MakePinKeyAsync(pin, email, kdfConfig);
+                    var userKey = await _cryptoService.GetUserKeyAsync();
+                    var protectedPinKey = await _cryptoService.EncryptAsync(userKey.Key, pinKey);
+
+                    var encPin = await _cryptoService.EncryptAsync(pin);
+                    await _stateService.SetProtectedPinAsync(encPin.EncryptedString);
+
+                    if (masterPassOnRestart)
+                    {
+                        await _stateService.SetPinKeyEncryptedUserKeyEphemeralAsync(protectedPinKey);
+                    }
+                    else
+                    {
+                        await _stateService.SetPinKeyEncryptedUserKeyAsync(protectedPinKey);
+                    }
+                }
+                else
+                {
+                    _pin = false;
+                }
+            }
+            if (!_pin)
+            {
+                await _vaultTimeoutService.ClearAsync();
+                await UpdateVaultTimeoutActionIfNeededAsync();
+            }
+            BuildList();
+        }
+
+        public async Task UpdateBiometricAsync()
+        {
+            var current = _biometric;
+            if (_biometric)
+            {
+                _biometric = false;
+            }
+            else if (await _platformUtilsService.SupportsBiometricAsync())
+            {
+                _biometric = await _platformUtilsService.AuthenticateBiometricAsync(null,
+                    Device.RuntimePlatform == Device.Android ? "." : null);
+            }
+            if (_biometric == current)
+            {
+                return;
+            }
+            if (_biometric)
+            {
+                await _biometricService.SetupBiometricAsync();
+                await _stateService.SetBiometricUnlockAsync(true);
+            }
+            else
+            {
+                await _stateService.SetBiometricUnlockAsync(null);
+                await UpdateVaultTimeoutActionIfNeededAsync();
+            }
+            await _stateService.SetBiometricLockedAsync(false);
+            await _cryptoService.RefreshKeysAsync();
+            BuildList();
+        }
+
+        public void BuildList()
+        {
+            //TODO: Refactor this once navigation is abstracted so that it doesn't depend on Page, e.g. Page.Navigation.PushModalAsync...
+
+            var doUpper = Device.RuntimePlatform != Device.Android;
+            var autofillItems = new List<SettingsPageListItem>();
+            if (Device.RuntimePlatform == Device.Android)
+            {
+                autofillItems.Add(new SettingsPageListItem
+                {
+                    Name = AppResources.AutofillServices,
+                    SubLabel = _autofillHandler.AutofillServicesEnabled() ? AppResources.On : AppResources.Off,
+                    ExecuteAsync = () => Page.Navigation.PushModalAsync(new NavigationPage(new AutofillServicesPage(Page as SettingsPage)))
+                });
+            }
+            else
+            {
+                if (_deviceActionService.SystemMajorVersion() >= 12)
+                {
+                    autofillItems.Add(new SettingsPageListItem
+                    {
+                        Name = AppResources.PasswordAutofill,
+                        ExecuteAsync = () => Page.Navigation.PushModalAsync(new NavigationPage(new AutofillPage()))
+                    });
+                }
+                autofillItems.Add(new SettingsPageListItem
+                {
+                    Name = AppResources.AppExtension,
+                    ExecuteAsync = () => Page.Navigation.PushModalAsync(new NavigationPage(new ExtensionPage()))
+                });
+            }
+            var manageItems = new List<SettingsPageListItem>
+            {
+                new SettingsPageListItem
+                {
+                    Name = AppResources.Folders,
+                    ExecuteAsync = () => Page.Navigation.PushModalAsync(new NavigationPage(new FoldersPage()))
+                },
+                new SettingsPageListItem
+                {
+                    Name = AppResources.Sync,
+                    SubLabel = _lastSyncDate,
+                    ExecuteAsync = () => Page.Navigation.PushModalAsync(new NavigationPage(new SyncPage()))
+                }
+            };
+            var securityItems = new List<SettingsPageListItem>
+            {
+                new SettingsPageListItem
+                {
+                    Name = AppResources.VaultTimeout,
+                    SubLabel = _vaultTimeoutDisplayValue,
+                    ExecuteAsync = () => VaultTimeoutAsync() },
+                new SettingsPageListItem
+                {
+                    Name = AppResources.VaultTimeoutAction,
+                    SubLabel = _vaultTimeoutActionDisplayValue,
+                    ExecuteAsync = () => VaultTimeoutActionAsync()
+                },
+                new SettingsPageListItem
+                {
+                    Name = AppResources.UnlockWithPIN,
+                    SubLabel = _pin ? AppResources.On : AppResources.Off,
+                    ExecuteAsync = () => UpdatePinAsync()
+                },
+                new SettingsPageListItem
+                {
+                    Name = AppResources.ApproveLoginRequests,
+                    SubLabel = _approvePasswordlessLoginRequests ? AppResources.On : AppResources.Off,
+                    ExecuteAsync = () => ApproveLoginRequestsAsync()
+                },
+                new SettingsPageListItem
+                {
+                    Name = AppResources.LockNow,
+                    ExecuteAsync = () => LockAsync()
+                },
+                new SettingsPageListItem
+                {
+                    Name = AppResources.TwoStepLogin,
+                    ExecuteAsync = () => TwoStepAsync()
+                }
+            };
+            if (_approvePasswordlessLoginRequests)
+            {
+                manageItems.Add(new SettingsPageListItem
+                {
+                    Name = AppResources.PendingLogInRequests,
+                    ExecuteAsync = () => PendingLoginRequestsAsync()
+                });
+            }
+            if (_supportsBiometric || _biometric)
+            {
+                var biometricName = AppResources.Biometrics;
+                if (Device.RuntimePlatform == Device.iOS)
+                {
+                    biometricName = _deviceActionService.SupportsFaceBiometric() ? AppResources.FaceID :
+                        AppResources.TouchID;
+                }
+                var item = new SettingsPageListItem
+                {
+                    Name = string.Format(AppResources.UnlockWith, biometricName),
+                    SubLabel = _biometric ? AppResources.On : AppResources.Off,
+                    ExecuteAsync = () => UpdateBiometricAsync()
+                };
+                securityItems.Insert(2, item);
+            }
+            if (_vaultTimeoutDisplayValue == AppResources.Custom)
+            {
+                securityItems.Insert(1, new SettingsPageListItem
+                {
+                    Name = AppResources.Custom,
+                    Time = TimeSpan.FromMinutes(Math.Abs((double)_vaultTimeout.GetValueOrDefault())),
+                });
+            }
+            if (_vaultTimeoutPolicy != null)
+            {
+                var policyMinutes = _vaultTimeoutPolicy.GetInt(Policy.MINUTES_KEY);
+                var policyAction = _vaultTimeoutPolicy.GetString(Policy.ACTION_KEY);
+
+                if (policyMinutes.HasValue || !string.IsNullOrWhiteSpace(policyAction))
+                {
+                    string policyAlert;
+                    if (policyMinutes.HasValue && string.IsNullOrWhiteSpace(policyAction))
+                    {
+                        policyAlert = string.Format(AppResources.VaultTimeoutPolicyInEffect,
+                            Math.Floor((float)policyMinutes / 60),
+                            policyMinutes % 60);
+                    }
+                    else if (!policyMinutes.HasValue && !string.IsNullOrWhiteSpace(policyAction))
+                    {
+                        policyAlert = string.Format(AppResources.VaultTimeoutActionPolicyInEffect,
+                            policyAction == Policy.ACTION_LOCK ? AppResources.Lock : AppResources.LogOut);
+                    }
+                    else
+                    {
+                        policyAlert = string.Format(AppResources.VaultTimeoutPolicyWithActionInEffect,
+                            Math.Floor((float)policyMinutes / 60),
+                            policyMinutes % 60,
+                            policyAction == Policy.ACTION_LOCK ? AppResources.Lock : AppResources.LogOut);
+                    }
+                    securityItems.Insert(0, new SettingsPageListItem
+                    {
+                        Name = policyAlert,
+                        UseFrame = true,
+                    });
+                }
+            }
+            if (Device.RuntimePlatform == Device.Android)
+            {
+                securityItems.Add(new SettingsPageListItem
+                {
+                    Name = AppResources.AllowScreenCapture,
+                    SubLabel = _screenCaptureAllowed ? AppResources.On : AppResources.Off,
+                    ExecuteAsync = () => SetScreenCaptureAllowedAsync()
+                });
+            }
+            var accountItems = new List<SettingsPageListItem>();
+            if (Device.RuntimePlatform == Device.iOS)
+            {
+                accountItems.Add(new SettingsPageListItem
+                {
+                    Name = AppResources.ConnectToWatch,
+                    SubLabel = _shouldConnectToWatch ? AppResources.On : AppResources.Off,
+                    ExecuteAsync = () => ToggleWatchConnectionAsync()
+                });
+            }
+            accountItems.Add(new SettingsPageListItem
+            {
+                Name = AppResources.FingerprintPhrase,
+                ExecuteAsync = () => FingerprintAsync()
+            });
+            accountItems.Add(new SettingsPageListItem
+            {
+                Name = AppResources.LogOut,
+                ExecuteAsync = () => LogOutAsync()
+            });
+            if (_showChangeMasterPassword)
+            {
+                accountItems.Insert(0, new SettingsPageListItem
+                {
+                    Name = AppResources.ChangeMasterPassword,
+                    ExecuteAsync = () => ChangePasswordAsync()
+                });
+            }
+            var toolsItems = new List<SettingsPageListItem>
+            {
+                new SettingsPageListItem
+                {
+                    Name = AppResources.ImportItems,
+                    ExecuteAsync = () => Device.InvokeOnMainThreadAsync(() => Import())
+                },
+                new SettingsPageListItem
+                {
+                    Name = AppResources.ExportVault,
+                    ExecuteAsync = () => Page.Navigation.PushModalAsync(new NavigationPage(new ExportVaultPage()))
+                }
+            };
+            if (IncludeLinksWithSubscriptionInfo())
+            {
+                toolsItems.Add(new SettingsPageListItem
+                {
+                    Name = AppResources.LearnOrg,
+                    ExecuteAsync = () => ShareAsync()
+                });
+                toolsItems.Add(new SettingsPageListItem
+                {
+                    Name = AppResources.WebVault,
+                    ExecuteAsync = () => Device.InvokeOnMainThreadAsync(() => WebVault())
+                });
+            }
+
+            var otherItems = new List<SettingsPageListItem>
+            {
+                new SettingsPageListItem
+                {
+                    Name = AppResources.Options,
+                    ExecuteAsync = () => Page.Navigation.PushModalAsync(new NavigationPage(new OptionsPage()))
+                },
+                new SettingsPageListItem
+                {
+                    Name = AppResources.About,
+                    ExecuteAsync = () => AboutAsync()
+                },
+                new SettingsPageListItem
+                {
+                    Name = AppResources.HelpAndFeedback,
+                    ExecuteAsync = () => Device.InvokeOnMainThreadAsync(() => Help())
+                },
+#if !FDROID 
+                new SettingsPageListItem
+                {
+                    Name = AppResources.SubmitCrashLogs,
+                    SubLabel = _reportLoggingEnabled ? AppResources.On : AppResources.Off,
+                    ExecuteAsync = () => LoggerReportingAsync()
+                },
+#endif
+                new SettingsPageListItem
+                {
+                    Name = AppResources.RateTheApp,
+                    ExecuteAsync = () => Device.InvokeOnMainThreadAsync(() => Rate())
+                },
+                new SettingsPageListItem
+                {
+                    Name = AppResources.DeleteAccount,
+                    ExecuteAsync = () => Page.Navigation.PushModalAsync(new NavigationPage(new DeleteAccountPage()))
+                }
+            };
+
+            // TODO: improve this. Leaving this as is to reduce error possibility on the hotfix.
+            var settingsListGroupItems = new List<SettingsPageListGroup>()
+            {
+                new SettingsPageListGroup(autofillItems, AppResources.Autofill, doUpper, true),
+                new SettingsPageListGroup(manageItems, AppResources.Manage, doUpper),
+                new SettingsPageListGroup(securityItems, AppResources.Security, doUpper),
+                new SettingsPageListGroup(accountItems, AppResources.Account, doUpper),
+                new SettingsPageListGroup(toolsItems, AppResources.Tools, doUpper),
+                new SettingsPageListGroup(otherItems, AppResources.Other, doUpper)
+            };
+
+            // TODO: refactor this
+            if (Device.RuntimePlatform == Device.Android
+                ||
+                GroupedItems.Any())
+            {
+                var items = new List<ISettingsPageListItem>();
+                foreach (var itemGroup in settingsListGroupItems)
+                {
+                    items.Add(new SettingsPageHeaderListItem(itemGroup.Name));
+                    items.AddRange(itemGroup);
+                }
+
+                GroupedItems.ReplaceRange(items);
+            }
+            else
+            {
+                // HACK: we need this on iOS, so that it doesn't crash when adding coming from an empty list
+                var first = true;
+                var items = new List<ISettingsPageListItem>();
+                foreach (var itemGroup in settingsListGroupItems)
+                {
+                    if (!first)
+                    {
+                        items.Add(new SettingsPageHeaderListItem(itemGroup.Name));
+                    }
+                    else
+                    {
+                        first = false;
+                    }
+                    items.AddRange(itemGroup);
+                }
+
+                if (settingsListGroupItems.Any())
+                {
+                    GroupedItems.ReplaceRange(new List<ISettingsPageListItem> { new SettingsPageHeaderListItem(settingsListGroupItems[0].Name) });
+                    GroupedItems.AddRange(items);
+                }
+                else
+                {
+                    GroupedItems.Clear();
+                }
+            }
+        }
+
+        private async Task PendingLoginRequestsAsync()
+        {
+            try
+            {
+                var requests = await _authService.GetActivePasswordlessLoginRequestsAsync();
+                if (requests == null || !requests.Any())
+                {
+                    _platformUtilsService.ShowToast("info", null, AppResources.NoPendingRequests);
+                    return;
+                }
+
+                Page.Navigation.PushModalAsync(new NavigationPage(new LoginPasswordlessRequestsListPage())).FireAndForget();
+            }
+            catch (Exception ex)
+            {
+                HandleException(ex);
+            }
+        }
+
+        private bool IncludeLinksWithSubscriptionInfo()
+        {
+            if (Device.RuntimePlatform == Device.iOS)
+            {
+                return false;
+            }
+            return true;
+        }
+
+        private VaultTimeoutAction GetVaultTimeoutActionFromKey(string key)
+        {
+            return _vaultTimeoutActionOptions.FirstOrDefault(o => o.Key == key).Value;
+        }
+
+        private int? GetVaultTimeoutFromKey(string key)
+        {
+            return _vaultTimeoutOptions.FirstOrDefault(o => o.Key == key).Value;
+        }
+
+        private string CreateSelectableOption(string option, bool selected) => selected ? ToSelectedOption(option) : option;
+
+        private bool CompareSelection(string selection, string compareTo) => selection == compareTo || selection == ToSelectedOption(compareTo);
+
+        private string ToSelectedOption(string option) => $"✓ {option}";
+
+        public async Task SetScreenCaptureAllowedAsync()
+        {
+            try
+            {
+                if (!_screenCaptureAllowed
+                    &&
+                    !await Page.DisplayAlert(AppResources.AllowScreenCapture, AppResources.AreYouSureYouWantToEnableScreenCapture, AppResources.Yes, AppResources.No))
+                {
+                    return;
+                }
+
+                await _stateService.SetScreenCaptureAllowedAsync(!_screenCaptureAllowed);
+                _screenCaptureAllowed = !_screenCaptureAllowed;
+                await _deviceActionService.SetScreenCaptureAllowedAsync();
+                BuildList();
+            }
+            catch (Exception ex)
+            {
+                _loggerService.Exception(ex);
+                await Page.DisplayAlert(AppResources.AnErrorHasOccurred, AppResources.GenericErrorMessage, AppResources.Ok);
+            }
+        }
+
+        private async Task ToggleWatchConnectionAsync()
+        {
+            _shouldConnectToWatch = !_shouldConnectToWatch;
+
+            await _watchDeviceService.SetShouldConnectToWatchAsync(_shouldConnectToWatch);
+            BuildList();
+        }
+
+        private async Task UpdateVaultTimeoutActionIfNeededAsync()
+        {
+            if (IsVaultTimeoutActionLockAllowed)
+            {
+                return;
+            }
+
+            _vaultTimeoutActionDisplayValue = _vaultTimeoutActionOptions.First(o => o.Value == VaultTimeoutAction.Logout).Key;
+            await _vaultTimeoutService.SetVaultTimeoutOptionsAsync(_vaultTimeout, VaultTimeoutAction.Logout);
+            _deviceActionService.Toast(AppResources.VaultTimeoutActionChangedToLogOut);
         }
     }
 }

src/App/Pages/Settings/SyncPage.xaml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<pages:BaseContentPage 
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="Bit.App.Pages.SyncPage"
+    xmlns:pages="clr-namespace:Bit.App.Pages"
+    xmlns:u="clr-namespace:Bit.App.Utilities"
+    x:DataType="pages:SyncPageViewModel"
+    Title="{Binding PageTitle}">
+
+    <ContentPage.BindingContext>
+        <pages:SyncPageViewModel />
+    </ContentPage.BindingContext>
+
+    <ContentPage.ToolbarItems>
+        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
+    </ContentPage.ToolbarItems>
+
+    <ScrollView Padding="0, 0, 0, 20">
+        <StackLayout Padding="0" Spacing="20">
+            <StackLayout StyleClass="box">
+                <StackLayout StyleClass="box-row, box-row-switch">
+                    <Label
+                        Text="{u:I18n EnableSyncOnRefresh}"
+                        StyleClass="box-label-regular"
+                        HorizontalOptions="StartAndExpand" />
+                    <Switch
+                        IsToggled="{Binding EnableSyncOnRefresh}"
+                        StyleClass="box-value"
+                        HorizontalOptions="End" />
+                </StackLayout>
+                <Label
+                    Text="{u:I18n EnableSyncOnRefreshDescription}"
+                    StyleClass="box-footer-label, box-footer-label-switch" />
+            </StackLayout>
+            <StackLayout StyleClass="box">
+                <Button Text="{u:I18n SyncVaultNow}" Clicked="Sync_Clicked"></Button>
+                <Label StyleClass="text-muted, text-sm" HorizontalTextAlignment="Center" Margin="0,10">
+                    <Label.FormattedText>
+                        <FormattedString>
+                            <Span Text="{u:I18n LastSync}" />
+                            <Span Text=" " />
+                            <Span Text="{Binding LastSync}" />
+                        </FormattedString>
+                    </Label.FormattedText>
+                </Label>
+            </StackLayout>
+        </StackLayout>
+    </ScrollView>
+
+</pages:BaseContentPage>

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

@@ -0,0 +1,43 @@
+using System;
+using Xamarin.Forms;
+
+namespace Bit.App.Pages
+{
+    public partial class SyncPage : BaseContentPage
+    {
+        private readonly SyncPageViewModel _vm;
+
+        public SyncPage()
+        {
+            InitializeComponent();
+            _vm = BindingContext as SyncPageViewModel;
+            _vm.Page = this;
+            if (Device.RuntimePlatform == Device.Android)
+            {
+                ToolbarItems.RemoveAt(0);
+            }
+        }
+
+        protected async override void OnAppearing()
+        {
+            base.OnAppearing();
+            await _vm.InitAsync();
+        }
+
+        private async void Sync_Clicked(object sender, EventArgs e)
+        {
+            if (DoOnce())
+            {
+                await _vm.SyncAsync();
+            }
+        }
+
+        private async void Close_Clicked(object sender, System.EventArgs e)
+        {
+            if (DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
+    }
+}

src/App/Pages/Settings/SyncPageViewModel.cs

@@ -0,0 +1,117 @@
+using System.Threading.Tasks;
+using Bit.App.Abstractions;
+using Bit.App.Resources;
+using Bit.Core.Abstractions;
+using Bit.Core.Exceptions;
+using Bit.Core.Utilities;
+
+namespace Bit.App.Pages
+{
+    public class SyncPageViewModel : BaseViewModel
+    {
+        private readonly IDeviceActionService _deviceActionService;
+        private readonly IPlatformUtilsService _platformUtilsService;
+        private readonly IStateService _stateService;
+        private readonly ISyncService _syncService;
+        private readonly ILocalizeService _localizeService;
+
+        private string _lastSync = "--";
+        private bool _inited;
+        private bool _syncOnRefresh;
+
+        public SyncPageViewModel()
+        {
+            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
+            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
+            _localizeService = ServiceContainer.Resolve<ILocalizeService>("localizeService");
+
+            PageTitle = AppResources.Sync;
+        }
+
+        public bool EnableSyncOnRefresh
+        {
+            get => _syncOnRefresh;
+            set
+            {
+                if (SetProperty(ref _syncOnRefresh, value))
+                {
+                    var task = UpdateSyncOnRefreshAsync();
+                }
+            }
+        }
+
+        public string LastSync
+        {
+            get => _lastSync;
+            set => SetProperty(ref _lastSync, value);
+        }
+
+        public async Task InitAsync()
+        {
+            await SetLastSyncAsync();
+            EnableSyncOnRefresh = await _stateService.GetSyncOnRefreshAsync();
+            _inited = true;
+        }
+
+        public async Task UpdateSyncOnRefreshAsync()
+        {
+            if (_inited)
+            {
+                await _stateService.SetSyncOnRefreshAsync(_syncOnRefresh);
+            }
+        }
+
+        public async Task SetLastSyncAsync()
+        {
+            var last = await _syncService.GetLastSyncAsync();
+            if (last != null)
+            {
+                var localDate = last.Value.ToLocalTime();
+                LastSync = string.Format("{0} {1}",
+                    _localizeService.GetLocaleShortDate(localDate),
+                    _localizeService.GetLocaleShortTime(localDate));
+            }
+            else
+            {
+                LastSync = AppResources.Never;
+            }
+        }
+
+        public async Task SyncAsync()
+        {
+            if (Xamarin.Essentials.Connectivity.NetworkAccess == Xamarin.Essentials.NetworkAccess.None)
+            {
+                await _platformUtilsService.ShowDialogAsync(AppResources.InternetConnectionRequiredMessage,
+                    AppResources.InternetConnectionRequiredTitle);
+                return;
+            }
+            try
+            {
+                await _deviceActionService.ShowLoadingAsync(AppResources.Syncing);
+                await _syncService.SyncPasswordlessLoginRequestsAsync();
+                var success = await _syncService.FullSyncAsync(true);
+                await _deviceActionService.HideLoadingAsync();
+                if (success)
+                {
+                    await SetLastSyncAsync();
+                    _platformUtilsService.ShowToast("success", null, AppResources.SyncingComplete);
+                }
+                else
+                {
+                    await Page.DisplayAlert(null, AppResources.SyncingFailed, AppResources.Ok);
+                }
+            }
+            catch (ApiException e)
+            {
+                await _deviceActionService.HideLoadingAsync();
+                if (e?.Error != null)
+                {
+                    await _platformUtilsService.ShowDialogAsync(e.Error.GetSingleMessage(),
+                        AppResources.AnErrorHasOccurred);
+                }
+            }
+        }
+    }
+}

src/App/Pages/Settings/VaultSettingsPage.xaml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<pages:BaseContentPage
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    x:DataType="pages:VaultSettingsPageViewModel"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    x:Class="Bit.App.Pages.VaultSettingsPage"
-    Title="{u:I18n Vault}">
-    
-    <ContentPage.BindingContext>
-        <pages:VaultSettingsPageViewModel />
-    </ContentPage.BindingContext>
-
-    <StackLayout>
-        <controls:CustomLabel
-            Text="{u:I18n Folders}"
-            StyleClass="settings-navigatable-label"
-            AutomationId="FoldersLabel">
-            <Label.GestureRecognizers>
-                <TapGestureRecognizer Command="{Binding GoToFoldersCommand}" />
-            </Label.GestureRecognizers>
-        </controls:CustomLabel>
-        <BoxView StyleClass="box-row-separator" />
-
-        <controls:CustomLabel
-            Text="{u:I18n ExportVault}"
-            StyleClass="settings-navigatable-label"
-            AutomationId="ExportVaultLabel">
-            <Label.GestureRecognizers>
-                <TapGestureRecognizer Command="{Binding GoToExportVaultCommand}" />
-            </Label.GestureRecognizers>
-        </controls:CustomLabel>
-        <BoxView StyleClass="box-row-separator" />
-
-        <controls:ExternalLinkItemView
-            Title="{u:I18n ImportItems}"
-            GoToLinkCommand="{Binding GoToImportItemsCommand}"
-            StyleClass="settings-external-link-item"
-            HorizontalOptions="FillAndExpand" 
-            AutomationId="ImportItemsLinkItemView" />
-        <BoxView StyleClass="box-row-separator" />
-
-    </StackLayout>
-
-</pages:BaseContentPage>
-

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

@@ -1,12 +0,0 @@
-namespace Bit.App.Pages
-{
-    public partial class VaultSettingsPage : BaseContentPage
-    {
-        public VaultSettingsPage()
-        {
-            InitializeComponent();
-            var vm = BindingContext as VaultSettingsPageViewModel;
-            vm.Page = this;
-        }
-    }
-}

src/App/Pages/Settings/VaultSettingsPageViewModel.cs

@@ -1,51 +0,0 @@
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Resources;
-using Bit.Core;
-using Bit.Core.Abstractions;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public class VaultSettingsPageViewModel : BaseViewModel
-    {
-        private readonly IPlatformUtilsService _platformUtilsService;
-        private readonly IEnvironmentService _environmentService;
-
-        public VaultSettingsPageViewModel()
-        {
-            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>();
-            _environmentService = ServiceContainer.Resolve<IEnvironmentService>();
-
-            GoToFoldersCommand = new AsyncCommand(() => Page.Navigation.PushModalAsync(new NavigationPage(new FoldersPage())),
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
-
-            GoToExportVaultCommand = new AsyncCommand(() => Page.Navigation.PushModalAsync(new NavigationPage(new ExportVaultPage())),
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
-
-            GoToImportItemsCommand = new AsyncCommand(GoToImportItemsAsync,
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
-        }
-
-        public ICommand GoToFoldersCommand { get; }
-        public ICommand GoToExportVaultCommand { get; }
-        public ICommand GoToImportItemsCommand { get; }
-
-        private async Task GoToImportItemsAsync()
-        {
-            var webVaultUrl = _environmentService.GetWebVaultUrl();
-            var body = string.Format(AppResources.YouCanImportDataToYourVaultOnX, webVaultUrl);
-            if (await _platformUtilsService.ShowDialogAsync(body, AppResources.ContinueToWebApp, AppResources.Continue, AppResources.Cancel))
-            {
-                _platformUtilsService.LaunchUri(webVaultUrl);
-            }
-        }
-    }
-}

src/App/Pages/TabsPage.cs

@@ -1,14 +1,11 @@
 using System;
-using System.Linq;
 using System.Threading.Tasks;
 using Bit.App.Effects;
 using Bit.App.Models;
 using Bit.App.Resources;
-using Bit.App.Utilities;
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Domain;
 using Bit.Core.Utilities;
 using Xamarin.Forms;
 
@@ -102,38 +99,11 @@ namespace Bit.App.Pages
                 _messagingService.Send("convertAccountToKeyConnector");
             }
 
-            await ForcePasswordResetIfNeededAsync();
-        }
-
-        private async Task ForcePasswordResetIfNeededAsync()
-        {
             var forcePasswordResetReason = await _stateService.GetForcePasswordResetReasonAsync();
-            switch (forcePasswordResetReason)
-            {
-                case ForcePasswordResetReason.TdeUserWithoutPasswordHasPasswordResetPermission:
-                    // TDE users should only have one org
-                    var userOrgs = await _stateService.GetOrganizationsAsync();
-                    if (userOrgs != null && userOrgs.Any())
-                    {
-                        _messagingService.Send(Constants.ForceSetPassword, userOrgs.First().Value.Identifier);
-                        return;
-                    }
-                    _logger.Value.Error("TDE user needs to set password but has no organizations.");
 
-                    var rememberedOrg = _stateService.GetRememberedOrgIdentifierAsync();
-                    if (rememberedOrg == null)
-                    {
-                        _logger.Value.Error("TDE user needs to set password but has no organizations or remembered org identifier.");
-                        return;
-                    }
-                    _messagingService.Send(Constants.ForceSetPassword, rememberedOrg);
-                    return;
-                case ForcePasswordResetReason.AdminForcePasswordReset:
-                case ForcePasswordResetReason.WeakMasterPasswordOnLogin:
-                    _messagingService.Send(Constants.ForceUpdatePassword);
-                    break;
-                default:
-                    return;
+            if (forcePasswordResetReason.HasValue)
+            {
+                _messagingService.Send(Constants.ForceUpdatePassword);
             }
         }
 
@@ -167,7 +137,7 @@ namespace Bit.App.Pages
                     await groupingsPage.HideAccountSwitchingOverlayAsync();
                 }
 
-                _messagingService.Send(ThemeManager.UPDATED_THEME_MESSAGE_KEY);
+                _messagingService.Send("updatedTheme");
                 if (navPage.RootPage is GroupingsPage)
                 {
                     // Load something?
@@ -176,6 +146,10 @@ namespace Bit.App.Pages
                 {
                     await genPage.InitAsync();
                 }
+                else if (navPage.RootPage is SettingsPage settingsPage)
+                {
+                    await settingsPage.InitAsync();
+                }
             }
         }