Update to latest Bitwarden SDK (#5405)

.github/actions/log-inputs/action.yml

@@ -1,20 +0,0 @@
-name: 'Log Inputs to Job Summary'
-description: 'Log workflow inputs to the GitHub Actions job summary'
-
-inputs:
-  inputs:
-    description: 'Workflow inputs as JSON'
-    required: true
-
-runs:
-  using: 'composite'
-  steps:
-    - name: Log inputs to job summary
-      shell: bash
-      run: |
-        echo "<details><summary>Job Inputs</summary>" >> $GITHUB_STEP_SUMMARY
-        echo "" >> $GITHUB_STEP_SUMMARY
-        echo '```json' >> $GITHUB_STEP_SUMMARY
-        echo '${{ inputs.inputs }}' >> $GITHUB_STEP_SUMMARY
-        echo '```' >> $GITHUB_STEP_SUMMARY
-        echo "</details>" >> $GITHUB_STEP_SUMMARY

.github/workflows/build-authenticator.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - release/**/*
   workflow_dispatch:
     inputs:
       version-name:
@@ -33,7 +32,6 @@ env:
 permissions:
   contents: read
   packages: read
-  id-token: write
 
 jobs:
   build:
@@ -41,20 +39,11 @@ jobs:
     runs-on: ubuntu-24.04
 
     steps:
-      - name: Log inputs to job summary
-        run: |
-          echo "<details><summary>Job Inputs</summary>" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo '```json' >> $GITHUB_STEP_SUMMARY
-          echo '${{ toJson(inputs) }}' >> $GITHUB_STEP_SUMMARY
-          echo '```' >> $GITHUB_STEP_SUMMARY
-          echo "</details>" >> $GITHUB_STEP_SUMMARY
-
       - name: Check out repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Validate Gradle wrapper
-        uses: gradle/actions/wrapper-validation@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+        uses: gradle/actions/wrapper-validation@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
 
       - name: Cache Gradle files
         uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
@@ -82,7 +71,7 @@ jobs:
           java-version: ${{ env.JAVA_VERSION }}
 
       - name: Configure Ruby
-        uses: ruby/setup-ruby@bb6434c747fa7022e12fa1cae2a0951fcffcff26 # v1.253.0
+        uses: ruby/setup-ruby@ca041f971d66735f3e5ff1e21cc13e2d51e7e535 # v1.233.0
         with:
           bundler-cache: true
 
@@ -113,7 +102,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Configure Ruby
-        uses: ruby/setup-ruby@bb6434c747fa7022e12fa1cae2a0951fcffcff26 # v1.253.0
+        uses: ruby/setup-ruby@ca041f971d66735f3e5ff1e21cc13e2d51e7e535 # v1.233.0
         with:
           bundler-cache: true
 
@@ -124,18 +113,9 @@ jobs:
           bundle install --jobs 4 --retry 3
 
       - name: Log in to Azure
-        uses: bitwarden/gh-actions/azure-login@main
+        uses: Azure/login@cb79c773a3cfa27f31f25eb3f677781210c9ce3d # v1.6.1
         with:
-          subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-          tenant_id: ${{ secrets.AZURE_TENANT_ID }}
-          client_id: ${{ secrets.AZURE_CLIENT_ID }}
-
-      - name: Get Azure Key Vault secrets
-        id: get-kv-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
-        with:
-          keyvault: gh-android
-          secrets: "BWA-AAB-KEYSTORE-STORE-PASSWORD,BWA-AAB-KEYSTORE-KEY-PASSWORD,BWA-APK-KEYSTORE-STORE-PASSWORD,BWA-APK-KEYSTORE-KEY-PASSWORD"
+          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
 
       - name: Retrieve secrets
         env:
@@ -179,9 +159,6 @@ jobs:
           az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
           --name authenticator_play_store-creds.json --file ${{ github.workspace }}/secrets/authenticator_play_store-creds.json --output none
 
-      - name: AZ Logout
-        uses: bitwarden/gh-actions/azure-logout@main
-
       - name: Verify Play Store credentials
         if: ${{ inputs.publish-to-play-store }}
         run: |
@@ -189,7 +166,7 @@ jobs:
           json_key:${{ github.workspace }}/secrets/authenticator_play_store-creds.json }}
 
       - name: Validate Gradle wrapper
-        uses: gradle/actions/wrapper-validation@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+        uses: gradle/actions/wrapper-validation@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
 
       - name: Cache Gradle files
         uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
@@ -220,12 +197,12 @@ jobs:
         run: |
           DEFAULT_VERSION_CODE=$GITHUB_RUN_NUMBER
           VERSION_CODE="${{ inputs.version-code || '$DEFAULT_VERSION_CODE' }}"
-          bundle exec fastlane setBuildVersionInfo \
+          bundle exec fastlane setAuthenticatorBuildVersionInfo \
           versionCode:$VERSION_CODE \
           versionName:${{ inputs.version-name || '' }}
 
-          regex='appVersionName = "([^"]+)"'
-          if [[ "$(cat gradle/libs.versions.toml)" =~ $regex ]]; then
+          regex='versionName = "([^"]+)"'
+          if [[ "$(cat authenticator/build.gradle.kts)" =~ $regex ]]; then
             VERSION_NAME="${BASH_REMATCH[1]}"
           fi
           echo "Version Name: ${VERSION_NAME}" >> $GITHUB_STEP_SUMMARY
@@ -236,18 +213,18 @@ jobs:
         run: |
           bundle exec fastlane bundleAuthenticatorRelease \
           storeFile:${{ github.workspace }}/keystores/authenticator_aab-keystore.jks \
-          storePassword:'${{ steps.get-kv-secrets.outputs.BWA-AAB-KEYSTORE-STORE-PASSWORD }}' \
+          storePassword:'${{ secrets.BWA_AAB_KEYSTORE_STORE_PASSWORD }}' \
           keyAlias:authenticatorupload \
-          keyPassword:'${{ steps.get-kv-secrets.outputs.BWA-AAB-KEYSTORE-KEY-PASSWORD }}'
+          keyPassword:'${{ secrets.BWA_AAB_KEYSTORE_KEY_PASSWORD }}'
 
       - name: Generate release Play Store APK
         if: ${{ matrix.variant == 'apk' }}
         run: |
           bundle exec fastlane buildAuthenticatorRelease \
           storeFile:${{ github.workspace }}/keystores/authenticator_apk-keystore.jks \
-          storePassword:'${{ steps.get-kv-secrets.outputs.BWA-APK-KEYSTORE-STORE-PASSWORD }}' \
+          storePassword:'${{ secrets.BWA_APK_KEYSTORE_STORE_PASSWORD }}' \
           keyAlias:bitwardenauthenticator \
-          keyPassword:'${{ steps.get-kv-secrets.outputs.BWA-APK-KEYSTORE-KEY-PASSWORD }}'
+          keyPassword:'${{ secrets.BWA_APK_KEYSTORE_KEY_PASSWORD }}'
 
       - name: Upload release Play Store .aab artifact
         if: ${{ matrix.variant == 'aab' }}

.github/workflows/build.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - release/**/*
   workflow_dispatch:
     inputs:
       version-name:
@@ -34,7 +33,6 @@ env:
 permissions:
   contents: read
   packages: read
-  id-token: write
 
 jobs:
   build:
@@ -42,20 +40,11 @@ jobs:
     runs-on: ubuntu-24.04
 
     steps:
-      - name: Log inputs to job summary
-        run: |
-          echo "<details><summary>Job Inputs</summary>" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo '```json' >> $GITHUB_STEP_SUMMARY
-          echo '${{ toJson(inputs) }}' >> $GITHUB_STEP_SUMMARY
-          echo '```' >> $GITHUB_STEP_SUMMARY
-          echo "</details>" >> $GITHUB_STEP_SUMMARY
-
       - name: Check out repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Validate Gradle wrapper
-        uses: gradle/actions/wrapper-validation@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+        uses: gradle/actions/wrapper-validation@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
 
       - name: Cache Gradle files
         uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
@@ -83,7 +72,7 @@ jobs:
           java-version: ${{ env.JAVA_VERSION }}
 
       - name: Configure Ruby
-        uses: ruby/setup-ruby@bb6434c747fa7022e12fa1cae2a0951fcffcff26 # v1.253.0
+        uses: ruby/setup-ruby@ca041f971d66735f3e5ff1e21cc13e2d51e7e535 # v1.233.0
         with:
           bundler-cache: true
 
@@ -121,7 +110,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Configure Ruby
-        uses: ruby/setup-ruby@bb6434c747fa7022e12fa1cae2a0951fcffcff26 # v1.253.0
+        uses: ruby/setup-ruby@ca041f971d66735f3e5ff1e21cc13e2d51e7e535 # v1.233.0
         with:
           bundler-cache: true
 
@@ -132,18 +121,9 @@ jobs:
           bundle install --jobs 4 --retry 3
 
       - name: Log in to Azure
-        uses: bitwarden/gh-actions/azure-login@main
+        uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
         with:
-          subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-          tenant_id: ${{ secrets.AZURE_TENANT_ID }}
-          client_id: ${{ secrets.AZURE_CLIENT_ID }}
-
-      - name: Get Azure Key Vault secrets
-        id: get-kv-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
-        with:
-          keyvault: gh-android
-          secrets: "UPLOAD-KEYSTORE-PASSWORD,UPLOAD-BETA-KEYSTORE-PASSWORD,UPLOAD-BETA-KEY-PASSWORD,PLAY-KEYSTORE-PASSWORD,PLAY-BETA-KEYSTORE-PASSWORD,PLAY-BETA-KEY-PASSWORD"
+          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
 
       - name: Retrieve secrets
         env:
@@ -180,11 +160,8 @@ jobs:
           az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
           --name app_play_prod_firebase-creds.json --file ${{ github.workspace }}/secrets/app_play_prod_firebase-creds.json --output none
 
-      - name: Log out from Azure
-        uses: bitwarden/gh-actions/azure-logout@main
-
       - name: Validate Gradle wrapper
-        uses: gradle/actions/wrapper-validation@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+        uses: gradle/actions/wrapper-validation@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
 
       - name: Cache Gradle files
         uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
@@ -230,48 +207,48 @@ jobs:
       - name: Generate release Play Store bundle
         if: ${{ matrix.variant == 'prod' && matrix.artifact == 'aab' }}
         env:
-          UPLOAD-KEYSTORE-PASSWORD: ${{ steps.get-kv-secrets.outputs.UPLOAD-KEYSTORE-PASSWORD }}
+          UPLOAD_KEYSTORE_PASSWORD: ${{ secrets.UPLOAD_KEYSTORE_PASSWORD }}
         run: |
           bundle exec fastlane bundlePlayStoreRelease \
           storeFile:app_upload-keystore.jks \
-          storePassword:${{ env.UPLOAD-KEYSTORE-PASSWORD }} \
+          storePassword:${{ env.UPLOAD_KEYSTORE_PASSWORD }} \
           keyAlias:upload \
-          keyPassword:${{ env.UPLOAD-KEYSTORE-PASSWORD }}
+          keyPassword:${{ env.UPLOAD_KEYSTORE_PASSWORD }}
 
       - name: Generate beta Play Store bundle
         if: ${{ (matrix.variant == 'prod') && (matrix.artifact == 'aab') }}
         env:
-          UPLOAD-BETA-KEYSTORE-PASSWORD: ${{ steps.get-kv-secrets.outputs.UPLOAD-BETA-KEYSTORE-PASSWORD }}
-          UPLOAD-BETA-KEY-PASSWORD: ${{ steps.get-kv-secrets.outputs.UPLOAD-BETA-KEY-PASSWORD }}
+          UPLOAD_BETA_KEYSTORE_PASSWORD: ${{ secrets.UPLOAD_BETA_KEYSTORE_PASSWORD }}
+          UPLOAD_BETA_KEY_PASSWORD: ${{ secrets.UPLOAD_BETA_KEY_PASSWORD }}
         run: |
           bundle exec fastlane bundlePlayStoreBeta \
           storeFile:app_beta_upload-keystore.jks \
-          storePassword:${{ env.UPLOAD-BETA-KEYSTORE-PASSWORD }} \
+          storePassword:${{ env.UPLOAD_BETA_KEYSTORE_PASSWORD }} \
           keyAlias:bitwarden-beta-upload \
-          keyPassword:${{ env.UPLOAD-BETA-KEY-PASSWORD }}
+          keyPassword:${{ env.UPLOAD_BETA_KEY_PASSWORD }}
 
       - name: Generate release Play Store APK
         if: ${{ (matrix.variant == 'prod') && (matrix.artifact == 'apk') }}
         env:
-          PLAY-KEYSTORE-PASSWORD: ${{ steps.get-kv-secrets.outputs.PLAY-KEYSTORE-PASSWORD }}
+          PLAY_KEYSTORE_PASSWORD: ${{ secrets.PLAY_KEYSTORE_PASSWORD }}
         run: |
           bundle exec fastlane assemblePlayStoreReleaseApk \
           storeFile:app_play-keystore.jks \
-          storePassword:${{ env.PLAY-KEYSTORE-PASSWORD }} \
+          storePassword:${{ env.PLAY_KEYSTORE_PASSWORD }} \
           keyAlias:bitwarden \
-          keyPassword:${{ env.PLAY-KEYSTORE-PASSWORD }}
+          keyPassword:${{ env.PLAY_KEYSTORE_PASSWORD }}
 
       - name: Generate beta Play Store APK
         if: ${{ (matrix.variant == 'prod') && (matrix.artifact == 'apk') }}
         env:
-          PLAY-BETA-KEYSTORE-PASSWORD: ${{ steps.get-kv-secrets.outputs.PLAY-BETA-KEYSTORE-PASSWORD }}
-          PLAY-BETA-KEY-PASSWORD: ${{ steps.get-kv-secrets.outputs.PLAY-BETA-KEY-PASSWORD }}
+          PLAY_BETA_KEYSTORE_PASSWORD: ${{ secrets.PLAY_BETA_KEYSTORE_PASSWORD }}
+          PLAY_BETA_KEY_PASSWORD: ${{ secrets.PLAY_BETA_KEY_PASSWORD }}
         run: |
           bundle exec fastlane assemblePlayStoreBetaApk \
           storeFile:app_beta_play-keystore.jks \
-          storePassword:${{ env.PLAY-BETA-KEYSTORE-PASSWORD }} \
+          storePassword:${{ env.PLAY_BETA_KEYSTORE_PASSWORD }} \
           keyAlias:bitwarden-beta \
-          keyPassword:${{ env.PLAY-BETA-KEY-PASSWORD }}
+          keyPassword:${{ env.PLAY_BETA_KEY_PASSWORD }}
 
       - name: Generate debug Play Store APKs
         if: ${{ (matrix.variant != 'prod') && (matrix.artifact == 'apk') }}
@@ -432,7 +409,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Configure Ruby
-        uses: ruby/setup-ruby@bb6434c747fa7022e12fa1cae2a0951fcffcff26 # v1.253.0
+        uses: ruby/setup-ruby@ca041f971d66735f3e5ff1e21cc13e2d51e7e535 # v1.233.0
         with:
           bundler-cache: true
 
@@ -443,18 +420,9 @@ jobs:
           bundle install --jobs 4 --retry 3
 
       - name: Log in to Azure
-        uses: bitwarden/gh-actions/azure-login@main
+        uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
         with:
-          subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-          tenant_id: ${{ secrets.AZURE_TENANT_ID }}
-          client_id: ${{ secrets.AZURE_CLIENT_ID }}
-
-      - name: Get Azure Key Vault secrets
-        id: get-kv-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
-        with:
-          keyvault: gh-android
-          secrets: "FDROID-KEYSTORE-PASSWORD,FDROID-BETA-KEYSTORE-PASSWORD,FDROID-BETA-KEY-PASSWORD"
+          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
 
       - name: Retrieve secrets
         env:
@@ -477,11 +445,8 @@ jobs:
           az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
           --name app_fdroid_firebase-creds.json --file ${{ github.workspace }}/secrets/app_fdroid_firebase-creds.json --output none
 
-      - name: Log out from Azure
-        uses: bitwarden/gh-actions/azure-logout@main
-
       - name: Validate Gradle wrapper
-        uses: gradle/actions/wrapper-validation@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+        uses: gradle/actions/wrapper-validation@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
 
       - name: Cache Gradle files
         uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
@@ -526,15 +491,15 @@ jobs:
           versionCode:$VERSION_CODE \
           versionName:${{ inputs.version-name || '' }}
 
-          regex='appVersionName = "([^"]+)"'
-          if [[ "$(cat gradle/libs.versions.toml)" =~ $regex ]]; then
+          regex='versionName = "([^"]+)"'
+          if [[ "$(cat app/build.gradle.kts)" =~ $regex ]]; then
             VERSION_NAME="${BASH_REMATCH[1]}"
           fi
           echo "Version Name: ${VERSION_NAME}" >> $GITHUB_STEP_SUMMARY
           echo "Version Number: $VERSION_CODE" >> $GITHUB_STEP_SUMMARY
       - name: Generate F-Droid artifacts
         env:
-          FDROID_STORE_PASSWORD: ${{ steps.get-kv-secrets.outputs.FDROID-KEYSTORE-PASSWORD }}
+          FDROID_STORE_PASSWORD: ${{ secrets.FDROID_KEYSTORE_PASSWORD }}
         run: |
           bundle exec fastlane assembleFDroidReleaseApk \
           storeFile:app_fdroid-keystore.jks \
@@ -544,14 +509,14 @@ jobs:
 
       - name: Generate F-Droid Beta Artifacts
         env:
-          FDROID-BETA-KEYSTORE-PASSWORD: ${{ steps.get-kv-secrets.outputs.FDROID-BETA-KEYSTORE-PASSWORD }}
-          FDROID-BETA-KEY-PASSWORD: ${{ steps.get-kv-secrets.outputs.FDROID-BETA-KEY-PASSWORD }}
+          FDROID_BETA_KEYSTORE_PASSWORD: ${{ secrets.FDROID_BETA_KEYSTORE_PASSWORD }}
+          FDROID_BETA_KEY_PASSWORD: ${{ secrets.FDROID_BETA_KEY_PASSWORD }}
         run: |
           bundle exec fastlane assembleFDroidBetaApk \
           storeFile:app_beta_fdroid-keystore.jks \
-          storePassword:"${{ env.FDROID-BETA-KEYSTORE-PASSWORD }}" \
+          storePassword:"${{ env.FDROID_BETA_KEYSTORE_PASSWORD }}" \
           keyAlias:bitwarden-beta \
-          keyPassword:"${{ env.FDROID-BETA-KEY-PASSWORD }}"
+          keyPassword:"${{ env.FDROID_BETA_KEY_PASSWORD }}"
 
       - name: Upload F-Droid .apk artifact
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2

.github/workflows/crowdin-pull.yml

@@ -8,29 +8,30 @@ on:
 
 jobs:
   crowdin-sync:
-    name: Crowdin Pull - ${{ github.event_name }}
+    name: Crowdin Pull - ${{ matrix.name }} - ${{ github.event_name }}
     runs-on: ubuntu-24.04
     permissions:
       contents: write
       pull-requests: write
-      id-token: write
+    strategy:
+      matrix:
+        include:
+          - name: Password Manager
+            project_id: 269690
+            config: crowdin-bwpm.yml
+            branch: crowdin-pull-bwpm
+          - name: Authenticator
+            project_id: 673718
+            config: crowdin-bwa.yml
+            branch: crowdin-pull-bwa
     steps:
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - name: Log in to Azure
-        uses: bitwarden/gh-actions/azure-login@main
+      - name: Login to Azure - CI Subscription
+        uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
         with:
-          subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-          tenant_id: ${{ secrets.AZURE_TENANT_ID }}
-          client_id: ${{ secrets.AZURE_CLIENT_ID }}
-
-      - name: Get Azure Key Vault secrets
-        id: get-kv-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
-        with:
-          keyvault: gh-org-bitwarden
-          secrets: "BW-GHAPP-ID,BW-GHAPP-KEY"
+          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
 
       - name: Retrieve secrets
         id: retrieve-secrets
@@ -39,33 +40,30 @@ jobs:
           keyvault: "bitwarden-ci"
           secrets: "crowdin-api-token, github-gpg-private-key, github-gpg-private-key-passphrase"
 
-      - name: Log out from Azure
-        uses: bitwarden/gh-actions/azure-logout@main
-
       - name: Generate GH App token
-        uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+        uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
         id: app-token
         with:
-          app-id: ${{ steps.get-kv-secrets.outputs.BW-GHAPP-ID }}
-          private-key: ${{ steps.get-kv-secrets.outputs.BW-GHAPP-KEY }}
+          app-id: ${{ secrets.BW_GHAPP_ID }}
+          private-key: ${{ secrets.BW_GHAPP_KEY }}
 
-      - name: Download translations
-        uses: crowdin/github-action@9fd07c1c5b36b15f082d1d860dc399f16f849bd7 # v2.9.0
+      - name: Download translations for ${{ matrix.name }}
+        uses: crowdin/github-action@b8012bd5491b8aa8578b73ab5b5f5e7c94aaa6e2 # v2.7.0
         env:
           GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
           CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
-          _CROWDIN_PROJECT_ID: "269690"
+          _CROWDIN_PROJECT_ID: ${{ matrix.project_id }}
         with:
-          config: crowdin.yml
+          config: ${{ matrix.config }}
           upload_sources: false
           upload_translations: false
           download_translations: true
           github_user_name: "bitwarden-devops-bot"
           github_user_email: "106330231+bitwarden-devops-bot@users.noreply.github.com"
-          commit_message: "Crowdin Pull"
-          localization_branch_name: "crowdin-pull"
+          commit_message: "Crowdin Pull - ${{ matrix.name }}"
+          localization_branch_name: ${{ matrix.branch }}
           create_pull_request: true
-          pull_request_title: "Crowdin Pull"
-          pull_request_body: ":inbox_tray: New translations received!"
+          pull_request_title: "Crowdin Pull - ${{ matrix.name }}"
+          pull_request_body: ":inbox_tray: New translations for ${{ matrix.name }} received!"
           gpg_private_key: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key }}
           gpg_passphrase: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key-passphrase }}

.github/workflows/crowdin-push.yml

@@ -13,17 +13,14 @@ jobs:
     runs-on: ubuntu-24.04
     permissions:
       contents: read
-      id-token: write
     steps:
       - name: Check out repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Log in to Azure
-        uses: bitwarden/gh-actions/azure-login@main
+        uses: Azure/login@cb79c773a3cfa27f31f25eb3f677781210c9ce3d # v1.6.1
         with:
-          subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-          tenant_id: ${{ secrets.AZURE_TENANT_ID }}
-          client_id: ${{ secrets.AZURE_CLIENT_ID }}
+          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
 
       - name: Retrieve secrets
         id: retrieve-secrets
@@ -32,16 +29,24 @@ jobs:
           keyvault: "bitwarden-ci"
           secrets: "crowdin-api-token"
 
-      - name: Upload sources
-        uses: crowdin/github-action@9fd07c1c5b36b15f082d1d860dc399f16f849bd7 # v2.9.0
+      - name: Upload sources for Password Manager
+        uses: crowdin/github-action@b8012bd5491b8aa8578b73ab5b5f5e7c94aaa6e2 # v2.7.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
           _CROWDIN_PROJECT_ID: "269690"
         with:
-          config: crowdin.yml
+          config: crowdin-bwpm.yml
           upload_sources: true
           upload_translations: false
 
-      - name: Log out from Azure
-        uses: bitwarden/gh-actions/azure-logout@main
+      - name: Upload sources for Authenticator
+        uses: crowdin/github-action@b8012bd5491b8aa8578b73ab5b5f5e7c94aaa6e2 # v2.7.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
+          _CROWDIN_PROJECT_ID: "673718"
+        with:
+          config: crowdin-bwa.yml
+          upload_sources: true
+          upload_translations: false

.github/workflows/github-release.yml

@@ -21,7 +21,6 @@ jobs:
     runs-on: ubuntu-24.04
     permissions:
       contents: write
-      id-token: write
 
     steps:
       - name: Check out repository
@@ -29,11 +28,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Log inputs to job summary
-        uses: ./.github/actions/log-inputs
-        with:
-          inputs: ${{ toJson(inputs) }}
-
       - name: Get branch from workflow run
         id: get_release_branch
         env:
@@ -50,29 +44,23 @@ jobs:
             exit 1
           fi
 
-          echo "🔖 Release branch: $release_branch"
-          echo "🔖 Workflow name: $workflow_name"
           echo "release_branch=$release_branch" >> $GITHUB_OUTPUT
           echo "workflow_name=$workflow_name" >> $GITHUB_OUTPUT
 
           case "$workflow_name" in
             *"Password Manager"* | "Build")
-              app_name="Password Manager"
-              app_name_suffix="bwpm"
+              echo "app_name=Password Manager" >> $GITHUB_OUTPUT
+              echo "app_name_suffix=bwpm" >> $GITHUB_OUTPUT
               ;;
             *"Authenticator"*)
-              app_name="Authenticator"
-              app_name_suffix="bwa"
+              echo "app_name=Authenticator" >> $GITHUB_OUTPUT
+              echo "app_name_suffix=bwa" >> $GITHUB_OUTPUT
               ;;
             *)
               echo "::error::Unknown workflow name: $workflow_name"
               exit 1
               ;;
           esac
-          echo "🔖 App name: $app_name"
-          echo "🔖 App name suffix: $app_name_suffix"
-          echo "app_name=$app_name" >> $GITHUB_OUTPUT
-          echo "app_name_suffix=$app_name_suffix" >> $GITHUB_OUTPUT
 
       - name: Get version info from run logs and set release tag name
         id: get_release_info
@@ -110,7 +98,7 @@ jobs:
           echo "🔖 New tag name: $tag_name"
           echo "tag_name=$tag_name" >> $GITHUB_OUTPUT
 
-          last_release_tag=$(git tag -l --sort=-authordate | grep "$_APP_NAME_SUFFIX" | head -n 1)
+          last_release_tag=$(git tag -l --sort=-authordate | grep "$APP_NAME_SUFFIX" | head -n 1)
           echo "🔖 Last release tag: $last_release_tag"
           echo "last_release_tag=$last_release_tag" >> $GITHUB_OUTPUT
 
@@ -127,51 +115,6 @@ jobs:
             find $ARTIFACTS_PATH -type f
           fi
 
-          # Files that won't be included in any release
-          files_to_remove=(
-            "com.x8bit.bitwarden.aab"
-            "com.x8bit.bitwarden.aab-sha256.txt"
-
-            "com.x8bit.bitwarden.beta.apk"
-            "com.x8bit.bitwarden.beta.apk-sha256.txt"
-            "com.x8bit.bitwarden.beta.aab"
-            "com.x8bit.bitwarden.beta.aab-sha256.txt"
-
-            "com.x8bit.bitwarden.beta-fdroid.apk"
-            "com.x8bit.bitwarden.beta-fdroid.apk-sha256.txt"
-
-            "com.x8bit.bitwarden.dev.apk"
-            "com.x8bit.bitwarden.dev.apk-sha256.txt"
-
-            "com.bitwarden.authenticator.aab"
-            "authenticator-android-aab-sha256.txt"
-          )
-
-          for file in "${files_to_remove[@]}"; do
-            find $ARTIFACTS_PATH -name "$file" -type f -delete
-          done
-          echo "🔖 Removed internal artifacts."
-          echo ""
-          echo "🔖 Files to be included in the release:"
-          find $ARTIFACTS_PATH -type f
-
-      - name: Log in to Azure
-        uses: bitwarden/gh-actions/azure-login@main
-        with:
-          subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-          tenant_id: ${{ secrets.AZURE_TENANT_ID }}
-          client_id: ${{ secrets.AZURE_CLIENT_ID }}
-
-      - name: Get Azure Key Vault secrets
-        id: get-kv-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
-        with:
-          keyvault: gh-android
-          secrets: "JIRA-API-EMAIL,JIRA-API-TOKEN"
-
-      - name: Log out from Azure
-        uses: bitwarden/gh-actions/azure-logout@main
-
       - name: Get product release notes
         id: get_release_notes
         env:
@@ -179,8 +122,8 @@ jobs:
           ARTIFACT_RUN_ID: ${{ inputs.artifact-run-id }}
           _VERSION_NAME: ${{ steps.get_release_info.outputs.version_name }}
           _RELEASE_TICKET_ID: ${{ inputs.release-ticket-id }}
-          _JIRA_API_EMAIL: ${{ steps.get-kv-secrets.outputs.JIRA-API-EMAIL }}
-          _JIRA_API_TOKEN: ${{ steps.get-kv-secrets.outputs.JIRA-API-TOKEN }}
+          _JIRA_API_EMAIL: ${{ secrets.JIRA_API_EMAIL }}
+          _JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
         run: |
           echo "Getting product release notes"
           product_release_notes=$(python3 .github/scripts/jira-get-release-notes/jira_release_notes.py $_RELEASE_TICKET_ID $_JIRA_API_EMAIL $_JIRA_API_TOKEN)
@@ -206,28 +149,23 @@ jobs:
           _TAG_NAME: ${{ steps.get_release_info.outputs.tag_name }}
           _LAST_RELEASE_TAG: ${{ steps.get_release_info.outputs.last_release_tag }}
         run: |
-          is_latest_release=false
-          if [[ "$_APP_NAME" == "Password Manager" ]]; then
-            is_latest_release=true
-          fi
-
           echo "⌛️ Creating release for $_APP_NAME $_VERSION_NAME ($_VERSION_NUMBER) on $_TARGET_COMMIT"
           release_url=$(gh release create "$_TAG_NAME" \
             --title "$_APP_NAME $_VERSION_NAME ($_VERSION_NUMBER)" \
             --target "$_TARGET_COMMIT" \
             --generate-notes \
             --notes-start-tag "$_LAST_RELEASE_TAG" \
-            --latest=$is_latest_release \
             --draft \
             $ARTIFACTS_PATH/*/*)
 
-          # Extract release tag from URL
-          release_id_from_url=$(echo "$release_url" | sed 's/.*\/tag\///')
-          echo "release_id_from_url=$release_id_from_url" >> $GITHUB_OUTPUT
-          echo "url=$release_url" >> $GITHUB_OUTPUT
-
           echo "✅ Release created: $release_url"
-          echo "🔖 Release ID from URL: $release_id_from_url"
+
+          # Get release info for outputs
+          release_data=$(gh release view "$_TAG_NAME" --json id)
+          release_id=$(echo "$release_data" | jq -r .id)
+
+          echo "id=$release_id" >> $GITHUB_OUTPUT
+          echo "url=$release_url" >> $GITHUB_OUTPUT
 
       - name: Update Release Description
         id: update_release_description
@@ -235,10 +173,10 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           ARTIFACT_RUN_ID: ${{ inputs.artifact-run-id }}
           _VERSION_NAME: ${{ steps.get_release_info.outputs.version_name }}
-          _RELEASE_ID: ${{ steps.create_release.outputs.release_id_from_url }}
+          _TAG_NAME: ${{ steps.get_release_info.outputs.tag_name }}
         run: |
-          echo "Getting current release body. Release ID: $_RELEASE_ID"
-          current_body=$(gh release view "$_RELEASE_ID" --json body --jq .body)
+          echo "Getting current release body. Tag: $_TAG_NAME"
+          current_body=$(gh release view "$_TAG_NAME" --json body --jq .body)
 
           product_release_notes=$(cat product_release_notes.txt)
 
@@ -249,7 +187,7 @@ jobs:
           ${current_body}
           **Builds Source:** https://github.com/${{ github.repository }}/actions/runs/$ARTIFACT_RUN_ID"
 
-          new_release_url=$(gh release edit "$_RELEASE_ID" --notes "$updated_body")
+          new_release_url=$(gh release edit "$_TAG_NAME" --notes "$updated_body")
 
           # draft release links change after editing
           echo "release_url=$new_release_url" >> $GITHUB_OUTPUT

.github/workflows/publish-github-release.yml

@@ -1,36 +1,12 @@
-name: Publish Password Manager and Authenticator GitHub Release as newest
+name: Publish GitHub Release as newest
 
 on:
   workflow_dispatch:
-  schedule:
-    - cron: '0 3 * * 1-5'
-
-permissions:
-  contents: write
-  id-token: write
-  actions: read
 
 jobs:
-  publish-release-password-manager:
-    name: Publish Password Manager Release
-    uses: bitwarden/gh-actions/.github/workflows/_publish-mobile-github-release.yml@main
-    with:
-      release_name: "Password Manager"
-      workflow_name: "publish-github-release.yml"
-      credentials_filename: "play_creds.json"
-      project_type: android
-      check_release_command: >
-        bundle exec fastlane getLatestPlayStoreVersion package_name:com.x8bit.bitwarden track:production
-    secrets: inherit
-
-  publish-release-authenticator:
-    name: Publish Authenticator Release
-    uses: bitwarden/gh-actions/.github/workflows/_publish-mobile-github-release.yml@main
-    with:
-      release_name: "Authenticator"
-      workflow_name: "publish-github-release.yml"
-      credentials_filename: "authenticator_play_store-creds.json"
-      project_type: android
-      check_release_command: >
-        bundle exec fastlane getLatestPlayStoreVersion package_name:com.bitwarden.authenticator track:production
-    secrets: inherit
+  stub:
+    runs-on: ubuntu-24.04
+    name: Stub
+    steps:
+      - name: Stub
+        run: echo "This is a stub job to trigger the workflow."

.github/workflows/publish-store.yml

@@ -1,159 +0,0 @@
-name: Publish to Google Play
-run-name: "Promoting ${{ inputs.product }} ${{ inputs.version-code }} from ${{ inputs.track-from }} to ${{ inputs.track-target }}"
-on:
-  workflow_dispatch:
-    inputs:
-      product:
-        description: "Which app is being released."
-        type: choice
-        options:
-          - Password Manager
-          - Authenticator
-      version-name:
-        description: "Version name to promote to production ex 2025.1.1"
-        type: string
-      version-code:
-        description: "Build number to promote to production."
-        required: true
-        type: string
-      rollout-percentage:
-          description: "Percentage of users who will receive this version update."
-          required: true
-          type: choice
-          options:
-            - 10%
-            - 30%
-            - 50%
-            - 100%
-          default: 10%
-      release-notes:
-        description: "Change notes to be included with this release."
-        type: string
-        default: "Bug fixes."
-        required: true
-      track-from:
-        description: "Track to promote from."
-        type: choice
-        options:
-          - internal
-          - Fastlane Automation Source
-        required: true
-        default: "internal"
-      track-target:
-        description: "Track to promote to."
-        type: choice
-        options:
-          - production
-          - Fastlane Automation Target
-        required: true
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GITHUB_ACTION_RUN_URL: "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-
-permissions:
-  contents: read
-  packages: read
-  id-token: write
-
-jobs:
-    promote:
-      runs-on: ubuntu-24.04
-      name: Promote build to Production in Play Store
-
-      steps:
-        - name: Log inputs to job summary
-          run: |
-            echo "<details><summary>Job Inputs</summary>" >> $GITHUB_STEP_SUMMARY
-            echo "" >> $GITHUB_STEP_SUMMARY
-            echo '```json' >> $GITHUB_STEP_SUMMARY
-            echo '${{ toJson(inputs) }}' >> $GITHUB_STEP_SUMMARY
-            echo '```' >> $GITHUB_STEP_SUMMARY
-            echo "</details>" >> $GITHUB_STEP_SUMMARY
-
-        - name: Check out repo
-          uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-        - name: Configure Ruby
-          uses: ruby/setup-ruby@bb6434c747fa7022e12fa1cae2a0951fcffcff26 # v1.253.0
-          with:
-            bundler-cache: true
-
-        - name: Install Fastlane
-          run: |
-            gem install bundler:2.2.27
-            bundle config path vendor/bundle
-            bundle install --jobs 4 --retry 3
-
-        - name: Log in to Azure
-          uses: bitwarden/gh-actions/azure-login@main
-          with:
-            subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-            tenant_id: ${{ secrets.AZURE_TENANT_ID }}
-            client_id: ${{ secrets.AZURE_CLIENT_ID }}
-
-        - name: Get Azure Key Vault secrets
-          id: get-kv-secrets
-          uses: bitwarden/gh-actions/get-keyvault-secrets@main
-          with:
-            keyvault: gh-android
-            secrets: "PLAY-BETA-KEYSTORE-PASSWORD,PLAY-BETA-KEY-PASSWORD"
-
-        - name: Retrieve secrets
-          env:
-            ACCOUNT_NAME: bitwardenci
-            CONTAINER_NAME: mobile
-          run: |
-            mkdir -p ${{ github.workspace }}/secrets
-            mkdir -p ${{ github.workspace }}/app/src/standardRelease
-
-            az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
-            --name play_creds.json --file ${{ github.workspace }}/secrets/play_creds.json --output none
-
-            az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
-            --name authenticator_play_store-creds.json --file ${{ github.workspace }}/secrets/authenticator_play_store-creds.json --output none
-
-        - name: Log out from Azure
-          uses: bitwarden/gh-actions/azure-logout@main
-
-        - name: Format Release Notes
-          run: |
-            FORMATTED_MESSAGE="$(echo "${{ inputs.release-notes }}" | sed 's/  /\n/g')"
-            echo "RELEASE_NOTES<<EOF" >> $GITHUB_ENV
-            echo "$FORMATTED_MESSAGE" >> $GITHUB_ENV
-            echo "EOF" >> $GITHUB_ENV
-        - name: Promote Play Store version to production
-          env:
-            PLAY_KEYSTORE_PASSWORD: ${{ steps.get-kv-secrets.outputs.PLAY-BETA-KEYSTORE-PASSWORD }}
-            PLAY_KEY_PASSWORD: ${{ steps.get-kv-secrets.outputs.PLAY-BETA-KEY-PASSWORD }}
-            VERSION_CODE_INPUT: ${{ inputs.version-code }}
-            VERSION_NAME: ${{inputs.version-name}}
-            ROLLOUT_PERCENTAGE: ${{ inputs.rollout-percentage }}
-            PRODUCT: ${{ inputs.product }}
-            TRACK_FROM: ${{ inputs.track-from }}
-            TRACK_TARGET: ${{ inputs.track-target }}
-          run: |
-            if [ "$PRODUCT" = "Password Manager" ]; then
-              PACKAGE_NAME="com.x8bit.bitwarden"
-            elif [ "$PRODUCT" = "Authenticator" ]; then
-              PACKAGE_NAME="com.bitwarden.authenticator"
-            else
-              echo "Unsupported product: $PRODUCT"
-              exit 1
-            fi
-
-            VERSION_CODE=$(echo "${VERSION_CODE_INPUT}" | tr -d ',')
-
-            decimal=$(echo "scale=2; ${ROLLOUT_PERCENTAGE/\%/} / 100" | bc)
-
-            bundle exec fastlane updateReleaseNotes \
-              releaseNotes:"$RELEASE_NOTES" \
-              versionCode:"$VERSION_CODE"
-
-            bundle exec fastlane promoteToProduction \
-              versionCode:"$VERSION_CODE" \
-              versionName:"$VERSION_NAME" \
-              rolloutPercentage:"$decimal" \
-              packageName:"$PACKAGE_NAME" \
-              releaseNotes:"$RELEASE_NOTES" \
-              track:"$TRACK_FROM" \
-              trackPromoteTo:"$TRACK_TARGET"

.github/workflows/publish.yml

@@ -0,0 +1,14 @@
+
+name: Publish
+
+on:
+  workflow_dispatch:
+
+jobs:
+    publish:
+      runs-on: ubuntu-24.04
+      name: Promote build to Production in Play Store
+
+      steps:
+        - name: TEST STEP
+          run: exit 0

.github/workflows/release-branch.yml

@@ -10,7 +10,6 @@ on:
         options:
           - RC
           - Hotfix
-          - Test
 
 jobs:
   create-release-branch:
@@ -18,36 +17,29 @@ jobs:
     runs-on: ubuntu-24.04
     permissions:
       contents: write
-      actions: write
     steps:
       - name: Check out repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 0
 
-      - name: Create RC or Test Branch
-        id: rc_branch
-        if: inputs.release_type == 'RC' || inputs.release_type == 'Test'
+      - name: Create RC Branch
+        if: inputs.release_type == 'RC'
         env:
-          _TEST_MODE: ${{ inputs.release_type == 'Test' }}
-          _RELEASE_TYPE: ${{ inputs.release_type }}
+          RC_PREFIX_DATE: "true" # replace with input if needed
         run: |
-          current_date=$(date +'%Y.%-m')
-          branch_name="${current_date}-rc${{ github.run_number }}"
-
-          if [ "$_TEST_MODE" = "true" ]; then
-            branch_name="WORKFLOW-TEST-${branch_name}"
+          if [ "$RC_PREFIX_DATE" = "true" ]; then
+            current_date=$(date +'%Y.%m')
+            branch_name="release/${current_date}-rc${{ github.run_number }}"
+          else
+            branch_name="release/rc${{ github.run_number }}"
           fi
-          branch_name="release/${branch_name}"
-
           git switch main
           git switch -c $branch_name
           git push origin $branch_name
-          echo "# :cherry_blossom: ${_RELEASE_TYPE} branch: ${branch_name}" >> $GITHUB_STEP_SUMMARY
-          echo "branch_name=$branch_name" >> $GITHUB_OUTPUT
+          echo "# :cherry_blossom: RC branch: ${branch_name}" >> $GITHUB_STEP_SUMMARY
 
       - name: Create Hotfix Branch
-        id: hotfix_branch
         if: inputs.release_type == 'Hotfix'
         run: |
           latest_tag=$(git tag -l --sort=-creatordate | head -n 1)
@@ -57,7 +49,6 @@ jobs:
           fi
           branch_name="release/hotfix-${latest_tag}"
           echo "🌿 branch name: $branch_name"
-          echo "branch_name=$branch_name" >> $GITHUB_OUTPUT
           if git show-ref --verify --quiet "refs/remotes/origin/$branch_name"; then
             echo "# :fire: :warning: Hotfix branch already exists: ${branch_name}" >> $GITHUB_STEP_SUMMARY
             exit 0
@@ -65,12 +56,3 @@ jobs:
           git switch -c $branch_name $latest_tag
           git push origin $branch_name
           echo "# :fire: Hotfix branch: ${branch_name}" >> $GITHUB_STEP_SUMMARY
-
-      - name: Trigger CI Workflows
-        env:
-          GH_TOKEN: ${{ github.token }}
-          _BRANCH_NAME: ${{ steps.rc_branch.outputs.branch_name || steps.hotfix_branch.outputs.branch_name }}
-        run: |
-          echo "🌿 branch name: $_BRANCH_NAME"
-          gh workflow run build.yml --ref $_BRANCH_NAME -f distribute-to-firebase=true -f publish-to-play-store=true
-          gh workflow run build-authenticator.yml --ref $_BRANCH_NAME -f distribute-to-firebase=true -f publish-to-play-store=true

.github/workflows/scan-ci.yml

@@ -6,38 +6,55 @@ on:
     branches:
       - "main"
 
-permissions: {}
-
 jobs:
-  check-run:
-    name: Check PR run
-    uses: bitwarden/gh-actions/.github/workflows/check-run.yml@main
-    permissions:
-      contents: read
-
   sast:
-    name: Checkmarx
-    uses: bitwarden/gh-actions/.github/workflows/_checkmarx.yml@main
-    needs: check-run
-    secrets:
-      AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-      AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
-      AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
+    name: SAST scan
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
-      pull-requests: write
       security-events: write
-      id-token: write
+
+    steps:
+      - name: Check out repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          fetch-depth: 0
+
+      - name: Scan with Checkmarx
+        uses: checkmarx/ast-github-action@ef93013c95adc60160bc22060875e90800d3ecfc # 2.3.19
+        with:
+          project_name: ${{ github.repository }}
+          cx_tenant: ${{ secrets.CHECKMARX_TENANT }}
+          base_uri: https://ast.checkmarx.net/
+          cx_client_id: ${{ secrets.CHECKMARX_CLIENT_ID }}
+          cx_client_secret: ${{ secrets.CHECKMARX_SECRET }}
+          additional_params: |
+            --report-format sarif \
+            --filter "state=TO_VERIFY;PROPOSED_NOT_EXPLOITABLE;CONFIRMED;URGENT" \
+            --output-path .
+
+      - name: Upload Checkmarx results to GitHub
+        uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
+        with:
+          sarif_file: cx_result.sarif
 
   quality:
-    name: Sonar
-    uses: bitwarden/gh-actions/.github/workflows/_sonar.yml@main
-    needs: check-run
-    secrets:
-      AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-      AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
-      AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
+    name: Quality scan
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
-      pull-requests: write
-      id-token: write
+
+    steps:
+      - name: Check out repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          fetch-depth: 0
+
+      - name: Scan with SonarCloud
+        uses: sonarsource/sonarqube-scan-action@aa494459d7c39c106cc77b166de8b4250a32bb97 # v5.1.0
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        with:
+          args: >
+            -Dsonar.organization=${{ github.repository_owner }}
+            -Dsonar.projectKey=${{ github.repository_owner }}_${{ github.event.repository.name }}

.github/workflows/scan.yml

@@ -21,28 +21,63 @@ jobs:
       contents: read
 
   sast:
-    name: Checkmarx
-    uses: bitwarden/gh-actions/.github/workflows/_checkmarx.yml@main
+    name: SAST scan
+    runs-on: ubuntu-24.04
     needs: check-run
-    secrets:
-      AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-      AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
-      AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
     permissions:
       contents: read
       pull-requests: write
       security-events: write
-      id-token: write
+
+    steps:
+      - name: Check out repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          ref: ${{  github.event.pull_request.head.sha }}
+
+      - name: Scan with Checkmarx
+        uses: checkmarx/ast-github-action@ef93013c95adc60160bc22060875e90800d3ecfc # 2.3.19
+        env:
+          INCREMENTAL: "${{ contains(github.event_name, 'pull_request') && '--sast-incremental' || '' }}"
+        with:
+          project_name: ${{ github.repository }}
+          cx_tenant: ${{ secrets.CHECKMARX_TENANT }}
+          base_uri: https://ast.checkmarx.net/
+          cx_client_id: ${{ secrets.CHECKMARX_CLIENT_ID }}
+          cx_client_secret: ${{ secrets.CHECKMARX_SECRET }}
+          additional_params: |
+            --report-format sarif \
+            --filter "state=TO_VERIFY;PROPOSED_NOT_EXPLOITABLE;CONFIRMED;URGENT" \
+            --output-path . ${{ env.INCREMENTAL }}
+
+      - name: Upload Checkmarx results to GitHub
+        uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
+        with:
+          sarif_file: cx_result.sarif
+          sha: ${{ contains(github.event_name, 'pull_request') && github.event.pull_request.head.sha || github.sha }}
+          ref: ${{ contains(github.event_name, 'pull_request') && format('refs/pull/{0}/head', github.event.pull_request.number) || github.ref }}
 
   quality:
-    name: Sonar
-    uses: bitwarden/gh-actions/.github/workflows/_sonar.yml@main
+    name: Quality scan
+    runs-on: ubuntu-24.04
     needs: check-run
-    secrets:
-      AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-      AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
-      AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
     permissions:
       contents: read
       pull-requests: write
-      id-token: write
+
+    steps:
+      - name: Check out repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          fetch-depth: 0
+          ref: ${{  github.event.pull_request.head.sha }}
+
+      - name: Scan with SonarCloud
+        uses: sonarsource/sonarqube-scan-action@aa494459d7c39c106cc77b166de8b4250a32bb97 # v5.1.0
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        with:
+          args: >
+            -Dsonar.organization=${{ github.repository_owner }}
+            -Dsonar.projectKey=${{ github.repository_owner }}_${{ github.event.repository.name }}
+            -Dsonar.pullrequest.key=${{ github.event.pull_request.number }}

.github/workflows/test.yml

@@ -30,7 +30,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Validate Gradle wrapper
-        uses: gradle/actions/wrapper-validation@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+        uses: gradle/actions/wrapper-validation@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
 
       - name: Cache Gradle files
         uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
@@ -52,7 +52,7 @@ jobs:
             ${{ runner.os }}-build-
 
       - name: Configure Ruby
-        uses: ruby/setup-ruby@bb6434c747fa7022e12fa1cae2a0951fcffcff26 # v1.253.0
+        uses: ruby/setup-ruby@ca041f971d66735f3e5ff1e21cc13e2d51e7e535 # v1.233.0
         with:
           bundler-cache: true
 
@@ -91,7 +91,7 @@ jobs:
 
       - name: Upload to codecov.io
         id: upload-to-codecov
-        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
+        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
         if: github.event_name == 'push' || github.event_name == 'pull_request'
         continue-on-error: true
         with:

.ruby-version

@@ -1 +1 @@
-3.4.2
+3.3.1

Gemfile

@@ -7,12 +7,3 @@ gem 'time'
 
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
 eval_gemfile(plugins_path) if File.exist?(plugins_path)
-
-# Since ruby 3.4.0 these are not included in the standard library
-gem 'abbrev'
-gem 'logger'
-gem 'mutex_m'
-gem 'csv'
-
-# Starting with Ruby 3.5.0, these are not included in the standard library
-gem 'ostruct'

Gemfile.lock

@@ -5,39 +5,35 @@ GEM
       base64
       nkf
       rexml
-    abbrev (0.1.2)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1139.0)
-    aws-sdk-core (3.228.0)
+    aws-partitions (1.1113.0)
+    aws-sdk-core (3.225.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
-      bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.109.0)
-      aws-sdk-core (~> 3, >= 3.228.0)
+    aws-sdk-kms (1.104.0)
+      aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.195.0)
-      aws-sdk-core (~> 3, >= 3.228.0)
+    aws-sdk-s3 (1.189.0)
+      aws-sdk-core (~> 3, >= 3.225.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.12.1)
+    aws-sigv4 (1.12.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.3.0)
-    bigdecimal (3.2.2)
     claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    csv (3.3.5)
     date (3.4.1)
     declarative (0.0.20)
     digest-crc (0.7.0)
@@ -62,10 +58,10 @@ GEM
       faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
     faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.1)
+    faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.1.1)
+    faraday-multipart (1.1.0)
       multipart-post (~> 2.0)
     faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
@@ -75,7 +71,7 @@ GEM
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.4.0)
-    fastlane (2.228.0)
+    fastlane (2.227.2)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -169,21 +165,20 @@ GEM
     httpclient (2.9.0)
       mutex_m
     jmespath (1.6.2)
-    json (2.13.2)
-    jwt (2.10.2)
+    json (2.12.2)
+    jwt (2.10.1)
       base64
     logger (1.7.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    multi_json (1.17.0)
+    multi_json (1.15.0)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     nanaimo (0.4.0)
-    naturally (2.3.0)
+    naturally (2.2.2)
     nkf (0.2.0)
     optparse (0.6.0)
     os (1.1.4)
-    ostruct (0.6.3)
     plist (3.7.2)
     public_suffix (6.0.2)
     rake (13.3.0)
@@ -235,17 +230,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  abbrev
-  csv
   fastlane
   fastlane-plugin-firebase_app_distribution
-  logger
-  mutex_m
-  ostruct
   time
 
 RUBY VERSION
-   ruby 3.4.2p28
+   ruby 3.3.1p55
 
 BUNDLED WITH
-   2.6.9
+   2.6.6

README.md

@@ -52,16 +52,6 @@
 
     Please avoid mixing formatting and logical changes in the same commit/PR. When possible, fix any large formatting issues in a separate PR before opening one to make logical changes to the same code. This helps others focus on the meaningful code changes when reviewing the code.
 
-4. Setup JDK `Version` `17`:
-
-    - Navigate to `Preferences > Build, Execution, Deployment > Build Tools > Gradle`.
-    - Hit the selected Gradle JDK next to `Gradle JDK:`.
-    - Select a `17.x` version or hit `Download JDK...` if not present.
-    - Select `Version` `17`.
-    - Select your preferred `Vendor`.
-    - Hit `Download`.
-    - Hit `Apply`.
-
 ## Theme
 
 ### Icons & Illustrations

annotation/build.gradle.kts

@@ -37,6 +37,6 @@ android {
 
 kotlin {
     compilerOptions {
-        jvmTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
+        jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
     }
 }

app/build.gradle.kts

@@ -10,7 +10,6 @@ import java.util.Properties
 
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.androidx.room)
     // Crashlytics is enabled for all builds initially but removed for FDroid builds in gradle and
     // standardDebug builds in the merged manifest.
     alias(libs.plugins.crashlytics)
@@ -47,32 +46,26 @@ android {
     namespace = "com.x8bit.bitwarden"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
-    room {
-        schemaDirectory("$projectDir/schemas")
-    }
-
     defaultConfig {
         applicationId = "com.x8bit.bitwarden"
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
-        versionCode = libs.versions.appVersionCode.get().toInt()
-        versionName = libs.versions.appVersionName.get()
+        versionCode = 1
+        versionName = "2025.4.0"
+
+        setProperty("archivesBaseName", "com.x8bit.bitwarden")
+
+        ksp {
+            // The location in which the generated Room Database Schemas will be stored in the repo.
+            arg("room.schemaLocation", "$projectDir/schemas")
+        }
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
-        // Set the base archive name for publishing purposes. This is used to derive the APK and AAB
-        // artifact names when uploading to Firebase and Play Store.
-        base.archivesName = "com.x8bit.bitwarden"
-
         buildConfigField(
             type = "String",
             name = "CI_INFO",
-            value = "${ciProperties.getOrDefault("ci.info", "\"\uD83D\uDCBB local\"")}",
-        )
-        buildConfigField(
-            type = "String",
-            name = "SDK_VERSION",
-            value = "\"${libs.versions.bitwardenSdk.get()}\"",
+            value = "${ciProperties.getOrDefault("ci.info", "\"local\"")}",
         )
     }
 
@@ -106,7 +99,6 @@ android {
             applicationIdSuffix = ".beta"
             isDebuggable = false
             isMinifyEnabled = true
-            isShrinkResources = true
             matchingFallbacks += listOf("release")
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
@@ -119,7 +111,6 @@ android {
         release {
             isDebuggable = false
             isMinifyEnabled = true
-            isShrinkResources = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro",
@@ -202,7 +193,7 @@ android {
 
 kotlin {
     compilerOptions {
-        jvmTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
+        jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
     }
 }
 
@@ -264,10 +255,11 @@ dependencies {
     implementation(libs.kotlinx.collections.immutable)
     implementation(libs.kotlinx.coroutines.android)
     implementation(libs.kotlinx.serialization)
-    implementation(platform(libs.square.okhttp.bom))
     implementation(libs.square.okhttp)
+    implementation(libs.square.okhttp.logging)
     implementation(platform(libs.square.retrofit.bom))
     implementation(libs.square.retrofit)
+    implementation(libs.square.retrofit.kotlinx.serialization)
     implementation(libs.timber)
     implementation(libs.zxing.zxing.core)
 
@@ -295,6 +287,7 @@ dependencies {
     testImplementation(libs.kotlinx.coroutines.test)
     testImplementation(libs.mockk.mockk)
     testImplementation(libs.robolectric.robolectric)
+    testImplementation(libs.square.okhttp.mockwebserver)
     testImplementation(libs.square.turbine)
 }
 
@@ -303,7 +296,8 @@ tasks {
         useJUnitPlatform()
         maxHeapSize = "2g"
         maxParallelForks = Runtime.getRuntime().availableProcessors()
-        jvmArgs = jvmArgs.orEmpty() + "-XX:+UseParallelGC" + "-Duser.country=US"
+        jvmArgs = jvmArgs.orEmpty() + "-XX:+UseParallelGC"
+        android.sourceSets["main"].res.srcDirs("src/test/res")
     }
 }
 

app/schemas/com.x8bit.bitwarden.data.vault.datasource.disk.database.VaultDatabase/7.json

@@ -1,252 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 7,
-    "identityHash": "4c6ad1f5268d7e8add7407201788aa2e",
-    "entities": [
-      {
-        "tableName": "ciphers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `has_totp` INTEGER NOT NULL DEFAULT 1, `cipher_type` TEXT NOT NULL, `cipher_json` TEXT NOT NULL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "user_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hasTotp",
-            "columnName": "has_totp",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "1"
-          },
-          {
-            "fieldPath": "cipherType",
-            "columnName": "cipher_type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "cipherJson",
-            "columnName": "cipher_json",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_ciphers_user_id",
-            "unique": false,
-            "columnNames": [
-              "user_id"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_ciphers_user_id` ON `${TABLE_NAME}` (`user_id`)"
-          }
-        ]
-      },
-      {
-        "tableName": "collections",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `organization_id` TEXT NOT NULL, `should_hide_passwords` INTEGER NOT NULL, `name` TEXT NOT NULL, `external_id` TEXT, `read_only` INTEGER NOT NULL, `manage` INTEGER, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "user_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "organizationId",
-            "columnName": "organization_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "shouldHidePasswords",
-            "columnName": "should_hide_passwords",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "externalId",
-            "columnName": "external_id",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "isReadOnly",
-            "columnName": "read_only",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "canManage",
-            "columnName": "manage",
-            "affinity": "INTEGER"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_collections_user_id",
-            "unique": false,
-            "columnNames": [
-              "user_id"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collections_user_id` ON `${TABLE_NAME}` (`user_id`)"
-          }
-        ]
-      },
-      {
-        "tableName": "domains",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `domains_json` TEXT, PRIMARY KEY(`user_id`))",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "user_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "domainsJson",
-            "columnName": "domains_json",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "user_id"
-          ]
-        }
-      },
-      {
-        "tableName": "folders",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `name` TEXT, `revision_date` INTEGER NOT NULL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "user_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "revisionDate",
-            "columnName": "revision_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_folders_user_id",
-            "unique": false,
-            "columnNames": [
-              "user_id"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_folders_user_id` ON `${TABLE_NAME}` (`user_id`)"
-          }
-        ]
-      },
-      {
-        "tableName": "sends",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `send_type` TEXT NOT NULL, `send_json` TEXT NOT NULL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "user_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sendType",
-            "columnName": "send_type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sendJson",
-            "columnName": "send_json",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_sends_user_id",
-            "unique": false,
-            "columnNames": [
-              "user_id"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_sends_user_id` ON `${TABLE_NAME}` (`user_id`)"
-          }
-        ]
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '4c6ad1f5268d7e8add7407201788aa2e')"
-    ]
-  }
-}

app/src/beta/AndroidManifest.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <application tools:ignore="MissingApplicationIcon">
-        <activity
-            android:name=".MainActivity">
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="https" />
-                <data android:host="*.bitwarden.pw" />
-                <data android:pathPattern="/redirect-connector.*" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>

app/src/debug/AndroidManifest.xml

@@ -7,20 +7,6 @@
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"
             android:value="false" />
-        <activity
-            android:name=".MainActivity"
-            tools:ignore="IntentFilterExportedReceiver">
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="https" />
-                <data android:host="*.bitwarden.pw" />
-                <data android:pathPattern="/redirect-connector.*" />
-            </intent-filter>
-        </activity>
     </application>
 
 </manifest>

app/src/debug/res/xml/network_security_config.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config xmlns:tools="http://schemas.android.com/tools">
-
-    <base-config
-        cleartextTrafficPermitted="true"
-        tools:ignore="InsecureBaseConfiguration">
-        <trust-anchors>
-            <!-- Trust pre-installed CAs -->
-            <certificates src="system" />
-            <!-- Additionally trust user added CAs -->
-            <certificates
-                src="user"
-                tools:ignore="AcceptsUserCertificates" />
-        </trust-anchors>
-    </base-config>
-
-    <domain-config cleartextTrafficPermitted="false">
-        <domain includeSubdomains="true">bitwarden.com</domain>
-        <domain includeSubdomains="true">bitwarden.eu</domain>
-        <domain includeSubdomains="true">bitwarden.pw</domain>
-        <trust-anchors>
-            <!-- Only trust pre-installed CAs for Bitwarden domains and all subdomains -->
-            <certificates src="system" />
-        </trust-anchors>
-    </domain-config>
-
-</network-security-config>

app/src/debug/res/xml/provider.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<credential-provider>
-    <capabilities>
-        <capability name="android.credentials.TYPE_PASSWORD_CREDENTIAL" />
-        <capability name="androidx.credentials.TYPE_PUBLIC_KEY_CREDENTIAL" />
-    </capabilities>
-</credential-provider>

app/src/main/AndroidManifest.xml

@@ -81,12 +81,12 @@
                 <data android:scheme="https" />
                 <data android:host="*.bitwarden.com" />
                 <data android:host="*.bitwarden.eu" />
+                <data android:host="*.bitwarden.pw" />
                 <data android:pathPattern="/redirect-connector.*" />
             </intent-filter>
             <intent-filter>
                 <action android:name="com.x8bit.bitwarden.credentials.ACTION_CREATE_PASSKEY" />
                 <action android:name="com.x8bit.bitwarden.credentials.ACTION_GET_PASSKEY" />
-                <action android:name="com.x8bit.bitwarden.credentials.ACTION_GET_PASSWORD" />
                 <action android:name="com.x8bit.bitwarden.credentials.ACTION_UNLOCK_ACCOUNT" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -330,19 +330,11 @@
             <action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.HOME" />
         </intent>
-        <!-- To Query Privileged Apps -->
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:scheme="http" />
-        </intent>
         <!-- To Query Chrome Beta: -->
         <package android:name="com.chrome.beta" />
 
         <!-- To Query Chrome Stable: -->
         <package android:name="com.android.chrome" />
-
-        <!-- To Query Brave Stable: -->
-        <package android:name="com.brave.browser" />
     </queries>
 
 </manifest>

app/src/main/assets/fido2_privileged_google.json

@@ -779,42 +779,6 @@
           }
         ]
       }
-    },
-    {
-      "type": "android",
-      "info": {
-        "package_name": "cz.seznam.sbrowser",
-        "signatures": [
-          {
-            "build": "release",
-            "cert_fingerprint_sha256": "DB:95:40:66:10:78:83:6E:4E:B1:66:F6:9E:F4:07:30:9E:8D:AE:33:34:68:5E:C8:F6:FA:2F:13:81:B9:AC:F6"
-          }
-        ]
-      }
-    },
-    {
-      "type": "android",
-      "info": {
-        "package_name": "com.opera.mini.native",
-        "signatures": [
-          {
-            "build": "release",
-            "cert_fingerprint_sha256": "57:AC:BC:52:5F:1B:2E:BD:19:19:6C:D6:F0:14:39:7C:C9:10:FD:18:84:1E:0A:E8:50:FE:BC:3E:1E:59:3F:F2"
-          }
-        ]
-      }
-    },
-    {
-      "type": "android",
-      "info": {
-        "package_name": "com.opera.mini.native.beta",
-        "signatures": [
-          {
-            "build": "release",
-            "cert_fingerprint_sha256": "57:AC:BC:52:5F:1B:2E:BD:19:19:6C:D6:F0:14:39:7C:C9:10:FD:18:84:1E:0A:E8:50:FE:BC:3E:1E:59:3F:F2"
-          }
-        ]
-      }
     }
   ]
 }

app/src/main/kotlin/com/x8bit/bitwarden/AccessibilityActivity.kt

@@ -1,11 +1,8 @@
 package com.x8bit.bitwarden
 
-import android.app.ComponentCaller
-import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.bitwarden.annotation.OmitFromCoverage
-import com.bitwarden.ui.platform.util.validate
 
 /**
  * An activity to be launched and then immediately closed so that the OS Shade can be collapsed
@@ -14,16 +11,7 @@ import com.bitwarden.ui.platform.util.validate
 @OmitFromCoverage
 class AccessibilityActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
-        intent = intent.validate()
         super.onCreate(savedInstanceState)
         finish()
     }
-
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent.validate())
-    }
-
-    override fun onNewIntent(intent: Intent, caller: ComponentCaller) {
-        super.onNewIntent(intent.validate(), caller)
-    }
 }

app/src/main/kotlin/com/x8bit/bitwarden/AuthCallbackActivity.kt

@@ -1,12 +1,10 @@
 package com.x8bit.bitwarden
 
-import android.app.ComponentCaller
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import com.bitwarden.annotation.OmitFromCoverage
-import com.bitwarden.ui.platform.util.validate
 import dagger.hilt.android.AndroidEntryPoint
 
 /**
@@ -23,7 +21,6 @@ class AuthCallbackActivity : AppCompatActivity() {
     private val viewModel: AuthCallbackViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        intent = intent.validate()
         super.onCreate(savedInstanceState)
 
         viewModel.trySendAction(AuthCallbackAction.IntentReceive(intent = intent))
@@ -38,12 +35,4 @@ class AuthCallbackActivity : AppCompatActivity() {
         startActivity(intent)
         finish()
     }
-
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent.validate())
-    }
-
-    override fun onNewIntent(intent: Intent, caller: ComponentCaller) {
-        super.onNewIntent(intent.validate(), caller)
-    }
 }

app/src/main/kotlin/com/x8bit/bitwarden/AutofillTotpCopyActivity.kt

@@ -1,13 +1,10 @@
 package com.x8bit.bitwarden
 
-import android.app.ComponentCaller
-import android.content.Intent
 import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.bitwarden.annotation.OmitFromCoverage
-import com.bitwarden.ui.platform.util.validate
 import com.x8bit.bitwarden.data.autofill.manager.AutofillCompletionManager
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.launchIn
@@ -29,7 +26,6 @@ class AutofillTotpCopyActivity : AppCompatActivity() {
     private val autofillTotpCopyViewModel: AutofillTotpCopyViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        intent = intent.validate()
         super.onCreate(savedInstanceState)
 
         observeViewModelEvents()
@@ -41,14 +37,6 @@ class AutofillTotpCopyActivity : AppCompatActivity() {
         )
     }
 
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent.validate())
-    }
-
-    override fun onNewIntent(intent: Intent, caller: ComponentCaller) {
-        super.onNewIntent(intent.validate(), caller)
-    }
-
     private fun observeViewModelEvents() {
         autofillTotpCopyViewModel
             .eventFlow

app/src/main/kotlin/com/x8bit/bitwarden/AutofillTotpCopyViewModel.kt

@@ -7,12 +7,12 @@ import com.bitwarden.vault.CipherView
 import com.x8bit.bitwarden.data.auth.repository.AuthRepository
 import com.x8bit.bitwarden.data.autofill.util.getTotpCopyIntentOrNull
 import com.x8bit.bitwarden.data.platform.util.launchWithTimeout
-import com.x8bit.bitwarden.data.vault.manager.model.GetCipherResult
 import com.x8bit.bitwarden.data.vault.repository.VaultRepository
 import com.x8bit.bitwarden.data.vault.repository.model.VaultUnlockData
 import com.x8bit.bitwarden.data.vault.repository.util.statusFor
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.mapNotNull
 import javax.inject.Inject
 
 /**
@@ -55,13 +55,19 @@ class AutofillTotpCopyViewModel @Inject constructor(
                 }
 
                 // Try and find the matching cipher.
-                when (val result = vaultRepository.getCipher(cipherId = cipherId)) {
-                    GetCipherResult.CipherNotFound -> finishActivity()
-                    is GetCipherResult.Failure -> finishActivity()
-                    is GetCipherResult.Success -> {
-                        sendEvent(AutofillTotpCopyEvent.CompleteAutofill(result.cipherView))
+                vaultRepository
+                    .ciphersStateFlow
+                    .mapNotNull { it.data }
+                    .first()
+                    .find { it.id == cipherId }
+                    ?.let { cipherView ->
+                        sendEvent(
+                            AutofillTotpCopyEvent.CompleteAutofill(
+                                cipherView = cipherView,
+                            ),
+                        )
                     }
-                }
+                    ?: finishActivity()
             }
     }
 

app/src/main/kotlin/com/x8bit/bitwarden/MainActivity.kt

@@ -1,6 +1,5 @@
 package com.x8bit.bitwarden
 
-import android.app.ComponentCaller
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
@@ -15,7 +14,6 @@ import androidx.appcompat.app.AppCompatDelegate
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
-import androidx.core.app.ActivityCompat
 import androidx.core.os.LocaleListCompat
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -25,7 +23,6 @@ import com.bitwarden.annotation.OmitFromCoverage
 import com.bitwarden.ui.platform.base.util.EventsEffect
 import com.bitwarden.ui.platform.theme.BitwardenTheme
 import com.bitwarden.ui.platform.util.setupEdgeToEdge
-import com.bitwarden.ui.platform.util.validate
 import com.x8bit.bitwarden.data.autofill.accessibility.manager.AccessibilityCompletionManager
 import com.x8bit.bitwarden.data.autofill.manager.AutofillActivityManager
 import com.x8bit.bitwarden.data.autofill.manager.AutofillCompletionManager
@@ -44,8 +41,6 @@ import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
-private const val ANDROID_15_BUG_MAX_REVISION: Int = 241007
-
 /**
  * Primary entry point for the application.
  */
@@ -72,11 +67,10 @@ class MainActivity : AppCompatActivity() {
     lateinit var debugLaunchManager: DebugMenuLaunchManager
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        intent = intent.validate()
         var shouldShowSplashScreen = true
         installSplashScreen().setKeepOnScreenCondition { shouldShowSplashScreen }
         super.onCreate(savedInstanceState)
-        window.decorView.filterTouchesWhenObscured = true
+
         if (savedInstanceState == null) {
             mainViewModel.trySendAction(MainAction.ReceiveFirstIntent(intent = intent))
         }
@@ -120,15 +114,8 @@ class MainActivity : AppCompatActivity() {
     }
 
     override fun onNewIntent(intent: Intent) {
-        val newIntent = intent.validate()
-        super.onNewIntent(newIntent)
-        mainViewModel.trySendAction(action = MainAction.ReceiveNewIntent(intent = newIntent))
-    }
-
-    override fun onNewIntent(intent: Intent, caller: ComponentCaller) {
-        val newIntent = intent.validate()
-        super.onNewIntent(newIntent, caller)
-        mainViewModel.trySendAction(action = MainAction.ReceiveNewIntent(intent = newIntent))
+        super.onNewIntent(intent)
+        mainViewModel.trySendAction(action = MainAction.ReceiveNewIntent(intent = intent))
     }
 
     override fun onResume() {
@@ -224,35 +211,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun handleRecreate() {
-        val isOldAndroidBuildRevision = {
-            // This fetches the date portion of the ID in order to determine the revision of
-            // Android 15 being used and whether we want to use the `recreate` API or not.
-            // If we fail to parse a date, we assume it is not an old revision.
-            "\\.([^.]+)\\."
-                .toRegex()
-                .find(Build.ID)
-                ?.groups
-                ?.get(1)
-                ?.value
-                ?.toIntOrNull()
-                ?.let { it <= ANDROID_15_BUG_MAX_REVISION } == true
-        }
-        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.VANILLA_ICE_CREAM &&
-            isOldAndroidBuildRevision()
-        ) {
-            // This is done to avoid a bug in specific older revisions of Android 15. The bug has
-            // been fixed but certain phones that are no longer supported will never get the fix.
-            // The OS bug is tracked here: https://issuetracker.google.com/issues/370180732
-            startActivity(
-                Intent
-                    .makeMainActivity(componentName)
-                    .addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION),
-            )
-            finish()
-            overrideActivityTransition(OVERRIDE_TRANSITION_CLOSE, 0, 0)
-        } else {
-            ActivityCompat.recreate(this)
-        }
+        recreate()
     }
 
     private fun updateScreenCapture(isScreenCaptureAllowed: Boolean) {

app/src/main/kotlin/com/x8bit/bitwarden/MainViewModel.kt

@@ -6,7 +6,6 @@ import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
 import com.bitwarden.ui.platform.base.BaseViewModel
 import com.bitwarden.ui.platform.feature.settings.appearance.model.AppTheme
-import com.bitwarden.ui.platform.resource.BitwardenString
 import com.bitwarden.ui.util.Text
 import com.bitwarden.ui.util.asText
 import com.bitwarden.vault.CipherView
@@ -23,12 +22,13 @@ import com.x8bit.bitwarden.data.credentials.manager.BitwardenCredentialManager
 import com.x8bit.bitwarden.data.credentials.util.getCreateCredentialRequestOrNull
 import com.x8bit.bitwarden.data.credentials.util.getFido2AssertionRequestOrNull
 import com.x8bit.bitwarden.data.credentials.util.getGetCredentialsRequestOrNull
-import com.x8bit.bitwarden.data.credentials.util.getProviderGetPasswordRequestOrNull
 import com.x8bit.bitwarden.data.platform.manager.AppResumeManager
+import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager
 import com.x8bit.bitwarden.data.platform.manager.SpecialCircumstanceManager
 import com.x8bit.bitwarden.data.platform.manager.garbage.GarbageCollectionManager
 import com.x8bit.bitwarden.data.platform.manager.model.AppResumeScreenData
 import com.x8bit.bitwarden.data.platform.manager.model.CompleteRegistrationData
+import com.x8bit.bitwarden.data.platform.manager.model.FlagKey
 import com.x8bit.bitwarden.data.platform.manager.model.SpecialCircumstance
 import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository
 import com.x8bit.bitwarden.data.platform.repository.SettingsRepository
@@ -44,15 +44,12 @@ import com.x8bit.bitwarden.ui.platform.util.isPasswordGeneratorShortcut
 import com.x8bit.bitwarden.ui.vault.model.TotpData
 import com.x8bit.bitwarden.ui.vault.util.getTotpDataOrNull
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.drop
-import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
@@ -61,17 +58,17 @@ import java.time.Clock
 import javax.inject.Inject
 
 private const val SPECIAL_CIRCUMSTANCE_KEY = "special-circumstance"
-private const val ANIMATION_DEBOUNCE_DELAY_MS = 500L
+private const val ANIMATION_REFRESH_DELAY = 500L
 
 /**
  * A view model that helps launch actions for the [MainActivity].
  */
-@OptIn(FlowPreview::class)
 @Suppress("LongParameterList", "TooManyFunctions")
 @HiltViewModel
 class MainViewModel @Inject constructor(
     accessibilitySelectionManager: AccessibilitySelectionManager,
     autofillSelectionManager: AutofillSelectionManager,
+    featureFlagManager: FeatureFlagManager,
     private val addTotpItemFromAuthenticatorManager: AddTotpItemFromAuthenticatorManager,
     private val specialCircumstanceManager: SpecialCircumstanceManager,
     private val garbageCollectionManager: GarbageCollectionManager,
@@ -88,6 +85,9 @@ class MainViewModel @Inject constructor(
     initialState = MainState(
         theme = settingsRepository.appTheme,
         isScreenCaptureAllowed = settingsRepository.isScreenCaptureAllowed,
+        isErrorReportingDialogEnabled = featureFlagManager.getFeatureFlag(
+            key = FlagKey.MobileErrorReporting,
+        ),
         isDynamicColorsEnabled = settingsRepository.isDynamicColorsEnabled,
     ),
 ) {
@@ -106,6 +106,12 @@ class MainViewModel @Inject constructor(
             .onEach { specialCircumstance = it }
             .launchIn(viewModelScope)
 
+        featureFlagManager
+            .getFeatureFlagFlow(key = FlagKey.MobileErrorReporting)
+            .map { MainAction.Internal.OnMobileErrorReportingReceive(it) }
+            .onEach(::sendAction)
+            .launchIn(viewModelScope)
+
         accessibilitySelectionManager
             .accessibilitySelectionFlow
             .map { MainAction.Internal.AccessibilitySelectionReceive(it) }
@@ -139,23 +145,36 @@ class MainViewModel @Inject constructor(
             .onEach(::trySendAction)
             .launchIn(viewModelScope)
 
-        merge(
-            authRepository
-                .userStateFlow
-                .drop(count = 1)
-                // Trigger an action whenever the current user changes or we go into/out of a
-                // pending account state (which acts like switching to a temporary user).
-                .map { it?.activeUserId to it?.hasPendingAccountAddition }
-                .distinctUntilChanged(),
-            vaultRepository
-                .vaultStateEventFlow
-                .filter { it is VaultStateEvent.Locked },
-        )
-            // This debounce ensure we do not emit multiple times rapidly and also acts as a short
-            // delay to give animations time to finish (ex: account switcher).
-            .debounce(timeoutMillis = ANIMATION_DEBOUNCE_DELAY_MS)
-            .map { MainAction.Internal.CurrentUserOrVaultStateChange }
-            .onEach(::sendAction)
+        authRepository
+            .userStateFlow
+            .drop(count = 1)
+            // Trigger an action whenever the current user changes or we go into/out of a pending
+            // account state (which acts like switching to a temporary user).
+            .map { it?.activeUserId to it?.hasPendingAccountAddition }
+            .distinctUntilChanged()
+            .onEach {
+                // Switching between account states often involves some kind of animation (ex:
+                // account switcher) that we might want to give time to finish before triggering
+                // a refresh.
+                delay(ANIMATION_REFRESH_DELAY)
+                trySendAction(MainAction.Internal.CurrentUserStateChange)
+            }
+            .launchIn(viewModelScope)
+
+        vaultRepository
+            .vaultStateEventFlow
+            .onEach {
+                when (it) {
+                    is VaultStateEvent.Locked -> {
+                        // Similar to account switching, triggering this action too soon can
+                        // interfere with animations or navigation logic, so we will delay slightly.
+                        delay(ANIMATION_REFRESH_DELAY)
+                        trySendAction(MainAction.Internal.VaultUnlockStateChange)
+                    }
+
+                    is VaultStateEvent.Unlocked -> Unit
+                }
+            }
             .launchIn(viewModelScope)
 
         // On app launch, mark all active users as having previously logged in.
@@ -193,13 +212,22 @@ class MainViewModel @Inject constructor(
                 handleAutofillSelectionReceive(action)
             }
 
-            is MainAction.Internal.CurrentUserOrVaultStateChange -> {
-                handleCurrentUserOrVaultStateChange()
-            }
-
+            is MainAction.Internal.CurrentUserStateChange -> handleCurrentUserStateChange()
             is MainAction.Internal.ScreenCaptureUpdate -> handleScreenCaptureUpdate(action)
             is MainAction.Internal.ThemeUpdate -> handleAppThemeUpdated(action)
+            is MainAction.Internal.VaultUnlockStateChange -> handleVaultUnlockStateChange()
             is MainAction.Internal.DynamicColorsUpdate -> handleDynamicColorsUpdate(action)
+            is MainAction.Internal.OnMobileErrorReportingReceive -> {
+                handleOnMobileErrorReportingReceive(action)
+            }
+        }
+    }
+
+    private fun handleOnMobileErrorReportingReceive(
+        action: MainAction.Internal.OnMobileErrorReportingReceive,
+    ) {
+        mutableStateFlow.update {
+            it.copy(isErrorReportingDialogEnabled = action.isErrorReportingEnabled)
         }
     }
 
@@ -232,9 +260,8 @@ class MainViewModel @Inject constructor(
         sendEvent(MainEvent.CompleteAutofill(cipherView = action.cipherView))
     }
 
-    private fun handleCurrentUserOrVaultStateChange() {
-        sendEvent(MainEvent.Recreate)
-        garbageCollectionManager.tryCollect()
+    private fun handleCurrentUserStateChange() {
+        recreateUiAndGarbageCollect()
     }
 
     private fun handleScreenCaptureUpdate(action: MainAction.Internal.ScreenCaptureUpdate) {
@@ -246,6 +273,10 @@ class MainViewModel @Inject constructor(
         sendEvent(MainEvent.UpdateAppTheme(osTheme = action.theme.osValue))
     }
 
+    private fun handleVaultUnlockStateChange() {
+        recreateUiAndGarbageCollect()
+    }
+
     private fun handleDynamicColorsUpdate(action: MainAction.Internal.DynamicColorsUpdate) {
         mutableStateFlow.update { it.copy(isDynamicColorsEnabled = action.isDynamicColorsEnabled) }
     }
@@ -294,7 +325,6 @@ class MainViewModel @Inject constructor(
         val createCredentialRequest = intent.getCreateCredentialRequestOrNull()
         val getCredentialsRequest = intent.getGetCredentialsRequestOrNull()
         val fido2AssertCredentialRequest = intent.getFido2AssertionRequestOrNull()
-        val providerGetPasswordRequest = intent.getProviderGetPasswordRequestOrNull()
         when {
             passwordlessRequestData != null -> {
                 authRepository.activeUserId?.let {
@@ -385,19 +415,6 @@ class MainViewModel @Inject constructor(
                     )
             }
 
-            providerGetPasswordRequest != null -> {
-                // Set the user's verification status when a new GetPassword request is
-                // received to force explicit verification if the user's vault is
-                // unlocked when the request is received.
-                bitwardenCredentialManager.isUserVerified =
-                    providerGetPasswordRequest.isUserPreVerified
-
-                specialCircumstanceManager.specialCircumstance =
-                    SpecialCircumstance.ProviderGetPasswordRequest(
-                        passwordGetRequest = providerGetPasswordRequest,
-                    )
-            }
-
             getCredentialsRequest != null -> {
                 specialCircumstanceManager.specialCircumstance =
                     SpecialCircumstance.ProviderGetCredentials(
@@ -421,6 +438,11 @@ class MainViewModel @Inject constructor(
         }
     }
 
+    private fun recreateUiAndGarbageCollect() {
+        sendEvent(MainEvent.Recreate)
+        garbageCollectionManager.tryCollect()
+    }
+
     private fun handleCompleteRegistrationData(data: CompleteRegistrationData) {
         viewModelScope.launch {
             // Attempt to load the environment for the user if they have a pre-auth environment
@@ -438,8 +460,7 @@ class MainViewModel @Inject constructor(
                             message = emailTokenResult
                                 .message
                                 ?.asText()
-                                ?: BitwardenString
-                                    .there_was_an_issue_validating_the_registration_token
+                                ?: R.string.there_was_an_issue_validating_the_registration_token
                                     .asText(),
                         ),
                     )
@@ -474,12 +495,15 @@ data class MainState(
     val theme: AppTheme,
     val isScreenCaptureAllowed: Boolean,
     val isDynamicColorsEnabled: Boolean,
+    private val isErrorReportingDialogEnabled: Boolean,
 ) : Parcelable {
     /**
      * Contains all feature flags that are available to the UI.
      */
     val featureFlagsState: FeatureFlagsState
-        get() = FeatureFlagsState
+        get() = FeatureFlagsState(
+            isErrorReportingDialogEnabled = isErrorReportingDialogEnabled,
+        )
 }
 
 /**
@@ -524,6 +548,13 @@ sealed class MainAction {
             val cipherView: CipherView,
         ) : Internal()
 
+        /**
+         * Indicates the Mobile Error Reporting feature flag has been updated.
+         */
+        data class OnMobileErrorReportingReceive(
+            val isErrorReportingEnabled: Boolean,
+        ) : Internal()
+
         /**
          * Indicates the user has manually selected the given [cipherView] for autofill.
          */
@@ -532,9 +563,9 @@ sealed class MainAction {
         ) : Internal()
 
         /**
-         * Indicates a relevant change in the current user state or vault locked state.
+         * Indicates a relevant change in the current user state.
          */
-        data object CurrentUserOrVaultStateChange : Internal()
+        data object CurrentUserStateChange : Internal()
 
         /**
          * Indicates that the screen capture state has changed.
@@ -550,6 +581,11 @@ sealed class MainAction {
             val theme: AppTheme,
         ) : Internal()
 
+        /**
+         * Indicates a relevant change in the current vault lock state.
+         */
+        data object VaultUnlockStateChange : Internal()
+
         /**
          * Indicates that the dynamic colors state has changed.
          */

app/src/main/kotlin/com/x8bit/bitwarden/data/auth/datasource/disk/model/AccountTokensJson.kt

@@ -2,14 +2,12 @@ package com.x8bit.bitwarden.data.auth.datasource.disk.model
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import java.time.Instant
 
 /**
  * Container for the user's API tokens.
  *
  * @property accessToken The user's primary access token.
  * @property refreshToken The user's refresh token.
- * @property expiresAtSec The time at which the token expires in epoch seconds.
  */
 @Serializable
 data class AccountTokensJson(
@@ -18,9 +16,6 @@ data class AccountTokensJson(
 
     @SerialName("refreshToken")
     val refreshToken: String?,
-
-    @SerialName("expiresAtSec")
-    val expiresAtSec: Long = Instant.MAX.epochSecond,
 ) {
     /**
      * Returns `true` if the user is logged in, `false otherwise.

app/src/main/kotlin/com/x8bit/bitwarden/data/auth/manager/AuthRequestNotificationManagerImpl.kt

@@ -9,8 +9,7 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import com.bitwarden.annotation.OmitFromCoverage
 import com.bitwarden.data.manager.DispatcherManager
-import com.bitwarden.ui.platform.resource.BitwardenDrawable
-import com.bitwarden.ui.platform.resource.BitwardenString
+import com.x8bit.bitwarden.R
 import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource
 import com.x8bit.bitwarden.data.auth.util.createPasswordlessRequestDataIntent
 import com.x8bit.bitwarden.data.autofill.util.toPendingIntentMutabilityFlag
@@ -49,14 +48,14 @@ class AuthRequestNotificationManagerImpl(
                     NOTIFICATION_CHANNEL_ID,
                     NotificationManagerCompat.IMPORTANCE_DEFAULT,
                 )
-                .setName(context.getString(BitwardenString.pending_log_in_requests))
+                .setName(context.getString(R.string.pending_log_in_requests))
                 .build(),
         )
         if (!notificationManager.areNotificationsEnabled(NOTIFICATION_CHANNEL_ID)) return
         // Create the notification
         val builder = NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_ID)
             .setContentIntent(createContentIntent(data))
-            .setContentTitle(context.getString(BitwardenString.log_in_requested))
+            .setContentTitle(context.getString(R.string.log_in_requested))
             .setContentText(
                 authDiskSource
                     .userState
@@ -64,10 +63,10 @@ class AuthRequestNotificationManagerImpl(
                     ?.get(data.userId)
                     ?.profile
                     ?.email
-                    ?.let { context.getString(BitwardenString.confim_log_in_attemp_for_x, it) }
-                    ?: context.getString(BitwardenString.confirm_log_in),
+                    ?.let { context.getString(R.string.confim_log_in_attemp_for_x, it) }
+                    ?: context.getString(R.string.confirm_log_in),
             )
-            .setSmallIcon(BitwardenDrawable.ic_notification)
+            .setSmallIcon(R.drawable.ic_notification)
             .setColor(Color.White.value.toInt())
             .setAutoCancel(true)
             .setTimeoutAfter(NOTIFICATION_DEFAULT_TIMEOUT_MILLIS)

app/src/main/kotlin/com/x8bit/bitwarden/data/auth/manager/AuthTokenManagerImpl.kt

@@ -1,6 +1,5 @@
 package com.x8bit.bitwarden.data.auth.manager
 
-import com.bitwarden.network.model.AuthTokenData
 import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource
 
 /**
@@ -10,19 +9,9 @@ class AuthTokenManagerImpl(
     private val authDiskSource: AuthDiskSource,
 ) : AuthTokenManager {
 
-    override fun getAuthTokenDataOrNull(): AuthTokenData? = authDiskSource
+    override fun getActiveAccessTokenOrNull(): String? = authDiskSource
         .userState
         ?.activeUserId
-        ?.let { userId ->
-            authDiskSource
-                .getAccountTokens(userId = userId)
-                ?.takeIf { it.accessToken != null }
-                ?.let {
-                    AuthTokenData(
-                        userId = userId,
-                        accessToken = requireNotNull(it.accessToken),
-                        expiresAtSec = it.expiresAtSec,
-                    )
-                }
-        }
+        ?.let { authDiskSource.getAccountTokens(it) }
+        ?.accessToken
 }

app/src/main/kotlin/com/x8bit/bitwarden/data/auth/manager/UserLogoutManagerImpl.kt

@@ -1,10 +1,11 @@
 package com.x8bit.bitwarden.data.auth.manager
 
+import android.content.Context
+import android.widget.Toast
 import androidx.annotation.StringRes
-import com.bitwarden.core.data.manager.toast.ToastManager
 import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
 import com.bitwarden.data.manager.DispatcherManager
-import com.bitwarden.ui.platform.resource.BitwardenString
+import com.x8bit.bitwarden.R
 import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource
 import com.x8bit.bitwarden.data.auth.manager.model.LogoutEvent
 import com.x8bit.bitwarden.data.auth.repository.model.LogoutReason
@@ -26,15 +27,15 @@ import timber.log.Timber
  */
 @Suppress("LongParameterList")
 class UserLogoutManagerImpl(
+    private val context: Context,
     private val authDiskSource: AuthDiskSource,
     private val generatorDiskSource: GeneratorDiskSource,
     private val passwordHistoryDiskSource: PasswordHistoryDiskSource,
     private val pushDiskSource: PushDiskSource,
     private val settingsDiskSource: SettingsDiskSource,
-    private val toastManager: ToastManager,
     private val vaultDiskSource: VaultDiskSource,
-    private val vaultSdkSource: VaultSdkSource,
     dispatcherManager: DispatcherManager,
+    private val vaultSdkSource: VaultSdkSource,
 ) : UserLogoutManager {
     private val scope = CoroutineScope(dispatcherManager.unconfined)
     private val mainScope = CoroutineScope(dispatcherManager.main)
@@ -48,7 +49,7 @@ class UserLogoutManagerImpl(
         Timber.d("logout reason=$reason")
         val isExpired = reason == LogoutReason.SecurityStamp
         if (isExpired) {
-            showToast(message = BitwardenString.login_expired)
+            showToast(message = R.string.login_expired)
         }
 
         val ableToSwitchToNewAccount = switchUserIfAvailable(
@@ -70,7 +71,7 @@ class UserLogoutManagerImpl(
         Timber.d("softLogout reason=$reason")
         val isExpired = reason == LogoutReason.SecurityStamp
         if (isExpired) {
-            showToast(message = BitwardenString.login_expired)
+            showToast(message = R.string.login_expired)
         }
         authDiskSource.storeAccountTokens(
             userId = userId,
@@ -80,7 +81,6 @@ class UserLogoutManagerImpl(
         // Save any data that will still need to be retained after otherwise clearing all dat
         val vaultTimeoutInMinutes = settingsDiskSource.getVaultTimeoutInMinutes(userId = userId)
         val vaultTimeoutAction = settingsDiskSource.getVaultTimeoutAction(userId = userId)
-        val pinProtectedUserKey = authDiskSource.getPinProtectedUserKey(userId = userId)
 
         switchUserIfAvailable(
             currentUserId = userId,
@@ -102,10 +102,6 @@ class UserLogoutManagerImpl(
                 vaultTimeoutAction = vaultTimeoutAction,
             )
         }
-        authDiskSource.storePinProtectedUserKey(
-            userId = userId,
-            pinProtectedUserKey = pinProtectedUserKey,
-        )
     }
 
     private fun clearData(userId: String) {
@@ -121,7 +117,7 @@ class UserLogoutManagerImpl(
     }
 
     private fun showToast(@StringRes message: Int) {
-        mainScope.launch { toastManager.show(messageId = message) }
+        mainScope.launch { Toast.makeText(context, message, Toast.LENGTH_SHORT).show() }
     }
 
     private fun switchUserIfAvailable(
@@ -140,7 +136,7 @@ class UserLogoutManagerImpl(
         // Check if there is a new active user
         return if (updatedAccounts.isNotEmpty()) {
             if (currentUserId == currentUserState.activeUserId && !isExpired) {
-                showToast(message = BitwardenString.account_switched_automatically)
+                showToast(message = R.string.account_switched_automatically)
             }
 
             // If we logged out a non-active user, we want to leave the active user unchanged.

app/src/main/kotlin/com/x8bit/bitwarden/data/auth/manager/di/AuthManagerModule.kt

@@ -1,7 +1,6 @@
 package com.x8bit.bitwarden.data.auth.manager.di
 
 import android.content.Context
-import com.bitwarden.core.data.manager.toast.ToastManager
 import com.bitwarden.data.manager.DispatcherManager
 import com.bitwarden.network.service.AccountsService
 import com.bitwarden.network.service.AuthRequestsService
@@ -108,23 +107,23 @@ object AuthManagerModule {
     @Provides
     @Singleton
     fun provideUserLogoutManager(
+        @ApplicationContext context: Context,
         authDiskSource: AuthDiskSource,
         generatorDiskSource: GeneratorDiskSource,
         passwordHistoryDiskSource: PasswordHistoryDiskSource,
         pushDiskSource: PushDiskSource,
         settingsDiskSource: SettingsDiskSource,
-        toastManager: ToastManager,
         vaultDiskSource: VaultDiskSource,
         vaultSdkSource: VaultSdkSource,
         dispatcherManager: DispatcherManager,
     ): UserLogoutManager =
         UserLogoutManagerImpl(
+            context = context,
             authDiskSource = authDiskSource,
             generatorDiskSource = generatorDiskSource,
             passwordHistoryDiskSource = passwordHistoryDiskSource,
             pushDiskSource = pushDiskSource,
             settingsDiskSource = settingsDiskSource,
-            toastManager = toastManager,
             vaultDiskSource = vaultDiskSource,
             vaultSdkSource = vaultSdkSource,
             dispatcherManager = dispatcherManager,

app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt

@@ -146,7 +146,6 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
-import java.time.Clock
 import javax.inject.Singleton
 
 /**
@@ -155,7 +154,6 @@ import javax.inject.Singleton
 @Suppress("LargeClass", "LongParameterList", "TooManyFunctions")
 @Singleton
 class AuthRepositoryImpl(
-    private val clock: Clock,
     private val accountsService: AccountsService,
     private val devicesService: DevicesService,
     private val haveIBeenPwnedService: HaveIBeenPwnedService,
@@ -406,7 +404,10 @@ class AuthRepositoryImpl(
             .onEach {
                 val userId = activeUserId ?: return@onEach
                 // TODO: [PM-20593] Investigate why tokens are explicitly refreshed.
-                refreshAccessTokenSynchronously(userId = userId)
+                refreshAccessTokenSynchronouslyInternal(
+                    userId = userId,
+                    logOutOnFailure = false,
+                )
                 vaultRepository.sync(forced = true)
             }
             // This requires the ioScope to ensure that refreshAccessTokenSynchronously
@@ -759,59 +760,11 @@ class AuthRepositoryImpl(
         orgIdentifier = organizationIdentifier,
     )
 
-    override fun refreshAccessTokenSynchronously(
-        userId: String,
-    ): Result<String> {
-        val refreshToken = authDiskSource
-            .getAccountTokens(userId = userId)
-            ?.refreshToken
-            ?: return IllegalStateException("Must be logged in.").asFailure()
-        return identityService
-            .refreshTokenSynchronously(refreshToken)
-            .flatMap { refreshTokenResponse ->
-                // Check to make sure the user is still logged in after making the request
-                authDiskSource
-                    .userState
-                    ?.accounts
-                    ?.get(userId)
-                    ?.let { refreshTokenResponse.asSuccess() }
-                    ?: IllegalStateException("Must be logged in.").asFailure()
-            }
-            .flatMap { refreshTokenResponse ->
-                when (refreshTokenResponse) {
-                    is RefreshTokenResponseJson.Error -> {
-                        if (refreshTokenResponse.isInvalidGrant) {
-                            logout(userId = userId, reason = LogoutReason.InvalidGrant)
-                        }
-                        IllegalStateException(refreshTokenResponse.error).asFailure()
-                    }
-
-                    is RefreshTokenResponseJson.Forbidden -> {
-                        logout(userId = userId, reason = LogoutReason.RefreshForbidden)
-                        refreshTokenResponse.error.asFailure()
-                    }
-
-                    is RefreshTokenResponseJson.Unauthorized -> {
-                        logout(userId = userId, reason = LogoutReason.RefreshUnauthorized)
-                        refreshTokenResponse.error.asFailure()
-                    }
-
-                    is RefreshTokenResponseJson.Success -> {
-                        // Store the new token information
-                        authDiskSource.storeAccountTokens(
-                            userId = userId,
-                            accountTokens = AccountTokensJson(
-                                accessToken = refreshTokenResponse.accessToken,
-                                refreshToken = refreshTokenResponse.refreshToken,
-                                expiresAtSec = clock.instant().epochSecond +
-                                    refreshTokenResponse.expiresIn,
-                            ),
-                        )
-                        refreshTokenResponse.accessToken.asSuccess()
-                    }
-                }
-            }
-    }
+    override fun refreshAccessTokenSynchronously(userId: String): Result<RefreshTokenResponseJson> =
+        refreshAccessTokenSynchronouslyInternal(
+            userId = userId,
+            logOutOnFailure = true,
+        )
 
     override fun logout(reason: LogoutReason) {
         activeUserId?.let { userId -> logout(userId = userId, reason = reason) }
@@ -1469,6 +1422,42 @@ class AuthRepositoryImpl(
             onFailure = { LeaveOrganizationResult.Error(error = it) },
         )
 
+    private fun refreshAccessTokenSynchronouslyInternal(
+        userId: String,
+        logOutOnFailure: Boolean,
+    ): Result<RefreshTokenResponseJson> {
+        val refreshToken = authDiskSource
+            .getAccountTokens(userId = userId)
+            ?.refreshToken
+            ?: return IllegalStateException("Must be logged in.").asFailure()
+        return identityService
+            .refreshTokenSynchronously(refreshToken)
+            .flatMap { refreshTokenResponse ->
+                // Check to make sure the user is still logged in after making the request
+                authDiskSource
+                    .userState
+                    ?.accounts
+                    ?.get(userId)
+                    ?.let { refreshTokenResponse.asSuccess() }
+                    ?: IllegalStateException("Must be logged in.").asFailure()
+            }
+            .onFailure {
+                if (logOutOnFailure) {
+                    logout(userId = userId, reason = LogoutReason.TokenRefreshFail)
+                }
+            }
+            .onSuccess { refreshTokenResponse ->
+                // Update the existing UserState with updated token information
+                authDiskSource.storeAccountTokens(
+                    userId = userId,
+                    accountTokens = AccountTokensJson(
+                        accessToken = refreshTokenResponse.accessToken,
+                        refreshToken = refreshTokenResponse.refreshToken,
+                    ),
+                )
+            }
+    }
+
     @Suppress("CyclomaticComplexMethod")
     private suspend fun validatePasswordAgainstPolicy(
         password: String,
@@ -1791,7 +1780,6 @@ class AuthRepositoryImpl(
             accountTokens = AccountTokensJson(
                 accessToken = loginResponse.accessToken,
                 refreshToken = loginResponse.refreshToken,
-                expiresAtSec = clock.instant().epochSecond + loginResponse.expiresInSeconds,
             ),
         )
         settingsRepository.hasUserLoggedInOrCreatedAccount = true

app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/di/AuthRepositoryModule.kt

@@ -27,7 +27,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import java.time.Clock
 import javax.inject.Singleton
 
 /**
@@ -40,7 +39,6 @@ object AuthRepositoryModule {
     @Provides
     @Singleton
     fun providesAuthRepository(
-        clock: Clock,
         accountsService: AccountsService,
         devicesService: DevicesService,
         identityService: IdentityService,
@@ -63,7 +61,6 @@ object AuthRepositoryModule {
         firstTimeActionManager: FirstTimeActionManager,
         logsManager: LogsManager,
     ): AuthRepository = AuthRepositoryImpl(
-        clock = clock,
         accountsService = accountsService,
         devicesService = devicesService,
         identityService = identityService,

app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/model/LogoutReason.kt

@@ -29,24 +29,6 @@ sealed class LogoutReason {
         data object NoLongerSupported : Biometrics()
     }
 
-    /**
-     * Indicates that the logout is happening because the there was an "invalid_grant" response
-     * from the network.
-     */
-    data object InvalidGrant : LogoutReason()
-
-    /**
-     * Indicates that the logout is happening because the there was a "Forbidden" response from
-     * token refresh API.
-     */
-    data object RefreshForbidden : LogoutReason()
-
-    /**
-     * Indicates that the logout is happening because the there was a "Unauthorized" response from
-     * token refresh API.
-     */
-    data object RefreshUnauthorized : LogoutReason()
-
     /**
      * Indicates that the logout is happening because of an invalid state.
      */
@@ -76,6 +58,11 @@ sealed class LogoutReason {
      */
     data object Timeout : LogoutReason()
 
+    /**
+     * Indicates that the logout is happening because the access token could not be refreshed.
+     */
+    data object TokenRefreshFail : LogoutReason()
+
     /**
      * Indicates that the logout is happening because the user tried to unlock the vault
      * unsuccessfully too many times.

app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/model/PolicyInformation.kt

@@ -1,6 +1,5 @@
 package com.x8bit.bitwarden.data.auth.repository.model
 
-import com.bitwarden.network.model.SyncResponseJson
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

app/src/main/kotlin/com/x8bit/bitwarden/data/auth/util/PasswordlessRequestDataUtils.kt

@@ -2,9 +2,9 @@ package com.x8bit.bitwarden.data.auth.util
 
 import android.content.Context
 import android.content.Intent
-import com.bitwarden.ui.platform.util.getSafeParcelableExtra
 import com.x8bit.bitwarden.MainActivity
 import com.x8bit.bitwarden.data.platform.manager.model.PasswordlessRequestData
+import com.x8bit.bitwarden.data.platform.util.getSafeParcelableExtra
 
 private const val NOTIFICATION_DATA: String = "notificationData"
 

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/accessibility/di/AccessibilityModule.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import android.content.pm.PackageManager
 import android.os.PowerManager
 import android.view.accessibility.AccessibilityManager
-import com.bitwarden.core.data.manager.toast.ToastManager
 import com.bitwarden.data.manager.DispatcherManager
 import com.x8bit.bitwarden.data.autofill.accessibility.manager.AccessibilityAutofillManager
 import com.x8bit.bitwarden.data.autofill.accessibility.manager.AccessibilityAutofillManagerImpl
@@ -90,7 +89,6 @@ object AccessibilityModule {
         accessibilityAutofillManager: AccessibilityAutofillManager,
         launcherPackageNameManager: LauncherPackageNameManager,
         powerManager: PowerManager,
-        toastManager: ToastManager,
     ): BitwardenAccessibilityProcessor =
         BitwardenAccessibilityProcessorImpl(
             context = context,
@@ -98,7 +96,6 @@ object AccessibilityModule {
             accessibilityAutofillManager = accessibilityAutofillManager,
             launcherPackageNameManager = launcherPackageNameManager,
             powerManager = powerManager,
-            toastManager = toastManager,
         )
 
     @Singleton

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/accessibility/processor/BitwardenAccessibilityProcessorImpl.kt

@@ -5,8 +5,7 @@ import android.os.PowerManager
 import android.view.accessibility.AccessibilityEvent
 import android.view.accessibility.AccessibilityNodeInfo
 import android.widget.Toast
-import com.bitwarden.core.data.manager.toast.ToastManager
-import com.bitwarden.ui.platform.resource.BitwardenString
+import com.x8bit.bitwarden.R
 import com.x8bit.bitwarden.data.autofill.accessibility.manager.AccessibilityAutofillManager
 import com.x8bit.bitwarden.data.autofill.accessibility.manager.LauncherPackageNameManager
 import com.x8bit.bitwarden.data.autofill.accessibility.model.AccessibilityAction
@@ -27,7 +26,6 @@ class BitwardenAccessibilityProcessorImpl(
     private val accessibilityAutofillManager: AccessibilityAutofillManager,
     private val launcherPackageNameManager: LauncherPackageNameManager,
     private val powerManager: PowerManager,
-    private val toastManager: ToastManager,
 ) : BitwardenAccessibilityProcessor {
     override fun processAccessibilityEvent(
         event: AccessibilityEvent,
@@ -112,10 +110,13 @@ class BitwardenAccessibilityProcessorImpl(
                 )
             }
             ?: run {
-                toastManager.show(
-                    messageId = BitwardenString.autofill_tile_uri_not_found,
-                    duration = Toast.LENGTH_LONG,
-                )
+                Toast
+                    .makeText(
+                        context,
+                        R.string.autofill_tile_uri_not_found,
+                        Toast.LENGTH_LONG,
+                    )
+                    .show()
             }
     }
 

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/builder/FillResponseBuilderImpl.kt

@@ -10,7 +10,6 @@ import com.x8bit.bitwarden.data.autofill.util.buildDataset
 import com.x8bit.bitwarden.data.autofill.util.buildVaultItemDataset
 import com.x8bit.bitwarden.data.autofill.util.createTotpCopyIntentSender
 import com.x8bit.bitwarden.data.autofill.util.fillableAutofillIds
-import timber.log.Timber
 
 /**
  * The default implementation for [FillResponseBuilder]. This is a component for compiling fulfilled
@@ -23,9 +22,12 @@ class FillResponseBuilderImpl : FillResponseBuilder {
         saveInfo: SaveInfo?,
     ): FillResponse? =
         if (filledData.fillableAutofillIds.isNotEmpty()) {
-            Timber.w("Autofill request constructing FillResponse")
             val fillResponseBuilder = FillResponse.Builder()
-            saveInfo?.let { nonNullSaveInfo -> fillResponseBuilder.setSaveInfo(nonNullSaveInfo) }
+
+            saveInfo
+                ?.let { nonNullSaveInfo ->
+                    fillResponseBuilder.setSaveInfo(nonNullSaveInfo)
+                }
 
             filledData
                 .filledPartitions
@@ -50,7 +52,12 @@ class FillResponseBuilderImpl : FillResponseBuilder {
 
             fillResponseBuilder
                 // Add the Vault Item
-                .addDataset(filledData.buildVaultItemDataset(autofillAppInfo = autofillAppInfo))
+                .addDataset(
+                    filledData
+                        .buildVaultItemDataset(
+                            autofillAppInfo = autofillAppInfo,
+                        ),
+                )
                 .setIgnoredIds(*filledData.ignoreAutofillIds.toTypedArray())
                 .build()
         } else {
@@ -59,7 +66,6 @@ class FillResponseBuilderImpl : FillResponseBuilder {
             // with a presentation view. Neither of these make sense in the case where we have no
             // views to fill. What we are supposed to do when we cannot fulfill a request is
             // replace [FillResponse] with null in order to avoid this crash.
-            Timber.w("Autofill request has no fillable ids")
             null
         }
 }

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/builder/FilledDataBuilderImpl.kt

@@ -9,7 +9,6 @@ import com.x8bit.bitwarden.data.autofill.model.FilledData
 import com.x8bit.bitwarden.data.autofill.model.FilledPartition
 import com.x8bit.bitwarden.data.autofill.provider.AutofillCipherProvider
 import com.x8bit.bitwarden.data.autofill.util.buildFilledItemOrNull
-import timber.log.Timber
 
 /**
  * The maximum amount of filled partitions the user will see. Viewing the rest will require opening
@@ -35,7 +34,6 @@ class FilledDataBuilderImpl(
     private val autofillCipherProvider: AutofillCipherProvider,
 ) : FilledDataBuilder {
     override suspend fun build(autofillRequest: AutofillRequest.Fillable): FilledData {
-        Timber.d("Autofill request constructing FilledData")
         val isVaultLocked = autofillCipherProvider.isVaultLocked()
 
         // Subtract one to make sure there is space for the vault item.
@@ -86,7 +84,7 @@ class FilledDataBuilderImpl(
                                 )
                             }
                     }
-                    .orEmpty()
+                    ?: emptyList()
             }
         }
 
@@ -116,13 +114,15 @@ class FilledDataBuilderImpl(
     ): FilledPartition {
         val filledItems = autofillViews
             .mapNotNull { autofillView ->
-                autofillCipher
-                    .getAutofillValueOrNull(autofillView)
-                    ?.let { value ->
-                        autofillView.buildFilledItemOrNull(
-                            value = value,
-                        )
-                    }
+                val value = when (autofillView) {
+                    is AutofillView.Card.ExpirationMonth -> autofillCipher.expirationMonth
+                    is AutofillView.Card.ExpirationYear -> autofillCipher.expirationYear
+                    is AutofillView.Card.Number -> autofillCipher.number
+                    is AutofillView.Card.SecurityCode -> autofillCipher.code
+                }
+                autofillView.buildFilledItemOrNull(
+                    value = value,
+                )
             }
 
         return FilledPartition(
@@ -160,44 +160,6 @@ class FilledDataBuilderImpl(
     }
 }
 
-/**
- * Get the autofill value for the given [autofillView], or null if no value is available.
- */
-private fun AutofillCipher.Card.getAutofillValueOrNull(autofillView: AutofillView.Card): String? =
-    when (autofillView) {
-        is AutofillView.Card.CardholderName -> {
-            cardholderName.takeIf { it.isNotEmpty() }
-        }
-
-        is AutofillView.Card.ExpirationMonth -> {
-            expirationMonth.takeIf { it.isNotEmpty() }
-        }
-
-        is AutofillView.Card.ExpirationYear -> {
-            expirationYear.takeIf { it.isNotEmpty() }
-        }
-
-        is AutofillView.Card.Number -> {
-            number
-                .filter { it.isDigit() }
-                .takeIf { it.isNotEmpty() }
-        }
-
-        is AutofillView.Card.SecurityCode -> {
-            code
-                .filter { it.isDigit() }
-                .takeIf { it.isNotEmpty() }
-        }
-
-        is AutofillView.Card.ExpirationDate -> {
-            if (expirationMonth.isNotBlank() && expirationYear.isNotBlank()) {
-                expirationMonth.padStart(2, '0') + expirationYear.takeLast(2)
-            } else {
-                null
-            }
-        }
-    }
-
 /**
  * Get the item at the [index]. If that fails, return the last item in the list. If that also fails,
  * return null.

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/builder/SaveInfoBuilderImpl.kt

@@ -4,7 +4,6 @@ import android.service.autofill.FillRequest
 import android.service.autofill.SaveInfo
 import com.x8bit.bitwarden.data.autofill.model.AutofillPartition
 import com.x8bit.bitwarden.data.platform.repository.SettingsRepository
-import timber.log.Timber
 
 /**
  * The primary implementation of [SaveInfoBuilder].This is used for converting autofill data into
@@ -19,7 +18,6 @@ class SaveInfoBuilderImpl(
         fillRequest: FillRequest,
         packageName: String?,
     ): SaveInfo? {
-        Timber.d("Autofill request constructing SaveInfo -- ${fillRequest.id}")
         // Make sure that the save prompt is possible.
         val canPerformSaveRequest = autofillPartition.canPerformSaveRequest
         if (settingsRepository.isAutofillSavePromptDisabled || !canPerformSaveRequest) return null
@@ -28,7 +26,6 @@ class SaveInfoBuilderImpl(
         // in Compat mode since they show as masked values.
         val isInCompatMode = (fillRequest.flags or
             FillRequest.FLAG_COMPATIBILITY_MODE_REQUEST) == fillRequest.flags
-        Timber.d("Autofill request isInCompatMode=$isInCompatMode -- ${fillRequest.id}")
 
         // If login and compat mode, the password might be obfuscated,
         // in which case we should skip the save request.

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/di/ActivityAutofillModule.kt

@@ -8,9 +8,9 @@ import androidx.lifecycle.lifecycleScope
 import com.x8bit.bitwarden.data.autofill.manager.AutofillActivityManager
 import com.x8bit.bitwarden.data.autofill.manager.AutofillActivityManagerImpl
 import com.x8bit.bitwarden.data.autofill.manager.AutofillEnabledManager
-import com.x8bit.bitwarden.data.autofill.manager.browser.BrowserThirdPartyAutofillEnabledManager
-import com.x8bit.bitwarden.data.autofill.manager.browser.BrowserThirdPartyAutofillManager
-import com.x8bit.bitwarden.data.autofill.manager.browser.BrowserThirdPartyAutofillManagerImpl
+import com.x8bit.bitwarden.data.autofill.manager.chrome.ChromeThirdPartyAutofillEnabledManager
+import com.x8bit.bitwarden.data.autofill.manager.chrome.ChromeThirdPartyAutofillManager
+import com.x8bit.bitwarden.data.autofill.manager.chrome.ChromeThirdPartyAutofillManagerImpl
 import com.x8bit.bitwarden.data.platform.manager.AppStateManager
 import dagger.Module
 import dagger.Provides
@@ -29,9 +29,9 @@ object ActivityAutofillModule {
     @ActivityScoped
     @ActivityScopedManager
     @Provides
-    fun provideActivityScopedBrowserThirdPartyAutofillManager(
+    fun provideActivityScopedChromeThirdPartyAutofillManager(
         activity: Activity,
-    ): BrowserThirdPartyAutofillManager = BrowserThirdPartyAutofillManagerImpl(
+    ): ChromeThirdPartyAutofillManager = ChromeThirdPartyAutofillManagerImpl(
         context = activity.baseContext,
     )
 
@@ -39,19 +39,19 @@ object ActivityAutofillModule {
     @Provides
     fun provideAutofillActivityManager(
         @ActivityScopedManager autofillManager: AutofillManager,
-        @ActivityScopedManager browserThirdPartyAutofillManager: BrowserThirdPartyAutofillManager,
+        @ActivityScopedManager chromeThirdPartyAutofillManager: ChromeThirdPartyAutofillManager,
         appStateManager: AppStateManager,
         autofillEnabledManager: AutofillEnabledManager,
         lifecycleScope: LifecycleCoroutineScope,
-        browserThirdPartyAutofillEnabledManager: BrowserThirdPartyAutofillEnabledManager,
+        chromeThirdPartyAutofillEnabledManager: ChromeThirdPartyAutofillEnabledManager,
     ): AutofillActivityManager =
         AutofillActivityManagerImpl(
             autofillManager = autofillManager,
-            browserThirdPartyAutofillManager = browserThirdPartyAutofillManager,
+            chromeThirdPartyAutofillManager = chromeThirdPartyAutofillManager,
             appStateManager = appStateManager,
             autofillEnabledManager = autofillEnabledManager,
             lifecycleScope = lifecycleScope,
-            browserThirdPartyAutofillEnabledManager = browserThirdPartyAutofillEnabledManager,
+            chromeThirdPartyAutofillEnabledManager = chromeThirdPartyAutofillEnabledManager,
         )
 
     /**

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/di/AutofillModule.kt

@@ -16,14 +16,15 @@ import com.x8bit.bitwarden.data.autofill.manager.AutofillEnabledManager
 import com.x8bit.bitwarden.data.autofill.manager.AutofillEnabledManagerImpl
 import com.x8bit.bitwarden.data.autofill.manager.AutofillTotpManager
 import com.x8bit.bitwarden.data.autofill.manager.AutofillTotpManagerImpl
-import com.x8bit.bitwarden.data.autofill.manager.browser.BrowserThirdPartyAutofillEnabledManager
-import com.x8bit.bitwarden.data.autofill.manager.browser.BrowserThirdPartyAutofillEnabledManagerImpl
+import com.x8bit.bitwarden.data.autofill.manager.chrome.ChromeThirdPartyAutofillEnabledManager
+import com.x8bit.bitwarden.data.autofill.manager.chrome.ChromeThirdPartyAutofillEnabledManagerImpl
 import com.x8bit.bitwarden.data.autofill.parser.AutofillParser
 import com.x8bit.bitwarden.data.autofill.parser.AutofillParserImpl
 import com.x8bit.bitwarden.data.autofill.processor.AutofillProcessor
 import com.x8bit.bitwarden.data.autofill.processor.AutofillProcessorImpl
 import com.x8bit.bitwarden.data.autofill.provider.AutofillCipherProvider
 import com.x8bit.bitwarden.data.autofill.provider.AutofillCipherProviderImpl
+import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager
 import com.x8bit.bitwarden.data.platform.manager.PolicyManager
 import com.x8bit.bitwarden.data.platform.manager.ciphermatching.CipherMatchingManager
 import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardManager
@@ -58,8 +59,12 @@ object AutofillModule {
 
     @Singleton
     @Provides
-    fun providesBrowserAutofillEnabledManager(): BrowserThirdPartyAutofillEnabledManager =
-        BrowserThirdPartyAutofillEnabledManagerImpl()
+    fun providesChromeAutofillEnabledManager(
+        featureFlagManager: FeatureFlagManager,
+    ): ChromeThirdPartyAutofillEnabledManager =
+        ChromeThirdPartyAutofillEnabledManagerImpl(
+            featureFlagManager = featureFlagManager,
+        )
 
     @Singleton
     @Provides
@@ -88,6 +93,7 @@ object AutofillModule {
     @Singleton
     @Provides
     fun providesAutofillTotpManager(
+        @ApplicationContext context: Context,
         clock: Clock,
         clipboardManager: BitwardenClipboardManager,
         authRepository: AuthRepository,
@@ -95,6 +101,7 @@ object AutofillModule {
         vaultRepository: VaultRepository,
     ): AutofillTotpManager =
         AutofillTotpManagerImpl(
+            context = context,
             clock = clock,
             clipboardManager = clipboardManager,
             authRepository = authRepository,

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/manager/AutofillActivityManagerImpl.kt

@@ -2,9 +2,9 @@ package com.x8bit.bitwarden.data.autofill.manager
 
 import android.view.autofill.AutofillManager
 import androidx.lifecycle.LifecycleCoroutineScope
-import com.x8bit.bitwarden.data.autofill.manager.browser.BrowserThirdPartyAutofillEnabledManager
-import com.x8bit.bitwarden.data.autofill.manager.browser.BrowserThirdPartyAutofillManager
-import com.x8bit.bitwarden.data.autofill.model.browser.BrowserThirdPartyAutofillStatus
+import com.x8bit.bitwarden.data.autofill.manager.chrome.ChromeThirdPartyAutofillEnabledManager
+import com.x8bit.bitwarden.data.autofill.manager.chrome.ChromeThirdPartyAutofillManager
+import com.x8bit.bitwarden.data.autofill.model.chrome.ChromeThirdPartyAutofillStatus
 import com.x8bit.bitwarden.data.platform.manager.AppStateManager
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -14,22 +14,21 @@ import kotlinx.coroutines.flow.onEach
  */
 class AutofillActivityManagerImpl(
     private val autofillManager: AutofillManager,
-    private val browserThirdPartyAutofillManager: BrowserThirdPartyAutofillManager,
+    private val chromeThirdPartyAutofillManager: ChromeThirdPartyAutofillManager,
     autofillEnabledManager: AutofillEnabledManager,
     appStateManager: AppStateManager,
     lifecycleScope: LifecycleCoroutineScope,
-    browserThirdPartyAutofillEnabledManager: BrowserThirdPartyAutofillEnabledManager,
+    chromeThirdPartyAutofillEnabledManager: ChromeThirdPartyAutofillEnabledManager,
 ) : AutofillActivityManager {
     private val isAutofillEnabledAndSupported: Boolean
         get() = autofillManager.isEnabled &&
             autofillManager.hasEnabledAutofillServices() &&
             autofillManager.isAutofillSupported
 
-    private val browserAutofillStatus: BrowserThirdPartyAutofillStatus
-        get() = BrowserThirdPartyAutofillStatus(
-            braveStableStatusData = browserThirdPartyAutofillManager.stableBraveAutofillStatus,
-            chromeStableStatusData = browserThirdPartyAutofillManager.stableChromeAutofillStatus,
-            chromeBetaChannelStatusData = browserThirdPartyAutofillManager.betaChromeAutofillStatus,
+    private val chromeAutofillStatus: ChromeThirdPartyAutofillStatus
+        get() = ChromeThirdPartyAutofillStatus(
+            stableStatusData = chromeThirdPartyAutofillManager.stableChromeAutofillStatus,
+            betaChannelStatusData = chromeThirdPartyAutofillManager.betaChromeAutofillStatus,
         )
 
     init {
@@ -37,8 +36,8 @@ class AutofillActivityManagerImpl(
             .appForegroundStateFlow
             .onEach {
                 autofillEnabledManager.isAutofillEnabled = isAutofillEnabledAndSupported
-                browserThirdPartyAutofillEnabledManager.browserThirdPartyAutofillStatus =
-                    browserAutofillStatus
+                chromeThirdPartyAutofillEnabledManager.chromeThirdPartyAutofillStatus =
+                    chromeAutofillStatus
             }
             .launchIn(lifecycleScope)
     }

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/manager/AutofillTotpManagerImpl.kt

@@ -1,8 +1,10 @@
 package com.x8bit.bitwarden.data.autofill.manager
 
-import com.bitwarden.ui.platform.resource.BitwardenString
+import android.content.Context
+import android.widget.Toast
 import com.bitwarden.ui.util.asText
 import com.bitwarden.vault.CipherView
+import com.x8bit.bitwarden.R
 import com.x8bit.bitwarden.data.auth.repository.AuthRepository
 import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardManager
 import com.x8bit.bitwarden.data.platform.repository.SettingsRepository
@@ -14,6 +16,7 @@ import java.time.Clock
  * Default implementation of the [AutofillTotpManager].
  */
 class AutofillTotpManagerImpl(
+    private val context: Context,
     private val clock: Clock,
     private val clipboardManager: BitwardenClipboardManager,
     private val authRepository: AuthRepository,
@@ -24,19 +27,25 @@ class AutofillTotpManagerImpl(
         if (settingsRepository.isAutoCopyTotpDisabled) return
         val isPremium = authRepository.userStateFlow.value?.activeAccount?.isPremium == true
         if (!isPremium && !cipherView.organizationUseTotp) return
-        cipherView.login?.totp ?: return
-        val cipherId = cipherView.id ?: return
+        val totpCode = cipherView.login?.totp ?: return
 
         val totpResult = vaultRepository.generateTotp(
             time = clock.instant(),
-            cipherId = cipherId,
+            totpCode = totpCode,
         )
 
         if (totpResult is GenerateTotpResult.Success) {
             clipboardManager.setText(
                 text = totpResult.code,
-                toastDescriptorOverride = BitwardenString.verification_code_totp.asText(),
+                toastDescriptorOverride = R.string.verification_code_totp.asText(),
             )
+            Toast
+                .makeText(
+                    context.applicationContext,
+                    R.string.verification_code_totp,
+                    Toast.LENGTH_LONG,
+                )
+                .show()
         }
     }
 }

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/manager/browser/BrowserThirdPartyAutofillEnabledManager.kt

@@ -1,22 +0,0 @@
-package com.x8bit.bitwarden.data.autofill.manager.browser
-
-import com.x8bit.bitwarden.data.autofill.model.browser.BrowserThirdPartyAutofillStatus
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.StateFlow
-
-/**
- * Manager which provides whether specific browser versions have third party autofill available and
- * enabled.
- */
-interface BrowserThirdPartyAutofillEnabledManager {
-    /**
-     * Combined status for all concerned browser versions.
-     */
-    var browserThirdPartyAutofillStatus: BrowserThirdPartyAutofillStatus
-
-    /**
-     * An observable [StateFlow] of the combined third party autofill status of all concerned
-     * browser versions.
-     */
-    val browserThirdPartyAutofillStatusFlow: Flow<BrowserThirdPartyAutofillStatus>
-}

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/manager/browser/BrowserThirdPartyAutofillEnabledManagerImpl.kt

@@ -1,42 +0,0 @@
-package com.x8bit.bitwarden.data.autofill.manager.browser
-
-import com.x8bit.bitwarden.data.autofill.model.browser.BrowserThirdPartyAutoFillData
-import com.x8bit.bitwarden.data.autofill.model.browser.BrowserThirdPartyAutofillStatus
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.update
-
-/**
- * Default implementation of [BrowserThirdPartyAutofillEnabledManager].
- */
-class BrowserThirdPartyAutofillEnabledManagerImpl : BrowserThirdPartyAutofillEnabledManager {
-    override var browserThirdPartyAutofillStatus: BrowserThirdPartyAutofillStatus = DEFAULT_STATUS
-        set(value) {
-            field = value
-            mutableBrowserThirdPartyAutofillStatusStateFlow.update {
-                value
-            }
-        }
-
-    private val mutableBrowserThirdPartyAutofillStatusStateFlow = MutableStateFlow(
-        value = browserThirdPartyAutofillStatus,
-    )
-
-    override val browserThirdPartyAutofillStatusFlow: Flow<BrowserThirdPartyAutofillStatus>
-        get() = mutableBrowserThirdPartyAutofillStatusStateFlow
-}
-
-private val DEFAULT_STATUS = BrowserThirdPartyAutofillStatus(
-    braveStableStatusData = BrowserThirdPartyAutoFillData(
-        isAvailable = false,
-        isThirdPartyEnabled = false,
-    ),
-    chromeStableStatusData = BrowserThirdPartyAutoFillData(
-        isAvailable = false,
-        isThirdPartyEnabled = false,
-    ),
-    chromeBetaChannelStatusData = BrowserThirdPartyAutoFillData(
-        isAvailable = false,
-        isThirdPartyEnabled = false,
-    ),
-)

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/manager/browser/BrowserThirdPartyAutofillManager.kt

@@ -1,25 +0,0 @@
-package com.x8bit.bitwarden.data.autofill.manager.browser
-
-import com.x8bit.bitwarden.data.autofill.model.browser.BrowserThirdPartyAutoFillData
-
-/**
- * Manager class used to determine if a device has installed versions of a browser (either the
- * stable release or beta channel) which support and require opt in to third party autofill.
- */
-interface BrowserThirdPartyAutofillManager {
-
-    /**
-     * The data representing the status of the stable Brave version
-     */
-    val stableBraveAutofillStatus: BrowserThirdPartyAutoFillData
-
-    /**
-     * The data representing the status of the stable Chrome version
-     */
-    val stableChromeAutofillStatus: BrowserThirdPartyAutoFillData
-
-    /**
-     * The data representing the status of the beta Chrome version
-     */
-    val betaChromeAutofillStatus: BrowserThirdPartyAutoFillData
-}

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/manager/chrome/ChromeThirdPartyAutofillEnabledManager.kt

@@ -0,0 +1,22 @@
+package com.x8bit.bitwarden.data.autofill.manager.chrome
+
+import com.x8bit.bitwarden.data.autofill.model.chrome.ChromeThirdPartyAutofillStatus
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.StateFlow
+
+/**
+ * Manager which provides whether specific Chrome versions have third party autofill available and
+ * enabled.
+ */
+interface ChromeThirdPartyAutofillEnabledManager {
+    /**
+     * Combined status for all concerned Chrome versions.
+     */
+    var chromeThirdPartyAutofillStatus: ChromeThirdPartyAutofillStatus
+
+    /**
+     * An observable [StateFlow] of the combined third party autofill status of all concerned
+     * chrome versions.
+     */
+    val chromeThirdPartyAutofillStatusFlow: Flow<ChromeThirdPartyAutofillStatus>
+}

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/manager/chrome/ChromeThirdPartyAutofillEnabledManagerImpl.kt

@@ -0,0 +1,52 @@
+package com.x8bit.bitwarden.data.autofill.manager.chrome
+
+import com.x8bit.bitwarden.data.autofill.model.chrome.ChromeThirdPartyAutoFillData
+import com.x8bit.bitwarden.data.autofill.model.chrome.ChromeThirdPartyAutofillStatus
+import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager
+import com.x8bit.bitwarden.data.platform.manager.model.FlagKey
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.update
+
+/**
+ * Default implementation of [ChromeThirdPartyAutofillEnabledManager].
+ */
+class ChromeThirdPartyAutofillEnabledManagerImpl(
+    private val featureFlagManager: FeatureFlagManager,
+) : ChromeThirdPartyAutofillEnabledManager {
+    override var chromeThirdPartyAutofillStatus: ChromeThirdPartyAutofillStatus = DEFAULT_STATUS
+        set(value) {
+            field = value
+            mutableChromeThirdPartyAutofillStatusStateFlow.update {
+                value
+            }
+        }
+
+    private val mutableChromeThirdPartyAutofillStatusStateFlow = MutableStateFlow(
+        chromeThirdPartyAutofillStatus,
+    )
+
+    override val chromeThirdPartyAutofillStatusFlow: Flow<ChromeThirdPartyAutofillStatus>
+        get() = mutableChromeThirdPartyAutofillStatusStateFlow
+            .combine(
+                featureFlagManager.getFeatureFlagFlow(FlagKey.ChromeAutofill),
+            ) { data, enabled ->
+                if (enabled) {
+                    data
+                } else {
+                    DEFAULT_STATUS
+                }
+            }
+}
+
+private val DEFAULT_STATUS = ChromeThirdPartyAutofillStatus(
+    ChromeThirdPartyAutoFillData(
+        isAvailable = false,
+        isThirdPartyEnabled = false,
+    ),
+    ChromeThirdPartyAutoFillData(
+        isAvailable = false,
+        isThirdPartyEnabled = false,
+    ),
+)

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/manager/chrome/ChromeThirdPartyAutofillManager.kt

@@ -0,0 +1,20 @@
+package com.x8bit.bitwarden.data.autofill.manager.chrome
+
+import com.x8bit.bitwarden.data.autofill.model.chrome.ChromeThirdPartyAutoFillData
+
+/**
+ * Manager class used to determine if a device has installed versions of Chrome (either the
+ * stable release or beta channel) which support and require opt in to third party autofill.
+ */
+interface ChromeThirdPartyAutofillManager {
+
+    /**
+     * The data representing the status of the stable chrome version
+     */
+    val stableChromeAutofillStatus: ChromeThirdPartyAutoFillData
+
+    /**
+     * The data representing the status of the beta chrome version
+     */
+    val betaChromeAutofillStatus: ChromeThirdPartyAutoFillData
+}

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/manager/chrome/ChromeThirdPartyAutofillManagerImpl.kt

@@ -1,36 +1,35 @@
-package com.x8bit.bitwarden.data.autofill.manager.browser
+package com.x8bit.bitwarden.data.autofill.manager.chrome
 
 import android.content.ContentResolver
 import android.content.Context
 import android.net.Uri
 import com.bitwarden.annotation.OmitFromCoverage
-import com.x8bit.bitwarden.data.autofill.model.browser.BrowserPackage
-import com.x8bit.bitwarden.data.autofill.model.browser.BrowserThirdPartyAutoFillData
+import com.x8bit.bitwarden.data.autofill.model.chrome.ChromeReleaseChannel
+import com.x8bit.bitwarden.data.autofill.model.chrome.ChromeThirdPartyAutoFillData
 
 private const val CONTENT_PROVIDER_NAME = ".AutofillThirdPartyModeContentProvider"
 private const val THIRD_PARTY_MODE_COLUMN = "autofill_third_party_state"
 private const val THIRD_PARTY_MODE_ACTIONS_URI_PATH = "autofill_third_party_mode"
 
 /**
- * Default implementation of the [BrowserThirdPartyAutofillManager] which uses a [ContentResolver]
- * to determine if the installed browser packages support and enable third party autofill services.
+ * Default implementation of the [ChromeThirdPartyAutofillManager] which uses a
+ * [ContentResolver] to determine if the installed Chrome packages support and enable
+ * third party autofill services.
  *
  * Based off of [this blog post](https://android-developers.googleblog.com/2025/02/chrome-3p-autofill-services-update.html)
  */
 @OmitFromCoverage
-class BrowserThirdPartyAutofillManagerImpl(
+class ChromeThirdPartyAutofillManagerImpl(
     private val context: Context,
-) : BrowserThirdPartyAutofillManager {
-    override val stableBraveAutofillStatus: BrowserThirdPartyAutoFillData
-        get() = getThirdPartyAutoFillStatusForChannel(BrowserPackage.BRAVE_RELEASE)
-    override val stableChromeAutofillStatus: BrowserThirdPartyAutoFillData
-        get() = getThirdPartyAutoFillStatusForChannel(BrowserPackage.CHROME_STABLE)
-    override val betaChromeAutofillStatus: BrowserThirdPartyAutoFillData
-        get() = getThirdPartyAutoFillStatusForChannel(BrowserPackage.CHROME_BETA)
+) : ChromeThirdPartyAutofillManager {
+    override val stableChromeAutofillStatus: ChromeThirdPartyAutoFillData
+        get() = getThirdPartyAutoFillStatusForChannel(ChromeReleaseChannel.STABLE)
+    override val betaChromeAutofillStatus: ChromeThirdPartyAutoFillData
+        get() = getThirdPartyAutoFillStatusForChannel(ChromeReleaseChannel.BETA)
 
     private fun getThirdPartyAutoFillStatusForChannel(
-        releaseChannel: BrowserPackage,
-    ): BrowserThirdPartyAutoFillData {
+        releaseChannel: ChromeReleaseChannel,
+    ): ChromeThirdPartyAutoFillData {
         val uri = Uri.Builder()
             .scheme(ContentResolver.SCHEME_CONTENT)
             .authority(releaseChannel.packageName + CONTENT_PROVIDER_NAME)
@@ -55,7 +54,7 @@ class BrowserThirdPartyAutofillManagerImpl(
                 true
             }
             ?: false
-        return BrowserThirdPartyAutoFillData(
+        return ChromeThirdPartyAutoFillData(
             isAvailable = isThirdPartyAvailable,
             isThirdPartyEnabled = thirdPartyEnabled,
         )

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/model/AutofillAppInfo.kt

@@ -1,7 +1,6 @@
 package com.x8bit.bitwarden.data.autofill.model
 
 import android.content.Context
-import androidx.annotation.ChecksSdkIntAtLeast
 
 /**
  * The app information required for the autofill service.
@@ -10,10 +9,4 @@ data class AutofillAppInfo(
     val context: Context,
     val packageName: String,
     val sdkInt: Int,
-) {
-    /**
-     * Returns true if the current [sdkInt] version is at least the provided [version].
-     */
-    @ChecksSdkIntAtLeast(parameter = 0)
-    fun isVersionAtLeast(version: Int): Boolean = sdkInt >= version
-}
+)

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/model/AutofillCipher.kt

@@ -2,7 +2,7 @@ package com.x8bit.bitwarden.data.autofill.model
 
 import androidx.annotation.DrawableRes
 import com.bitwarden.core.Uuid
-import com.bitwarden.ui.platform.resource.BitwardenDrawable
+import com.x8bit.bitwarden.R
 
 /**
  * A paired down model of the CipherView for use within the autofill feature.
@@ -48,7 +48,7 @@ sealed class AutofillCipher {
         val number: String,
     ) : AutofillCipher() {
         override val iconRes: Int
-            @DrawableRes get() = BitwardenDrawable.ic_payment_card
+            @DrawableRes get() = R.drawable.ic_payment_card
 
         override val isTotpEnabled: Boolean
             get() = false
@@ -67,6 +67,6 @@ sealed class AutofillCipher {
         val username: String,
     ) : AutofillCipher() {
         override val iconRes: Int
-            @DrawableRes get() = BitwardenDrawable.ic_globe
+            @DrawableRes get() = R.drawable.ic_globe
     }
 }

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/model/AutofillHint.kt

@@ -1,15 +0,0 @@
-package com.x8bit.bitwarden.data.autofill.model
-
-/**
- * Autofill hints used to determine what data an input field is associated with.
- */
-enum class AutofillHint {
-    CARD_CARDHOLDER,
-    CARD_EXPIRATION_DATE,
-    CARD_EXPIRATION_MONTH,
-    CARD_EXPIRATION_YEAR,
-    CARD_NUMBER,
-    CARD_SECURITY_CODE,
-    PASSWORD,
-    USERNAME,
-}

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/model/AutofillView.kt

@@ -54,20 +54,6 @@ sealed class AutofillView {
             override val data: Data,
         ) : Card()
 
-        /**
-         * The expiration date [AutofillView] for the [Card] data partition.
-         */
-        data class ExpirationDate(
-            override val data: Data,
-        ) : Card()
-
-        /**
-         * The cardholder name [AutofillView] for the [Card] data partition.
-         */
-        data class CardholderName(
-            override val data: Data,
-        ) : Card()
-
         /**
          * The number [AutofillView] for the [Card] data partition.
          */

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/model/browser/BrowserPackage.kt

@@ -1,16 +0,0 @@
-package com.x8bit.bitwarden.data.autofill.model.browser
-
-private const val BRAVE_CHANNEL_PACKAGE = "com.brave.browser"
-private const val CHROME_BETA_CHANNEL_PACKAGE = "com.chrome.beta"
-private const val CHROME_RELEASE_CHANNEL_PACKAGE = "com.android.chrome"
-
-/**
- * Enumerated values of each browser that supports third party autofill checks.
- *
- * @property packageName the package name of the release channel for the browser version.
- */
-enum class BrowserPackage(val packageName: String) {
-    BRAVE_RELEASE(BRAVE_CHANNEL_PACKAGE),
-    CHROME_STABLE(CHROME_RELEASE_CHANNEL_PACKAGE),
-    CHROME_BETA(CHROME_BETA_CHANNEL_PACKAGE),
-}

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/model/browser/BrowserThirdPartyAutoFillData.kt

@@ -1,18 +0,0 @@
-package com.x8bit.bitwarden.data.autofill.model.browser
-
-/**
- * Relevant data relating to the third party autofill status of a specific browser app.
- */
-data class BrowserThirdPartyAutoFillData(
-    val isAvailable: Boolean,
-    val isThirdPartyEnabled: Boolean,
-)
-
-/**
- * The overall status for all relevant browsers.
- */
-data class BrowserThirdPartyAutofillStatus(
-    val braveStableStatusData: BrowserThirdPartyAutoFillData,
-    val chromeStableStatusData: BrowserThirdPartyAutoFillData,
-    val chromeBetaChannelStatusData: BrowserThirdPartyAutoFillData,
-)

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/model/chrome/ChromeReleaseChannel.kt

@@ -0,0 +1,14 @@
+package com.x8bit.bitwarden.data.autofill.model.chrome
+
+private const val BETA_CHANNEL_PACKAGE = "com.chrome.beta"
+private const val CHROME_CHANNEL_PACKAGE = "com.android.chrome"
+
+/**
+ * Enumerated values of each version of Chrome supported for third party autofill checks.
+ *
+ * @property packageName the package name of the release channel for the Chrome version.
+ */
+enum class ChromeReleaseChannel(val packageName: String) {
+    STABLE(CHROME_CHANNEL_PACKAGE),
+    BETA(BETA_CHANNEL_PACKAGE),
+}

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/model/chrome/ChromeThirdPartyAutoFillData.kt

@@ -0,0 +1,17 @@
+package com.x8bit.bitwarden.data.autofill.model.chrome
+
+/**
+ * Relevant data relating to the third party autofill status of a version of the Chrome browser app.
+ */
+data class ChromeThirdPartyAutoFillData(
+    val isAvailable: Boolean,
+    val isThirdPartyEnabled: Boolean,
+)
+
+/**
+ * The overall status for all relevant release channels of Chrome.
+ */
+data class ChromeThirdPartyAutofillStatus(
+    val stableStatusData: ChromeThirdPartyAutoFillData,
+    val betaChannelStatusData: ChromeThirdPartyAutoFillData,
+)

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/parser/AutofillParserImpl.kt

@@ -15,7 +15,6 @@ import com.x8bit.bitwarden.data.autofill.util.getMaxInlineSuggestionsCount
 import com.x8bit.bitwarden.data.autofill.util.toAutofillView
 import com.x8bit.bitwarden.data.autofill.util.website
 import com.x8bit.bitwarden.data.platform.repository.SettingsRepository
-import timber.log.Timber
 
 /**
  * A list of URIs that should never be autofilled.
@@ -24,8 +23,6 @@ private val BLOCK_LISTED_URIS: List<String> = listOf(
     "androidapp://android",
     "androidapp://com.android.settings",
     "androidapp://com.x8bit.bitwarden",
-    "androidapp://com.x8bit.bitwarden.beta",
-    "androidapp://com.x8bit.bitwarden.dev",
     "androidapp://com.oneplus.applocker",
 )
 
@@ -73,7 +70,6 @@ class AutofillParserImpl(
         autofillAppInfo: AutofillAppInfo,
         fillRequest: FillRequest?,
     ): AutofillRequest {
-        Timber.d("Parsing AssistStructure -- ${fillRequest?.id}")
         // Parse the `assistStructure` into internal models.
         val traversalDataList = assistStructure.traverse()
         // Take only the autofill views from the node that currently has focus.
@@ -135,7 +131,6 @@ class AutofillParserImpl(
 
         // Get inline information if available
         val isInlineAutofillEnabled = settingsRepository.isInlineAutofillEnabled
-        Timber.e("Autofill request isInlineEnabled=$isInlineAutofillEnabled -- ${fillRequest?.id}")
         val maxInlineSuggestionsCount = fillRequest.getMaxInlineSuggestionsCount(
             autofillAppInfo = autofillAppInfo,
             isInlineAutofillEnabled = isInlineAutofillEnabled,

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/processor/AutofillProcessorImpl.kt

@@ -53,12 +53,8 @@ class AutofillProcessorImpl(
         fillCallback: FillCallback,
         request: FillRequest,
     ) {
-        Timber.d("Begin processing Autofill fill request -- ${request.id}")
         // Set the listener so that any long running work is cancelled when it is no longer needed.
-        cancellationSignal.setOnCancelListener {
-            Timber.d("Autofill job cancelled")
-            job.cancel()
-        }
+        cancellationSignal.setOnCancelListener { job.cancel() }
         // Process the OS data and handle invoking the callback with the result.
         job.cancel()
         job = scope.launch {
@@ -126,7 +122,6 @@ class AutofillProcessorImpl(
         )
         when (autofillRequest) {
             is AutofillRequest.Fillable -> {
-                Timber.d("Autofill request is Fillable -- ${fillRequest.id}")
                 // Fulfill the [autofillRequest].
                 val filledData = filledDataBuilder.build(
                     autofillRequest = autofillRequest,
@@ -146,7 +141,6 @@ class AutofillProcessorImpl(
 
                 @Suppress("TooGenericExceptionCaught")
                 try {
-                    Timber.d("Autofill request success: Fillable -- ${fillRequest.id}")
                     fillCallback.onSuccess(response)
                 } catch (e: RuntimeException) {
                     // This is to catch any TransactionTooLargeExceptions that could occur here.
@@ -159,7 +153,6 @@ class AutofillProcessorImpl(
                 // If we are unable to fulfill the request, we should invoke the callback
                 // with null. This effectively disables autofill for this view set and
                 // allows the [AutofillService] to be unbound.
-                Timber.d("Autofill request success: Unfillable -- ${fillRequest.id}")
                 fillCallback.onSuccess(null)
             }
         }

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/provider/AutofillCipherProviderImpl.kt

@@ -1,19 +1,16 @@
 package com.x8bit.bitwarden.data.autofill.provider
 
-import com.bitwarden.vault.CipherListView
-import com.bitwarden.vault.CipherListViewType
 import com.bitwarden.vault.CipherRepromptType
+import com.bitwarden.vault.CipherType
 import com.bitwarden.vault.CipherView
 import com.x8bit.bitwarden.data.auth.repository.AuthRepository
 import com.x8bit.bitwarden.data.autofill.model.AutofillCipher
 import com.x8bit.bitwarden.data.platform.manager.ciphermatching.CipherMatchingManager
 import com.x8bit.bitwarden.data.platform.util.firstWithTimeoutOrNull
 import com.x8bit.bitwarden.data.platform.util.subtitle
-import com.x8bit.bitwarden.data.vault.manager.model.GetCipherResult
 import com.x8bit.bitwarden.data.vault.repository.VaultRepository
 import com.x8bit.bitwarden.data.vault.repository.model.VaultUnlockData
 import com.x8bit.bitwarden.data.vault.repository.util.statusFor
-import timber.log.Timber
 
 /**
  * The duration, in milliseconds, we should wait while waiting for the vault status to not be
@@ -52,35 +49,31 @@ class AutofillCipherProviderImpl(
     }
 
     override suspend fun getCardAutofillCiphers(): List<AutofillCipher.Card> {
-        val cipherListViews = getUnlockedCipherListViewsOrNull() ?: return emptyList()
+        val cipherViews = getUnlockedCiphersOrNull() ?: return emptyList()
 
-        return cipherListViews
-            .mapNotNull { cipherListView ->
-                cipherListView
+        return cipherViews
+            .mapNotNull { cipherView ->
+                cipherView
                     // We only care about non-deleted card ciphers.
                     .takeIf {
                         // Must be card type.
-                        it.type is CipherListViewType.Card &&
+                        cipherView.type == CipherType.CARD &&
                             // Must not be deleted.
-                            it.deletedDate == null &&
+                            cipherView.deletedDate == null &&
                             // Must not require a reprompt.
                             it.reprompt == CipherRepromptType.NONE
                     }
-                    ?.let { nonNullCipherListView ->
-                        nonNullCipherListView.id?.let { cipherId ->
-                            decryptCipherOrNull(cipherId = cipherId)?.let { cipherView ->
-                                AutofillCipher.Card(
-                                    cipherId = cipherView.id,
-                                    name = cipherView.name,
-                                    subtitle = cipherView.subtitle.orEmpty(),
-                                    cardholderName = cipherView.card?.cardholderName.orEmpty(),
-                                    code = cipherView.card?.code.orEmpty(),
-                                    expirationMonth = cipherView.card?.expMonth.orEmpty(),
-                                    expirationYear = cipherView.card?.expYear.orEmpty(),
-                                    number = cipherView.card?.number.orEmpty(),
-                                )
-                            }
-                        }
+                    ?.let { nonNullCipherView ->
+                        AutofillCipher.Card(
+                            cipherId = cipherView.id,
+                            name = nonNullCipherView.name,
+                            subtitle = nonNullCipherView.subtitle.orEmpty(),
+                            cardholderName = nonNullCipherView.card?.cardholderName.orEmpty(),
+                            code = nonNullCipherView.card?.code.orEmpty(),
+                            expirationMonth = nonNullCipherView.card?.expMonth.orEmpty(),
+                            expirationYear = nonNullCipherView.card?.expYear.orEmpty(),
+                            number = nonNullCipherView.card?.number.orEmpty(),
+                        )
                     }
             }
     }
@@ -88,12 +81,12 @@ class AutofillCipherProviderImpl(
     override suspend fun getLoginAutofillCiphers(
         uri: String,
     ): List<AutofillCipher.Login> {
-        val cipherViews = getUnlockedCipherListViewsOrNull() ?: return emptyList()
+        val cipherViews = getUnlockedCiphersOrNull() ?: return emptyList()
         // We only care about non-deleted login ciphers.
         val loginCiphers = cipherViews
             .filter {
                 // Must be login type
-                it.type is CipherListViewType.Login &&
+                it.type == CipherType.LOGIN &&
                     // Must not be deleted.
                     it.deletedDate == null &&
                     // Must not require a reprompt.
@@ -103,12 +96,9 @@ class AutofillCipherProviderImpl(
         return cipherMatchingManager
             // Filter for ciphers that match the uri in some way.
             .filterCiphersForMatches(
-                cipherListViews = loginCiphers,
+                ciphers = loginCiphers,
                 matchUri = uri,
             )
-            .mapNotNull { cipherListView ->
-                cipherListView.id?.let { decryptCipherOrNull(cipherId = it) }
-            }
             .map { cipherView ->
                 AutofillCipher.Login(
                     cipherId = cipherView.id,
@@ -124,24 +114,10 @@ class AutofillCipherProviderImpl(
     /**
      * Get available [CipherView]s if possible.
      */
-    private suspend fun getUnlockedCipherListViewsOrNull(): List<CipherListView>? =
+    private suspend fun getUnlockedCiphersOrNull(): List<CipherView>? =
         vaultRepository
-            .decryptCipherListResultStateFlow
+            .ciphersStateFlow
             .takeUnless { isVaultLocked() }
             ?.firstWithTimeoutOrNull(timeMillis = GET_CIPHERS_TIMEOUT_MS) { it.data != null }
             ?.data
-            ?.successes
-
-    private suspend fun decryptCipherOrNull(cipherId: String): CipherView? =
-        when (val result = vaultRepository.getCipher(cipherId = cipherId)) {
-            GetCipherResult.CipherNotFound -> {
-                Timber.e("Cipher not found for autofill.")
-                null
-            }
-            is GetCipherResult.Failure -> {
-                Timber.e(result.error, "Failed to decrypt cipher for autofill.")
-                null
-            }
-            is GetCipherResult.Success -> result.cipherView
-        }
 }

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/util/AutofillIntentUtils.kt

@@ -12,13 +12,13 @@ import android.service.autofill.Dataset
 import android.view.autofill.AutofillManager
 import androidx.core.os.bundleOf
 import com.bitwarden.annotation.OmitFromCoverage
-import com.bitwarden.ui.platform.util.getSafeParcelableExtra
 import com.x8bit.bitwarden.AutofillTotpCopyActivity
 import com.x8bit.bitwarden.MainActivity
 import com.x8bit.bitwarden.data.autofill.model.AutofillAppInfo
 import com.x8bit.bitwarden.data.autofill.model.AutofillSaveItem
 import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData
 import com.x8bit.bitwarden.data.autofill.model.AutofillTotpCopyData
+import com.x8bit.bitwarden.data.platform.util.getSafeParcelableExtra
 import kotlin.random.Random
 
 private const val AUTOFILL_SAVE_ITEM_DATA_KEY = "autofill-save-item-data"

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/util/CipherListViewExtensions.kt

@@ -1,31 +0,0 @@
-package com.x8bit.bitwarden.data.autofill.util
-
-import com.bitwarden.vault.CardListView
-import com.bitwarden.vault.CipherListView
-import com.bitwarden.vault.CipherListViewType
-import com.bitwarden.vault.CopyableCipherFields
-import com.bitwarden.vault.LoginListView
-
-/**
- * Returns true when the cipher is not deleted and contains at least one FIDO 2 credential.
- */
-val CipherListView.isActiveWithFido2Credentials: Boolean
-    get() = deletedDate == null && login?.hasFido2 ?: false
-
-/**
- * Returns true when the cipher type is not deleted and contains a copyable password.
- */
-val CipherListView.isActiveWithCopyablePassword: Boolean
-    get() = deletedDate == null && copyableFields.contains(CopyableCipherFields.LOGIN_PASSWORD)
-
-/**
- * Returns the [LoginListView] if the cipher is of type [CipherListViewType.Login], otherwise null.
- */
-val CipherListView.login: LoginListView?
-    get() = (this.type as? CipherListViewType.Login)?.v1
-
-/**
- * Returns the [CardListView] if the cipher is of type [CipherListViewType.Card], otherwise null.
- */
-val CipherListView.card: CardListView?
-    get() = (this.type as? CipherListViewType.Card)?.v1

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/util/CipherViewExtensions.kt

@@ -50,9 +50,3 @@ fun CipherView.toAutofillCipherProvider(): AutofillCipherProvider =
  */
 val CipherView.isActiveWithFido2Credentials: Boolean
     get() = deletedDate == null && !(login?.fido2Credentials.isNullOrEmpty())
-
-/**
- * Returns true when the cipher is not deleted and contains at least one Pasword credential.
- */
-val CipherView.isActiveWithPasswordCredentials: Boolean
-    get() = deletedDate == null && !(login?.password.isNullOrEmpty())

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/util/FillRequestExtensions.kt

@@ -1,5 +1,6 @@
 package com.x8bit.bitwarden.data.autofill.util
 
+import android.annotation.SuppressLint
 import android.os.Build
 import android.service.autofill.FillRequest
 import android.widget.inline.InlinePresentationSpec
@@ -8,11 +9,12 @@ import com.x8bit.bitwarden.data.autofill.model.AutofillAppInfo
 /**
  * Extract the list of [InlinePresentationSpec]s. If it fails, return an empty list.
  */
+@SuppressLint("NewApi")
 fun FillRequest?.getInlinePresentationSpecs(
     autofillAppInfo: AutofillAppInfo,
     isInlineAutofillEnabled: Boolean,
 ): List<InlinePresentationSpec>? =
-    if (!autofillAppInfo.isVersionAtLeast(version = Build.VERSION_CODES.R)) {
+    if (autofillAppInfo.sdkInt < Build.VERSION_CODES.R) {
         // When SDK version is bellow 30, InlinePresentationSpec is not available and null
         // must be returned.
         null
@@ -26,13 +28,14 @@ fun FillRequest?.getInlinePresentationSpecs(
  * Extract the max inline suggestions count. If the OS is below Android R, this will always
  * return 0.
  */
+@SuppressLint("NewApi")
 fun FillRequest?.getMaxInlineSuggestionsCount(
     autofillAppInfo: AutofillAppInfo,
     isInlineAutofillEnabled: Boolean,
 ): Int =
     if (this != null &&
         isInlineAutofillEnabled &&
-        autofillAppInfo.isVersionAtLeast(version = Build.VERSION_CODES.R)
+        autofillAppInfo.sdkInt >= Build.VERSION_CODES.R
     ) {
         inlineSuggestionsRequest?.maxSuggestionCount ?: 0
     } else {

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/util/FilledDataExtensions.kt

@@ -1,5 +1,6 @@
 package com.x8bit.bitwarden.data.autofill.util
 
+import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.os.Build
 import android.service.autofill.Dataset
@@ -27,6 +28,7 @@ val FilledData.fillableAutofillIds: List<AutofillId>
 /**
  * Builds a [Dataset] for the Vault item.
  */
+@SuppressLint("NewApi")
 fun FilledData.buildVaultItemDataset(
     autofillAppInfo: AutofillAppInfo,
 ): Dataset {
@@ -68,7 +70,7 @@ fun FilledData.buildVaultItemDataset(
     return Dataset.Builder()
         .setAuthentication(pendingIntent.intentSender)
         .apply {
-            if (autofillAppInfo.isVersionAtLeast(version = Build.VERSION_CODES.TIRAMISU)) {
+            if (autofillAppInfo.sdkInt >= Build.VERSION_CODES.TIRAMISU) {
                 addVaultItemDataPostTiramisu(
                     autofillAppInfo = autofillAppInfo,
                     pendingIntent = pendingIntent,
@@ -130,7 +132,8 @@ private fun Dataset.Builder.addVaultItemDataPostTiramisu(
 /**
  * Adds the Vault data to the given [Dataset.Builder] for pre-Tiramisu versions.
  */
-@Suppress("LongParameterList")
+@Suppress("DEPRECATION", "LongParameterList")
+@SuppressLint("NewApi")
 private fun Dataset.Builder.addVaultItemDataPreTiramisu(
     autofillAppInfo: AutofillAppInfo,
     pendingIntent: PendingIntent,
@@ -139,7 +142,7 @@ private fun Dataset.Builder.addVaultItemDataPreTiramisu(
     inlinePresentationSpec: InlinePresentationSpec?,
     isLocked: Boolean,
 ): Dataset.Builder {
-    if (autofillAppInfo.isVersionAtLeast(version = Build.VERSION_CODES.R)) {
+    if (autofillAppInfo.sdkInt >= Build.VERSION_CODES.R) {
         inlinePresentationSpec
             ?.createVaultItemInlinePresentationOrNull(
                 autofillAppInfo = autofillAppInfo,
@@ -147,7 +150,6 @@ private fun Dataset.Builder.addVaultItemDataPreTiramisu(
                 isLocked = isLocked,
             )
             ?.let { inlinePresentation ->
-                @Suppress("DEPRECATION")
                 this.setInlinePresentation(inlinePresentation)
             }
     }

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/util/FilledItemExtensions.kt

@@ -1,18 +1,17 @@
 package com.x8bit.bitwarden.data.autofill.util
 
-import android.os.Build
+import android.annotation.SuppressLint
 import android.service.autofill.Dataset
 import android.service.autofill.Field
 import android.service.autofill.Presentations
 import android.widget.RemoteViews
-import androidx.annotation.RequiresApi
 import com.x8bit.bitwarden.data.autofill.model.FilledItem
 
 /**
  * Set up an overlay presentation for this [FilledItem] in the [datasetBuilder] for Android devices
  * running on API Tiramisu or greater.
  */
-@RequiresApi(Build.VERSION_CODES.TIRAMISU)
+@SuppressLint("NewApi")
 fun FilledItem.applyToDatasetPostTiramisu(
     datasetBuilder: Dataset.Builder,
     presentations: Presentations,
@@ -30,11 +29,11 @@ fun FilledItem.applyToDatasetPostTiramisu(
  * Set up an overlay presentation for this [FilledItem] in the [datasetBuilder] for Android devices
  * running on APIs that predate Tiramisu.
  */
+@Suppress("Deprecation")
 fun FilledItem.applyToDatasetPreTiramisu(
     datasetBuilder: Dataset.Builder,
     remoteViews: RemoteViews,
 ) {
-    @Suppress("DEPRECATION")
     datasetBuilder.setValue(
         autofillId,
         value,

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/util/FilledPartitionExtensions.kt

@@ -1,5 +1,6 @@
 package com.x8bit.bitwarden.data.autofill.util
 
+import android.annotation.SuppressLint
 import android.content.IntentSender
 import android.os.Build
 import android.service.autofill.Dataset
@@ -15,6 +16,7 @@ import com.x8bit.bitwarden.ui.autofill.util.createCipherInlinePresentationOrNull
  * Build a [Dataset] to represent the [FilledPartition]. This dataset includes an overlay UI
  * presentation for each filled item. If an [authIntentSender] is present, add it to the dataset.
  */
+@SuppressLint("NewApi")
 fun FilledPartition.buildDataset(
     authIntentSender: IntentSender?,
     autofillAppInfo: AutofillAppInfo,
@@ -24,9 +26,13 @@ fun FilledPartition.buildDataset(
         autofillCipher = autofillCipher,
     )
     val datasetBuilder = Dataset.Builder()
-    authIntentSender?.let { intentSender -> datasetBuilder.setAuthentication(intentSender) }
 
-    if (autofillAppInfo.isVersionAtLeast(version = Build.VERSION_CODES.TIRAMISU)) {
+    authIntentSender
+        ?.let { intentSender ->
+            datasetBuilder.setAuthentication(intentSender)
+        }
+
+    if (autofillAppInfo.sdkInt >= Build.VERSION_CODES.TIRAMISU) {
         applyToDatasetPostTiramisu(
             autofillAppInfo = autofillAppInfo,
             datasetBuilder = datasetBuilder,
@@ -79,19 +85,20 @@ private fun FilledPartition.applyToDatasetPostTiramisu(
  * Apply this [FilledPartition] to the [datasetBuilder] on devices running OS versions that predate
  * Tiramisu.
  */
+@Suppress("DEPRECATION")
+@SuppressLint("NewApi")
 private fun FilledPartition.buildDatasetPreTiramisu(
     autofillAppInfo: AutofillAppInfo,
     datasetBuilder: Dataset.Builder,
     remoteViews: RemoteViews,
 ) {
-    if (autofillAppInfo.isVersionAtLeast(version = Build.VERSION_CODES.R)) {
+    if (autofillAppInfo.sdkInt >= Build.VERSION_CODES.R) {
         inlinePresentationSpec
             ?.createCipherInlinePresentationOrNull(
                 autofillAppInfo = autofillAppInfo,
                 autofillCipher = autofillCipher,
             )
             ?.let { inlinePresentation ->
-                @Suppress("DEPRECATION")
                 datasetBuilder.setInlinePresentation(inlinePresentation)
             }
     }

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/util/HtmlInfoExtensions.kt

@@ -1,111 +1,53 @@
-@file:Suppress("TooManyFunctions")
-
 package com.x8bit.bitwarden.data.autofill.util
 
 import android.view.ViewStructure.HtmlInfo
+import com.bitwarden.annotation.OmitFromCoverage
 
 /**
  * Whether this [HtmlInfo] represents a password field.
- */
-fun HtmlInfo?.isPasswordField(): Boolean = isInputField &&
-    hints().containsAnyTerms(SUPPORTED_RAW_PASSWORD_HINTS)
-
-/**
- * Whether this [HtmlInfo] represents a username field.
- */
-fun HtmlInfo?.isUsernameField(): Boolean = isInputField &&
-    hints().containsAnyTerms(SUPPORTED_RAW_USERNAME_HINTS)
-
-/**
- * Whether this [HtmlInfo] represents a cardholder name field.
- */
-fun HtmlInfo?.isCardholderNameField(): Boolean = isInputField &&
-    hints().containsAnyPatterns(SUPPORTED_RAW_CARDHOLDER_NAME_HINT_PATTERNS)
-
-/**
- * Whether this [HtmlInfo] represents a card number field.
- */
-fun HtmlInfo?.isCardNumberField(): Boolean = isInputField &&
-    hints().containsAnyPatterns(SUPPORTED_RAW_CARD_NUMBER_HINT_PATTERNS)
-
-/**
- * Whether this [HtmlInfo] represents a card expiration month field.
- */
-fun HtmlInfo?.isCardExpirationMonthField(): Boolean = isInputField &&
-    hints().containsAnyPatterns(SUPPORTED_RAW_CARD_EXP_MONTH_HINT_PATTERNS)
-
-/**
- * Whether this [HtmlInfo] represents a card expiration year field.
- */
-fun HtmlInfo?.isCardExpirationYearField(): Boolean = isInputField &&
-    hints().containsAnyPatterns(SUPPORTED_RAW_CARD_EXP_YEAR_HINT_PATTERNS)
-
-/**
- * Whether this [HtmlInfo] represents a card expiration date field.
- */
-fun HtmlInfo?.isCardExpirationDateField(): Boolean = isInputField &&
-    hints().containsAnyPatterns(SUPPORTED_RAW_CARD_EXP_DATE_HINT_PATTERNS)
-
-/**
- * Whether this [HtmlInfo] represents a card security code field.
- */
-fun HtmlInfo?.isCardSecurityCodeField(): Boolean = isInputField &&
-    hints().containsAnyPatterns(SUPPORTED_RAW_CARD_SECURITY_CODE_HINT_PATTERNS)
-
-/**
- * Attributes that can be used as hints to determine the type of data the associated node expects.
  *
  * This function is untestable as [HtmlInfo] contains [android.util.Pair] which requires
  * instrumentation testing.
- *
- * @see IGNORED_RAW_HINTS
- * @see SUPPORTED_HTML_ATTRIBUTE_HINTS
  */
-fun HtmlInfo?.hints(): List<String> = this
-    ?.let { htmlInfo ->
-        htmlInfo
-            .attributes
-            // Filter out attributes with null values or values that match ignored raw hints
-            ?.filter { attribute ->
-                attribute.second != null &&
-                    !attribute.second.containsAnyTerms(IGNORED_RAW_HINTS)
+@OmitFromCoverage
+fun HtmlInfo?.isPasswordField(): Boolean =
+    this
+        ?.let { htmlInfo ->
+            if (htmlInfo.isInputField) {
+                htmlInfo
+                    .attributes
+                    ?.any {
+                        it.first == "type" && it.second == "password"
+                    }
+            } else {
+                false
             }
-            // Filter attributes that match supported HTML attribute hints
-            ?.filter { attribute ->
-                attribute.first.containsAnyTerms(
-                    terms = SUPPORTED_HTML_ATTRIBUTE_HINTS,
-                    ignoreCase = true,
-                )
+        }
+        ?: false
+
+/**
+ * Whether this [HtmlInfo] represents a username field.
+ *
+ * This function is untestable as [HtmlInfo] contains [android.util.Pair] which requires
+ * instrumentation testing.
+ */
+@OmitFromCoverage
+fun HtmlInfo?.isUsernameField(): Boolean =
+    this
+        ?.let { htmlInfo ->
+            if (htmlInfo.isInputField) {
+                htmlInfo
+                    .attributes
+                    ?.any {
+                        it.first == "type" && it.second == "email"
+                    }
+            } else {
+                false
             }
-            .orEmpty()
-            .mapNotNull { it.second }
-    }
-    .orEmpty()
+        }
+        ?: false
 
 /**
  * Whether this [HtmlInfo] represents an input field.
  */
 val HtmlInfo?.isInputField: Boolean get() = this?.tag == "input"
-
-/**
- * Checks if the list of strings contains any of the specified patterns.
- */
-private fun List<String>.containsAnyPatterns(patterns: List<Regex>): Boolean = this
-    .any { string -> patterns.any { pattern -> string.matches(pattern) } }
-
-/**
- * Checks if the list of strings contains any of the specified terms.
- */
-private fun List<String>.containsAnyTerms(terms: List<String>): Boolean =
-    this.any { string -> string.containsAnyTerms(terms) }
-
-/**
- * The supported attribute keys whose value can represent an autofill hint.
- */
-private val SUPPORTED_HTML_ATTRIBUTE_HINTS: List<String> = listOf(
-    "name",
-    "label",
-    "type",
-    "hint",
-    "autofill",
-)

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/util/StringExtensions.kt

@@ -16,13 +16,3 @@ fun String.containsAnyTerms(
             ignoreCase = ignoreCase,
         )
     }
-
-/**
- * Check whether this string matches any of these [expressions].
- */
-fun String.matchesAnyExpressions(
-    expressions: List<Regex>,
-): Boolean =
-    expressions.any {
-        this.matches(regex = it)
-    }

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/util/ViewNodeExtensions.kt

@@ -3,9 +3,7 @@ package com.x8bit.bitwarden.data.autofill.util
 import android.app.assist.AssistStructure
 import android.view.View
 import android.widget.EditText
-import androidx.annotation.VisibleForTesting
 import com.bitwarden.ui.platform.base.util.orNullIfBlank
-import com.x8bit.bitwarden.data.autofill.model.AutofillHint
 import com.x8bit.bitwarden.data.autofill.model.AutofillView
 
 /**
@@ -13,13 +11,39 @@ import com.x8bit.bitwarden.data.autofill.model.AutofillView
  */
 private const val DEFAULT_SCHEME: String = "https"
 
+/**
+ * The set of raw autofill hints that should be ignored.
+ */
+private val IGNORED_RAW_HINTS: List<String> = listOf(
+    "search",
+    "find",
+    "recipient",
+    "edit",
+)
+
+/**
+ * The supported password autofill hints.
+ */
+private val SUPPORTED_RAW_PASSWORD_HINTS: List<String> = listOf(
+    "password",
+    "pswd",
+)
+
+/**
+ * The supported raw autofill hints.
+ */
+private val SUPPORTED_RAW_USERNAME_HINTS: List<String> = listOf(
+    "email",
+    "phone",
+    "username",
+)
+
 /**
  * The supported autofill Android View hints.
  */
 private val SUPPORTED_VIEW_HINTS: List<String> = listOf(
     View.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_MONTH,
     View.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_YEAR,
-    View.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DATE,
     View.AUTOFILL_HINT_CREDIT_CARD_NUMBER,
     View.AUTOFILL_HINT_CREDIT_CARD_SECURITY_CODE,
     View.AUTOFILL_HINT_EMAIL_ADDRESS,
@@ -36,7 +60,7 @@ private val AssistStructure.ViewNode.isInputField: Boolean
             ?.let {
                 try {
                     Class.forName(it)
-                } catch (_: ClassNotFoundException) {
+                } catch (e: ClassNotFoundException) {
                     null
                 }
             }
@@ -54,7 +78,11 @@ fun AssistStructure.ViewNode.toAutofillView(): AutofillView? =
         .autofillId
         // We only care about nodes with a valid `AutofillId`.
         ?.let { nonNullAutofillId ->
-            if (supportedAutofillHint != null || this.isInputField) {
+            val supportedHint = this
+                .autofillHints
+                ?.firstOrNull { SUPPORTED_VIEW_HINTS.contains(it) }
+
+            if (supportedHint != null || this.isInputField) {
                 val autofillOptions = this
                     .autofillOptions
                     .orEmpty()
@@ -71,63 +99,22 @@ fun AssistStructure.ViewNode.toAutofillView(): AutofillView? =
                 buildAutofillView(
                     autofillOptions = autofillOptions,
                     autofillViewData = autofillViewData,
-                    autofillHint = supportedAutofillHint,
+                    supportedHint = supportedHint,
                 )
             } else {
                 null
             }
         }
 
-/**
- * The first supported autofill hint for this view node, or null if none are found.
- */
-private val AssistStructure.ViewNode.supportedAutofillHint: AutofillHint?
-    get() = firstSupportedAutofillHintOrNull()
-        ?: when {
-            this.isUsernameField -> AutofillHint.USERNAME
-            this.isPasswordField -> AutofillHint.PASSWORD
-            this.isCardExpirationMonthField -> AutofillHint.CARD_EXPIRATION_MONTH
-            this.isCardExpirationYearField -> AutofillHint.CARD_EXPIRATION_YEAR
-            this.isCardExpirationDateField -> AutofillHint.CARD_EXPIRATION_DATE
-            this.isCardNumberField -> AutofillHint.CARD_NUMBER
-            this.isCardSecurityCodeField -> AutofillHint.CARD_SECURITY_CODE
-            this.isCardholderNameField -> AutofillHint.CARD_CARDHOLDER
-            else -> null
-        }
-
-/**
- * Get the first supported autofill hint from the view node's autofillHints, or null if none are
- * found.
- */
-private fun AssistStructure.ViewNode.firstSupportedAutofillHintOrNull(): AutofillHint? =
-    autofillHints
-        ?.firstOrNull { SUPPORTED_VIEW_HINTS.contains(it) }
-        ?.toBitwardenAutofillHintOrNull()
-
-private fun String.toBitwardenAutofillHintOrNull(): AutofillHint? =
-    when (this) {
-        View.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_MONTH -> AutofillHint.CARD_EXPIRATION_MONTH
-        View.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_YEAR -> AutofillHint.CARD_EXPIRATION_YEAR
-        View.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DATE -> AutofillHint.CARD_EXPIRATION_DATE
-        View.AUTOFILL_HINT_CREDIT_CARD_NUMBER -> AutofillHint.CARD_NUMBER
-        View.AUTOFILL_HINT_CREDIT_CARD_SECURITY_CODE -> AutofillHint.CARD_SECURITY_CODE
-        View.AUTOFILL_HINT_PASSWORD -> AutofillHint.PASSWORD
-        View.AUTOFILL_HINT_EMAIL_ADDRESS,
-        View.AUTOFILL_HINT_USERNAME,
-            -> AutofillHint.USERNAME
-
-        else -> null
-    }
-
 /**
  * Attempt to convert this [AssistStructure.ViewNode] and [autofillViewData] into an [AutofillView].
  */
 private fun AssistStructure.ViewNode.buildAutofillView(
     autofillOptions: List<String>,
     autofillViewData: AutofillView.Data,
-    autofillHint: AutofillHint?,
-): AutofillView = when (autofillHint) {
-    AutofillHint.CARD_EXPIRATION_MONTH -> {
+    supportedHint: String?,
+): AutofillView = when {
+    supportedHint == View.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_MONTH -> {
         val monthValue = this
             .autofillValue
             ?.extractMonthValue(
@@ -140,43 +127,31 @@ private fun AssistStructure.ViewNode.buildAutofillView(
         )
     }
 
-    AutofillHint.CARD_EXPIRATION_YEAR -> {
+    supportedHint == View.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_YEAR -> {
         AutofillView.Card.ExpirationYear(
             data = autofillViewData,
         )
     }
 
-    AutofillHint.CARD_EXPIRATION_DATE -> {
-        AutofillView.Card.ExpirationDate(
-            data = autofillViewData,
-        )
-    }
-
-    AutofillHint.CARD_NUMBER -> {
+    supportedHint == View.AUTOFILL_HINT_CREDIT_CARD_NUMBER -> {
         AutofillView.Card.Number(
             data = autofillViewData,
         )
     }
 
-    AutofillHint.CARD_SECURITY_CODE -> {
+    supportedHint == View.AUTOFILL_HINT_CREDIT_CARD_SECURITY_CODE -> {
         AutofillView.Card.SecurityCode(
             data = autofillViewData,
         )
     }
 
-    AutofillHint.CARD_CARDHOLDER -> {
-        AutofillView.Card.CardholderName(
-            data = autofillViewData,
-        )
-    }
-
-    AutofillHint.PASSWORD -> {
+    this.isPasswordField(supportedHint) -> {
         AutofillView.Login.Password(
             data = autofillViewData,
         )
     }
 
-    AutofillHint.USERNAME -> {
+    this.isUsernameField(supportedHint) -> {
         AutofillView.Login.Username(
             data = autofillViewData,
         )
@@ -192,97 +167,41 @@ private fun AssistStructure.ViewNode.buildAutofillView(
 /**
  * Check whether this [AssistStructure.ViewNode] represents a password field.
  */
-@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-internal val AssistStructure.ViewNode.isPasswordField: Boolean
-    get() {
-        val isUsernameField = this.isUsernameField
-        if (
-            this.inputType.isPasswordInputType &&
-            !this.containsIgnoredHintTerms() &&
-            !isUsernameField
-        ) {
-            return true
-        }
+fun AssistStructure.ViewNode.isPasswordField(
+    supportedHint: String?,
+): Boolean {
+    if (supportedHint == View.AUTOFILL_HINT_PASSWORD) return true
 
-        return hint?.containsAnyTerms(SUPPORTED_RAW_PASSWORD_HINTS) == true ||
-            htmlInfo.isPasswordField()
-    }
+    val isInvalidField = this.idEntry?.containsAnyTerms(IGNORED_RAW_HINTS) == true ||
+        this.hint?.containsAnyTerms(IGNORED_RAW_HINTS) == true
+    val isUsernameField = this.isUsernameField(supportedHint)
+    if (this.inputType.isPasswordInputType && !isInvalidField && !isUsernameField) return true
+
+    return this
+        .htmlInfo
+        .isPasswordField()
+}
 
 /**
  * Check whether this [AssistStructure.ViewNode] includes any password specific terms.
  */
-@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-internal fun AssistStructure.ViewNode.hasPasswordTerms(): Boolean =
+fun AssistStructure.ViewNode.hasPasswordTerms(): Boolean =
     this.idEntry?.containsAnyTerms(SUPPORTED_RAW_PASSWORD_HINTS) == true ||
-        this.hint?.containsAnyTerms(SUPPORTED_RAW_PASSWORD_HINTS) == true ||
-        this.htmlInfo.hints().any { it.containsAnyTerms(SUPPORTED_RAW_PASSWORD_HINTS) }
+        this.hint?.containsAnyTerms(SUPPORTED_RAW_PASSWORD_HINTS) == true
 
 /**
  * Check whether this [AssistStructure.ViewNode] represents a username field.
  */
-@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-internal val AssistStructure.ViewNode.isUsernameField: Boolean
-    get() = inputType.isUsernameInputType ||
+fun AssistStructure.ViewNode.isUsernameField(
+    supportedHint: String?,
+): Boolean =
+    supportedHint == View.AUTOFILL_HINT_USERNAME ||
+        supportedHint == View.AUTOFILL_HINT_EMAIL_ADDRESS ||
+        inputType.isUsernameInputType ||
         idEntry?.containsAnyTerms(SUPPORTED_RAW_USERNAME_HINTS) == true ||
         hint?.containsAnyTerms(SUPPORTED_RAW_USERNAME_HINTS) == true ||
         htmlInfo.isUsernameField()
 
-/**
- * Check whether this [AssistStructure.ViewNode] represents a card expiration month field.
- */
-private val AssistStructure.ViewNode.isCardExpirationMonthField: Boolean
-    get() = idEntry?.matchesAnyExpressions(SUPPORTED_RAW_CARD_EXP_MONTH_HINT_PATTERNS) == true ||
-        hint?.matchesAnyExpressions(SUPPORTED_RAW_CARD_EXP_MONTH_HINT_PATTERNS) == true ||
-        htmlInfo.isCardExpirationMonthField()
-
-/**
- * Check whether this [AssistStructure.ViewNode] represents a card expiration year field.
- */
-private val AssistStructure.ViewNode.isCardExpirationYearField: Boolean
-    get() = idEntry?.matchesAnyExpressions(SUPPORTED_RAW_CARD_EXP_YEAR_HINT_PATTERNS) == true ||
-        hint?.matchesAnyExpressions(SUPPORTED_RAW_CARD_EXP_YEAR_HINT_PATTERNS) == true ||
-        htmlInfo.isCardExpirationYearField()
-
-/**
- * Check whether this [AssistStructure.ViewNode] represents a card expiration date field.
- */
-private val AssistStructure.ViewNode.isCardExpirationDateField: Boolean
-    get() = idEntry?.matchesAnyExpressions(SUPPORTED_RAW_CARD_EXP_DATE_HINT_PATTERNS) == true ||
-        hint?.matchesAnyExpressions(SUPPORTED_RAW_CARD_EXP_DATE_HINT_PATTERNS) == true ||
-        htmlInfo.isCardExpirationDateField()
-
-/**
- * Check whether this [AssistStructure.ViewNode] represents a card number field based.
- */
-private val AssistStructure.ViewNode.isCardNumberField: Boolean
-    get() = idEntry?.matchesAnyExpressions(SUPPORTED_RAW_CARD_NUMBER_HINT_PATTERNS) == true ||
-        hint?.matchesAnyExpressions(SUPPORTED_RAW_CARD_NUMBER_HINT_PATTERNS) == true ||
-        htmlInfo.isCardNumberField()
-
-/**
- * Check whether this [AssistStructure.ViewNode] represents a card security code field based.
- */
-private val AssistStructure.ViewNode.isCardSecurityCodeField: Boolean
-    get() =
-        idEntry?.matchesAnyExpressions(SUPPORTED_RAW_CARD_SECURITY_CODE_HINT_PATTERNS) == true ||
-            hint?.matchesAnyExpressions(SUPPORTED_RAW_CARD_SECURITY_CODE_HINT_PATTERNS) == true ||
-            htmlInfo.isCardSecurityCodeField()
-
-/**
- * Check whether this [AssistStructure.ViewNode] represents a cardholder name field based.
- */
-private val AssistStructure.ViewNode.isCardholderNameField: Boolean
-    get() = idEntry?.matchesAnyExpressions(SUPPORTED_RAW_CARDHOLDER_NAME_HINT_PATTERNS) == true ||
-        hint?.matchesAnyExpressions(SUPPORTED_RAW_CARDHOLDER_NAME_HINT_PATTERNS) == true ||
-        htmlInfo.isCardholderNameField()
-
-/**
- * Check whether this [AssistStructure.ViewNode] contains any ignored hint terms.
- */
-private fun AssistStructure.ViewNode.containsIgnoredHintTerms(): Boolean =
-    this.idEntry?.containsAnyTerms(IGNORED_RAW_HINTS) == true ||
-        this.hint?.containsAnyTerms(IGNORED_RAW_HINTS) == true ||
-        this.htmlInfo.hints().any { it.containsAnyTerms(IGNORED_RAW_HINTS) }
 /**
  * The website that this [AssistStructure.ViewNode] is a part of representing.
  */

app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/util/ViewStructureUtils.kt

@@ -1,137 +0,0 @@
-package com.x8bit.bitwarden.data.autofill.util
-
-/**
- * The set of raw autofill hints that should be ignored.
- */
-val IGNORED_RAW_HINTS: List<String> = listOf(
-    "search",
-    "find",
-    "recipient",
-    "edit",
-)
-
-/**
- * The supported password autofill hints.
- */
-val SUPPORTED_RAW_PASSWORD_HINTS: List<String> = listOf(
-    "password",
-    "pswd",
-)
-
-/**
- * The supported raw autofill hints.
- */
-val SUPPORTED_RAW_USERNAME_HINTS: List<String> = listOf(
-    "email",
-    "phone",
-    "username",
-)
-
-/**
- * Matches common patterns for cardholder name hints.
- * - `\b(?i)`: Case-insensitive word boundary to ensure we match whole words.
- * - `(?:credit[\\s_-])?`: Optionally matches "credit" followed by a space, underscore, or hyphen.
- * - `(?:cc|card)[\\s_-](?:name|cardholder).*`: Matches "cc" or "card" followed by a space,
- * underscore, or hyphen, then "name" or "cardholder", and finally any characters. This covers
- * variations like "cc name", "card_cardholder", "credit-card-name something else".
- * - `|`: OR operator, allowing for an alternative pattern.
- * - `name[\\s_-]on[\\s_-]card`: Matches "name" followed by a space, underscore, or hyphen, then
- * "on", another space, underscore, or hyphen, and finally "card". This covers phrases like "name on
- * card" or "name_on_card".
- * - `\b`: Word boundary to ensure we match whole words.
- */
-val SUPPORTED_RAW_CARDHOLDER_NAME_HINT_PATTERNS: List<Regex> = listOf(
-    "\\b(?i)(?:credit[\\s_-])?(?:cc|card)[\\s_-](?:name|cardholder).*\\b".toRegex(),
-    "\\b(?i)name[\\s_-]on[\\s_-]card\\b".toRegex(),
-)
-
-/**
- * Matches common patterns for card number hints.
- * - `\b(?i)`: Case-insensitive word boundary to ensure we match whole words.
- * - `(?:credit[\\s_-])?`: Optionally matches "credit" followed by a space, underscore, or hyphen.
- * - `(?:cc|card)`: Matches "cc" or "card".
- * - `[\\s_-]number`: Matches "number" preceded by a space, underscore, or hyphen.
- * - `\b`: Word boundary to ensure we match whole words.
- */
-val SUPPORTED_RAW_CARD_NUMBER_HINT_PATTERNS: List<Regex> = listOf(
-    "\\b(?i)(?:credit[\\s_-])?(?:cc|card)[\\s_-]number\\b".toRegex(),
-)
-
-/**
- * Matches common patterns for card expiration month hints.
- * - `\b(?i)`: Case-insensitive word boundary to ensure we match whole words.
- * - `(?:credit[\\s_-])?`: Optionally matches "credit" followed by a space, underscore, or hyphen.
- * - `(?:cc|card)`: Matches "cc" or "card".
- * - `[\\s_-]exp[\\s_-]month`: Matches "exp" followed by a space, underscore, or hyphen, then
- * "month".
- * - `\b`: Word boundary to ensure we match whole words.
- *
- * Examples:
- * - "credit card exp month"
- * - "cc_exp_month"
- * - "card-exp-month"
- */
-val SUPPORTED_RAW_CARD_EXP_MONTH_HINT_PATTERNS: List<Regex> = listOf(
-    "\\b(?i)(?:credit[\\s_-])?(?:(cc|card)[\\s_-])?(?:exp|expiration|expiry)[\\s_-]month\\b"
-        .toRegex(),
-)
-
-/**
- * Matches common patterns for card expiration year hints.
- * - `\b(?i)`: Case-insensitive word boundary to ensure we match whole words.
- * - `(?:credit[\\s_-])?`: Optionally matches "credit" followed by a space, underscore, or hyphen.
- * - `(?:cc|card)`: Matches "cc" or "card".
- * - `[\\s_-]exp[\\s_-]year`: Matches "exp" followed by a space, underscore, or hyphen, then "year".
- * - `\b`: Word boundary to ensure we match whole words.
- *
- * Similar to [SUPPORTED_RAW_CARD_EXP_MONTH_HINT_PATTERNS], but for "year" instead of "month".
- * @see SUPPORTED_RAW_CARD_EXP_MONTH_HINT_PATTERNS
- */
-val SUPPORTED_RAW_CARD_EXP_YEAR_HINT_PATTERNS: List<Regex> = listOf(
-    "\\b(?i)(?:credit[\\s_-])?(?:(cc|card)[\\s_-])?(?:exp|expiration|expiry)[\\s_-]year\\b"
-        .toRegex(),
-)
-
-/**
- * Matches common patterns for card expiration date hints.
- * - `\b(?i)`: Case-insensitive word boundary to ensure we match whole words.
- * - `(?:credit[\\s_-])?`: Optionally matches "credit" followed by a space, underscore, or hyphen.
- * - `(?:cc|card)`: Matches "cc" or "card".
- * - `[\\s_-]exp[\\s_-]date`: Matches "exp" followed by a space, underscore, or hyphen, then "date".
- * - `.*`: Matches any characters following "date" (e.g., "MM/YY", "month/year").
- * - `\b`: Word boundary to ensure we match whole words.
- *
- * Examples:
- * - "credit card exp date"
- * - "cc_exp_date_mm_yy"
- * - "card-exp-date month/year"
- */
-val SUPPORTED_RAW_CARD_EXP_DATE_HINT_PATTERNS: List<Regex> = listOf(
-    "\\b(?i)(?:credit[\\s_-])?(?:(cc|card)[\\s_-])?(?:exp|expiration|expiry)[\\s_-]date\\b"
-        .toRegex(),
-)
-
-/**
- * Matches common patterns for card security code hints.
- * - `\b(?i)`: Case-insensitive word boundary to ensure we match whole words.
- * - `(?:credit[\\s_-])?`: Optionally matches "credit" followed by a space, underscore, or hyphen.
- * - The first pattern `(?:cc|card[\\s_-])(cvc|cvv)\b`:
- *    - `(?:cc|card[\\s_-])`: Matches "cc" or "card" followed by a space, underscore, or hyphen.
- *    - `(cvc|cvv)\b`: Matches "cvc" or "cvv" followed by a word boundary.
- * - The second pattern `(?:cc|card)(?:[\\s_-]verification)?([\\s_-]code)\b`:
- *    - `(?:cc|card)`: Matches "cc" or "card".
- *    - `(?:[\\s_-]verification)?`: Optionally matches "verification" preceded by a space,
- *    underscore, or hyphen.
- * - `([\\s_-]code)\b`: Matches "code" preceded by a space, underscore, or hyphen, and
- * followed by a word boundary.
- *
- * Examples:
- * - "credit card cvc"
- * - "cc_verification_code"
- * - "card-code"
- */
-val SUPPORTED_RAW_CARD_SECURITY_CODE_HINT_PATTERNS: List<Regex> = listOf(
-    "\\b(?i)(?:credit[\\s_-])?(?:cc|card[\\s_-])?(cvc|cvv)2?\\b".toRegex(),
-    "\\b(?i)(?:credit[\\s_-])?(?:cc|card)(?:[\\s_-](?:verification|security))?([\\s_-]code)\\b"
-        .toRegex(),
-)

app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/builder/CredentialEntryBuilder.kt

@@ -1,11 +1,8 @@
 package com.x8bit.bitwarden.data.credentials.builder
 
-import androidx.credentials.provider.BeginGetPasswordOption
 import androidx.credentials.provider.BeginGetPublicKeyCredentialOption
-import androidx.credentials.provider.PasswordCredentialEntry
 import androidx.credentials.provider.PublicKeyCredentialEntry
 import com.bitwarden.fido.Fido2CredentialAutofillView
-import com.bitwarden.vault.CipherListView
 
 /**
  * Builder for credential entries.
@@ -21,14 +18,4 @@ interface CredentialEntryBuilder {
         beginGetPublicKeyCredentialOptions: List<BeginGetPublicKeyCredentialOption>,
         isUserVerified: Boolean,
     ): List<PublicKeyCredentialEntry>
-
-    /**
-     * Build password credential entries from the given cipher views and options.
-     */
-    fun buildPasswordCredentialEntries(
-        userId: String,
-        cipherListViews: List<CipherListView>,
-        beginGetPasswordCredentialOptions: List<BeginGetPasswordOption>,
-        isUserVerified: Boolean,
-    ): List<PasswordCredentialEntry>
 }

app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/builder/CredentialEntryBuilderImpl.kt

@@ -3,25 +3,25 @@ package com.x8bit.bitwarden.data.credentials.builder
 import android.content.Context
 import android.graphics.drawable.Icon
 import androidx.core.graphics.drawable.IconCompat
-import androidx.credentials.provider.BeginGetPasswordOption
 import androidx.credentials.provider.BeginGetPublicKeyCredentialOption
-import androidx.credentials.provider.PasswordCredentialEntry
 import androidx.credentials.provider.PublicKeyCredentialEntry
 import com.bitwarden.fido.Fido2CredentialAutofillView
-import com.bitwarden.ui.platform.resource.BitwardenDrawable
-import com.bitwarden.ui.platform.resource.BitwardenString
-import com.bitwarden.vault.CipherListView
-import com.x8bit.bitwarden.data.autofill.util.login
-import com.x8bit.bitwarden.data.credentials.manager.CredentialManagerPendingIntentManager
+import com.x8bit.bitwarden.R
+import com.x8bit.bitwarden.data.credentials.processor.GET_PASSKEY_INTENT
 import com.x8bit.bitwarden.data.credentials.util.setBiometricPromptDataIfSupported
 import com.x8bit.bitwarden.data.platform.manager.BiometricsEncryptionManager
+import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager
+import com.x8bit.bitwarden.data.platform.manager.model.FlagKey
+import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
+import kotlin.random.Random
 
 /**
  * Primary implementation of [CredentialEntryBuilder].
  */
 class CredentialEntryBuilderImpl(
     private val context: Context,
-    private val pendingIntentManager: CredentialManagerPendingIntentManager,
+    private val intentManager: IntentManager,
+    private val featureFlagManager: FeatureFlagManager,
     private val biometricsEncryptionManager: BiometricsEncryptionManager,
 ) : CredentialEntryBuilder {
 
@@ -40,21 +40,6 @@ class CredentialEntryBuilderImpl(
                 )
         }
 
-    override fun buildPasswordCredentialEntries(
-        userId: String,
-        cipherListViews: List<CipherListView>,
-        beginGetPasswordCredentialOptions: List<BeginGetPasswordOption>,
-        isUserVerified: Boolean,
-    ): List<PasswordCredentialEntry> = beginGetPasswordCredentialOptions
-        .flatMap { option ->
-            cipherListViews
-                .toPasswordCredentialEntryList(
-                    userId = userId,
-                    option = option,
-                    isUserVerified = isUserVerified,
-                )
-        }
-
     private fun List<Fido2CredentialAutofillView>.toPublicKeyCredentialEntryList(
         userId: String,
         option: BeginGetPublicKeyCredentialOption,
@@ -65,13 +50,16 @@ class CredentialEntryBuilderImpl(
                 .Builder(
                     context = context,
                     username = fido2AutofillView.userNameForUi
-                        ?: context.getString(BitwardenString.no_username),
-                    pendingIntent = pendingIntentManager.createFido2GetCredentialPendingIntent(
-                        userId = userId,
-                        credentialId = fido2AutofillView.credentialId.toString(),
-                        cipherId = fido2AutofillView.cipherId,
-                        isUserVerified = isUserVerified,
-                    ),
+                        ?: context.getString(R.string.no_username),
+                    pendingIntent = intentManager
+                        .createFido2GetCredentialPendingIntent(
+                            action = GET_PASSKEY_INTENT,
+                            userId = userId,
+                            credentialId = fido2AutofillView.credentialId.toString(),
+                            cipherId = fido2AutofillView.cipherId,
+                            isUserVerified = isUserVerified,
+                            requestCode = Random.nextInt(),
+                        ),
                     beginGetPublicKeyCredentialOption = option,
                 )
                 .setIcon(
@@ -82,39 +70,10 @@ class CredentialEntryBuilderImpl(
                 .also { builder ->
                     if (!isUserVerified) {
                         builder.setBiometricPromptDataIfSupported(
-                            cipher = biometricsEncryptionManager.getOrCreateCipher(userId),
-                        )
-                    }
-                }
-                .build()
-        }
-
-    private fun List<CipherListView>.toPasswordCredentialEntryList(
-        userId: String,
-        option: BeginGetPasswordOption,
-        isUserVerified: Boolean,
-    ): List<PasswordCredentialEntry> = this
-        .map { cipherView ->
-            PasswordCredentialEntry
-                .Builder(
-                    context = context,
-                    username = cipherView.login?.username
-                        ?: context.getString(BitwardenString.no_username),
-                    pendingIntent = pendingIntentManager.createPasswordGetCredentialPendingIntent(
-                        userId = userId,
-                        cipherId = cipherView.id,
-                        isUserVerified = isUserVerified,
-                    ),
-                    beginGetPasswordOption = option,
-                )
-                .setDisplayName(cipherView.name)
-                .setAutoSelectAllowed(this.size == 1)
-                .setIcon(getCredentialEntryIcon())
-                .apply {
-                    if (!isUserVerified) {
-                        setBiometricPromptDataIfSupported(
                             cipher = biometricsEncryptionManager
                                 .getOrCreateCipher(userId),
+                            isSingleTapAuthEnabled = featureFlagManager
+                                .getFeatureFlag(FlagKey.SingleTapPasskeyAuthentication),
                         )
                     }
                 }
@@ -124,14 +83,13 @@ class CredentialEntryBuilderImpl(
     // TODO: [PM-20176] Enable web icons in credential entries
     // Leave web icons disabled until CredentialManager TransactionTooLargeExceptions
     // are addressed. See https://issuetracker.google.com/issues/355141766 for details.
-    private fun getCredentialEntryIcon(
-        isPasskey: Boolean = false,
-    ): Icon = IconCompat
+    private fun getCredentialEntryIcon(isPasskey: Boolean): Icon = IconCompat
         .createWithResource(
             context,
-            when {
-                isPasskey -> BitwardenDrawable.ic_bw_passkey
-                else -> BitwardenDrawable.ic_globe
+            if (isPasskey) {
+                R.drawable.ic_bw_passkey
+            } else {
+                R.drawable.ic_globe
             },
         )
         .toIcon(context)

app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/di/CredentialProviderModule.kt

@@ -12,8 +12,6 @@ import com.x8bit.bitwarden.data.credentials.builder.CredentialEntryBuilderImpl
 import com.x8bit.bitwarden.data.credentials.datasource.disk.PrivilegedAppDiskSource
 import com.x8bit.bitwarden.data.credentials.manager.BitwardenCredentialManager
 import com.x8bit.bitwarden.data.credentials.manager.BitwardenCredentialManagerImpl
-import com.x8bit.bitwarden.data.credentials.manager.CredentialManagerPendingIntentManager
-import com.x8bit.bitwarden.data.credentials.manager.CredentialManagerPendingIntentManagerImpl
 import com.x8bit.bitwarden.data.credentials.manager.OriginManager
 import com.x8bit.bitwarden.data.credentials.manager.OriginManagerImpl
 import com.x8bit.bitwarden.data.credentials.parser.RelyingPartyParser
@@ -25,9 +23,9 @@ import com.x8bit.bitwarden.data.credentials.repository.PrivilegedAppRepositoryIm
 import com.x8bit.bitwarden.data.platform.manager.AssetManager
 import com.x8bit.bitwarden.data.platform.manager.BiometricsEncryptionManager
 import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager
-import com.x8bit.bitwarden.data.platform.manager.ciphermatching.CipherMatchingManager
 import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource
 import com.x8bit.bitwarden.data.vault.repository.VaultRepository
+import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -52,18 +50,20 @@ object CredentialProviderModule {
         authRepository: AuthRepository,
         bitwardenCredentialManager: BitwardenCredentialManager,
         dispatcherManager: DispatcherManager,
-        pendingIntentManager: CredentialManagerPendingIntentManager,
+        intentManager: IntentManager,
         biometricsEncryptionManager: BiometricsEncryptionManager,
+        featureFlagManager: FeatureFlagManager,
         clock: Clock,
     ): CredentialProviderProcessor =
         CredentialProviderProcessorImpl(
-            context = context,
-            authRepository = authRepository,
-            bitwardenCredentialManager = bitwardenCredentialManager,
-            pendingIntentManager = pendingIntentManager,
-            clock = clock,
-            biometricsEncryptionManager = biometricsEncryptionManager,
-            dispatcherManager = dispatcherManager,
+            context,
+            authRepository,
+            bitwardenCredentialManager,
+            intentManager,
+            clock,
+            biometricsEncryptionManager,
+            featureFlagManager,
+            dispatcherManager,
         )
 
     @Provides
@@ -75,7 +75,6 @@ object CredentialProviderModule {
         vaultRepository: VaultRepository,
         dispatcherManager: DispatcherManager,
         credentialEntryBuilder: CredentialEntryBuilder,
-        cipherMatchingManager: CipherMatchingManager,
     ): BitwardenCredentialManager =
         BitwardenCredentialManagerImpl(
             vaultSdkSource = vaultSdkSource,
@@ -84,7 +83,6 @@ object CredentialProviderModule {
             vaultRepository = vaultRepository,
             dispatcherManager = dispatcherManager,
             credentialEntryBuilder = credentialEntryBuilder,
-            cipherMatchingManager = cipherMatchingManager,
         )
 
     @Provides
@@ -106,11 +104,13 @@ object CredentialProviderModule {
     @Singleton
     fun provideCredentialEntryBuilder(
         @ApplicationContext context: Context,
-        pendingIntentManager: CredentialManagerPendingIntentManager,
+        intentManager: IntentManager,
+        featureFlagManager: FeatureFlagManager,
         biometricsEncryptionManager: BiometricsEncryptionManager,
     ): CredentialEntryBuilder = CredentialEntryBuilderImpl(
         context = context,
-        pendingIntentManager = pendingIntentManager,
+        intentManager = intentManager,
+        featureFlagManager = featureFlagManager,
         biometricsEncryptionManager = biometricsEncryptionManager,
     )
 
@@ -118,13 +118,9 @@ object CredentialProviderModule {
     @Singleton
     fun providePrivilegedAppRepository(
         privilegedAppDiskSource: PrivilegedAppDiskSource,
-        assetManager: AssetManager,
-        dispatcherManager: DispatcherManager,
         json: Json,
     ): PrivilegedAppRepository = PrivilegedAppRepositoryImpl(
         privilegedAppDiskSource = privilegedAppDiskSource,
-        assetManager = assetManager,
-        dispatcherManager = dispatcherManager,
         json = json,
     )
 
@@ -133,13 +129,4 @@ object CredentialProviderModule {
     fun provideRelyingPartyParser(
         json: Json,
     ): RelyingPartyParser = RelyingPartyParserImpl(json)
-
-    @Provides
-    @Singleton
-    fun provideCredentialManagerPendingIntentManager(
-        @ApplicationContext context: Context,
-    ): CredentialManagerPendingIntentManager =
-        CredentialManagerPendingIntentManagerImpl(
-            context = context,
-        )
 }

app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/manager/BitwardenCredentialManagerImpl.kt

@@ -3,7 +3,6 @@ package com.x8bit.bitwarden.data.credentials.manager
 import androidx.credentials.CreatePublicKeyCredentialRequest
 import androidx.credentials.GetPublicKeyCredentialOption
 import androidx.credentials.exceptions.GetCredentialUnknownException
-import androidx.credentials.provider.BeginGetPasswordOption
 import androidx.credentials.provider.BeginGetPublicKeyCredentialOption
 import androidx.credentials.provider.CallingAppInfo
 import androidx.credentials.provider.CredentialEntry
@@ -19,12 +18,8 @@ import com.bitwarden.fido.Origin
 import com.bitwarden.fido.UnverifiedAssetLink
 import com.bitwarden.sdk.Fido2CredentialStore
 import com.bitwarden.ui.platform.base.util.prefixHttpsIfNecessaryOrNull
-import com.bitwarden.ui.platform.base.util.toAndroidAppUriString
-import com.bitwarden.vault.CipherListView
 import com.bitwarden.vault.CipherView
-import com.x8bit.bitwarden.data.autofill.util.isActiveWithCopyablePassword
 import com.x8bit.bitwarden.data.autofill.util.isActiveWithFido2Credentials
-import com.x8bit.bitwarden.data.autofill.util.login
 import com.x8bit.bitwarden.data.credentials.builder.CredentialEntryBuilder
 import com.x8bit.bitwarden.data.credentials.model.Fido2CredentialAssertionResult
 import com.x8bit.bitwarden.data.credentials.model.Fido2RegisterCredentialResult
@@ -32,7 +27,6 @@ import com.x8bit.bitwarden.data.credentials.model.GetCredentialsRequest
 import com.x8bit.bitwarden.data.credentials.model.PasskeyAssertionOptions
 import com.x8bit.bitwarden.data.credentials.model.PasskeyAttestationOptions
 import com.x8bit.bitwarden.data.credentials.model.UserVerificationRequirement
-import com.x8bit.bitwarden.data.platform.manager.ciphermatching.CipherMatchingManager
 import com.x8bit.bitwarden.data.platform.util.getAppOrigin
 import com.x8bit.bitwarden.data.platform.util.getAppSigningSignatureFingerprint
 import com.x8bit.bitwarden.data.platform.util.getSignatureFingerprintAsHexString
@@ -41,8 +35,8 @@ import com.x8bit.bitwarden.data.vault.datasource.sdk.model.AuthenticateFido2Cred
 import com.x8bit.bitwarden.data.vault.datasource.sdk.model.RegisterFido2CredentialRequest
 import com.x8bit.bitwarden.data.vault.datasource.sdk.util.toAndroidAttestationResponse
 import com.x8bit.bitwarden.data.vault.datasource.sdk.util.toAndroidFido2PublicKeyCredential
-import com.x8bit.bitwarden.data.vault.manager.model.GetCipherResult
 import com.x8bit.bitwarden.data.vault.repository.VaultRepository
+import com.x8bit.bitwarden.data.vault.repository.model.DecryptFido2CredentialAutofillViewResult
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.fold
 import kotlinx.coroutines.withContext
@@ -59,7 +53,6 @@ class BitwardenCredentialManagerImpl(
     private val credentialEntryBuilder: CredentialEntryBuilder,
     private val json: Json,
     private val vaultRepository: VaultRepository,
-    private val cipherMatchingManager: CipherMatchingManager,
     dispatcherManager: DispatcherManager,
 ) : BitwardenCredentialManager,
     Fido2CredentialStore by fido2CredentialStore {
@@ -175,48 +168,30 @@ class BitwardenCredentialManagerImpl(
     override suspend fun getCredentialEntries(
         getCredentialsRequest: GetCredentialsRequest,
     ): Result<List<CredentialEntry>> = withContext(ioScope.coroutineContext) {
-        val cipherListViews = vaultRepository
-            .decryptCipherListResultStateFlow
+        val cipherViews = vaultRepository
+            .ciphersStateFlow
             .takeUntilLoaded()
-            .fold(initial = emptyList<CipherListView>()) { _, dataState ->
+            .fold(initial = emptyList<CipherView>()) { _, dataState ->
                 when (dataState) {
-                    is DataState.Loaded -> dataState.data.successes
+                    is DataState.Loaded -> {
+                        dataState.data
+                    }
+
                     else -> emptyList()
                 }
             }
-            .filter { it.isActiveWithFido2Credentials || it.isActiveWithCopyablePassword }
-            .ifEmpty { return@withContext emptyList<CredentialEntry>().asSuccess() }
-
-        val passwordCredentialResult = getCredentialsRequest
-            .callingAppInfo
-            ?.packageName
-            ?.let { packageName ->
-                getCredentialsRequest
-                    .beginGetPasswordOptions
-                    .toPasswordCredentialEntries(
-                        userId = getCredentialsRequest.userId,
-                        cipherListViews = cipherMatchingManager.filterCiphersForMatches(
-                            cipherListViews = cipherListViews,
-                            matchUri = packageName.toAndroidAppUriString(),
-                        ),
-                    )
+            .filter { it.isActiveWithFido2Credentials }
+            .ifEmpty {
+                return@withContext emptyList<CredentialEntry>().asSuccess()
             }
-            .orEmpty()
 
-        val passkeyCredentialResult = getCredentialsRequest
+        getCredentialsRequest
             .beginGetPublicKeyCredentialOptions
             .toPublicKeyCredentialEntries(
                 userId = getCredentialsRequest.userId,
-                cipherListViews = cipherListViews
-                    .filter { it.isActiveWithFido2Credentials },
+                cipherViewsWithPublicKeyCredentials = cipherViews,
             )
             .onFailure { Timber.e(it, "Failed to get FIDO 2 credential entries.") }
-
-        if (passkeyCredentialResult.isFailure && passwordCredentialResult.isNotEmpty()) {
-            Result.success(passwordCredentialResult)
-        } else {
-            passkeyCredentialResult.map { it + passwordCredentialResult }
-        }
     }
 
     private fun getPasskeyAssertionOptionsOrNull(
@@ -225,10 +200,8 @@ class BitwardenCredentialManagerImpl(
 
     private suspend fun List<BeginGetPublicKeyCredentialOption>.toPublicKeyCredentialEntries(
         userId: String,
-        cipherListViews: List<CipherListView>,
+        cipherViewsWithPublicKeyCredentials: List<CipherView>,
     ): Result<List<CredentialEntry>> {
-        if (this.isEmpty()) return emptyList<CredentialEntry>().asSuccess()
-
         val relyingPartyIds = this
             .mapNotNull { getPasskeyAssertionOptionsOrNull(it.requestJson)?.relyingPartyId }
             .distinct()
@@ -236,54 +209,27 @@ class BitwardenCredentialManagerImpl(
                 return GetCredentialUnknownException("Relying party id required.").asFailure()
             }
 
-        val cipherViews = cipherListViews
-            .filter { cipherListView ->
-                cipherListView.login
-                    ?.fido2Credentials
-                    .orEmpty()
-                    .any { credential -> credential.rpId in relyingPartyIds }
+        val decryptResult = vaultRepository
+            .getDecryptedFido2CredentialAutofillViews(cipherViewsWithPublicKeyCredentials)
+
+        return when (decryptResult) {
+            is DecryptFido2CredentialAutofillViewResult.Error -> {
+                GetCredentialUnknownException("Error decrypting credentials.").asFailure()
             }
-            .mapNotNull { cipherListView ->
-                when (val result = vaultRepository.getCipher(cipherListView.id.orEmpty())) {
-                    GetCipherResult.CipherNotFound -> {
-                        Timber.e("Cipher not found while building public key credential entries.")
-                        null
-                    }
 
-                    is GetCipherResult.Failure -> {
-                        Timber.e(
-                            result.error,
-                            "Failed to decrypt cipher while building credential entries.",
-                        )
-                        null
-                    }
-
-                    is GetCipherResult.Success -> result.cipherView
-                }
+            is DecryptFido2CredentialAutofillViewResult.Success -> {
+                credentialEntryBuilder
+                    .buildPublicKeyCredentialEntries(
+                        userId = userId,
+                        fido2CredentialAutofillViews = decryptResult
+                            .fido2CredentialAutofillViews
+                            .filter { it.rpId in relyingPartyIds },
+                        beginGetPublicKeyCredentialOptions = this,
+                        isUserVerified = isUserVerified,
+                    )
+                    .asSuccess()
             }
-            .toTypedArray()
-            .ifEmpty { return emptyList<CredentialEntry>().asSuccess() }
-
-        return vaultSdkSource
-            .decryptFido2CredentialAutofillViews(
-                userId = userId,
-                cipherViews = cipherViews,
-            )
-            .fold(
-                onSuccess = { fido2AutofillViews ->
-                    credentialEntryBuilder
-                        .buildPublicKeyCredentialEntries(
-                            userId = userId,
-                            fido2CredentialAutofillViews = fido2AutofillViews,
-                            beginGetPublicKeyCredentialOptions = this,
-                            isUserVerified = isUserVerified,
-                        )
-                        .asSuccess()
-                },
-                onFailure = {
-                    GetCredentialUnknownException("Error decrypting credentials.").asFailure()
-                },
-            )
+        }
     }
 
     private suspend fun registerFido2CredentialForUnprivilegedApp(
@@ -375,21 +321,6 @@ class BitwardenCredentialManagerImpl(
             },
         )
 
-    private fun List<BeginGetPasswordOption>.toPasswordCredentialEntries(
-        userId: String,
-        cipherListViews: List<CipherListView>,
-    ): List<CredentialEntry> {
-        if (this.isEmpty()) return emptyList()
-
-        return credentialEntryBuilder
-            .buildPasswordCredentialEntries(
-                userId = userId,
-                cipherListViews = cipherListViews,
-                beginGetPasswordCredentialOptions = this,
-                isUserVerified = isUserVerified,
-            )
-    }
-
     private fun getOriginUrlFromAssertionOptionsOrNull(requestJson: String) =
         getPasskeyAssertionOptionsOrNull(requestJson)
             ?.relyingPartyId

app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/manager/CredentialManagerPendingIntentManager.kt

@@ -1,69 +0,0 @@
-package com.x8bit.bitwarden.data.credentials.manager
-
-import android.app.PendingIntent
-
-/**
- * Key for the user id included in Credential provider "create entries".
- *
- * @see CredentialManagerPendingIntentManager.createFido2CreationPendingIntent
- */
-const val EXTRA_KEY_USER_ID: String = "user_id"
-
-/**
- * Key for the credential id included in FIDO 2 provider "get entries".
- *
- * @see CredentialManagerPendingIntentManager.createFido2GetCredentialPendingIntent
- */
-const val EXTRA_KEY_CREDENTIAL_ID: String = "credential_id"
-
-/**
- * Key for the cipher id included in FIDO 2 provider "get entries".
- *
- * @see CredentialManagerPendingIntentManager.createFido2GetCredentialPendingIntent
- */
-const val EXTRA_KEY_CIPHER_ID: String = "cipher_id"
-
-/**
- * Key for the user verification performed during vault unlock while
- * processing a Credential request.
- */
-const val EXTRA_KEY_UV_PERFORMED_DURING_UNLOCK: String = "uv_performed_during_unlock"
-
-/**
- * A manager class for creating pending intents used in credential management operations.
- */
-interface CredentialManagerPendingIntentManager {
-
-    /**
-     * Creates a pending intent to use when providing options for FIDO 2 credential creation.
-     */
-    fun createFido2CreationPendingIntent(
-        userId: String,
-    ): PendingIntent
-
-    /**
-     * Creates a pending intent to use when providing options for FIDO 2 credential filling.
-     */
-    fun createFido2GetCredentialPendingIntent(
-        userId: String,
-        credentialId: String,
-        cipherId: String,
-        isUserVerified: Boolean,
-    ): PendingIntent
-
-    /**
-     * Creates a pending intent to use when providing unlock options for FIDO 2 credential filling.
-     */
-    fun createFido2UnlockPendingIntent(
-        userId: String,
-    ): PendingIntent
-
-    /**
-     * Creates a pending intent to use when providing options for Password credential filling.
-     */
-    fun createPasswordGetCredentialPendingIntent(
-        userId: String,
-        cipherId: String?,
-        isUserVerified: Boolean,
-    ): PendingIntent
-}

app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/manager/CredentialManagerPendingIntentManagerImpl.kt

@@ -1,104 +0,0 @@
-package com.x8bit.bitwarden.data.credentials.manager
-
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import com.bitwarden.annotation.OmitFromCoverage
-import com.x8bit.bitwarden.data.autofill.util.toPendingIntentMutabilityFlag
-import kotlin.random.Random
-
-/**
- * Primary implementation of [CredentialManagerPendingIntentManager].
- */
-@OmitFromCoverage
-class CredentialManagerPendingIntentManagerImpl(
-    private val context: Context,
-) : CredentialManagerPendingIntentManager {
-
-    /**
-     * Creates a pending intent to use when providing options for FIDO 2 credential creation.
-     */
-    override fun createFido2CreationPendingIntent(
-        userId: String,
-    ): PendingIntent {
-        val intent = Intent(CREATE_PASSKEY_ACTION)
-            .setPackage(context.packageName)
-            .putExtra(EXTRA_KEY_USER_ID, userId)
-
-        return PendingIntent.getActivity(
-            /* context = */ context,
-            /* requestCode = */ Random.nextInt(),
-            /* intent = */ intent,
-            /* flags = */ PendingIntent.FLAG_UPDATE_CURRENT.toPendingIntentMutabilityFlag(),
-        )
-    }
-
-    /**
-     * Creates a pending intent to use when providing options for FIDO 2 credential filling.
-     */
-    override fun createFido2GetCredentialPendingIntent(
-        userId: String,
-        credentialId: String,
-        cipherId: String,
-        isUserVerified: Boolean,
-    ): PendingIntent {
-        val intent = Intent(GET_PASSKEY_ACTION)
-            .setPackage(context.packageName)
-            .putExtra(EXTRA_KEY_USER_ID, userId)
-            .putExtra(EXTRA_KEY_CREDENTIAL_ID, credentialId)
-            .putExtra(EXTRA_KEY_CIPHER_ID, cipherId)
-            .putExtra(EXTRA_KEY_UV_PERFORMED_DURING_UNLOCK, isUserVerified)
-
-        return PendingIntent.getActivity(
-            /* context = */ context,
-            /* requestCode = */ Random.nextInt(),
-            /* intent = */ intent,
-            /* flags = */ PendingIntent.FLAG_UPDATE_CURRENT.toPendingIntentMutabilityFlag(),
-        )
-    }
-
-    /**
-     * Creates a pending intent to use when providing unlock options for FIDO 2 credential filling.
-     */
-    override fun createFido2UnlockPendingIntent(
-        userId: String,
-    ): PendingIntent {
-        val intent = Intent(UNLOCK_ACCOUNT_ACTION)
-            .setPackage(context.packageName)
-            .putExtra(EXTRA_KEY_USER_ID, userId)
-
-        return PendingIntent.getActivity(
-            /* context = */ context,
-            /* requestCode = */ Random.nextInt(),
-            /* intent = */ intent,
-            /* flags = */ PendingIntent.FLAG_UPDATE_CURRENT.toPendingIntentMutabilityFlag(),
-        )
-    }
-
-    /**
-     * Creates a pending intent to use when providing options for Password credential filling.
-     */
-    override fun createPasswordGetCredentialPendingIntent(
-        userId: String,
-        cipherId: String?,
-        isUserVerified: Boolean,
-    ): PendingIntent {
-        val intent = Intent(GET_PASSWORD_ACTION)
-            .setPackage(context.packageName)
-            .putExtra(EXTRA_KEY_USER_ID, userId)
-            .putExtra(EXTRA_KEY_CIPHER_ID, cipherId)
-            .putExtra(EXTRA_KEY_UV_PERFORMED_DURING_UNLOCK, isUserVerified)
-
-        return PendingIntent.getActivity(
-            /* context = */ context,
-            /* requestCode = */ Random.nextInt(),
-            /* intent = */ intent,
-            /* flags = */ PendingIntent.FLAG_UPDATE_CURRENT.toPendingIntentMutabilityFlag(),
-        )
-    }
-}
-
-private const val CREATE_PASSKEY_ACTION = "com.x8bit.bitwarden.credentials.ACTION_CREATE_PASSKEY"
-private const val UNLOCK_ACCOUNT_ACTION = "com.x8bit.bitwarden.credentials.ACTION_UNLOCK_ACCOUNT"
-private const val GET_PASSKEY_ACTION = "com.x8bit.bitwarden.credentials.ACTION_GET_PASSKEY"
-private const val GET_PASSWORD_ACTION = "com.x8bit.bitwarden.credentials.ACTION_GET_PASSWORD"

app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/manager/OriginManagerImpl.kt

@@ -1,13 +1,13 @@
 package com.x8bit.bitwarden.data.credentials.manager
 
 import androidx.credentials.provider.CallingAppInfo
-import com.bitwarden.core.data.manager.model.FlagKey
 import com.bitwarden.network.service.DigitalAssetLinkService
 import com.bitwarden.ui.platform.base.util.prefixHttpsIfNecessary
 import com.x8bit.bitwarden.data.credentials.model.ValidateOriginResult
 import com.x8bit.bitwarden.data.credentials.repository.PrivilegedAppRepository
 import com.x8bit.bitwarden.data.platform.manager.AssetManager
 import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager
+import com.x8bit.bitwarden.data.platform.manager.model.FlagKey
 import com.x8bit.bitwarden.data.platform.util.getSignatureFingerprintAsHexString
 import com.x8bit.bitwarden.data.platform.util.validatePrivilegedApp
 import timber.log.Timber

app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/model/GetCredentialsRequest.kt

@@ -2,7 +2,6 @@ package com.x8bit.bitwarden.data.credentials.model
 
 import android.os.Bundle
 import android.os.Parcelable
-import androidx.credentials.CredentialManager
 import androidx.credentials.provider.BeginGetCredentialRequest
 import androidx.credentials.provider.BeginGetPasswordOption
 import androidx.credentials.provider.BeginGetPublicKeyCredentialOption
@@ -11,7 +10,7 @@ import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
 /**
- * Models a [CredentialManager] request to retrieve credentials parsed from the launching intent.
+ * Models a FIDO 2 request to retrieve FIDO credentials parsed from the launching intent.
  *
  * @param userId The ID of the user's vault to search.
  * @param requestData Provider request data in the form of a [Bundle].

app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/model/PasskeyAttestationOptions.kt

@@ -73,7 +73,7 @@ data class PasskeyAttestationOptions(
         @SerialName("type")
         val type: String,
         @SerialName("alg")
-        val alg: Double,
+        val alg: Long,
     )
 
     /**

app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/model/ProviderGetPasswordCredentialRequest.kt

@@ -2,51 +2,22 @@ package com.x8bit.bitwarden.data.credentials.model
 
 import android.os.Bundle
 import android.os.Parcelable
-import androidx.credentials.CredentialOption
-import androidx.credentials.GetPasswordOption
-import androidx.credentials.provider.CallingAppInfo
 import androidx.credentials.provider.ProviderGetCredentialRequest
-import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
 /**
- * Models a Password credential authentication request parsed from the launching intent.
+ * A wrapper around [ProviderGetCredentialRequest] that includes additional information needed to
+ * fulfill the request.
  *
- * @property userId ID of the user requesting credential authentication.
- * @property cipherId ID of the cipher to be authenticated against.
- * @property isUserPreVerified Whether the user has already been verified by the OS biometric
- * prompt.
- * @property requestData Provider request data in the form of a [Bundle].
+ * @param userId The ID of the user that owns the credential being requested.
+ * @param cipherId The ID of the cipher containing the password to be retrieved.
+ * @param isUserVerified Whether the user has been verified prior to this request.
+ * @param requestData The original request data from the system.
  */
 @Parcelize
 data class ProviderGetPasswordCredentialRequest(
     val userId: String,
     val cipherId: String,
-    val isUserPreVerified: Boolean,
-    private val requestData: Bundle,
-) : Parcelable {
-
-    /**
-     * The [ProviderGetCredentialRequest] from the [requestData].
-     */
-    @IgnoredOnParcel
-    val providerRequest: ProviderGetCredentialRequest by lazy {
-        ProviderGetCredentialRequest.fromBundle(requestData)
-    }
-
-    /**
-     * The [CallingAppInfo] from the [providerRequest].
-     */
-    @IgnoredOnParcel
-    val callingAppInfo: CallingAppInfo by lazy { providerRequest.callingAppInfo }
-
-    /**
-     * The [CredentialOption] from the [providerRequest], or null if one is not found
-     * in the request options list.
-     */
-    @IgnoredOnParcel
-    val option: GetPasswordOption? by lazy {
-        providerRequest.credentialOptions
-            .firstNotNullOfOrNull { it as? GetPasswordOption }
-    }
-}
+    val isUserVerified: Boolean,
+    val requestData: Bundle,
+) : Parcelable

app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/processor/CredentialProviderProcessorImpl.kt

@@ -25,20 +25,27 @@ import androidx.credentials.provider.BeginGetCredentialResponse
 import androidx.credentials.provider.BiometricPromptData
 import androidx.credentials.provider.CreateEntry
 import androidx.credentials.provider.ProviderClearCredentialStateRequest
-import com.bitwarden.core.util.isBuildVersionAtLeast
 import com.bitwarden.data.manager.DispatcherManager
-import com.bitwarden.ui.platform.resource.BitwardenString
+import com.x8bit.bitwarden.R
 import com.x8bit.bitwarden.data.auth.repository.AuthRepository
 import com.x8bit.bitwarden.data.auth.repository.model.UserState
 import com.x8bit.bitwarden.data.credentials.manager.BitwardenCredentialManager
-import com.x8bit.bitwarden.data.credentials.manager.CredentialManagerPendingIntentManager
 import com.x8bit.bitwarden.data.credentials.model.GetCredentialsRequest
 import com.x8bit.bitwarden.data.platform.manager.BiometricsEncryptionManager
+import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager
+import com.x8bit.bitwarden.data.platform.manager.model.FlagKey
+import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow
+import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import java.time.Clock
+import java.util.concurrent.atomic.AtomicInteger
 import javax.crypto.Cipher
 
+private const val CREATE_PASSKEY_INTENT = "com.x8bit.bitwarden.credentials.ACTION_CREATE_PASSKEY"
+const val GET_PASSKEY_INTENT = "com.x8bit.bitwarden.credentials.ACTION_GET_PASSKEY"
+const val UNLOCK_ACCOUNT_INTENT = "com.x8bit.bitwarden.credentials.ACTION_UNLOCK_ACCOUNT"
+
 /**
  * The default implementation of [CredentialProviderProcessor]. Its purpose is to handle
  * [CredentialManager] requests from other applications.
@@ -49,12 +56,14 @@ class CredentialProviderProcessorImpl(
     private val context: Context,
     private val authRepository: AuthRepository,
     private val bitwardenCredentialManager: BitwardenCredentialManager,
-    private val pendingIntentManager: CredentialManagerPendingIntentManager,
+    private val intentManager: IntentManager,
     private val clock: Clock,
     private val biometricsEncryptionManager: BiometricsEncryptionManager,
+    private val featureFlagManager: FeatureFlagManager,
     dispatcherManager: DispatcherManager,
 ) : CredentialProviderProcessor {
 
+    private val requestCode = AtomicInteger()
     private val ioScope = CoroutineScope(dispatcherManager.io)
 
     override fun processCreateCredentialRequest(
@@ -96,9 +105,11 @@ class CredentialProviderProcessorImpl(
         // Return an unlock action if the current account is locked.
         if (!userState.activeAccount.isVaultUnlocked) {
             val authenticationAction = AuthenticationAction(
-                title = context.getString(BitwardenString.unlock),
-                pendingIntent = pendingIntentManager.createFido2UnlockPendingIntent(
+                title = context.getString(R.string.unlock),
+                pendingIntent = intentManager.createFido2UnlockPendingIntent(
+                    action = UNLOCK_ACCOUNT_INTENT,
                     userId = userState.activeUserId,
+                    requestCode = requestCode.getAndIncrement(),
                 ),
             )
 
@@ -173,13 +184,15 @@ class CredentialProviderProcessorImpl(
         val entryBuilder = CreateEntry
             .Builder(
                 accountName = accountName,
-                pendingIntent = pendingIntentManager.createFido2CreationPendingIntent(
-                    userId = userId,
+                pendingIntent = intentManager.createFido2CreationPendingIntent(
+                    CREATE_PASSKEY_INTENT,
+                    userId,
+                    requestCode.getAndIncrement(),
                 ),
             )
             .setDescription(
                 context.getString(
-                    BitwardenString.your_passkey_will_be_saved_to_your_bitwarden_vault_for_x,
+                    R.string.your_passkey_will_be_saved_to_your_bitwarden_vault_for_x,
                     accountName,
                 ),
             )
@@ -188,7 +201,9 @@ class CredentialProviderProcessorImpl(
             .setLastUsedTime(if (isActive) clock.instant() else null)
             .setAutoSelectAllowed(true)
 
-        if (isVaultUnlocked) {
+        if (isVaultUnlocked &&
+            featureFlagManager.getFeatureFlag(FlagKey.SingleTapPasskeyCreation)
+        ) {
             biometricsEncryptionManager
                 .getOrCreateCipher(userId)
                 ?.let { entryBuilder.setBiometricPromptDataIfSupported(cipher = it) }
@@ -199,7 +214,7 @@ class CredentialProviderProcessorImpl(
     private fun CreateEntry.Builder.setBiometricPromptDataIfSupported(
         cipher: Cipher,
     ): CreateEntry.Builder {
-        return if (!isBuildVersionAtLeast(Build.VERSION_CODES.VANILLA_ICE_CREAM)) {
+        return if (isBuildVersionBelow(Build.VERSION_CODES.VANILLA_ICE_CREAM)) {
             this
         } else {
             setBiometricPromptData(

app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/repository/PrivilegedAppRepository.kt

@@ -1,49 +1,22 @@
 package com.x8bit.bitwarden.data.credentials.repository
 
-import com.bitwarden.core.data.repository.model.DataState
 import com.x8bit.bitwarden.data.credentials.model.PrivilegedAppAllowListJson
-import com.x8bit.bitwarden.data.credentials.repository.model.PrivilegedAppData
-import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.Flow
 
 /**
  * Repository for managing privileged apps trusted by the user.
  */
 interface PrivilegedAppRepository {
 
-    /**
-     * Flow that represents the trusted privileged apps data.
-     */
-    val trustedAppDataStateFlow: StateFlow<DataState<PrivilegedAppData>>
-
     /**
      * Flow of the user's trusted privileged apps.
      */
-    val userTrustedAppsFlow: StateFlow<DataState<PrivilegedAppAllowListJson>>
-
-    /**
-     * Flow of the Google's trusted privileged apps.
-     */
-    val googleTrustedPrivilegedAppsFlow: StateFlow<DataState<PrivilegedAppAllowListJson>>
-
-    /**
-     * Flow of the community's trusted privileged apps.
-     */
-    val communityTrustedAppsFlow: StateFlow<DataState<PrivilegedAppAllowListJson>>
+    val userTrustedPrivilegedAppsFlow: Flow<PrivilegedAppAllowListJson>
 
     /**
      * List the user's trusted privileged apps.
      */
-    suspend fun getUserTrustedPrivilegedAppsOrNull(): PrivilegedAppAllowListJson?
-
-    /**
-     * List Google's trusted privileged apps.
-     */
-    suspend fun getGoogleTrustedPrivilegedAppsOrNull(): PrivilegedAppAllowListJson?
-
-    /**
-     * List community's trusted privileged apps.
-     */
-    suspend fun getCommunityTrustedPrivilegedAppsOrNull(): PrivilegedAppAllowListJson?
+    suspend fun getAllUserTrustedPrivilegedApps(): PrivilegedAppAllowListJson
 
     /**
      * Returns true if the given [packageName] and [signature] are trusted.

app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/repository/PrivilegedAppRepositoryImpl.kt

@@ -1,35 +1,12 @@
 package com.x8bit.bitwarden.data.credentials.repository
 
-import com.bitwarden.core.data.repository.model.DataState
-import com.bitwarden.core.data.repository.util.combineDataStates
-import com.bitwarden.core.data.util.decodeFromStringOrNull
-import com.bitwarden.data.manager.DispatcherManager
 import com.x8bit.bitwarden.data.credentials.datasource.disk.PrivilegedAppDiskSource
 import com.x8bit.bitwarden.data.credentials.datasource.disk.entity.PrivilegedAppEntity
 import com.x8bit.bitwarden.data.credentials.model.PrivilegedAppAllowListJson
-import com.x8bit.bitwarden.data.credentials.repository.model.PrivilegedAppData
-import com.x8bit.bitwarden.data.platform.manager.AssetManager
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import kotlinx.serialization.json.Json
 
-/**
- * A "stop timeout delay" in milliseconds used to let a shared coroutine continue to run for the
- * specified period of time after it no longer has subscribers.
- */
-private const val STOP_TIMEOUT_DELAY_MS: Long = 1000L
-private const val GOOGLE_ALLOW_LIST_FILE_NAME = "fido2_privileged_google.json"
-private const val COMMUNITY_ALLOW_LIST_FILE_NAME = "fido2_privileged_community.json"
 private const val ANDROID_TYPE = "android"
 private const val RELEASE_BUILD = "release"
 
@@ -38,102 +15,17 @@ private const val RELEASE_BUILD = "release"
  */
 class PrivilegedAppRepositoryImpl(
     private val privilegedAppDiskSource: PrivilegedAppDiskSource,
-    private val assetManager: AssetManager,
-    dispatcherManager: DispatcherManager,
     private val json: Json,
 ) : PrivilegedAppRepository {
 
-    private val unconfinedScope = CoroutineScope(dispatcherManager.unconfined)
-    private val ioScope = CoroutineScope(dispatcherManager.io)
+    override val userTrustedPrivilegedAppsFlow: Flow<PrivilegedAppAllowListJson> =
+        privilegedAppDiskSource.userTrustedPrivilegedAppsFlow
+            .map { it.toPrivilegedAppAllowListJson() }
 
-    private val mutableUserTrustedAppsFlow =
-        MutableStateFlow<DataState<PrivilegedAppAllowListJson>>(DataState.Loading)
-    private val mutableGoogleTrustedAppsFlow =
-        MutableStateFlow<DataState<PrivilegedAppAllowListJson>>(DataState.Loading)
-    private val mutableCommunityTrustedPrivilegedAppsFlow =
-        MutableStateFlow<DataState<PrivilegedAppAllowListJson>>(DataState.Loading)
-
-    override val trustedAppDataStateFlow: StateFlow<DataState<PrivilegedAppData>> =
-        combine(
-            userTrustedAppsFlow,
-            googleTrustedPrivilegedAppsFlow,
-            communityTrustedAppsFlow,
-        ) { userAppsState, googleAppsState, communityAppsState ->
-            combineDataStates(
-                userAppsState,
-                googleAppsState,
-                communityAppsState,
-            ) { userApps, googleApps, communityApps ->
-                PrivilegedAppData(
-                    googleTrustedApps = googleApps,
-                    communityTrustedApps = communityApps,
-                    userTrustedApps = userApps,
-                )
-            }
-        }
-            .stateIn(
-                scope = unconfinedScope,
-                started = SharingStarted.WhileSubscribed(stopTimeoutMillis = STOP_TIMEOUT_DELAY_MS),
-                initialValue = DataState.Loading,
-            )
-
-    override val userTrustedAppsFlow: StateFlow<DataState<PrivilegedAppAllowListJson>>
-        get() = mutableUserTrustedAppsFlow.asStateFlow()
-
-    override val googleTrustedPrivilegedAppsFlow: StateFlow<DataState<PrivilegedAppAllowListJson>>
-        get() = mutableGoogleTrustedAppsFlow.asStateFlow()
-
-    override val communityTrustedAppsFlow: StateFlow<DataState<PrivilegedAppAllowListJson>>
-        get() = mutableCommunityTrustedPrivilegedAppsFlow.asStateFlow()
-
-    init {
-        ioScope.launch {
-            mutableGoogleTrustedAppsFlow.value = assetManager
-                .readAsset(fileName = GOOGLE_ALLOW_LIST_FILE_NAME)
-                .map { json.decodeFromString<PrivilegedAppAllowListJson>(it) }
-                .fold(
-                    onSuccess = { DataState.Loaded(it) },
-                    onFailure = { DataState.Error(it) },
-                )
-
-            mutableCommunityTrustedPrivilegedAppsFlow.value = assetManager
-                .readAsset(fileName = COMMUNITY_ALLOW_LIST_FILE_NAME)
-                .map { json.decodeFromString<PrivilegedAppAllowListJson>(it) }
-                .fold(
-                    onSuccess = { DataState.Loaded(it) },
-                    onFailure = { DataState.Error(it) },
-                )
-        }
-
-        privilegedAppDiskSource
-            .userTrustedPrivilegedAppsFlow
-            .map { DataState.Loaded(it.toPrivilegedAppAllowListJson()) }
-            .onEach { mutableUserTrustedAppsFlow.value = it }
-            .launchIn(ioScope)
-    }
-
-    override suspend fun getUserTrustedPrivilegedAppsOrNull(): PrivilegedAppAllowListJson =
-        privilegedAppDiskSource
-            .getAllUserTrustedPrivilegedApps()
+    override suspend fun getAllUserTrustedPrivilegedApps(): PrivilegedAppAllowListJson =
+        privilegedAppDiskSource.getAllUserTrustedPrivilegedApps()
             .toPrivilegedAppAllowListJson()
 
-    override suspend fun getGoogleTrustedPrivilegedAppsOrNull(): PrivilegedAppAllowListJson? =
-        withContext(ioScope.coroutineContext) {
-            assetManager
-                .readAsset(fileName = GOOGLE_ALLOW_LIST_FILE_NAME)
-                .map { json.decodeFromStringOrNull<PrivilegedAppAllowListJson>(it) }
-                .getOrNull()
-        }
-
-    override suspend fun getCommunityTrustedPrivilegedAppsOrNull(): PrivilegedAppAllowListJson? {
-        return withContext(ioScope.coroutineContext) {
-            assetManager
-                .readAsset(fileName = COMMUNITY_ALLOW_LIST_FILE_NAME)
-                .map { json.decodeFromStringOrNull<PrivilegedAppAllowListJson>(it) }
-                .getOrNull()
-        }
-    }
-
     override suspend fun isPrivilegedAppAllowed(
         packageName: String,
         signature: String,

app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/repository/model/PrivilegedAppData.kt

@@ -1,12 +0,0 @@
-package com.x8bit.bitwarden.data.credentials.repository.model
-
-import com.x8bit.bitwarden.data.credentials.model.PrivilegedAppAllowListJson
-
-/**
- * Represents privileged applications that are trusted by various sources.
- */
-data class PrivilegedAppData(
-    val googleTrustedApps: PrivilegedAppAllowListJson,
-    val communityTrustedApps: PrivilegedAppAllowListJson,
-    val userTrustedApps: PrivilegedAppAllowListJson,
-)

app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/util/CredentialEntryBuilderExtensions.kt

@@ -1,38 +0,0 @@
-@file:OmitFromCoverage
-
-package com.x8bit.bitwarden.data.credentials.util
-
-import android.os.Build
-import androidx.credentials.provider.PasswordCredentialEntry
-import androidx.credentials.provider.PublicKeyCredentialEntry
-import com.bitwarden.annotation.OmitFromCoverage
-import com.bitwarden.core.util.isBuildVersionAtLeast
-import javax.crypto.Cipher
-
-/**
- * Sets the biometric prompt data on the [PublicKeyCredentialEntry.Builder] if supported.
- */
-fun PublicKeyCredentialEntry.Builder.setBiometricPromptDataIfSupported(
-    cipher: Cipher?,
-): PublicKeyCredentialEntry.Builder =
-    if (isBuildVersionAtLeast(Build.VERSION_CODES.VANILLA_ICE_CREAM) && cipher != null) {
-        setBiometricPromptData(
-            biometricPromptData = buildPromptDataWithCipher(cipher),
-        )
-    } else {
-        this
-    }
-
-/**
- * Sets the biometric prompt data on the [PasswordCredentialEntry.Builder] if supported.
- */
-fun PasswordCredentialEntry.Builder.setBiometricPromptDataIfSupported(
-    cipher: Cipher?,
-): PasswordCredentialEntry.Builder =
-    if (isBuildVersionAtLeast(Build.VERSION_CODES.VANILLA_ICE_CREAM) && cipher != null) {
-        setBiometricPromptData(
-            biometricPromptData = buildPromptDataWithCipher(cipher),
-        )
-    } else {
-        this
-    }

app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/util/CredentialProviderIntentUtils.kt

@@ -7,22 +7,21 @@ import androidx.credentials.provider.BeginGetCredentialRequest
 import androidx.credentials.provider.PendingIntentHandler
 import androidx.credentials.provider.ProviderCreateCredentialRequest
 import androidx.credentials.provider.ProviderGetCredentialRequest
-import com.bitwarden.core.util.isBuildVersionAtLeast
-import com.x8bit.bitwarden.data.credentials.manager.EXTRA_KEY_CIPHER_ID
-import com.x8bit.bitwarden.data.credentials.manager.EXTRA_KEY_CREDENTIAL_ID
-import com.x8bit.bitwarden.data.credentials.manager.EXTRA_KEY_USER_ID
-import com.x8bit.bitwarden.data.credentials.manager.EXTRA_KEY_UV_PERFORMED_DURING_UNLOCK
 import com.x8bit.bitwarden.data.credentials.model.CreateCredentialRequest
 import com.x8bit.bitwarden.data.credentials.model.Fido2CredentialAssertionRequest
 import com.x8bit.bitwarden.data.credentials.model.GetCredentialsRequest
-import com.x8bit.bitwarden.data.credentials.model.ProviderGetPasswordCredentialRequest
+import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow
+import com.x8bit.bitwarden.ui.platform.manager.intent.EXTRA_KEY_CIPHER_ID
+import com.x8bit.bitwarden.ui.platform.manager.intent.EXTRA_KEY_CREDENTIAL_ID
+import com.x8bit.bitwarden.ui.platform.manager.intent.EXTRA_KEY_USER_ID
+import com.x8bit.bitwarden.ui.platform.manager.intent.EXTRA_KEY_UV_PERFORMED_DURING_UNLOCK
 
 /**
  * Checks if this [Intent] contains a [CreateCredentialRequest] related to an ongoing
  * [CredentialManager] creation process.
  */
 fun Intent.getCreateCredentialRequestOrNull(): CreateCredentialRequest? {
-    if (!isBuildVersionAtLeast(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)) return null
+    if (isBuildVersionBelow(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)) return null
 
     val systemRequest = PendingIntentHandler.retrieveProviderCreateCredentialRequest(this)
         ?: return null
@@ -49,7 +48,7 @@ fun Intent.getCreateCredentialRequestOrNull(): CreateCredentialRequest? {
  * credential authentication process.
  */
 fun Intent.getFido2AssertionRequestOrNull(): Fido2CredentialAssertionRequest? {
-    if (!isBuildVersionAtLeast(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)) return null
+    if (isBuildVersionBelow(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)) return null
 
     val systemRequest = PendingIntentHandler
         .retrieveProviderGetCredentialRequest(this)
@@ -80,44 +79,12 @@ fun Intent.getFido2AssertionRequestOrNull(): Fido2CredentialAssertionRequest? {
     )
 }
 
-/**
- * Checks if this [Intent] contains a [ProviderGetPasswordCredentialRequest] related to an
- * ongoing password credential GetPassword process.
- */
-fun Intent.getProviderGetPasswordRequestOrNull(): ProviderGetPasswordCredentialRequest? {
-    if (!isBuildVersionAtLeast(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)) return null
-
-    val systemRequest = PendingIntentHandler
-        .retrieveProviderGetCredentialRequest(this)
-        ?: return null
-
-    val cipherId = getStringExtra(EXTRA_KEY_CIPHER_ID)
-        ?: return null
-
-    val userId: String = getStringExtra(EXTRA_KEY_USER_ID)
-        ?: return null
-
-    // Extract the OS biometric prompt result from the request data because it is not included in
-    // the bundle returned by `ProviderGetCredentialRequest.asBundle()`.
-    val isUserPreVerified = systemRequest
-        .biometricPromptResult
-        ?.isSuccessful
-        ?: getBooleanExtra(EXTRA_KEY_UV_PERFORMED_DURING_UNLOCK, false)
-
-    return ProviderGetPasswordCredentialRequest(
-        userId = userId,
-        cipherId = cipherId,
-        isUserPreVerified = isUserPreVerified,
-        requestData = ProviderGetCredentialRequest.asBundle(systemRequest),
-    )
-}
-
 /**
  * Checks if this [Intent] contains a [GetCredentialsRequest] related to an ongoing
  * [CredentialManager] credential lookup process.
  */
 fun Intent.getGetCredentialsRequestOrNull(): GetCredentialsRequest? {
-    if (!isBuildVersionAtLeast(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)) return null
+    if (isBuildVersionBelow(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)) return null
 
     val systemRequest = PendingIntentHandler
         .retrieveBeginGetCredentialRequest(this)

app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/util/PublicKeyCredentialEntryBuilderExtensions.kt

@@ -0,0 +1,27 @@
+@file:OmitFromCoverage
+
+package com.x8bit.bitwarden.data.credentials.util
+
+import android.os.Build
+import androidx.credentials.provider.PublicKeyCredentialEntry
+import com.bitwarden.annotation.OmitFromCoverage
+import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow
+import javax.crypto.Cipher
+
+/**
+ * Sets the biometric prompt data on the [PublicKeyCredentialEntry.Builder] if supported.
+ */
+fun PublicKeyCredentialEntry.Builder.setBiometricPromptDataIfSupported(
+    cipher: Cipher?,
+    isSingleTapAuthEnabled: Boolean,
+): PublicKeyCredentialEntry.Builder =
+    if (!isBuildVersionBelow(Build.VERSION_CODES.VANILLA_ICE_CREAM) &&
+        cipher != null &&
+        isSingleTapAuthEnabled
+    ) {
+        setBiometricPromptData(
+            biometricPromptData = buildPromptDataWithCipher(cipher),
+        )
+    } else {
+        this
+    }

app/src/main/kotlin/com/x8bit/bitwarden/data/platform/datasource/disk/FeatureFlagOverrideDiskSource.kt

@@ -1,6 +1,6 @@
 package com.x8bit.bitwarden.data.platform.datasource.disk
 
-import com.bitwarden.core.data.manager.model.FlagKey
+import com.x8bit.bitwarden.data.platform.manager.model.FlagKey
 
 /**
  * Disk data source for saved feature flag overrides.

app/src/main/kotlin/com/x8bit/bitwarden/data/platform/datasource/disk/FeatureFlagOverrideDiskSourceImpl.kt

@@ -1,8 +1,8 @@
 package com.x8bit.bitwarden.data.platform.datasource.disk
 
 import android.content.SharedPreferences
-import com.bitwarden.core.data.manager.model.FlagKey
 import com.bitwarden.data.datasource.disk.BaseDiskSource
+import com.x8bit.bitwarden.data.platform.manager.model.FlagKey
 
 /**
  * Default implementation of the [FeatureFlagOverrideDiskSource]

app/src/main/kotlin/com/x8bit/bitwarden/data/platform/datasource/disk/PushDiskSourceImpl.kt

@@ -1,9 +1,9 @@
 package com.x8bit.bitwarden.data.platform.datasource.disk
 
 import android.content.SharedPreferences
-import com.bitwarden.core.util.getBinaryLongFromZoneDateTime
-import com.bitwarden.core.util.getZoneDateTimeFromBinaryLong
 import com.bitwarden.data.datasource.disk.BaseDiskSource
+import com.x8bit.bitwarden.data.platform.util.getBinaryLongFromZoneDateTime
+import com.x8bit.bitwarden.data.platform.util.getZoneDateTimeFromBinaryLong
 import java.time.ZonedDateTime
 
 private const val CURRENT_PUSH_TOKEN_KEY = "pushCurrentToken"