[PM-9933] Update copy for marketing emails

Merge branch 'main' into pm-6702/registration-flows
# Conflicts: # app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/intent/IntentManager.kt
2026-05-11 10:54:26 -05:00 · 2024-07-23 12:12:13 +01:00 · 2024-07-23 10:38:55 +01:00 · 2024-07-23 10:37:44 +01:00 · 2024-07-22 18:32:43 +01:00 · 2024-07-22 18:00:03 +01:00
1423 changed files with 27383 additions and 119452 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,10 +5,7 @@
 # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners

 # Default file owners.
-* @bitwarden/team-android @brian-livefront @david-livefront @dseverns-livefront @ahaisting-livefront @phil-livefront
-
-# Actions and workflow changes.
-.github/ @bitwarden/dept-development-mobile
+# * @bitwarden/tech-leads

 # Auth
 # app/src/main/java/com/x8bit/bitwarden/data/auth @bitwarden/team-auth-dev
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -1,4 +1,4 @@
-name: Android Bug Report
+name: Android Beta Bug Report
 description: File a bug report
 labels: [ bug ]
 body:
@@ -7,7 +7,19 @@ body:
      value: |
        Thanks for taking the time to fill out this bug report!

+        > [!WARNING]
+        > This is the new native Bitwarden Beta app repository. For the publicly available apps in App Store / Play Store, submit your report in [bitwarden/mobile](https://github.com/bitwarden/mobile)
+
+
        Please do not submit feature requests. The [Community Forums](https://community.bitwarden.com) has a section for submitting, voting for, and discussing product feature requests.
+  - type: checkboxes
+    id: beta
+    attributes:
+      label: Bitwarden Beta
+      options:
+        - label: "I'm using the new native Bitwarden Beta app and I'm aware that legacy .NET app bugs should be reported in [bitwarden/mobile](https://github.com/bitwarden/mobile)"
+    validations:
+      required: true
  - type: textarea
    id: reproduce
    attributes:
@@ -51,22 +63,6 @@ body:
      description: What version of our software are you running?
    validations:
      required: true
-  - type: dropdown
-    id: server-region
-    attributes:
-      label: What server are you connecting to?
-      options:
-        - US
-        - EU
-        - Self-host
-        - N/A
-    validations:
-      required: true
-  - type: input
-    id: server-version
-    attributes:
-      label: Self-host Server Version
-      description: If self-hosting, what version of Bitwarden Server are you running?
  - type: textarea
    id: environment-details
    attributes:
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -15,5 +15,3 @@ contact_links:
  - name: Security Issues
    url: https://hackerone.com/bitwarden
    about: We use HackerOne to manage security disclosures.
-  - name: Report mobile autofill failure
-    url: https://docs.google.com/forms/d/e/1FAIpQLScMopHyN7KGJs8hW562VTzbIGL4KcFnx0wJcsW0GYE1BnPiGA/viewform
--- a/.github/workflows/build-authenticator.yml
+++ b/.github/workflows/build-authenticator.yml
@@ -1,13 +0,0 @@
-name: Build Authenticator
-
-on:
-  workflow_dispatch:
-
-jobs:
-  placeholder:
-    name: Placeholder Job
-    runs-on: ubuntu-24.04
-
-    steps:
-      - name: Placeholder Step
-        run: echo "placeholder workflow"
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,22 +28,21 @@ on:
 env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  JAVA_VERSION: 17
-  GITHUB_ACTION_RUN_URL: "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"

 jobs:
  build:
    name: Build
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04

    steps:
      - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

      - name: Validate Gradle wrapper
-        uses: gradle/actions/wrapper-validation@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
+        uses: gradle/actions/wrapper-validation@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0

      - name: Cache Gradle files
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
        with:
          path: |
            ~/.gradle/caches
@@ -53,7 +52,7 @@ jobs:
            ${{ runner.os }}-gradle-v2-

      - name: Cache build output
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
        with:
          path: |
            ${{ github.workspace }}/build-cache
@@ -62,13 +61,13 @@ jobs:
            ${{ runner.os }}-build-

      - name: Configure JDK
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
        with:
          distribution: "temurin"
          java-version: ${{ env.JAVA_VERSION }}

      - name: Configure Ruby
-        uses: ruby/setup-ruby@28c4deda893d5a96a6b2d958c5b47fc18d65c9d3 # v1.213.0
+        uses: ruby/setup-ruby@161cd54b698f1fb3ea539faab2e036d409550e3c # v1.187.0
        with:
          bundler-cache: true

@@ -84,29 +83,22 @@ jobs:
      - name: Build
        run: bundle exec fastlane assembleDebugApks

-      - name: Upload test reports on failure
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
-        if: failure()
-        with:
-          name: test-reports
-          path: app/build/reports/tests/
-
  publish_playstore:
    name: Publish Play Store artifacts
    needs:
      - build
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    strategy:
      fail-fast: false
      matrix:
-        variant: ["prod", "dev"]
+        variant: ["prod", "qa"]
        artifact: ["apk", "aab"]
    steps:
      - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

      - name: Configure Ruby
-        uses: ruby/setup-ruby@28c4deda893d5a96a6b2d958c5b47fc18d65c9d3 # v1.213.0
+        uses: ruby/setup-ruby@161cd54b698f1fb3ea539faab2e036d409550e3c # v1.187.0
        with:
          bundler-cache: true

@@ -157,10 +149,10 @@ jobs:
          --name app_play_prod_firebase-creds.json --file ${{ github.workspace }}/secrets/app_play_prod_firebase-creds.json --output none

      - name: Validate Gradle wrapper
-        uses: gradle/actions/wrapper-validation@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
+        uses: gradle/actions/wrapper-validation@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0

      - name: Cache Gradle files
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
        with:
          path: |
            ~/.gradle/caches
@@ -170,7 +162,7 @@ jobs:
            ${{ runner.os }}-gradle-v2-

      - name: Cache build output
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
        with:
          path: |
            ${{ github.workspace }}/build-cache
@@ -179,20 +171,11 @@ jobs:
            ${{ runner.os }}-build-

      - name: Configure JDK
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
        with:
          distribution: "temurin"
          java-version: ${{ env.JAVA_VERSION }}

-      - name: Update app CI Build info
-        run: |
-          ./scripts/update_app_ci_build_info.sh \
-          $GITHUB_REPOSITORY \
-          $GITHUB_REF_NAME \
-          $GITHUB_SHA \
-          $GITHUB_RUN_ID \
-          $GITHUB_RUN_ATTEMPT
-
      - name: Increment version
        run: |
          DEFAULT_VERSION_CODE=$((11000+$GITHUB_RUN_NUMBER))
@@ -246,142 +229,140 @@ jobs:
          keyAlias:bitwarden-beta \
          keyPassword:${{ env.PLAY_BETA_KEY_PASSWORD }}

-      - name: Generate debug Play Store APKs
+      - name: Generate QA Play Store APKs
        if: ${{ (matrix.variant != 'prod') && (matrix.artifact == 'apk') }}
        run: |
          bundle exec fastlane assembleDebugApks

      - name: Upload release Play Store .aab artifact
        if: ${{ (matrix.variant == 'prod') && (matrix.artifact == 'aab') }}
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
        with:
          name: com.x8bit.bitwarden.aab
-          path: app/build/outputs/bundle/standardRelease/com.x8bit.bitwarden.aab
+          path: app/build/outputs/bundle/standardRelease/com.x8bit.bitwarden-standard-release.aab
          if-no-files-found: error

      - name: Upload beta Play Store .aab artifact
        if: ${{ (matrix.variant == 'prod') && (matrix.artifact == 'aab') }}
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
        with:
          name: com.x8bit.bitwarden.beta.aab
-          path: app/build/outputs/bundle/standardBeta/com.x8bit.bitwarden.beta.aab
+          path: app/build/outputs/bundle/standardBeta/com.x8bit.bitwarden-standard-beta.aab
          if-no-files-found: error

      - name: Upload release .apk artifact
        if: ${{ (matrix.variant == 'prod') && (matrix.artifact == 'apk') }}
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
        with:
          name: com.x8bit.bitwarden.apk
-          path: app/build/outputs/apk/standard/release/com.x8bit.bitwarden.apk
+          path: app/build/outputs/apk/standard/release/com.x8bit.bitwarden-standard-release.apk
          if-no-files-found: error

      - name: Upload beta .apk artifact
        if: ${{ (matrix.variant == 'prod') && (matrix.artifact == 'apk') }}
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
        with:
          name: com.x8bit.bitwarden.beta.apk
-          path: app/build/outputs/apk/standard/beta/com.x8bit.bitwarden.beta.apk
+          path: app/build/outputs/apk/standard/beta/com.x8bit.bitwarden-standard-beta.apk
          if-no-files-found: error

      # When building variants other than 'prod'
-      - name: Upload debug .apk artifact
+      - name: Upload other .apk artifact
        if: ${{ (matrix.variant != 'prod') && (matrix.artifact == 'apk') }}
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
        with:
-          name: com.x8bit.bitwarden.${{ matrix.variant }}.apk
-          path: app/build/outputs/apk/standard/debug/com.x8bit.bitwarden.dev.apk
+          name: com.x8bit.bitwarden-${{ matrix.variant }}.apk
+          path: app/build/outputs/apk/standard/debug/com.x8bit.bitwarden-standard-debug.apk
          if-no-files-found: error

      - name: Create checksum for release .apk artifact
        if: ${{ (matrix.variant == 'prod') && (matrix.artifact == 'apk') }}
        run: |
-          sha256sum "app/build/outputs/apk/standard/release/com.x8bit.bitwarden.apk" \
-            > ./com.x8bit.bitwarden.apk-sha256.txt
+          sha256sum "app/build/outputs/apk/standard/release/com.x8bit.bitwarden-standard-release.apk" \
+            > ./bw-android-apk-sha256.txt

      - name: Create checksum for beta .apk artifact
        if: ${{ (matrix.variant == 'prod') && (matrix.artifact == 'apk') }}
        run: |
-          sha256sum "app/build/outputs/apk/standard/beta/com.x8bit.bitwarden.beta.apk" \
-            > ./com.x8bit.bitwarden.beta.apk-sha256.txt
+          sha256sum "app/build/outputs/apk/standard/beta/com.x8bit.bitwarden-standard-beta.apk" \
+            > ./bw-android-beta-apk-sha256.txt

      - name: Create checksum for release .aab artifact
        if: ${{ (matrix.variant == 'prod') && (matrix.artifact == 'aab') }}
        run: |
-          sha256sum "app/build/outputs/bundle/standardRelease/com.x8bit.bitwarden.aab" \
-            > ./com.x8bit.bitwarden.aab-sha256.txt
+          sha256sum "app/build/outputs/bundle/standardRelease/com.x8bit.bitwarden-standard-release.aab" \
+            > ./bw-android-aab-sha256.txt

      - name: Create checksum for beta .aab artifact
        if: ${{ (matrix.variant == 'prod') && (matrix.artifact == 'aab') }}
        run: |
-          sha256sum "app/build/outputs/bundle/standardBeta/com.x8bit.bitwarden.beta.aab" \
-            > ./com.x8bit.bitwarden.beta.aab-sha256.txt
+          sha256sum "app/build/outputs/bundle/standardBeta/com.x8bit.bitwarden-standard-beta.aab" \
+            > ./bw-android-beta-aab-sha256.txt

-      - name: Create checksum for Debug .apk artifact
+      - name: Create checksum for other .apk artifact
        if: ${{ (matrix.variant != 'prod') && (matrix.artifact == 'apk') }}
        run: |
-          sha256sum "app/build/outputs/apk/standard/debug/com.x8bit.bitwarden.dev.apk" \
-           > ./com.x8bit.bitwarden.${{ matrix.variant }}.apk-sha256.txt
+          sha256sum "app/build/outputs/apk/standard/debug/com.x8bit.bitwarden-standard-debug.apk" \
+           > ./bw-android-${{ matrix.variant }}-apk-sha256.txt

      - name: Upload .apk SHA file for release
        if: ${{ (matrix.variant == 'prod') && (matrix.artifact == 'apk') }}
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
        with:
-          name: com.x8bit.bitwarden.apk-sha256.txt
-          path: ./com.x8bit.bitwarden.apk-sha256.txt
+          name: bw-android-apk-sha256.txt
+          path: ./bw-android-apk-sha256.txt
          if-no-files-found: error

      - name: Upload .apk SHA file for beta
        if: ${{ (matrix.variant == 'prod') && (matrix.artifact == 'apk') }}
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
        with:
-          name: com.x8bit.bitwarden.beta.apk-sha256.txt
-          path: ./com.x8bit.bitwarden.beta.apk-sha256.txt
+          name: bw-android-beta-apk-sha256.txt
+          path: ./bw-android-beta-apk-sha256.txt
          if-no-files-found: error

      - name: Upload .aab SHA file for release
        if: ${{ (matrix.variant == 'prod') && (matrix.artifact == 'aab') }}
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
        with:
-          name: com.x8bit.bitwarden.aab-sha256.txt
-          path: ./com.x8bit.bitwarden.aab-sha256.txt
+          name: bw-android-aab-sha256.txt
+          path: ./bw-android-aab-sha256.txt
          if-no-files-found: error

      - name: Upload .aab SHA file for beta
        if: ${{ (matrix.variant == 'prod') && (matrix.artifact == 'aab') }}
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
        with:
-          name: com.x8bit.bitwarden.beta.aab-sha256.txt
-          path: ./com.x8bit.bitwarden.beta.aab-sha256.txt
+          name: bw-android-beta-aab-sha256.txt
+          path: ./bw-android-beta-aab-sha256.txt
          if-no-files-found: error

-      - name: Upload .apk SHA file for debug
+      - name: Upload .apk SHA file for other
        if: ${{ (matrix.variant != 'prod') && (matrix.artifact == 'apk') }}
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
        with:
-          name: com.x8bit.bitwarden.${{ matrix.variant }}.apk-sha256.txt
-          path: ./com.x8bit.bitwarden.${{ matrix.variant }}.apk-sha256.txt
+          name: bw-android-${{ matrix.variant }}-apk-sha256.txt
+          path: ./bw-android-${{ matrix.variant }}-apk-sha256.txt
          if-no-files-found: error

      - name: Install Firebase app distribution plugin
-        if: ${{ matrix.variant == 'prod' && (inputs.distribute-to-firebase || github.event_name == 'push') }}
+        if: ${{ matrix.variant == 'prod' && github.ref_name == 'main' && (inputs.distribute-to-firebase || github.event_name == 'push') }}
        run: bundle exec fastlane add_plugin firebase_app_distribution

      - name: Publish release artifacts to Firebase
-        if: ${{ matrix.variant == 'prod' && matrix.artifact == 'apk' && (inputs.distribute-to-firebase || github.event_name == 'push') }}
+        if: ${{ matrix.variant == 'prod' && matrix.artifact == 'apk' && github.ref_name == 'main' && (inputs.distribute-to-firebase || github.event_name == 'push') }}
        env:
          APP_PLAY_FIREBASE_CREDS_PATH: ${{ github.workspace }}/secrets/app_play_prod_firebase-creds.json
        run: |
          bundle exec fastlane distributeReleasePlayStoreToFirebase \
-          actionUrl:${{ env.GITHUB_ACTION_RUN_URL }} \
          service_credentials_file:${{ env.APP_PLAY_FIREBASE_CREDS_PATH }}

      - name: Publish beta artifacts to Firebase
-        if: ${{ (matrix.variant == 'prod' && matrix.artifact == 'apk') && (inputs.distribute-to-firebase || github.event_name == 'push') }}
+        if: ${{ (matrix.variant == 'prod' && matrix.artifact == 'apk') && github.ref_name == 'main' && (inputs.distribute-to-firebase || github.event_name == 'push') }}
        env:
          APP_PLAY_FIREBASE_CREDS_PATH: ${{ github.workspace }}/secrets/app_play_prod_firebase-creds.json
        run: |
          bundle exec fastlane distributeBetaPlayStoreToFirebase \
-          actionUrl:${{ env.GITHUB_ACTION_RUN_URL }} \
          service_credentials_file:${{ env.APP_PLAY_FIREBASE_CREDS_PATH }}

      - name: Verify Play Store credentials
@@ -391,21 +372,19 @@ jobs:

      - name: Publish Play Store bundle
        if: ${{ matrix.variant == 'prod' && matrix.artifact == 'aab' && (inputs.publish-to-play-store || github.ref_name == 'main') }}
-        run: |
-          bundle exec fastlane publishProdToPlayStore
-          bundle exec fastlane publishBetaToPlayStore
+        run: bundle exec fastlane publishBetaToPlayStore

  publish_fdroid:
    name: Publish F-Droid artifacts
    needs:
      - build
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    steps:
      - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

      - name: Configure Ruby
-        uses: ruby/setup-ruby@28c4deda893d5a96a6b2d958c5b47fc18d65c9d3 # v1.213.0
+        uses: ruby/setup-ruby@161cd54b698f1fb3ea539faab2e036d409550e3c # v1.187.0
        with:
          bundler-cache: true

@@ -442,10 +421,10 @@ jobs:
          --name app_fdroid_firebase-creds.json --file ${{ github.workspace }}/secrets/app_fdroid_firebase-creds.json --output none

      - name: Validate Gradle wrapper
-        uses: gradle/actions/wrapper-validation@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
+        uses: gradle/actions/wrapper-validation@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0

      - name: Cache Gradle files
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
        with:
          path: |
            ~/.gradle/caches
@@ -455,7 +434,7 @@ jobs:
            ${{ runner.os }}-gradle-v2-

      - name: Cache build output
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
        with:
          path: |
            ${{ github.workspace }}/build-cache
@@ -464,35 +443,19 @@ jobs:
            ${{ runner.os }}-build-

      - name: Configure JDK
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
        with:
          distribution: "temurin"
          java-version: ${{ env.JAVA_VERSION }}

-      - name: Update app CI Build info
-        run: |
-          ./scripts/update_app_ci_build_info.sh \
-          $GITHUB_REPOSITORY \
-          $GITHUB_REF_NAME \
-          $GITHUB_SHA \
-          $GITHUB_RUN_ID \
-          $GITHUB_RUN_ATTEMPT
-
      # Start from 11000 to prevent collisions with mobile build version codes
      - name: Increment version
        run: |
          DEFAULT_VERSION_CODE=$((11000+$GITHUB_RUN_NUMBER))
-          VERSION_CODE="${{ inputs.version-code || '$DEFAULT_VERSION_CODE' }}"
          bundle exec fastlane setBuildVersionInfo \
-          versionCode:$VERSION_CODE \
+          versionCode:${{ inputs.version-code || '$DEFAULT_VERSION_CODE' }} \
          versionName:${{ inputs.version-name || '' }}

-          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: ${{ secrets.FDROID_KEYSTORE_PASSWORD }}
@@ -503,6 +466,7 @@ jobs:
          keyAlias:bitwarden \
          keyPassword:"${{ env.FDROID_STORE_PASSWORD }}"

+            # Generate the F-Droid APK for publishing
      - name: Generate F-Droid Beta Artifacts
        env:
          FDROID_BETA_KEYSTORE_PASSWORD: ${{ secrets.FDROID_BETA_KEYSTORE_PASSWORD }}
@@ -515,52 +479,51 @@ jobs:
          keyPassword:"${{ env.FDROID_BETA_KEY_PASSWORD }}"

      - name: Upload F-Droid .apk artifact
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
        with:
          name: com.x8bit.bitwarden-fdroid.apk
-          path: app/build/outputs/apk/fdroid/release/com.x8bit.bitwarden-fdroid.apk
+          path: app/build/outputs/apk/fdroid/release/com.x8bit.bitwarden-fdroid-release.apk
          if-no-files-found: error

      - name: Create checksum for F-Droid artifact
        run: |
-          sha256sum "app/build/outputs/apk/fdroid/release/com.x8bit.bitwarden-fdroid.apk" \
-          > ./com.x8bit.bitwarden-fdroid.apk-sha256.txt
+          sha256sum "app/build/outputs/apk/fdroid/release/com.x8bit.bitwarden-fdroid-release.apk" \
+          > ./bw-fdroid-apk-sha256.txt

      - name: Upload F-Droid SHA file
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
        with:
-          name: com.x8bit.bitwarden-fdroid.apk-sha256.txt
-          path: ./com.x8bit.bitwarden-fdroid.apk-sha256.txt
+          name: bw-fdroid-apk-sha256.txt
+          path: ./bw-fdroid-apk-sha256.txt
          if-no-files-found: error

      - name: Upload F-Droid Beta .apk artifact
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
        with:
-          name: com.x8bit.bitwarden.beta-fdroid.apk
-          path: app/build/outputs/apk/fdroid/beta/com.x8bit.bitwarden.beta-fdroid.apk
+          name: com.x8bit.bitwarden-fdroid-beta.apk
+          path: app/build/outputs/apk/fdroid/beta/com.x8bit.bitwarden-fdroid-beta.apk
          if-no-files-found: error

      - name: Create checksum for F-Droid Beta artifact
        run: |
-          sha256sum "app/build/outputs/apk/fdroid/beta/com.x8bit.bitwarden.beta-fdroid.apk" \
-          > ./com.x8bit.bitwarden.beta-fdroid.apk-sha256.txt
+          sha256sum "app/build/outputs/apk/fdroid/beta/com.x8bit.bitwarden-fdroid-beta.apk" \
+          > ./bw-fdroid-beta-apk-sha256.txt

      - name: Upload F-Droid Beta SHA file
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
        with:
-          name: com.x8bit.bitwarden.beta-fdroid.apk-sha256.txt
-          path: ./com.x8bit.bitwarden.beta-fdroid.apk-sha256.txt
+          name: bw-fdroid-beta-apk-sha256.txt
+          path: ./bw-fdroid-beta-apk-sha256.txt
          if-no-files-found: error

      - name: Install Firebase app distribution plugin
-        if: ${{ inputs.distribute-to-firebase || github.event_name == 'push' }}
+        if: ${{ github.ref_name == 'main' && inputs.distribute_to_firebase }}
        run: bundle exec fastlane add_plugin firebase_app_distribution

      - name: Publish release F-Droid artifacts to Firebase
-        if: ${{ inputs.distribute-to-firebase || github.event_name == 'push' }}
+        if: ${{ github.ref_name == 'main' && inputs.distribute_to_firebase }}
        env:
          APP_FDROID_FIREBASE_CREDS_PATH: ${{ github.workspace }}/secrets/app_fdroid_firebase-creds.json
        run: |
          bundle exec fastlane distributeReleaseFDroidToFirebase \
-          actionUrl:${{ env.GITHUB_ACTION_RUN_URL }} \
          service_credentials_file:${{ env.APP_FDROID_FIREBASE_CREDS_PATH }}
--- a/.github/workflows/crowdin-pull-authenticator.yml
+++ b/.github/workflows/crowdin-pull-authenticator.yml
@@ -1,13 +0,0 @@
-name: Crowdin Sync - Authenticator
-
-on:
-  workflow_dispatch:
-
-jobs:
-  placeholder:
-    name: Placeholder Job
-    runs-on: ubuntu-24.04
-
-    steps:
-      - name: Placeholder Step
-        run: echo "placeholder workflow"
--- a/.github/workflows/crowdin-pull.yml
+++ b/.github/workflows/crowdin-pull.yml
@@ -1,20 +1,21 @@
+---
 name: Crowdin Sync

 on:
  workflow_dispatch:
-    inputs: {}
+    inputs: { }
  schedule:
    - cron: '0 0 * * 5'

 jobs:
  crowdin-sync:
    name: Autosync
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    env:
      _CROWDIN_PROJECT_ID: "269690"
    steps:
      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

      - name: Login to Azure - CI Subscription
        uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
@@ -28,17 +29,10 @@ jobs:
          keyvault: "bitwarden-ci"
          secrets: "crowdin-api-token, github-gpg-private-key, github-gpg-private-key-passphrase"

-      - name: Generate GH App token
-        uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1
-        id: app-token
-        with:
-          app-id: ${{ secrets.BW_GHAPP_ID }}
-          private-key: ${{ secrets.BW_GHAPP_KEY }}
-
      - name: Download translations
-        uses: crowdin/github-action@d1632879d4d4da358f2d040f79fa094571c9a649 # v2.5.1
+        uses: crowdin/github-action@61ac8b980551f674046220c3e104bddae2916ac5 # v2.0.0
        env:
-          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
        with:
          config: crowdin.yml
--- a/.github/workflows/crowdin-push-authenticator.yml
+++ b/.github/workflows/crowdin-push-authenticator.yml
@@ -1,13 +0,0 @@
-name: Crowdin Push - Authenticator
-
-on:
-  workflow_dispatch:
-
-jobs:
-  placeholder:
-    name: Placeholder Job
-    runs-on: ubuntu-24.04
-
-    steps:
-      - name: Placeholder Step
-        run: echo "placeholder workflow"
--- a/.github/workflows/crowdin-push.yml
+++ b/.github/workflows/crowdin-push.yml
@@ -9,12 +9,12 @@ on:
 jobs:
  crowdin-push:
    name: Crowdin Push
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    env:
      _CROWDIN_PROJECT_ID: "269690"
    steps:
      - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

      - name: Log in to Azure
        uses: Azure/login@cb79c773a3cfa27f31f25eb3f677781210c9ce3d # v1.6.1
@@ -23,13 +23,13 @@ jobs:

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
+        uses: bitwarden/gh-actions/get-keyvault-secrets@2bd1450c2cdb2a8ac886232b8589696f22794229 # v0.2.0
        with:
          keyvault: "bitwarden-ci"
          secrets: "crowdin-api-token"

      - name: Upload sources
-        uses: crowdin/github-action@d1632879d4d4da358f2d040f79fa094571c9a649 # v2.5.1
+        uses: crowdin/github-action@61ac8b980551f674046220c3e104bddae2916ac5 # v2.0.0
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
--- a/.github/workflows/github-release.yml
+++ b/.github/workflows/github-release.yml
@@ -1,129 +0,0 @@
-name: Create GitHub Release
-
-on:
-  workflow_dispatch:
-    inputs:
-      version-name:
-        description: 'Version Name - E.g. "2024.11.1"'
-        required: true
-        type: string
-      version-number:
-        description: 'Version Number - E.g. "123456"'
-        required: true
-        type: string
-      artifact-run-id:
-        description: 'GitHub Action Run ID containing artifacts'
-        required: true
-        type: string
-      draft:
-        description: 'Create as draft release'
-        type: boolean
-        default: true
-      prerelease:
-        description: 'Mark as pre-release'
-        type: boolean
-        default: true
-      make-latest:
-        description: 'Set as the latest release'
-        type: boolean
-      branch-protection-type:
-        description: 'Branch protection type'
-        type: choice
-        options:
-          - Branch Name
-          - GitHub API
-        default: Branch Name
-env:
-    ARTIFACTS_PATH: artifacts
-jobs:
-  create-release:
-    name: Create GitHub Release
-    runs-on: ubuntu-24.04
-    permissions:
-      contents: write
-      actions: read
-
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          fetch-depth: 0
-
-      - name: Get branch from workflow run
-        id: get_release_branch
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ARTIFACT_RUN_ID: ${{ inputs.artifact-run-id }}
-          BRANCH_PROTECTION_TYPE: ${{ inputs.branch-protection-type }}
-        run: |
-          release_branch=$(gh run view $ARTIFACT_RUN_ID --json headBranch -q .headBranch)
-
-          case "$BRANCH_PROTECTION_TYPE" in
-            "Branch Name")
-              if [[ "$release_branch" != "main" && ! "$release_branch" =~ ^release/ ]]; then
-                echo "::error::Branch '$release_branch' is not 'main' or a release branch starting with 'release/'. Releases must be created from protected branches."
-                exit 1
-              fi
-              ;;
-            "GitHub API")
-              #NOTE requires token with "administration:read" scope
-              if ! gh api "repos/${{ github.repository }}/branches/$release_branch/protection" | grep -q "required_status_checks"; then
-                echo "::error::Branch '$release_branch' is not protected. Releases must be created from protected branches. If that's not correct, confirm if the github token user has the 'administration:read' scope."
-                exit 1
-              fi
-              ;;
-            *)
-              echo "::error::Unsupported branch protection type: $BRANCH_PROTECTION_TYPE"
-              exit 1
-              ;;
-          esac
-
-          echo "release_branch=$release_branch" >> $GITHUB_OUTPUT
-
-      - name: Download artifacts
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ARTIFACT_RUN_ID: ${{ inputs.artifact-run-id }}
-        run: |
-          gh run download $ARTIFACT_RUN_ID -D $ARTIFACTS_PATH
-          file_count=$(find $ARTIFACTS_PATH -type f | wc -l)
-          echo "Downloaded $file_count file(s)."
-          if [ "$file_count" -gt 0 ]; then
-            echo "Downloaded files:"
-            find $ARTIFACTS_PATH -type f
-          fi
-
-      - name: Create Release
-        id: create_release
-        uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2.2.1
-        with:
-          tag_name: "v${{ inputs.version-name }}"
-          name: "${{ inputs.version-name }} (${{ inputs.version-number }})"
-          prerelease: ${{ inputs.prerelease }}
-          draft: ${{ inputs.draft }}
-          make_latest: ${{ inputs.make-latest }}
-          target_commitish: ${{ steps.get_release_branch.outputs.release_branch }}
-          generate_release_notes: true
-          files: |
-            artifacts/**/*
-
-      - name: Update Release Description
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          RELEASE_ID: ${{ steps.create_release.outputs.id }}
-          RELEASE_URL: ${{ steps.create_release.outputs.url }}
-          ARTIFACT_RUN_ID: ${{ inputs.artifact-run-id }}
-        run: |
-          # Get current release body
-          current_body=$(gh api /repos/${{ github.repository }}/releases/$RELEASE_ID --jq .body)
-
-          # Append build source to the end
-          updated_body="${current_body}
-          **Builds Source:** https://github.com/${{ github.repository }}/actions/runs/$ARTIFACT_RUN_ID"
-
-          # Update release
-          gh api --method PATCH /repos/${{ github.repository }}/releases/$RELEASE_ID \
-            -f body="$updated_body"
-
-          echo "# :rocket: Release ready at:" >> $GITHUB_STEP_SUMMARY
-          echo "$RELEASE_URL" >> $GITHUB_STEP_SUMMARY
--- a/.github/workflows/release-branch.yml
+++ b/.github/workflows/release-branch.yml
@@ -1,58 +0,0 @@
-name: Cut Release Branch
-
-on:
-  workflow_dispatch:
-    inputs:
-      release_type:
-        description: 'Release Type'
-        required: true
-        type: choice
-        options:
-          - RC
-          - Hotfix
-
-jobs:
-  create-release-branch:
-    name: Create Release Branch
-    runs-on: ubuntu-24.04
-    permissions:
-      contents: write
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          fetch-depth: 0
-
-      - name: Create RC Branch
-        if: inputs.release_type == 'RC'
-        env:
-          RC_PREFIX_DATE: "true" # replace with input if needed
-        run: |
-          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
-          git switch main
-          git switch -c $branch_name
-          git push origin $branch_name
-          echo "# :cherry_blossom: RC branch: ${branch_name}" >> $GITHUB_STEP_SUMMARY
-
-      - name: Create Hotfix Branch
-        if: inputs.release_type == 'Hotfix'
-        run: |
-          latest_tag=$(git tag -l --sort=-creatordate | head -n 1)
-          if [ -z "$latest_tag" ]; then
-            echo "::error::No tags found in the repository"
-            exit 1
-          fi
-          branch_name="release/hotfix-${latest_tag}"
-          echo "🌿 branch name: $branch_name"
-          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
-          fi
-          git switch -c $branch_name $latest_tag
-          git push origin $branch_name
-          echo "# :fire: Hotfix branch: ${branch_name}" >> $GITHUB_STEP_SUMMARY
--- a/.github/workflows/scan-authenticator.yml
+++ b/.github/workflows/scan-authenticator.yml
@@ -1,13 +0,0 @@
-name: Scan Authenticator
-
-on:
-  workflow_dispatch:
-
-jobs:
-  placeholder:
-    name: Placeholder Job
-    runs-on: ubuntu-24.04
-
-    steps:
-      - name: Placeholder Step
-        run: echo "placeholder workflow"
--- a/.github/workflows/scan-ci.yml
+++ b/.github/workflows/scan-ci.yml
@@ -1,61 +0,0 @@
-name: Scan Protected Branches On Push
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - "main"
-
-jobs:
-  sast:
-    name: SAST scan
-    runs-on: ubuntu-24.04
-    permissions:
-      contents: read
-      security-events: 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@184bf2f64f55d1c93fd6636d539edf274703e434 # 2.0.41
-        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@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
-        with:
-          sarif_file: cx_result.sarif
-
-  quality:
-    name: Quality scan
-    runs-on: ubuntu-24.04
-    permissions:
-      contents: read
-
-    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@bfd4e558cda28cda6b5defafb9232d191be8c203 # v4.2.1
-        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 }}
--- a/.github/workflows/scan.yml
+++ b/.github/workflows/scan.yml
@@ -1,7 +1,12 @@
-name: Scan Pull Requests
+name: Scan

 on:
  workflow_dispatch:
+  push:
+    branches:
+      - "main"
+      - "rc"
+      - "hotfix-rc"
  pull_request_target:
    types: [opened, synchronize]

@@ -12,7 +17,7 @@ jobs:

  sast:
    name: SAST scan
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    needs: check-run
    permissions:
      contents: read
@@ -21,12 +26,12 @@ jobs:

    steps:
      - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
        with:
          ref: ${{  github.event.pull_request.head.sha }}

      - name: Scan with Checkmarx
-        uses: checkmarx/ast-github-action@184bf2f64f55d1c93fd6636d539edf274703e434 # 2.0.41
+        uses: checkmarx/ast-github-action@4c637b1cb6b6b63637c7b99578c9fceefebbb08d # 2.0.30
        env:
          INCREMENTAL: "${{ contains(github.event_name, 'pull_request') && '--sast-incremental' || '' }}"
        with:
@@ -41,13 +46,13 @@ jobs:
            --output-path . ${{ env.INCREMENTAL }}

      - name: Upload Checkmarx results to GitHub
-        uses: github/codeql-action/upload-sarif@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
+        uses: github/codeql-action/upload-sarif@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
        with:
          sarif_file: cx_result.sarif

  quality:
    name: Quality scan
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    needs: check-run
    permissions:
      contents: read
@@ -55,17 +60,17 @@ jobs:

    steps:
      - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
        with:
          fetch-depth: 0
          ref: ${{  github.event.pull_request.head.sha }}

      - name: Scan with SonarCloud
-        uses: sonarsource/sonarqube-scan-action@bfd4e558cda28cda6b5defafb9232d191be8c203 # v4.2.1
+        uses: sonarsource/sonarcloud-github-action@e44258b109568baa0df60ed515909fc6c72cba92 # v2.3.0
        env:
          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_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 }}
--- a/.github/workflows/test-authenticator.yml
+++ b/.github/workflows/test-authenticator.yml
@@ -1,13 +0,0 @@
-name: Test Authenticator
-
-on:
-  workflow_dispatch:
-
-jobs:
-  placeholder:
-    name: Placeholder Job
-    runs-on: ubuntu-24.04
-
-    steps:
-      - name: Placeholder Step
-        run: echo "placeholder workflow"
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,33 +6,40 @@ on:
      - "main"
      - "rc"
      - "hotfix-rc"
-  pull_request:
+  pull_request_target:
    types: [opened, synchronize]
-  merge_group:
-    type: [checks_requested]
  workflow_dispatch:

 env:
-  _JAVA_VERSION: 17
-  _GITHUB_ACTION_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/attempts/${{ github.run_attempt }}
-
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  JAVA_VERSION: 17

 jobs:
+  check-run:
+    name: Check PR run
+    uses: bitwarden/gh-actions/.github/workflows/check-run.yml@main
+
  test:
    name: Test
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
+    needs: check-run
    permissions:
+      contents: read
+      issues: write
      packages: read
+      pull-requests: write

    steps:
      - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        with:
+          ref: ${{  github.event.pull_request.head.sha }}

      - name: Validate Gradle wrapper
-        uses: gradle/actions/wrapper-validation@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
+        uses: gradle/actions/wrapper-validation@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0

      - name: Cache Gradle files
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
        with:
          path: |
            ~/.gradle/caches
@@ -42,7 +49,7 @@ jobs:
            ${{ runner.os }}-gradle-v2-

      - name: Cache build output
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
        with:
          path: |
            ${{ github.workspace }}/build-cache
@@ -51,15 +58,15 @@ jobs:
            ${{ runner.os }}-build-

      - name: Configure Ruby
-        uses: ruby/setup-ruby@28c4deda893d5a96a6b2d958c5b47fc18d65c9d3 # v1.213.0
+        uses: ruby/setup-ruby@161cd54b698f1fb3ea539faab2e036d409550e3c # v1.187.0
        with:
          bundler-cache: true

      - name: Configure JDK
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
        with:
          distribution: "temurin"
-          java-version: ${{ env._JAVA_VERSION }}
+          java-version: ${{ env.JAVA_VERSION }}

      - name: Install Fastlane
        run: |
@@ -68,58 +75,12 @@ jobs:
          bundle install --jobs 4 --retry 3

      - name: Build and test
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Used in settings.gradle.kts to download the SDK from GitHub Maven Packages
        run: |
          bundle exec fastlane check

-      - name: Upload test reports
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
-        if: always()
-        with:
-          name: test-reports
-          path: |
-            app/build/reports/tests/
-            app/build/reports/kover/reportStandardDebug.xml
-
-  report:
-    name: Process Test Reports
-    needs: test
-    runs-on: ubuntu-24.04
-    permissions:
-      contents: read
-      issues: write
-      pull-requests: write
-    if: success()
-
-    steps:
-      - name: Download test artifacts
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
-        if: github.event_name == 'push' || github.event_name == 'pull_request'
-        with:
-          name: test-reports
-
      - name: Upload to codecov.io
-        id: upload-to-codecov
-        uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # v5.1.2
-        if: github.event_name == 'push' || github.event_name == 'pull_request'
-        continue-on-error: true
+        uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
        with:
-          os: linux
-          files: kover/reportStandardDebug.xml
-          fail_ci_if_error: true
-
-      - name: Comment PR if tests failed
-        if: steps.upload-to-codecov.outcome == 'failure' && (github.event_name == 'push' || github.event_name == 'pull_request')
+          file: app/build/reports/kover/reportStandardDebug.xml
        env:
-            PR_NUMBER: ${{ github.event.number }}
-            GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-            RUN_ACTOR: ${{ github.triggering_actor }}
-        run: |
-          echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-          echo "> Uploading code coverage report failed. Please check the \"Upload to codecov.io\" step of \"Process Test Reports\" job for more details." >> $GITHUB_STEP_SUMMARY
-
-          if [ ! -z "$PR_NUMBER" ]; then
-            message=$'> [!WARNING]\n> @'$RUN_ACTOR' Uploading code coverage report failed. Please check the "Upload to codecov.io" step of [Process Test Reports job]('$_GITHUB_ACTION_RUN_URL') for more details.'
-            gh pr comment --repo $GITHUB_REPOSITORY $PR_NUMBER --body "$message"
-          fi
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
--- a/1
+++ b/1
@@ -0,0 +1 @@
+shroud.reportKover 'App', 'app/build/reports/kover/reportStandardDebug.xml', 80, 80, false
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,20 +10,20 @@ GEM
    artifactory (3.0.17)
    atomos (0.1.3)
    aws-eventstream (1.3.0)
-    aws-partitions (1.1040.0)
-    aws-sdk-core (3.216.0)
+    aws-partitions (1.957.0)
+    aws-sdk-core (3.201.2)
      aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.992.0)
-      aws-sigv4 (~> 1.9)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.8)
      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.97.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
+    aws-sdk-kms (1.88.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
      aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.178.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
+    aws-sdk-s3 (1.156.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.11.0)
+    aws-sigv4 (1.8.0)
      aws-eventstream (~> 1, >= 1.0.2)
    babosa (1.0.4)
    base64 (0.2.0)
@@ -32,15 +32,15 @@ GEM
    colored2 (3.1.2)
    commander (4.6.0)
      highline (~> 2.0.0)
-    date (3.4.1)
+    date (3.3.4)
    declarative (0.0.20)
    digest-crc (0.6.5)
      rake (>= 12.0.0, < 14.0.0)
    domain_name (0.6.20240107)
    dotenv (2.8.1)
    emoji_regex (3.2.3)
-    excon (0.112.0)
-    faraday (1.10.4)
+    excon (0.111.0)
+    faraday (1.10.3)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
      faraday-excon (~> 1.1)
@@ -59,17 +59,17 @@ GEM
    faraday-em_synchrony (1.0.0)
    faraday-excon (1.1.0)
    faraday-httpclient (1.0.1)
-    faraday-multipart (1.1.0)
-      multipart-post (~> 2.0)
-    faraday-net_http (1.0.2)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
    faraday-net_http_persistent (1.2.0)
    faraday-patron (1.0.0)
    faraday-rack (1.0.0)
    faraday-retry (1.0.3)
-    faraday_middleware (1.2.1)
+    faraday_middleware (1.2.0)
      faraday (~> 1.0)
-    fastimage (2.4.0)
-    fastlane (2.226.0)
+    fastimage (2.3.1)
+    fastlane (2.221.1)
      CFPropertyList (>= 2.3, < 4.0.0)
      addressable (>= 2.8, < 3.0.0)
      artifactory (~> 3.0)
@@ -85,7 +85,6 @@ GEM
      faraday-cookie_jar (~> 0.0.6)
      faraday_middleware (~> 1.0)
      fastimage (>= 2.1.0, < 3.0.0)
-      fastlane-sirp (>= 1.0.0)
      gh_inspector (>= 1.1.2, < 2.0.0)
      google-apis-androidpublisher_v3 (~> 0.3)
      google-apis-playcustomapp_v1 (~> 0.1)
@@ -109,13 +108,11 @@ GEM
      tty-spinner (>= 0.8.0, < 1.0.0)
      word_wrap (~> 1.0.0)
      xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.4.0)
+      xcpretty (~> 0.3.0)
      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
-    fastlane-plugin-firebase_app_distribution (0.10.0)
+    fastlane-plugin-firebase_app_distribution (0.9.1)
      google-apis-firebaseappdistribution_v1 (~> 0.3.0)
      google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
-    fastlane-sirp (1.0.0)
-      sysrandom (~> 1.0)
    gh_inspector (1.1.3)
    google-apis-androidpublisher_v3 (0.54.0)
      google-apis-core (>= 0.11.0, < 2.a)
@@ -137,7 +134,7 @@ GEM
      google-apis-core (>= 0.11.0, < 2.a)
    google-apis-storage_v1 (0.31.0)
      google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.7.1)
+    google-cloud-core (1.7.0)
      google-cloud-env (>= 1.0, < 3.a)
      google-cloud-errors (~> 1.0)
    google-cloud-env (1.6.0)
@@ -158,34 +155,35 @@ GEM
      os (>= 0.9, < 2.0)
      signet (>= 0.16, < 2.a)
    highline (2.0.3)
-    http-cookie (1.0.8)
+    http-cookie (1.0.6)
      domain_name (~> 0.5)
    httpclient (2.8.3)
    jmespath (1.6.2)
-    json (2.9.1)
-    jwt (2.10.1)
+    json (2.7.2)
+    jwt (2.8.2)
      base64
    mini_magick (4.13.2)
    mini_mime (1.1.5)
    multi_json (1.15.0)
    multipart-post (2.4.1)
-    nanaimo (0.4.0)
+    nanaimo (0.3.0)
    naturally (2.2.1)
    nkf (0.2.0)
-    optparse (0.6.0)
+    optparse (0.5.0)
    os (1.1.4)
-    plist (3.7.2)
-    public_suffix (6.0.1)
+    plist (3.7.1)
+    public_suffix (6.0.0)
    rake (13.2.1)
    representable (3.2.0)
      declarative (< 0.1.0)
      trailblazer-option (>= 0.1.1, < 0.2.0)
      uber (< 0.2.0)
    retriable (3.1.2)
-    rexml (3.4.0)
-    rouge (3.28.0)
+    rexml (3.2.9)
+      strscan
+    rouge (2.0.7)
    ruby2_keywords (0.0.5)
-    rubyzip (2.4.1)
+    rubyzip (2.3.2)
    security (0.1.5)
    signet (0.19.0)
      addressable (~> 2.8)
@@ -195,11 +193,11 @@ GEM
    simctl (1.6.10)
      CFPropertyList
      naturally
-    sysrandom (1.0.5)
+    strscan (3.1.0)
    terminal-notifier (2.0.0)
    terminal-table (3.0.2)
      unicode-display_width (>= 1.1.1, < 3)
-    time (0.4.1)
+    time (0.3.0)
      date
    trailblazer-option (0.1.2)
    tty-cursor (0.7.1)
@@ -207,17 +205,17 @@ GEM
    tty-spinner (0.9.3)
      tty-cursor (~> 0.7)
    uber (0.1.0)
-    unicode-display_width (2.6.0)
+    unicode-display_width (2.5.0)
    word_wrap (1.0.0)
-    xcodeproj (1.27.0)
+    xcodeproj (1.24.0)
      CFPropertyList (>= 2.3.3, < 4.0)
      atomos (~> 0.1.3)
      claide (>= 1.0.2, < 2.0)
      colored2 (~> 3.1)
-      nanaimo (~> 0.4.0)
-      rexml (>= 3.3.6, < 4.0)
-    xcpretty (0.4.0)
-      rouge (~> 3.28.0)
+      nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
    xcpretty-travis-formatter (1.0.1)
      xcpretty (~> 0.2, >= 0.0.7)

--- a/README.md
+++ b/README.md
@@ -1,4 +1,7 @@
-# Bitwarden Android
+# Bitwarden Android (BETA)
+
+> [!TIP]
+> This repo has the new native Android app, currently in [Beta](https://community.bitwarden.com/t/about-the-beta-program/39185). Looking for the legacy .NET MAUI apps? Head on over to [bitwarden/mobile](https://github.com/bitwarden/mobile)

 ## Contents

@@ -8,8 +11,8 @@

 ## Compatibility

- **Minimum SDK**: 29
- **Target SDK**: 35
+- **Minimum SDK**: 28
+- **Target SDK**: 34
 - **Device Types Supported**: Phone and Tablet
 - **Orientations Supported**: Portrait and Landscape

@@ -25,7 +28,6 @@
 2. Create a `user.properties` file in the root directory of the project and add the following properties:

    - `gitHubToken`: A "classic" Github Personal Access Token (PAT) with the `read:packages` scope (ex: `gitHubToken=gph_xx...xx`). These can be generated by going to the [Github tokens page](https://github.com/settings/tokens). See [the Github Packages user documentation concerning authentication](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-gradle-registry#authenticating-to-github-packages) for more details.
-    - `localSdk`: A boolean value to determine if the SDK should be loaded from the local maven artifactory (ex: `localSdk=true`). This is particularly useful when developing new SDK capabilities. Review [Linking SDK to clients](https://contributing.bitwarden.com/getting-started/sdk/#linking-the-sdk-to-clients) for more details.

 3. Setup the code style formatter:

@@ -132,11 +134,6 @@ The following is a list of all third-party dependencies included as part of the
    - https://github.com/firebase/firebase-android-sdk
    - Purpose: SDK for crash and non-fatal error reporting. (**NOTE:** This dependency is not included in builds distributed via F-Droid.)
    - License: Apache 2.0
-  
- **Google Play Reviews**
-  - https://developer.android.com/reference/com/google/android/play/core/release-notes
-  - Purpose: On standard builds provide an interface to add a review for the password manager application in Google Play.
-  - License: Apache 2.0

 - **Glide**
    - https://github.com/bumptech/glide
@@ -173,11 +170,6 @@ The following is a list of all third-party dependencies included as part of the
    - Purpose: A networking layer interface.
    - License: Apache 2.0

- **Timber**
-    - https://github.com/JakeWharton/timber
-    - Purpose: Extensible logging library for Android.
-    - License: Apache 2.0
-
 - **zxcvbn4j**
    - https://github.com/nulab/zxcvbn4j
    - Purpose: Password strength estimation.
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,12 +1,7 @@
-import com.android.build.gradle.internal.api.BaseVariantOutputImpl
-import com.android.utils.cxx.io.removeExtensionIfPresent
 import com.google.firebase.crashlytics.buildtools.gradle.tasks.InjectMappingFileIdTask
 import com.google.firebase.crashlytics.buildtools.gradle.tasks.UploadMappingFileTask
 import com.google.gms.googleservices.GoogleServicesTask
-import dagger.hilt.android.plugin.util.capitalize
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import java.io.FileInputStream
-import java.util.Properties

 plugins {
    alias(libs.plugins.android.application)
@@ -25,26 +20,6 @@ plugins {
    alias(libs.plugins.sonarqube)
 }

-/**
- * Loads local user-specific build properties that are not checked into source control.
- */
-val userProperties = Properties().apply {
-    val buildPropertiesFile = File(rootDir, "user.properties")
-    if (buildPropertiesFile.exists()) {
-        FileInputStream(buildPropertiesFile).use { load(it) }
-    }
-}
-
-/**
- * Loads CI-specific build properties that are not checked into source control.
- */
-val ciProperties = Properties().apply {
-    val ciPropsFile = File(rootDir, "ci.properties")
-    if (ciPropsFile.exists()) {
-        FileInputStream(ciPropsFile).use { load(it) }
-    }
-}
-
 android {
    namespace = "com.x8bit.bitwarden"
    compileSdk = libs.versions.compileSdk.get().toInt()
@@ -54,7 +29,7 @@ android {
        minSdk = libs.versions.minSdk.get().toInt()
        targetSdk = libs.versions.targetSdk.get().toInt()
        versionCode = 1
-        versionName = "2024.9.0"
+        versionName = "2024.06.00"

        setProperty("archivesBaseName", "com.x8bit.bitwarden")

@@ -64,12 +39,6 @@ android {
        }

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-
-        buildConfigField(
-            type = "String",
-            name = "CI_INFO",
-            value = "${ciProperties.getOrDefault("ci.info", "\"local\"")}"
-        )
    }

    androidResources {
@@ -92,23 +61,12 @@ android {
            signingConfig = signingConfigs.getByName("debug")
            isDebuggable = true
            isMinifyEnabled = false
-
-            buildConfigField(type = "boolean", name = "HAS_DEBUG_MENU", value = "true")
-            buildConfigField(type = "boolean", name = "HAS_LOGS_ENABLED", value = "true")
        }

        // Beta and Release variants are identical except beta has a different package name
        create("beta") {
+            initWith(buildTypes.getByName("release"))
            applicationIdSuffix = ".beta"
-            isDebuggable = false
-            isMinifyEnabled = true
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-
-            buildConfigField(type = "boolean", name = "HAS_DEBUG_MENU", value = "false")
-            buildConfigField(type = "boolean", name = "HAS_LOGS_ENABLED", value = "false")
        }
        release {
            isDebuggable = false
@@ -117,9 +75,6 @@ android {
                getDefaultProguardFile("proguard-android-optimize.txt"),
                "proguard-rules.pro"
            )
-
-            buildConfigField(type = "boolean", name = "HAS_DEBUG_MENU", value = "false")
-            buildConfigField(type = "boolean", name = "HAS_LOGS_ENABLED", value = "false")
        }
    }

@@ -134,39 +89,6 @@ android {
        }
    }

-    applicationVariants.all {
-        val bundlesDir = "${layout.buildDirectory.get()}/outputs/bundle"
-        outputs
-            .mapNotNull { it as? BaseVariantOutputImpl }
-            .forEach { output ->
-                val fileNameWithoutExtension = when (flavorName) {
-                    "fdroid" -> "$applicationId-$flavorName"
-                    "standard" -> "$applicationId"
-                    else -> output.outputFileName.removeExtensionIfPresent(".apk")
-                }
-
-                // Set the APK output filename.
-                output.outputFileName = "$fileNameWithoutExtension.apk"
-
-                val variantName = name
-                val renameTaskName = "rename${variantName.capitalize()}AabFiles"
-                tasks.register(renameTaskName) {
-                    group = "build"
-                    description = "Renames the bundle files for $variantName variant"
-                    doLast {
-                        renameFile(
-                            "$bundlesDir/$variantName/$namespace-$flavorName-${buildType.name}.aab",
-                            "$fileNameWithoutExtension.aab",
-                        )
-                    }
-                }
-                // Force renaming task to execute after the variant is built.
-                tasks
-                    .getByName("bundle${variantName.capitalize()}")
-                    .finalizedBy(renameTaskName)
-            }
-    }
-
    compileOptions {
        sourceCompatibility(libs.versions.jvmTarget.get())
        targetCompatibility(libs.versions.jvmTarget.get())
@@ -187,10 +109,7 @@ android {
        unitTests.isReturnDefaultValues = true
    }
    lint {
-        disable += listOf(
-            "MissingTranslation",
-            "ExtraTranslation",
-        )
+        disable.add("MissingTranslation")
    }
 }

@@ -200,22 +119,11 @@ kotlin {
    }
 }

-configurations.all {
-    resolutionStrategy.dependencySubstitution {
-        if ((userProperties["localSdk"] as String?).toBoolean()) {
-            substitute(module("com.bitwarden:sdk-android"))
-                .using(module("com.bitwarden:sdk-android:LOCAL"))
-        }
-    }
-}
-
 dependencies {
    fun standardImplementation(dependencyNotation: Any) {
        add("standardImplementation", dependencyNotation)
    }

-    implementation(files("libs/authenticatorbridge-1.0.0-release.aar"))
-
    implementation(libs.androidx.activity.compose)
    implementation(libs.androidx.appcompat)
    implementation(libs.androidx.autofill)
@@ -257,7 +165,6 @@ dependencies {
    implementation(platform(libs.square.retrofit.bom))
    implementation(libs.square.retrofit)
    implementation(libs.square.retrofit.kotlinx.serialization)
-    implementation(libs.timber)
    implementation(libs.zxing.zxing.core)

    // For now we are restricted to running Compose tests for debug builds only
@@ -268,7 +175,6 @@ dependencies {
    standardImplementation(libs.google.firebase.cloud.messaging)
    standardImplementation(platform(libs.google.firebase.bom))
    standardImplementation(libs.google.firebase.crashlytics)
-    standardImplementation(libs.google.play.review)

    testImplementation(libs.androidx.compose.ui.test)
    testImplementation(libs.google.hilt.android.testing)
@@ -302,7 +208,6 @@ kover {
                annotatedBy(
                    // Compose previews
                    "androidx.compose.ui.tooling.preview.Preview",
-                    "androidx.compose.ui.tooling.preview.PreviewScreenSizes",
                    // Manually excluded classes/files/etc.
                    "com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage",
                )
@@ -325,7 +230,6 @@ kover {
                    "*_*Factory\$*",
                    "*.Hilt_*",
                    "*_HiltModules",
-                    "*_HiltModules*",
                    "*_HiltModules\$*",
                    "*_Impl",
                    "*_Impl\$*",
@@ -352,10 +256,6 @@ tasks {
        dependsOn("detekt")
    }

-    getByName("sonar") {
-        dependsOn("check")
-    }
-
    withType<io.gitlab.arturbosch.detekt.Detekt>().configureEach {
        jvmTarget = libs.versions.jvmTarget.get()
    }
@@ -368,16 +268,15 @@ tasks {
        maxHeapSize = "2g"
        maxParallelForks = Runtime.getRuntime().availableProcessors()
        jvmArgs = jvmArgs.orEmpty() + "-XX:+UseParallelGC"
-        android.sourceSets["main"].res.srcDirs("src/test/res")
    }
 }

 afterEvaluate {
    // Disable Fdroid-specific tasks that we want to exclude
-    val fdroidTasksToDisable = tasks.withType<GoogleServicesTask>() +
+    val tasks = tasks.withType<GoogleServicesTask>() +
        tasks.withType<InjectMappingFileIdTask>() +
        tasks.withType<UploadMappingFileTask>()
-    fdroidTasksToDisable
+    tasks
        .filter { it.name.contains("Fdroid") }
        .forEach { it.enabled = false }
 }
@@ -394,17 +293,8 @@ sonar {
    }
 }

-private fun renameFile(path: String, newName: String) {
-    val originalFile = File(path)
-    if (!originalFile.exists()) {
-        println("File $originalFile does not exist!")
-        return
+tasks {
+    getByName("sonar") {
+        dependsOn("check")
    }
-
-    val newFile = File(originalFile.parentFile, newName)
-    if (originalFile.renameTo(newFile)) {
-        println("Renamed $originalFile to $newFile")
-    } else {
-        throw RuntimeException("Failed to rename $originalFile to $newFile")
-    }
-}
+} 
--- a/app/libs/authenticatorbridge-1.0.0-release.aar
+++ b/app/libs/authenticatorbridge-1.0.0-release.aar
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -6,10 +6,6 @@
 # we keep it here.
 -keep class com.bitwarden.** { *; }

-# The Android Verifier component must be kept because it looks like dead code. Proguard is unable to
-# see any JNI usage, so our rules must manually opt into keeping it.
-keep, includedescriptorclasses class org.rustls.platformverifier.** { *; }
-
 ################################################################################
 # Bitwarden Models
 ################################################################################
--- a/app/schemas/com.x8bit.bitwarden.data.vault.datasource.disk.database.VaultDatabase/4.json
+++ b/app/schemas/com.x8bit.bitwarden.data.vault.datasource.disk.database.VaultDatabase/4.json
@@ -1,256 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 4,
-    "identityHash": "f7906c69e0a2c065d4d3be140fc721b6",
-    "entities": [
-      {
-        "tableName": "ciphers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `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": "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`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "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 NOT NULL, 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",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isReadOnly",
-            "columnName": "read_only",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "canManage",
-            "columnName": "manage",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "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`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "domains",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `domains_json` TEXT NOT NULL, PRIMARY KEY(`user_id`))",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "user_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "domainsJson",
-            "columnName": "domains_json",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "user_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "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",
-            "notNull": false
-          },
-          {
-            "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`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "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`)"
-          }
-        ],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "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, 'f7906c69e0a2c065d4d3be140fc721b6')"
-    ]
-  }
-}
--- a/app/schemas/com.x8bit.bitwarden.data.vault.datasource.disk.database.VaultDatabase/5.json
+++ b/app/schemas/com.x8bit.bitwarden.data.vault.datasource.disk.database.VaultDatabase/5.json
@@ -1,256 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 5,
-    "identityHash": "ee697e71290c92fe5b607d0b7665481b",
-    "entities": [
-      {
-        "tableName": "ciphers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `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": "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`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "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 NOT NULL, 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",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isReadOnly",
-            "columnName": "read_only",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "canManage",
-            "columnName": "manage",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "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`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "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",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "user_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "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",
-            "notNull": false
-          },
-          {
-            "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`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "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`)"
-          }
-        ],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "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, 'ee697e71290c92fe5b607d0b7665481b')"
-    ]
-  }
-}
--- a/app/schemas/com.x8bit.bitwarden.data.vault.datasource.disk.database.VaultDatabase/6.json
+++ b/app/schemas/com.x8bit.bitwarden.data.vault.datasource.disk.database.VaultDatabase/6.json
@@ -1,256 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 6,
-    "identityHash": "ee158c483edfe5102504670f3d9845d4",
-    "entities": [
-      {
-        "tableName": "ciphers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `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": "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`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "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",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isReadOnly",
-            "columnName": "read_only",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "canManage",
-            "columnName": "manage",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "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`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "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",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "user_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "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",
-            "notNull": false
-          },
-          {
-            "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`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "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`)"
-          }
-        ],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "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, 'ee158c483edfe5102504670f3d9845d4')"
-    ]
-  }
-}
--- a/app/src/beta/res/values/manifest.xml
+++ b/app/src/beta/res/values/manifest.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- For beta variant, we don't have a matching variant of the Bitwarden Authenticator app.
-    Therefore, we leave the known app cert null here so that no clients can connect to
-    AuthenticatorBridgeService in the beta variant. If later another variant of the
-    Bitwarden Authenticator app is added, a SHA-256 digest of that variant's APK can be added here.
-    -->
-    <string-array name="known_authenticator_app_certs" />
-</resources>
--- a/app/src/beta/res/xml/shortcuts.xml
+++ b/app/src/beta/res/xml/shortcuts.xml
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
-    <shortcut
-        android:enabled="true"
-        android:icon="@mipmap/ic_generator_shortcut"
-        android:shortcutId="bitwarden_password_generator"
-        android:shortcutLongLabel="@string/password_generator"
-        android:shortcutShortLabel="@string/password_generator">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="bitwarden://password_generator"
-            android:targetClass="com.x8bit.bitwarden.MainActivity"
-            android:targetPackage="com.x8bit.bitwarden.beta" />
-    </shortcut>
-    <shortcut
-        android:enabled="true"
-        android:icon="@mipmap/ic_vault_shortcut"
-        android:shortcutId="bitwarden_my_vault"
-        android:shortcutLongLabel="@string/my_vault"
-        android:shortcutShortLabel="@string/my_vault">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="bitwarden://my_vault"
-            android:targetClass="com.x8bit.bitwarden.MainActivity"
-            android:targetPackage="com.x8bit.bitwarden.beta" />
-    </shortcut>
-</shortcuts>
--- a/app/src/debug/AndroidManifest.xml
+++ b/app/src/debug/AndroidManifest.xml
@@ -3,6 +3,17 @@
    xmlns:tools="http://schemas.android.com/tools">

    <application tools:ignore="MissingApplicationIcon">
+
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.x8bit.bitwarden.fido2.ACTION_CREATE_PASSKEY" />
+                <action android:name="com.x8bit.bitwarden.fido2.ACTION_GET_PASSKEY" />
+                <action android:name="com.x8bit.bitwarden.fido2.ACTION_UNLOCK_ACCOUNT" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
        <!-- Disable Crashlytics for debug builds -->
        <meta-data
            android:name="firebase_crashlytics_collection_enabled"
--- a/app/src/debug/res/values/manifest.xml
+++ b/app/src/debug/res/values/manifest.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="known_authenticator_app_certs">
-        <!-- This is the SHA-256 digest for the Authenticator App debug variant:-->
-        <item>13144ab52af797a88c2fe292674461ef1715e0e1e4f5f538f63f1c174696f476</item>
-    </string-array>
-</resources>
--- a/app/src/debug/res/xml/provider.xml
+++ b/app/src/debug/res/xml/provider.xml
--- a/app/src/fdroid/java/com/x8bit/bitwarden/data/platform/manager/CrashLogsManagerImpl.kt
+++ b/app/src/fdroid/java/com/x8bit/bitwarden/data/platform/manager/CrashLogsManagerImpl.kt
@@ -0,0 +1,16 @@
+package com.x8bit.bitwarden.data.platform.manager
+
+import com.x8bit.bitwarden.data.platform.datasource.disk.legacy.LegacyAppCenterMigrator
+import com.x8bit.bitwarden.data.platform.repository.SettingsRepository
+
+/**
+ * CrashLogsManager implementation for F-droid flavor builds.
+ */
+class CrashLogsManagerImpl(
+    settingsRepository: SettingsRepository,
+    legacyAppCenterMigrator: LegacyAppCenterMigrator,
+) : CrashLogsManager {
+    override var isEnabled: Boolean = true
+
+    override fun trackNonFatalException(e: Exception) = Unit
+}
--- a/app/src/fdroid/java/com/x8bit/bitwarden/data/platform/manager/LogsManagerImpl.kt
+++ b/app/src/fdroid/java/com/x8bit/bitwarden/data/platform/manager/LogsManagerImpl.kt
@@ -1,27 +0,0 @@
-package com.x8bit.bitwarden.data.platform.manager
-
-import com.x8bit.bitwarden.BuildConfig
-import com.x8bit.bitwarden.data.platform.datasource.disk.legacy.LegacyAppCenterMigrator
-import com.x8bit.bitwarden.data.platform.repository.SettingsRepository
-import com.x8bit.bitwarden.data.platform.repository.model.Environment
-import timber.log.Timber
-
-/**
- * [LogsManager] implementation for F-droid flavor builds.
- */
-class LogsManagerImpl(
-    settingsRepository: SettingsRepository,
-    legacyAppCenterMigrator: LegacyAppCenterMigrator,
-) : LogsManager {
-    init {
-        if (BuildConfig.HAS_LOGS_ENABLED) {
-            Timber.plant(Timber.DebugTree())
-        }
-    }
-
-    override var isEnabled: Boolean = false
-
-    override fun setUserData(userId: String?, environmentType: Environment.Type) = Unit
-
-    override fun trackNonFatalException(throwable: Throwable) = Unit
-}
--- a/app/src/fdroid/java/com/x8bit/bitwarden/ui/platform/manager/review/AppReviewManagerImpl.kt
+++ b/app/src/fdroid/java/com/x8bit/bitwarden/ui/platform/manager/review/AppReviewManagerImpl.kt
@@ -1,12 +0,0 @@
-package com.x8bit.bitwarden.ui.platform.manager.review
-
-import android.app.Activity
-
-/**
- * No-op implementation of [AppReviewManager] for F-Droid builds.
- */
-class AppReviewManagerImpl(
-    activity: Activity,
-) : AppReviewManager {
-    override fun promptForReview() = Unit
-}
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,20 +15,6 @@
    <uses-permission android:name="android.permission.CAMERA" />
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.READ_USER_DICTIONARY"/>
-    <!-- Protect access to AuthenticatorBridgeService using this custom permission.
-
-    Note that each build type uses a different value for knownCerts.
-
-    This in effect means that the only application that can connect to the debug/release/etc
-    variant AuthenticatorBridgeService is the debug/release/etc variant Bitwarden Authenticator
-    app. -->
-    <permission
-        android:name="${applicationId}.permission.AUTHENTICATOR_BRIDGE_SERVICE"
-        android:knownCerts="@array/known_authenticator_app_certs"
-        android:label="Bitwarden Bridge"
-        android:protectionLevel="signature|knownSigner"
-        tools:targetApi="s" />

    <application
        android:name=".BitwardenApplication"
@@ -76,42 +62,12 @@
                <category android:name="android.intent.category.BROWSABLE" />

                <data android:scheme="https" />
-
-                <data android:host="vault.bitwarden.com" />
-                <data android:host="vault.bitwarden.eu" />
-                <data android:host="*.bitwarden.pw" />
-                <data android:pathPattern="/redirect-connector.*" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="com.x8bit.bitwarden.fido2.ACTION_CREATE_PASSKEY" />
-                <action android:name="com.x8bit.bitwarden.fido2.ACTION_GET_PASSKEY" />
-                <action android:name="com.x8bit.bitwarden.fido2.ACTION_UNLOCK_ACCOUNT" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="otpauth" />
-                <data android:host="totp" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:scheme="bitwarden" />
+                <data android:host="bitwarden.com" />
+                <data android:host="bitwarden.pw" />
+                <data android:host="bitwarden.eu" />
            </intent-filter>
        </activity>

-        <activity
-            android:name=".AccessibilityActivity"
-            android:exported="false"
-            android:launchMode="singleTop"
-            android:noHistory="true"
-            android:theme="@android:style/Theme.NoDisplay" />
-
        <activity
            android:name=".AutofillTotpCopyActivity"
            android:exported="true"
@@ -196,47 +152,6 @@
            </intent-filter>
        </service>

-        <!--
-        The AccessibilityService name below refers to the legacy Xamarin app's service name. This
-        must always match in order for the app to properly query if it is providing accessibility
-        services.
-        -->
-        <!--suppress AndroidDomInspection -->
-        <service
-            android:name="com.x8bit.bitwarden.Accessibility.AccessibilityService"
-            android:exported="true"
-            android:label="@string/app_name"
-            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
-            tools:ignore="MissingClass">
-            <intent-filter>
-                <action android:name="android.accessibilityservice.AccessibilityService" />
-            </intent-filter>
-            <meta-data
-                android:name="android.accessibilityservice"
-                android:resource="@xml/accessibility_service" />
-        </service>
-
-        <!--
-        The CredentialProviderService name below refers to the legacy Xamarin app's service name.
-        This must always match in order for the app to properly query if it is providing credential
-        services.
-        -->
-        <!--suppress AndroidDomInspection -->
-        <service
-            android:name="com.x8bit.bitwarden.Autofill.CredentialProviderService"
-            android:enabled="true"
-            android:exported="true"
-            android:label="@string/bitwarden"
-            android:permission="android.permission.BIND_CREDENTIAL_PROVIDER_SERVICE"
-            tools:ignore="MissingClass">
-            <intent-filter>
-                <action android:name="android.service.credentials.CredentialProviderService" />
-            </intent-filter>
-            <meta-data
-                android:name="android.credentials.provider"
-                android:resource="@xml/provider" />
-        </service>
-
        <!-- This is required to support in-app language picker in Android 12 (API 32) and below -->
        <service
            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
@@ -247,84 +162,16 @@
                android:value="true" />
        </service>

-        <!--
-        The AutofillTileService name below refers to the legacy Xamarin app's service name.
-        This must always match in order for the app to properly query if it is providing autofill
-        tile services.
-        -->
-        <!--suppress AndroidDomInspection -->
-        <service
-            android:name="com.x8bit.bitwarden.AutofillTileService"
-            android:exported="true"
-            android:icon="@drawable/ic_notification"
-            android:label="@string/autofill"
-            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
-            tools:ignore="MissingClass">
-            <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE" />
-            </intent-filter>
-        </service>
-
-        <!--
-        The GeneratorTileService name below refers to the legacy Xamarin app's service name.
-        This must always match in order for the app to properly query if it is providing generator
-        tile services.
-        -->
-        <!--suppress AndroidDomInspection -->
-        <service
-            android:name="com.x8bit.bitwarden.GeneratorTileService"
-            android:exported="true"
-            android:icon="@drawable/ic_generator"
-            android:label="@string/password_generator"
-            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
-            tools:ignore="MissingClass">
-            <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE" />
-            </intent-filter>
-        </service>
-
-        <!--
-        The MyVaultTileService name below refers to the legacy Xamarin app's service name.
-        This must always match in order for the app to properly query if it is providing vault
-        tile services.
-        -->
-        <!--suppress AndroidDomInspection -->
-        <service
-            android:name="com.x8bit.bitwarden.MyVaultTileService"
-            android:exported="true"
-            android:icon="@drawable/ic_notification"
-            android:label="@string/my_vault"
-            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
-            tools:ignore="MissingClass">
-            <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE" />
-            </intent-filter>
-        </service>
-
        <meta-data
            android:name="android.content.APP_RESTRICTIONS"
            android:resource="@xml/app_restrictions" />

-        <service
-            android:name="com.x8bit.bitwarden.data.platform.service.AuthenticatorBridgeService"
-            android:exported="true"
-            android:permission="${applicationId}.permission.AUTHENTICATOR_BRIDGE_SERVICE" />
-
    </application>

    <queries>
        <intent>
            <action android:name="android.media.action.IMAGE_CAPTURE" />
        </intent>
-        <intent>
-            <action android:name="android.intent.action.MAIN" />
-            <category android:name="android.intent.category.HOME" />
-        </intent>
-        <!-- To Query Chrome Beta: -->
-        <package android:name="com.chrome.beta" />
-
-        <!-- To Query Chrome Stable: -->
-        <package android:name="com.android.chrome" />
    </queries>

 </manifest>
--- a/app/src/main/assets/fido2_privileged_allow_list.json
+++ b/app/src/main/assets/fido2_privileged_allow_list.json
@@ -475,102 +475,7 @@
          }
        ]
      }
-    },
-    {
-      "type": "android",
-      "info": {
-        "package_name": "com.talonsec.talon",
-        "signatures": [
-          {
-            "build": "release",
-            "cert_fingerprint_sha256": "A3:66:03:44:A6:F6:AF:CA:81:8C:BF:43:96:A2:3C:CF:D5:ED:7A:78:1B:B4:A3:D1:85:03:01:E2:F4:6D:23:83"
-          },
-          {
-            "build": "release",
-            "cert_fingerprint_sha256": "E2:A5:64:74:EA:23:7B:06:67:B6:F5:2C:DC:E9:04:5E:24:88:3B:AE:D0:82:59:9A:A2:DF:0B:60:3A:CF:6A:3B"
-          }
-        ]
-      }
-    },
-    {
-      "type": "android",
-      "info": {
-        "package_name": "com.talonsec.talon_beta",
-        "signatures": [
-          {
-            "build": "release",
-            "cert_fingerprint_sha256": "F5:86:62:7A:32:C8:9F:E6:7E:00:6D:B1:8C:34:31:9E:01:7F:B3:B2:BE:D6:9D:01:01:B7:F9:43:E7:7C:48:AE"
-          },
-          {
-            "build": "release",
-            "cert_fingerprint_sha256": "9A:A1:25:D5:E5:5E:3F:B0:DE:96:72:D9:A9:5D:04:65:3F:49:4A:1E:C3:EE:76:1E:94:C4:4E:5D:2F:65:8E:2F"
-          }
-        ]
-      }
-    },
-    {
-      "type": "android",
-      "info": {
-        "package_name": "com.duckduckgo.mobile.android.debug",
-        "signatures": [
-          {
-            "build": "release",
-            "cert_fingerprint_sha256": "C4:F0:9E:2B:D7:25:AD:F5:AD:92:0B:A2:80:27:66:AC:16:4A:C1:53:B3:EA:9E:08:48:B0:57:98:37:F7:6A:29"
-          }
-        ]
-      }
-    },
-    {
-      "type": "android",
-      "info": {
-        "package_name": "com.duckduckgo.mobile.android",
-        "signatures": [
-          {
-            "build": "release",
-            "cert_fingerprint_sha256": "BB:7B:B3:1C:57:3C:46:A1:DA:7F:C5:C5:28:A6:AC:F4:32:10:84:56:FE:EC:50:81:0C:7F:33:69:4E:B3:D2:D4"
-          }
-        ]
-      }
-    },
-    {
-      "type": "android",
-      "info": {
-        "package_name": "com.naver.whale",
-        "signatures": [
-          {
-            "build": "release",
-            "cert_fingerprint_sha256": "0B:8B:85:23:BB:4A:EF:FA:34:6E:4B:DD:4F:BF:7D:19:34:50:56:9A:A1:4A:AA:D4:AD:FD:94:A3:F7:B2:27:BB"
-          }
-        ]
-      }
-    },
-    {
-      "type": "android",
-      "info": {
-        "package_name": "com.fido.fido2client",
-        "signatures": [
-          {
-            "build": "release",
-            "cert_fingerprint_sha256": "FC:98:DA:E6:3A:D3:96:26:C8:C6:7F:BE:83:F2:F0:6F:74:93:2A:9C:D1:46:B9:2C:EC:FC:6A:04:7A:90:43:86"
-          }
-        ]
-      }
-    },
-    {
-      "type": "android",
-      "info": {
-        "package_name": "com.heytap.browser",
-        "signatures": [
-          {
-            "build": "release",
-            "cert_fingerprint_sha256": "AF:F8:A7:49:CF:0E:7D:75:44:65:D0:FB:FA:7B:8D:0C:64:5E:22:5C:10:C6:E2:32:AD:A0:D9:74:88:36:B8:E5"
-          },
-          {
-            "build": "release",
-            "cert_fingerprint_sha256": "A8:FE:A4:CA:FB:93:32:DA:26:B8:E6:81:08:17:C1:DA:90:A5:03:0E:35:A6:0A:79:E0:6C:90:97:AA:C6:A4:42"
-          }
-        ]
-      }
    }
  ]
 }
+
--- a/app/src/main/assets/fido2_privileged_community.json
+++ b/app/src/main/assets/fido2_privileged_community.json
@@ -1,90 +0,0 @@
-{
-  "apps": [
-    {
-      "type": "android",
-      "info": {
-        "package_name": "io.github.forkmaintainers.iceraven",
-        "signatures": [
-          {
-            "build": "release",
-            "cert_fingerprint_sha256": "9C:0D:22:37:9F:48:7B:70:A4:F9:F8:BE:C0:17:3C:F9:1A:16:44:F0:8F:93:38:5B:5B:78:2C:E3:76:60:BA:81"
-          }
-        ]
-      }
-    },
-
-    {
-      "type": "android",
-      "info": {
-        "package_name": "net.quetta.browser",
-        "signatures": [
-          {
-            "build": "release",
-            "cert_fingerprint_sha256": "BE:FE:E7:31:12:6A:A5:6E:7E:FD:AE:AF:5E:F3:FA:EA:44:1C:19:CC:E0:CA:EC:42:6B:65:BB:F8:2C:59:46:80"
-          }
-        ]
-      }
-    },
-
-    {
-      "type": "android",
-      "info": {
-        "package_name": "org.chromium.chrome",
-        "signatures": [
-          {
-            "build": "release",
-            "cert_fingerprint_sha256": "A8:56:48:50:79:BC:B3:57:BF:BE:69:BA:19:A9:BA:43:CD:0A:D9:AB:22:67:52:C7:80:B6:88:8A:FD:48:21:6B"
-          }
-        ]
-      }
-    },
-    {
-      "type": "android",
-      "info": {
-        "package_name": "org.cromite.cromite",
-        "signatures": [
-          {
-            "build": "release",
-            "cert_fingerprint_sha256": "63:3F:A4:1D:82:11:D6:D0:91:6A:81:9B:89:66:8C:6D:E9:2E:64:23:2D:A6:7F:9D:16:FD:81:C3:B7:E9:23:FF"
-          }
-        ]
-      }
-    },
-    {
-      "type": "android",
-      "info": {
-        "package_name": "org.ironfoxoss.ironfox",
-        "signatures": [
-          {
-            "build": "release",
-            "cert_fingerprint_sha256": "C5:E2:91:B5:A5:71:F9:C8:CD:9A:97:99:C2:C9:4E:02:EC:97:03:94:88:93:F2:CA:75:6D:67:B9:42:04:F9:04"
-          }
-        ]
-      }
-    },
-    {
-      "type": "android",
-      "info": {
-        "package_name": "org.mozilla.fenix",
-        "signatures": [
-          {
-            "build": "release",
-            "cert_fingerprint_sha256": "50:04:77:90:88:E7:F9:88:D5:BC:5C:C5:F8:79:8F:EB:F4:F8:CD:08:4A:1B:2A:46:EF:D4:C8:EE:4A:EA:F2:11"
-          }
-        ]
-      }
-    },
-    {
-      "type": "android",
-      "info": {
-        "package_name": "org.mozilla.fennec_fdroid",
-        "signatures": [
-          {
-            "build": "release",
-            "cert_fingerprint_sha256": "06:66:53:58:EF:D8:BA:05:BE:23:6A:47:A1:2C:B0:95:8D:7D:75:DD:93:9D:77:C2:B3:1F:53:98:53:7E:BD:C5"
-          }
-        ]
-      }
-    }
-  ]
-}
--- a/app/src/main/java/com/x8bit/bitwarden/AccessibilityActivity.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/AccessibilityActivity.kt
@@ -1,17 +0,0 @@
-package com.x8bit.bitwarden
-
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage
-
-/**
- * An activity to be launched and then immediately closed so that the OS Shade can be collapsed
- * after the user clicks on the Autofill Quick Tile.
- */
-@OmitFromCoverage
-class AccessibilityActivity : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        finish()
-    }
-}
--- a/app/src/main/java/com/x8bit/bitwarden/BitwardenAppComponentFactory.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/BitwardenAppComponentFactory.kt
@@ -3,62 +3,37 @@ package com.x8bit.bitwarden
 import android.app.Service
 import android.content.Intent
 import android.os.Build
-import androidx.annotation.Keep
 import androidx.core.app.AppComponentFactory
 import com.x8bit.bitwarden.data.autofill.BitwardenAutofillService
-import com.x8bit.bitwarden.data.autofill.accessibility.BitwardenAccessibilityService
 import com.x8bit.bitwarden.data.autofill.fido2.BitwardenFido2ProviderService
 import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage
-import com.x8bit.bitwarden.data.tiles.BitwardenAutofillTileService
-import com.x8bit.bitwarden.data.tiles.BitwardenGeneratorTileService
-import com.x8bit.bitwarden.data.tiles.BitwardenVaultTileService
+
+private const val LEGACY_AUTOFILL_SERVICE_NAME = "com.x8bit.bitwarden.Autofill.AutofillService"
+private const val LEGACY_CREDENTIAL_SERVICE_NAME =
+    "com.x8bit.bitwarden.Autofill.CredentialProviderService"

 /**
 * A factory class that allows us to intercept when a manifest element is being instantiated
 * and modify various characteristics before initialization.
 */
@Suppress("unused")
-@Keep
@OmitFromCoverage
 class BitwardenAppComponentFactory : AppComponentFactory() {
    /**
-     * Used to intercept when certain legacy services are being instantiated and modify which
-     * service is created. This is required because the [className] used in the manifest must match
-     * the legacy Xamarin app service name but the service name in this app is different.
-     *
-     * Services currently being managed:
-     * * [BitwardenAccessibilityService]
-     * * [BitwardenAutofillService]
-     * * [BitwardenAutofillTileService]
-     * * [BitwardenFido2ProviderService]
-     * * [BitwardenVaultTileService]
-     * * [BitwardenGeneratorTileService]
+     * Used to intercept when the [BitwardenAutofillService] or [BitwardenFido2ProviderService] is
+     * being instantiated and modify which service is created. This is required because the
+     * [className] used in the manifest must match the legacy Xamarin app service name but the
+     * service name in this app is different.
     */
    override fun instantiateServiceCompat(
        cl: ClassLoader,
        className: String,
        intent: Intent?,
    ): Service = when (className) {
-        LEGACY_ACCESSIBILITY_SERVICE_NAME -> {
-            super.instantiateServiceCompat(
-                cl,
-                BitwardenAccessibilityService::class.java.name,
-                intent,
-            )
-        }
-
        LEGACY_AUTOFILL_SERVICE_NAME -> {
            super.instantiateServiceCompat(cl, BitwardenAutofillService::class.java.name, intent)
        }

-        LEGACY_AUTOFILL_TILE_SERVICE_NAME -> {
-            super.instantiateServiceCompat(
-                cl,
-                BitwardenAutofillTileService::class.java.name,
-                intent,
-            )
-        }
-
        LEGACY_CREDENTIAL_SERVICE_NAME -> {
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
                super.instantiateServiceCompat(
@@ -73,18 +48,6 @@ class BitwardenAppComponentFactory : AppComponentFactory() {
            }
        }

-        LEGACY_VAULT_TILE_SERVICE_NAME -> {
-            super.instantiateServiceCompat(cl, BitwardenVaultTileService::class.java.name, intent)
-        }
-
-        LEGACY_GENERATOR_TILE_SERVICE_NAME -> {
-            super.instantiateServiceCompat(
-                cl,
-                BitwardenGeneratorTileService::class.java.name,
-                intent,
-            )
-        }
-
        else -> super.instantiateServiceCompat(cl, className, intent)
    }
 }
--- a/app/src/main/java/com/x8bit/bitwarden/BitwardenApplication.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/BitwardenApplication.kt
@@ -3,9 +3,9 @@ package com.x8bit.bitwarden
 import android.app.Application
 import com.x8bit.bitwarden.data.auth.manager.AuthRequestNotificationManager
 import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage
-import com.x8bit.bitwarden.data.platform.manager.LogsManager
+import com.x8bit.bitwarden.data.platform.manager.CrashLogsManager
+import com.x8bit.bitwarden.data.platform.manager.NetworkConfigManager
 import com.x8bit.bitwarden.data.platform.manager.event.OrganizationEventManager
-import com.x8bit.bitwarden.data.platform.manager.network.NetworkConfigManager
 import com.x8bit.bitwarden.data.platform.manager.restriction.RestrictionManager
 import dagger.hilt.android.HiltAndroidApp
 import javax.inject.Inject
@@ -19,10 +19,10 @@ class BitwardenApplication : Application() {
    // Inject classes here that must be triggered on startup but are not otherwise consumed by
    // other callers.
    @Inject
-    lateinit var logsManager: LogsManager
+    lateinit var networkConfigManager: NetworkConfigManager

    @Inject
-    lateinit var networkConfigManager: NetworkConfigManager
+    lateinit var crashLogsManager: CrashLogsManager

    @Inject
    lateinit var authRequestNotificationManager: AuthRequestNotificationManager
--- a/app/src/main/java/com/x8bit/bitwarden/BitwardenLegacyAppComponents.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/BitwardenLegacyAppComponents.kt
@@ -1,33 +0,0 @@
-package com.x8bit.bitwarden
-
-/**
- * The legacy name for the accessibility service.
- */
-const val LEGACY_ACCESSIBILITY_SERVICE_NAME: String =
-    "com.x8bit.bitwarden.Accessibility.AccessibilityService"
-
-/**
- * The legacy name for the autofill service.
- */
-const val LEGACY_AUTOFILL_SERVICE_NAME: String = "com.x8bit.bitwarden.Autofill.AutofillService"
-
-/**
- * The legacy name for the accessibility autofill tile service.
- */
-const val LEGACY_AUTOFILL_TILE_SERVICE_NAME: String = "com.x8bit.bitwarden.AutofillTileService"
-
-/**
- * The legacy name for the credential service.
- */
-const val LEGACY_CREDENTIAL_SERVICE_NAME: String =
-    "com.x8bit.bitwarden.Autofill.CredentialProviderService"
-
-/**
- * The legacy name for the generator tile service.
- */
-const val LEGACY_GENERATOR_TILE_SERVICE_NAME: String = "com.x8bit.bitwarden.GeneratorTileService"
-
-/**
- * The legacy name for the vault tile service.
- */
-const val LEGACY_VAULT_TILE_SERVICE_NAME: String = "com.x8bit.bitwarden.MyVaultTileService"
--- a/app/src/main/java/com/x8bit/bitwarden/MainActivity.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/MainActivity.kt
@@ -2,33 +2,26 @@ package com.x8bit.bitwarden

 import android.content.Intent
 import android.os.Bundle
-import android.view.KeyEvent
-import android.view.MotionEvent
 import android.view.WindowManager
-import android.widget.Toast
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
 import androidx.core.os.LocaleListCompat
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.navigation.compose.rememberNavController
-import com.x8bit.bitwarden.data.autofill.accessibility.manager.AccessibilityCompletionManager
+import androidx.lifecycle.lifecycleScope
 import com.x8bit.bitwarden.data.autofill.manager.AutofillActivityManager
 import com.x8bit.bitwarden.data.autofill.manager.AutofillCompletionManager
 import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage
-import com.x8bit.bitwarden.data.platform.manager.util.ObserveScreenDataEffect
 import com.x8bit.bitwarden.data.platform.repository.SettingsRepository
-import com.x8bit.bitwarden.ui.platform.base.util.EventsEffect
 import com.x8bit.bitwarden.ui.platform.composition.LocalManagerProvider
-import com.x8bit.bitwarden.ui.platform.feature.debugmenu.manager.DebugMenuLaunchManager
-import com.x8bit.bitwarden.ui.platform.feature.debugmenu.navigateToDebugMenuScreen
 import com.x8bit.bitwarden.ui.platform.feature.rootnav.RootNavScreen
 import com.x8bit.bitwarden.ui.platform.theme.BitwardenTheme
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import javax.inject.Inject

 /**
@@ -46,21 +39,16 @@ class MainActivity : AppCompatActivity() {
    @Inject
    lateinit var autofillCompletionManager: AutofillCompletionManager

-    @Inject
-    lateinit var accessibilityCompletionManager: AccessibilityCompletionManager
-
    @Inject
    lateinit var settingsRepository: SettingsRepository

-    @Inject
-    lateinit var debugLaunchManager: DebugMenuLaunchManager
-
-    @Suppress("LongMethod")
    override fun onCreate(savedInstanceState: Bundle?) {
        var shouldShowSplashScreen = true
        installSplashScreen().setKeepOnScreenCondition { shouldShowSplashScreen }
        super.onCreate(savedInstanceState)

+        observeViewModelEvents()
+
        if (savedInstanceState == null) {
            mainViewModel.trySendAction(
                MainAction.ReceiveFirstIntent(
@@ -69,62 +57,20 @@ class MainActivity : AppCompatActivity() {
            )
        }

-        // Within the app the language and theme will change dynamically and will be managed by the
-        // OS, but we need to ensure we properly set the values when upgrading from older versions
-        // that handle this differently or when the activity restarts.
+        // Within the app the language will change dynamically and will be managed
+        // by the OS, but we need to ensure we properly set the language when
+        // upgrading from older versions that handle this differently.
        settingsRepository.appLanguage.localeName?.let { localeName ->
            val localeList = LocaleListCompat.forLanguageTags(localeName)
            AppCompatDelegate.setApplicationLocales(localeList)
        }
-        AppCompatDelegate.setDefaultNightMode(settingsRepository.appTheme.osValue)
        setContent {
            val state by mainViewModel.stateFlow.collectAsStateWithLifecycle()
-            val navController = rememberNavController()
-            EventsEffect(viewModel = mainViewModel) { event ->
-                when (event) {
-                    is MainEvent.CompleteAccessibilityAutofill -> {
-                        handleCompleteAccessibilityAutofill(event)
-                    }
-
-                    is MainEvent.CompleteAutofill -> handleCompleteAutofill(event)
-                    MainEvent.Recreate -> handleRecreate()
-                    MainEvent.NavigateToDebugMenu -> navController.navigateToDebugMenuScreen()
-                    is MainEvent.ShowToast -> {
-                        Toast
-                            .makeText(
-                                baseContext,
-                                event.message.invoke(resources),
-                                Toast.LENGTH_SHORT,
-                            )
-                            .show()
-                    }
-
-                    is MainEvent.UpdateAppLocale -> {
-                        AppCompatDelegate.setApplicationLocales(
-                            LocaleListCompat.forLanguageTags(event.localeName),
-                        )
-                    }
-
-                    is MainEvent.UpdateAppTheme -> {
-                        AppCompatDelegate.setDefaultNightMode(event.osTheme)
-                    }
-                }
-            }
            updateScreenCapture(isScreenCaptureAllowed = state.isScreenCaptureAllowed)
            LocalManagerProvider {
-                ObserveScreenDataEffect(
-                    onDataUpdate = remember(mainViewModel) {
-                        {
-                            mainViewModel.trySendAction(
-                                MainAction.ResumeScreenDataReceived(it),
-                            )
-                        }
-                    },
-                )
                BitwardenTheme(theme = state.theme) {
                    RootNavScreen(
                        onSplashScreenRemoved = { shouldShowSplashScreen = false },
-                        navController = navController,
                    )
                }
            }
@@ -147,27 +93,16 @@ class MainActivity : AppCompatActivity() {
        currentFocus?.clearFocus()
    }

-    override fun dispatchTouchEvent(event: MotionEvent): Boolean = debugLaunchManager
-        .actionOnInputEvent(event = event, action = ::sendOpenDebugMenuEvent)
-        .takeIf { it }
-        ?: super.dispatchTouchEvent(event)
-
-    override fun dispatchKeyEvent(event: KeyEvent): Boolean = debugLaunchManager
-        .actionOnInputEvent(event = event, action = ::sendOpenDebugMenuEvent)
-        .takeIf { it }
-        ?: super.dispatchKeyEvent(event)
-
-    private fun sendOpenDebugMenuEvent() {
-        mainViewModel.trySendAction(MainAction.OpenDebugMenu)
-    }
-
-    private fun handleCompleteAccessibilityAutofill(
-        event: MainEvent.CompleteAccessibilityAutofill,
-    ) {
-        accessibilityCompletionManager.completeAccessibilityAutofill(
-            activity = this,
-            cipherView = event.cipherView,
-        )
+    private fun observeViewModelEvents() {
+        mainViewModel
+            .eventFlow
+            .onEach { event ->
+                when (event) {
+                    is MainEvent.CompleteAutofill -> handleCompleteAutofill(event)
+                    MainEvent.Recreate -> handleRecreate()
+                }
+            }
+            .launchIn(lifecycleScope)
    }

    private fun handleCompleteAutofill(event: MainEvent.CompleteAutofill) {
--- a/app/src/main/java/com/x8bit/bitwarden/MainViewModel.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/MainViewModel.kt
@@ -5,52 +5,34 @@ import android.os.Parcelable
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
 import com.bitwarden.vault.CipherView
-import com.x8bit.bitwarden.data.auth.manager.AddTotpItemFromAuthenticatorManager
 import com.x8bit.bitwarden.data.auth.repository.AuthRepository
-import com.x8bit.bitwarden.data.auth.repository.model.EmailTokenResult
 import com.x8bit.bitwarden.data.auth.util.getCompleteRegistrationDataIntentOrNull
 import com.x8bit.bitwarden.data.auth.util.getPasswordlessRequestDataIntentOrNull
-import com.x8bit.bitwarden.data.autofill.accessibility.manager.AccessibilitySelectionManager
 import com.x8bit.bitwarden.data.autofill.fido2.manager.Fido2CredentialManager
-import com.x8bit.bitwarden.data.autofill.fido2.util.getFido2AssertionRequestOrNull
-import com.x8bit.bitwarden.data.autofill.fido2.util.getFido2CreateCredentialRequestOrNull
-import com.x8bit.bitwarden.data.autofill.fido2.util.getFido2GetCredentialsRequestOrNull
+import com.x8bit.bitwarden.data.autofill.fido2.util.getFido2CredentialRequestOrNull
 import com.x8bit.bitwarden.data.autofill.manager.AutofillSelectionManager
 import com.x8bit.bitwarden.data.autofill.util.getAutofillSaveItemOrNull
 import com.x8bit.bitwarden.data.autofill.util.getAutofillSelectionDataOrNull
-import com.x8bit.bitwarden.data.platform.manager.AppResumeManager
 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.SpecialCircumstance
-import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository
 import com.x8bit.bitwarden.data.platform.repository.SettingsRepository
-import com.x8bit.bitwarden.data.platform.util.isAddTotpLoginItemFromAuthenticator
 import com.x8bit.bitwarden.data.vault.manager.model.VaultStateEvent
 import com.x8bit.bitwarden.data.vault.repository.VaultRepository
 import com.x8bit.bitwarden.ui.platform.base.BaseViewModel
-import com.x8bit.bitwarden.ui.platform.base.util.Text
-import com.x8bit.bitwarden.ui.platform.base.util.asText
 import com.x8bit.bitwarden.ui.platform.feature.settings.appearance.model.AppTheme
 import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
-import com.x8bit.bitwarden.ui.platform.util.isAccountSecurityShortcut
 import com.x8bit.bitwarden.ui.platform.util.isMyVaultShortcut
 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.delay
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.drop
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
 import kotlinx.parcelize.Parcelize
-import java.time.Clock
 import javax.inject.Inject

 private const val SPECIAL_CIRCUMSTANCE_KEY = "special-circumstance"
@@ -61,9 +43,7 @@ private const val SPECIAL_CIRCUMSTANCE_KEY = "special-circumstance"
@Suppress("LongParameterList", "TooManyFunctions")
@HiltViewModel
 class MainViewModel @Inject constructor(
-    accessibilitySelectionManager: AccessibilitySelectionManager,
    autofillSelectionManager: AutofillSelectionManager,
-    private val addTotpItemFromAuthenticatorManager: AddTotpItemFromAuthenticatorManager,
    private val specialCircumstanceManager: SpecialCircumstanceManager,
    private val garbageCollectionManager: GarbageCollectionManager,
    private val fido2CredentialManager: Fido2CredentialManager,
@@ -71,10 +51,7 @@ class MainViewModel @Inject constructor(
    settingsRepository: SettingsRepository,
    private val vaultRepository: VaultRepository,
    private val authRepository: AuthRepository,
-    private val environmentRepository: EnvironmentRepository,
    private val savedStateHandle: SavedStateHandle,
-    private val appResumeManager: AppResumeManager,
-    private val clock: Clock,
 ) : BaseViewModel<MainState, MainEvent, MainAction>(
    initialState = MainState(
        theme = settingsRepository.appTheme,
@@ -96,12 +73,6 @@ class MainViewModel @Inject constructor(
            .onEach { specialCircumstance = it }
            .launchIn(viewModelScope)

-        accessibilitySelectionManager
-            .accessibilitySelectionFlow
-            .map { MainAction.Internal.AccessibilitySelectionReceive(it) }
-            .onEach(::sendAction)
-            .launchIn(viewModelScope)
-
        autofillSelectionManager
            .autofillSelectionFlow
            .onEach { trySendAction(MainAction.Internal.AutofillSelectionReceive(it)) }
@@ -111,11 +82,6 @@ class MainViewModel @Inject constructor(
            .appThemeStateFlow
            .onEach { trySendAction(MainAction.Internal.ThemeUpdate(it)) }
            .launchIn(viewModelScope)
-        settingsRepository
-            .appLanguageStateFlow
-            .map { MainEvent.UpdateAppLocale(it.localeName) }
-            .onEach(::sendEvent)
-            .launchIn(viewModelScope)

        settingsRepository
            .isScreenCaptureAllowedStateFlow
@@ -145,10 +111,6 @@ class MainViewModel @Inject constructor(
            .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.
-                        @Suppress("MagicNumber")
-                        delay(500)
                        trySendAction(MainAction.Internal.VaultUnlockStateChange)
                    }

@@ -156,27 +118,10 @@ class MainViewModel @Inject constructor(
                }
            }
            .launchIn(viewModelScope)
-
-        // On app launch, mark all active users as having previously logged in.
-        // This covers any users who are active prior to this value being recorded.
-        viewModelScope.launch {
-            val userState = authRepository
-                .userStateFlow
-                .first()
-            userState
-                ?.accounts
-                ?.forEach {
-                    settingsRepository.storeUserHasLoggedInValue(it.userId)
-                }
-        }
    }

    override fun handleAction(action: MainAction) {
        when (action) {
-            is MainAction.Internal.AccessibilitySelectionReceive -> {
-                handleAccessibilitySelectionReceive(action)
-            }
-
            is MainAction.Internal.AutofillSelectionReceive -> {
                handleAutofillSelectionReceive(action)
            }
@@ -187,33 +132,12 @@ class MainViewModel @Inject constructor(
            is MainAction.Internal.VaultUnlockStateChange -> handleVaultUnlockStateChange()
            is MainAction.ReceiveFirstIntent -> handleFirstIntentReceived(action)
            is MainAction.ReceiveNewIntent -> handleNewIntentReceived(action)
-            MainAction.OpenDebugMenu -> handleOpenDebugMenu()
-            is MainAction.ResumeScreenDataReceived -> handleAppResumeDataUpdated(action)
        }
    }

-    private fun handleAppResumeDataUpdated(action: MainAction.ResumeScreenDataReceived) {
-        when (val data = action.screenResumeData) {
-            null -> appResumeManager.clearResumeScreen()
-            else -> appResumeManager.setResumeScreen(data)
-        }
-    }
-
-    private fun handleOpenDebugMenu() {
-        sendEvent(MainEvent.NavigateToDebugMenu)
-    }
-
-    private fun handleAccessibilitySelectionReceive(
-        action: MainAction.Internal.AccessibilitySelectionReceive,
-    ) {
-        specialCircumstanceManager.specialCircumstance = null
-        sendEvent(MainEvent.CompleteAccessibilityAutofill(cipherView = action.cipherView))
-    }
-
    private fun handleAutofillSelectionReceive(
        action: MainAction.Internal.AutofillSelectionReceive,
    ) {
-        specialCircumstanceManager.specialCircumstance = null
        sendEvent(MainEvent.CompleteAutofill(cipherView = action.cipherView))
    }

@@ -227,7 +151,6 @@ class MainViewModel @Inject constructor(

    private fun handleAppThemeUpdated(action: MainAction.Internal.ThemeUpdate) {
        mutableStateFlow.update { it.copy(theme = action.theme) }
-        sendEvent(MainEvent.UpdateAppTheme(osTheme = action.theme.osValue))
    }

    private fun handleVaultUnlockStateChange() {
@@ -248,7 +171,6 @@ class MainViewModel @Inject constructor(
        )
    }

-    @Suppress("LongMethod", "CyclomaticComplexMethod")
    private fun handleIntent(
        intent: Intent,
        isFirstIntent: Boolean,
@@ -257,39 +179,12 @@ class MainViewModel @Inject constructor(
        val autofillSaveItem = intent.getAutofillSaveItemOrNull()
        val autofillSelectionData = intent.getAutofillSelectionDataOrNull()
        val shareData = intentManager.getShareDataFromIntent(intent)
-        val totpData: TotpData? =
-            // First grab TOTP URI directly from the intent data:
-            intent.getTotpDataOrNull()
-                ?: run {
-                    // Then check to see if the intent is coming from the Authenticator app:
-                    if (intent.isAddTotpLoginItemFromAuthenticator()) {
-                        addTotpItemFromAuthenticatorManager.pendingAddTotpLoginItemData.also {
-                            // Clear pending add TOTP data so it is only handled once:
-                            addTotpItemFromAuthenticatorManager.pendingAddTotpLoginItemData = null
-                        }
-                    } else {
-                        null
-                    }
-                }
        val hasGeneratorShortcut = intent.isPasswordGeneratorShortcut
        val hasVaultShortcut = intent.isMyVaultShortcut
-        val hasAccountSecurityShortcut = intent.isAccountSecurityShortcut
-        val fido2CreateCredentialRequestData = intent.getFido2CreateCredentialRequestOrNull()
+        val fido2CredentialRequestData = intent.getFido2CredentialRequestOrNull()
        val completeRegistrationData = intent.getCompleteRegistrationDataIntentOrNull()
-        val fido2CredentialAssertionRequest = intent.getFido2AssertionRequestOrNull()
-        val fido2GetCredentialsRequest = intent.getFido2GetCredentialsRequestOrNull()
        when {
            passwordlessRequestData != null -> {
-                authRepository.activeUserId?.let {
-                    if (it != passwordlessRequestData.userId &&
-                        !vaultRepository.isVaultUnlocked(it)
-                    ) {
-                        // We only switch the account here if the current user's vault is not
-                        // unlocked, otherwise prompt the user to allow us to change the account
-                        // in the LoginApprovalScreen
-                        authRepository.switchAccount(passwordlessRequestData.userId)
-                    }
-                }
                specialCircumstanceManager.specialCircumstance =
                    SpecialCircumstance.PasswordlessRequest(
                        passwordlessRequestData = passwordlessRequestData,
@@ -300,7 +195,11 @@ class MainViewModel @Inject constructor(
            }

            completeRegistrationData != null -> {
-                handleCompleteRegistrationData(completeRegistrationData)
+                specialCircumstanceManager.specialCircumstance =
+                    SpecialCircumstance.CompleteRegistration(
+                        completeRegistrationData = completeRegistrationData,
+                        timestamp = System.currentTimeMillis()
+                    )
            }

            autofillSaveItem != null -> {
@@ -320,11 +219,6 @@ class MainViewModel @Inject constructor(
                    )
            }

-            totpData != null -> {
-                specialCircumstanceManager.specialCircumstance =
-                    SpecialCircumstance.AddTotpLoginItem(data = totpData)
-            }
-
            shareData != null -> {
                specialCircumstanceManager.specialCircumstance =
                    SpecialCircumstance.ShareNewSend(
@@ -335,44 +229,24 @@ class MainViewModel @Inject constructor(
                    )
            }

-            fido2CreateCredentialRequestData != null -> {
+            fido2CredentialRequestData != null -> {
                // Set the user's verification status when a new FIDO 2 request is received to force
                // explicit verification if the user's vault is unlocked when the request is
                // received.
-                fido2CreateCredentialRequestData.isUserVerified
-                    ?.let { isVerified -> fido2CredentialManager.isUserVerified = isVerified }
+                fido2CredentialManager.isUserVerified = false
                specialCircumstanceManager.specialCircumstance =
                    SpecialCircumstance.Fido2Save(
-                        fido2CreateCredentialRequest = fido2CreateCredentialRequestData,
+                        fido2CredentialRequest = fido2CredentialRequestData,
                    )

                // Switch accounts if the selected user is not the active user.
                if (authRepository.activeUserId != null &&
-                    authRepository.activeUserId != fido2CreateCredentialRequestData.userId
+                    authRepository.activeUserId != fido2CredentialRequestData.userId
                ) {
-                    authRepository.switchAccount(fido2CreateCredentialRequestData.userId)
+                    authRepository.switchAccount(fido2CredentialRequestData.userId)
                }
            }

-            fido2CredentialAssertionRequest != null -> {
-                // If device biometric verification was performed as part of single-tap
-                // authentication, set the user's verification state to the device result.
-                // Otherwise, retain the verification state as-is.
-                fido2CredentialAssertionRequest.isUserVerified
-                    ?.let { isVerified -> fido2CredentialManager.isUserVerified = isVerified }
-                specialCircumstanceManager.specialCircumstance =
-                    SpecialCircumstance.Fido2Assertion(
-                        fido2AssertionRequest = fido2CredentialAssertionRequest,
-                    )
-            }
-
-            fido2GetCredentialsRequest != null -> {
-                specialCircumstanceManager.specialCircumstance =
-                    SpecialCircumstance.Fido2GetCredentials(
-                        fido2GetCredentialsRequest = fido2GetCredentialsRequest,
-                    )
-            }
-
            hasGeneratorShortcut -> {
                specialCircumstanceManager.specialCircumstance =
                    SpecialCircumstance.GeneratorShortcut
@@ -381,11 +255,6 @@ class MainViewModel @Inject constructor(
            hasVaultShortcut -> {
                specialCircumstanceManager.specialCircumstance = SpecialCircumstance.VaultShortcut
            }
-
-            hasAccountSecurityShortcut -> {
-                specialCircumstanceManager.specialCircumstance =
-                    SpecialCircumstance.AccountSecurityShortcut
-            }
        }
    }

@@ -393,49 +262,6 @@ class MainViewModel @Inject constructor(
        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
-            // saved.
-            environmentRepository.loadEnvironmentForEmail(userEmail = data.email)
-            // Determine if the token is still valid.
-            val emailTokenResult = authRepository.validateEmailToken(
-                email = data.email,
-                token = data.verificationToken,
-            )
-            when (emailTokenResult) {
-                is EmailTokenResult.Error -> {
-                    sendEvent(
-                        MainEvent.ShowToast(
-                            message = emailTokenResult
-                                .message
-                                ?.asText()
-                                ?: R.string.there_was_an_issue_validating_the_registration_token
-                                    .asText(),
-                        ),
-                    )
-                }
-
-                EmailTokenResult.Expired -> {
-                    specialCircumstanceManager.specialCircumstance = SpecialCircumstance
-                        .RegistrationEvent
-                        .ExpiredRegistrationLink
-                }
-
-                EmailTokenResult.Success -> {
-                    if (authRepository.activeUserId != null) {
-                        authRepository.hasPendingAccountAddition = true
-                    }
-                    specialCircumstanceManager.specialCircumstance =
-                        SpecialCircumstance.RegistrationEvent.CompleteRegistration(
-                            completeRegistrationData = data,
-                            timestamp = clock.millis(),
-                        )
-                }
-            }
-        }
-    }
 }

 /**
@@ -461,28 +287,10 @@ sealed class MainAction {
     */
    data class ReceiveNewIntent(val intent: Intent) : MainAction()

-    /**
-     * Receive event to open the debug menu.
-     */
-    data object OpenDebugMenu : MainAction()
-
-    /**
-     * Receive event to save the app resume screen
-     */
-    data class ResumeScreenDataReceived(val screenResumeData: AppResumeScreenData?) : MainAction()
-
    /**
     * Actions for internal use by the ViewModel.
     */
    sealed class Internal : MainAction() {
-        /**
-         * Indicates the user has manually selected the given [cipherView] for accessibility
-         * autofill.
-         */
-        data class AccessibilitySelectionReceive(
-            val cipherView: CipherView,
-        ) : Internal()
-
        /**
         * Indicates the user has manually selected the given [cipherView] for autofill.
         */
@@ -520,12 +328,6 @@ sealed class MainAction {
 * Represents events that are emitted by the [MainViewModel].
 */
 sealed class MainEvent {
-    /**
-     * Event indicating that the user has chosen the given [cipherView] for accessibility autofill
-     * and that the process is ready to complete.
-     */
-    data class CompleteAccessibilityAutofill(val cipherView: CipherView) : MainEvent()
-
    /**
     * Event indicating that the user has chosen the given [cipherView] for autofill and that the
     * process is ready to complete.
@@ -536,28 +338,4 @@ sealed class MainEvent {
     * Event indicating that the UI should recreate itself.
     */
    data object Recreate : MainEvent()
-
-    /**
-     * Navigate to the debug menu.
-     */
-    data object NavigateToDebugMenu : MainEvent()
-
-    /**
-     * Show a toast with the given [message].
-     */
-    data class ShowToast(val message: Text) : MainEvent()
-
-    /**
-     * Indicates that the app language has been updated.
-     */
-    data class UpdateAppLocale(
-        val localeName: String?,
-    ) : MainEvent()
-
-    /**
-     * Indicates that the app theme has been updated.
-     */
-    data class UpdateAppTheme(
-        val osTheme: Int,
-    ) : MainEvent()
 }
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSource.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSource.kt
@@ -1,26 +1,17 @@
 package com.x8bit.bitwarden.data.auth.datasource.disk

 import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountTokensJson
-import com.x8bit.bitwarden.data.auth.datasource.disk.model.NewDeviceNoticeState
-import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus
+import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson
 import com.x8bit.bitwarden.data.auth.datasource.disk.model.PendingAuthRequestJson
 import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson
 import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson
 import kotlinx.coroutines.flow.Flow
-import java.time.Instant

 /**
 * Primary access point for disk information.
 */
@Suppress("TooManyFunctions")
 interface AuthDiskSource {
-
-    /**
-     * The currently persisted authenticator sync symmetric key. This key is used for
-     * encrypting IPC traffic.
-     */
-    var authenticatorSyncSymmetricKey: ByteArray?
-
    /**
     * Retrieves a unique ID for the application that is stored locally. This will generate a new
     * one if it does not yet exist and it will only be reset for new installs or when clearing
@@ -55,49 +46,12 @@ interface AuthDiskSource {
     */
    fun clearData(userId: String)

-    /**
-     * Get the authenticator sync unlock key. Null means there is no key, which means the user
-     * has not enabled authenticator syncing
-     */
-    fun getAuthenticatorSyncUnlockKey(userId: String): String?
-
-    /**
-     * Store the authenticator sync unlock key. Storing a null key effectively disables
-     * authenticator syncing.
-     */
-    fun storeAuthenticatorSyncUnlockKey(userId: String, authenticatorSyncUnlockKey: String?)
-
-    /**
-     * Retrieves the state indicating that the user should use a key connector.
-     */
-    fun getShouldUseKeyConnector(userId: String): Boolean?
-
-    /**
-     * Retrieves the state indicating that the user should use a key connector as a flow.
-     */
-    fun getShouldUseKeyConnectorFlow(userId: String): Flow<Boolean?>
-
-    /**
-     * Stores the boolean indicating that the user should use a key connector.
-     */
-    fun storeShouldUseKeyConnector(userId: String, shouldUseKeyConnector: Boolean?)
-
-    /**
-     * Retrieves the state indicating that the user has completed login with TDE.
-     */
-    fun getIsTdeLoginComplete(userId: String): Boolean?
-
-    /**
-     * Stores the boolean indicating that the user has completed login with TDE.
-     */
-    fun storeIsTdeLoginComplete(userId: String, isTdeLoginComplete: Boolean?)
-
    /**
     * Retrieves the state indicating that the user has chosen to trust this device.
     *
     * Note: This indicates intent to trust the device, the device may not be trusted yet.
     */
-    fun getShouldTrustDevice(userId: String): Boolean?
+    fun getShouldTrustDevice(userId: String): Boolean

    /**
     * Stores the boolean indicating that the user has chosen to trust this device for the given
@@ -107,6 +61,25 @@ interface AuthDiskSource {
     */
    fun storeShouldTrustDevice(userId: String, shouldTrustDevice: Boolean?)

+    /**
+     * Retrieves the "last active time" for the given [userId], in milliseconds.
+     *
+     * This time is intended to be derived from a call to
+     * [SystemClock.elapsedRealtime()](https://developer.android.com/reference/android/os/SystemClock#elapsedRealtime())
+     */
+    fun getLastActiveTimeMillis(userId: String): Long?
+
+    /**
+     * Stores the [lastActiveTimeMillis] for the given [userId].
+     *
+     * This time is intended to be derived from a call to
+     * [SystemClock.elapsedRealtime()](https://developer.android.com/reference/android/os/SystemClock#elapsedRealtime())
+     */
+    fun storeLastActiveTimeMillis(
+        userId: String,
+        lastActiveTimeMillis: Long?,
+    )
+
    /**
     * Retrieves the number of consecutive invalid lock attempts for the given [userId].
     */
@@ -173,16 +146,6 @@ interface AuthDiskSource {
        pendingAuthRequest: PendingAuthRequestJson?,
    )

-    /**
-     * Gets the biometrics initialization vector for the given [userId].
-     */
-    fun getUserBiometricInitVector(userId: String): ByteArray?
-
-    /**
-     * Stores the biometrics initialization vector for the given [userId].
-     */
-    fun storeUserBiometricInitVector(userId: String, iv: ByteArray?)
-
    /**
     * Gets the biometrics key for the given [userId].
     */
@@ -193,11 +156,6 @@ interface AuthDiskSource {
     */
    fun storeUserBiometricUnlockKey(userId: String, biometricsKey: String?)

-    /**
-     * Gets the flow for the biometrics key for the given [userId].
-     */
-    fun getUserBiometicUnlockKeyFlow(userId: String): Flow<String?>
-
    /**
     * Retrieves a pin-protected user key for the given [userId].
     */
@@ -215,11 +173,6 @@ interface AuthDiskSource {
        inMemoryOnly: Boolean = false,
    )

-    /**
-     * Retrieves a flow for the pin-protected user key for the given [userId].
-     */
-    fun getPinProtectedUserKeyFlow(userId: String): Flow<String?>
-
    /**
     * Gets a two-factor auth token using a user's [email].
     */
@@ -314,53 +267,12 @@ interface AuthDiskSource {
    fun storeAccountTokens(userId: String, accountTokens: AccountTokensJson?)

    /**
-     * Gets the onboarding status for the given [userId].
+     * Gets the pre authentication urls for the given [userEmail].
     */
-    fun getOnboardingStatus(userId: String): OnboardingStatus?
+    fun getEmailVerificationUrls(userEmail: String): EnvironmentUrlDataJson?

    /**
-     * Stores the [onboardingStatus] for the given [userId].
+     * Stores the [urls] for the given [userEmail].
     */
-    fun storeOnboardingStatus(userId: String, onboardingStatus: OnboardingStatus?)
-
-    /**
-     *  Emits updates that track [getOnboardingStatus]. This will replay the last known value,
-     *  if any exists.
-     */
-    fun getOnboardingStatusFlow(userId: String): Flow<OnboardingStatus?>
-
-    /**
-     * Gets the show import logins flag for the given [userId].
-     */
-    fun getShowImportLogins(userId: String): Boolean?
-
-    /**
-     * Stores the show import logins flag for the given [userId].
-     */
-    fun storeShowImportLogins(userId: String, showImportLogins: Boolean?)
-
-    /**
-     * Emits updates that track [getShowImportLogins]. This will replay the last known value.
-     */
-    fun getShowImportLoginsFlow(userId: String): Flow<Boolean?>
-
-    /**
-     * Gets the new device notice state for the given [userId].
-     */
-    fun getNewDeviceNoticeState(userId: String): NewDeviceNoticeState
-
-    /**
-     * Stores the new device notice state for the given [userId].
-     */
-    fun storeNewDeviceNoticeState(userId: String, newState: NewDeviceNoticeState?)
-
-    /**
-     * Gets the last lock timestamp for the given [userId].
-     */
-    fun getLastLockTimestamp(userId: String): Instant?
-
-    /**
-     * Stores the last lock timestamp for the given [userId].
-     */
-    fun storeLastLockTimestamp(userId: String, lastLockTimestamp: Instant?)
+    fun storeEmailVerificationUrls(userEmail: String, urls: EnvironmentUrlDataJson)
 }
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceImpl.kt
@@ -2,9 +2,7 @@ package com.x8bit.bitwarden.data.auth.datasource.disk

 import android.content.SharedPreferences
 import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountTokensJson
-import com.x8bit.bitwarden.data.auth.datasource.disk.model.NewDeviceNoticeDisplayStatus
-import com.x8bit.bitwarden.data.auth.datasource.disk.model.NewDeviceNoticeState
-import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus
+import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson
 import com.x8bit.bitwarden.data.auth.datasource.disk.model.PendingAuthRequestJson
 import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson
 import com.x8bit.bitwarden.data.platform.datasource.disk.BaseEncryptedDiskSource
@@ -15,15 +13,12 @@ import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.onSubscription
+import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import java.time.Instant
 import java.util.UUID

 // These keys should be encrypted
 private const val ACCOUNT_TOKENS_KEY = "accountTokens"
-private const val AUTHENTICATOR_SYNC_SYMMETRIC_KEY = "authenticatorSyncSymmetric"
-private const val AUTHENTICATOR_SYNC_UNLOCK_KEY = "authenticatorSyncUnlock"
-private const val BIOMETRICS_INIT_VECTOR_KEY = "biometricInitializationVector"
 private const val BIOMETRICS_UNLOCK_KEY = "userKeyBiometricUnlock"
 private const val USER_AUTO_UNLOCK_KEY_KEY = "userKeyAutoUnlock"
 private const val DEVICE_KEY_KEY = "deviceKey"
@@ -34,6 +29,7 @@ private const val UNIQUE_APP_ID_KEY = "appId"
 private const val REMEMBERED_EMAIL_ADDRESS_KEY = "rememberedEmail"
 private const val REMEMBERED_ORG_IDENTIFIER_KEY = "rememberedOrgIdentifier"
 private const val STATE_KEY = "state"
+private const val LAST_ACTIVE_TIME_KEY = "lastActiveTime"
 private const val INVALID_UNLOCK_ATTEMPTS_KEY = "invalidUnlockAttempts"
 private const val MASTER_KEY_ENCRYPTION_USER_KEY = "masterKeyEncryptedUserKey"
 private const val MASTER_KEY_ENCRYPTION_PRIVATE_KEY = "encPrivateKey"
@@ -45,12 +41,7 @@ private const val TWO_FACTOR_TOKEN_KEY = "twoFactorToken"
 private const val MASTER_PASSWORD_HASH_KEY = "keyHash"
 private const val POLICIES_KEY = "policies"
 private const val SHOULD_TRUST_DEVICE_KEY = "shouldTrustDevice"
-private const val TDE_LOGIN_COMPLETE = "tdeLoginComplete"
-private const val USES_KEY_CONNECTOR = "usesKeyConnector"
-private const val ONBOARDING_STATUS_KEY = "onboardingStatus"
-private const val SHOW_IMPORT_LOGINS_KEY = "showImportLogins"
-private const val NEW_DEVICE_NOTICE_STATE = "newDeviceNoticeState"
-private const val LAST_LOCK_TIMESTAMP = "lastLockTimestamp"
+private const val EMAIL_VERIFICATION_URLS = "emailVerificationUrls"

 /**
 * Primary implementation of [AuthDiskSource].
@@ -68,21 +59,12 @@ class AuthDiskSourceImpl(
    AuthDiskSource {

    private val inMemoryPinProtectedUserKeys = mutableMapOf<String, String?>()
-    private val mutableShouldUseKeyConnectorFlowMap =
-        mutableMapOf<String, MutableSharedFlow<Boolean?>>()
    private val mutableOrganizationsFlowMap =
        mutableMapOf<String, MutableSharedFlow<List<SyncResponseJson.Profile.Organization>?>>()
    private val mutablePoliciesFlowMap =
        mutableMapOf<String, MutableSharedFlow<List<SyncResponseJson.Policy>?>>()
    private val mutableAccountTokensFlowMap =
        mutableMapOf<String, MutableSharedFlow<AccountTokensJson?>>()
-    private val mutableOnboardingStatusFlowMap =
-        mutableMapOf<String, MutableSharedFlow<OnboardingStatus?>>()
-    private val mutableShowImportLoginsFlowMap = mutableMapOf<String, MutableSharedFlow<Boolean?>>()
-    private val mutableBiometricUnlockKeyFlowMap =
-        mutableMapOf<String, MutableSharedFlow<String?>>()
-    private val mutablePinProtectedUserKeyFlowMap =
-        mutableMapOf<String, MutableSharedFlow<String?>>()
    private val mutableUserStateFlow = bufferedMutableSharedFlow<UserStateJson?>(replay = 1)

    override var userState: UserStateJson?
@@ -105,14 +87,6 @@ class AuthDiskSourceImpl(
        migrateAccountTokens()
    }

-    override var authenticatorSyncSymmetricKey: ByteArray?
-        set(value) {
-            val asString = value?.let { value.toString(Charsets.ISO_8859_1) }
-            putEncryptedString(AUTHENTICATOR_SYNC_SYMMETRIC_KEY, asString)
-        }
-        get() = getEncryptedString(AUTHENTICATOR_SYNC_SYMMETRIC_KEY)
-            ?.toByteArray(Charsets.ISO_8859_1)
-
    override val uniqueAppId: String
        get() = getString(key = UNIQUE_APP_ID_KEY) ?: generateAndStoreUniqueAppId()

@@ -139,6 +113,7 @@ class AuthDiskSourceImpl(
            .onSubscription { emit(userState) }

    override fun clearData(userId: String) {
+        storeLastActiveTimeMillis(userId = userId, lastActiveTimeMillis = null)
        storeInvalidUnlockAttempts(userId = userId, invalidUnlockAttempts = null)
        storeUserKey(userId = userId, userKey = null)
        storeUserAutoUnlockKey(userId = userId, userAutoUnlockKey = null)
@@ -147,67 +122,37 @@ class AuthDiskSourceImpl(
        storePrivateKey(userId = userId, privateKey = null)
        storeOrganizationKeys(userId = userId, organizationKeys = null)
        storeOrganizations(userId = userId, organizations = null)
-        storeUserBiometricInitVector(userId = userId, iv = null)
        storeUserBiometricUnlockKey(userId = userId, biometricsKey = null)
        storeMasterPasswordHash(userId = userId, passwordHash = null)
        storePolicies(userId = userId, policies = null)
        storeAccountTokens(userId = userId, accountTokens = null)
-        storeShouldUseKeyConnector(userId = userId, shouldUseKeyConnector = null)
-        storeIsTdeLoginComplete(userId = userId, isTdeLoginComplete = null)
-        storeAuthenticatorSyncUnlockKey(userId = userId, authenticatorSyncUnlockKey = null)
-        storeShowImportLogins(userId = userId, showImportLogins = null)
-        storeLastLockTimestamp(userId = userId, lastLockTimestamp = null)

        // Do not remove the DeviceKey or PendingAuthRequest on logout, these are persisted
        // indefinitely unless the TDE flow explicitly removes them.
-        // Do not remove OnboardingStatus we want to keep track of this even after logout.
    }

-    override fun getAuthenticatorSyncUnlockKey(userId: String): String? =
-        getEncryptedString(AUTHENTICATOR_SYNC_UNLOCK_KEY.appendIdentifier(userId))
-
-    override fun storeAuthenticatorSyncUnlockKey(
-        userId: String,
-        authenticatorSyncUnlockKey: String?,
-    ) {
-        putEncryptedString(
-            key = AUTHENTICATOR_SYNC_UNLOCK_KEY.appendIdentifier(userId),
-            value = authenticatorSyncUnlockKey,
+    override fun getShouldTrustDevice(userId: String): Boolean =
+        requireNotNull(
+            getBoolean(key = SHOULD_TRUST_DEVICE_KEY.appendIdentifier(userId), default = false),
        )
-    }
-
-    override fun getShouldUseKeyConnectorFlow(userId: String): Flow<Boolean?> =
-        getMutableShouldUseKeyConnectorFlowMap(userId = userId)
-            .onSubscription { emit(getShouldUseKeyConnector(userId = userId)) }
-
-    override fun getShouldUseKeyConnector(
-        userId: String,
-    ): Boolean? = getBoolean(key = USES_KEY_CONNECTOR.appendIdentifier(userId))
-
-    override fun storeShouldUseKeyConnector(userId: String, shouldUseKeyConnector: Boolean?) {
-        putBoolean(
-            key = USES_KEY_CONNECTOR.appendIdentifier(userId),
-            value = shouldUseKeyConnector,
-        )
-        getMutableShouldUseKeyConnectorFlowMap(userId = userId).tryEmit(shouldUseKeyConnector)
-    }
-
-    override fun getIsTdeLoginComplete(
-        userId: String,
-    ): Boolean? = getBoolean(key = TDE_LOGIN_COMPLETE.appendIdentifier(userId))
-
-    override fun storeIsTdeLoginComplete(userId: String, isTdeLoginComplete: Boolean?) {
-        putBoolean(TDE_LOGIN_COMPLETE.appendIdentifier(userId), isTdeLoginComplete)
-    }
-
-    override fun getShouldTrustDevice(
-        userId: String,
-    ): Boolean? = getBoolean(key = SHOULD_TRUST_DEVICE_KEY.appendIdentifier(userId))

    override fun storeShouldTrustDevice(userId: String, shouldTrustDevice: Boolean?) {
        putBoolean(SHOULD_TRUST_DEVICE_KEY.appendIdentifier(userId), shouldTrustDevice)
    }

+    override fun getLastActiveTimeMillis(userId: String): Long? =
+        getLong(key = LAST_ACTIVE_TIME_KEY.appendIdentifier(userId))
+
+    override fun storeLastActiveTimeMillis(
+        userId: String,
+        lastActiveTimeMillis: Long?,
+    ) {
+        putLong(
+            key = LAST_ACTIVE_TIME_KEY.appendIdentifier(userId),
+            value = lastActiveTimeMillis,
+        )
+    }
+
    override fun getInvalidUnlockAttempts(userId: String): Int? =
        getInt(key = INVALID_UNLOCK_ATTEMPTS_KEY.appendIdentifier(userId))

@@ -284,17 +229,6 @@ class AuthDiskSourceImpl(
        )
    }

-    override fun getUserBiometricInitVector(userId: String): ByteArray? =
-        getEncryptedString(key = BIOMETRICS_INIT_VECTOR_KEY.appendIdentifier(userId))
-            ?.toByteArray(Charsets.ISO_8859_1)
-
-    override fun storeUserBiometricInitVector(userId: String, iv: ByteArray?) {
-        putEncryptedString(
-            key = BIOMETRICS_INIT_VECTOR_KEY.appendIdentifier(userId),
-            value = iv?.toString(Charsets.ISO_8859_1),
-        )
-    }
-
    override fun getUserBiometricUnlockKey(userId: String): String? =
        getEncryptedString(key = BIOMETRICS_UNLOCK_KEY.appendIdentifier(userId))

@@ -306,13 +240,8 @@ class AuthDiskSourceImpl(
            key = BIOMETRICS_UNLOCK_KEY.appendIdentifier(userId),
            value = biometricsKey,
        )
-        getMutableBiometricUnlockKeyFlow(userId).tryEmit(biometricsKey)
    }

-    override fun getUserBiometicUnlockKeyFlow(userId: String): Flow<String?> =
-        getMutableBiometricUnlockKeyFlow(userId)
-            .onSubscription { emit(getUserBiometricUnlockKey(userId = userId)) }
-
    override fun getPinProtectedUserKey(userId: String): String? =
        inMemoryPinProtectedUserKeys[userId]
            ?: getString(key = PIN_PROTECTED_USER_KEY_KEY.appendIdentifier(userId))
@@ -328,13 +257,8 @@ class AuthDiskSourceImpl(
            key = PIN_PROTECTED_USER_KEY_KEY.appendIdentifier(userId),
            value = pinProtectedUserKey,
        )
-        getMutablePinProtectedUserKeyFlow(userId).tryEmit(pinProtectedUserKey)
    }

-    override fun getPinProtectedUserKeyFlow(userId: String): Flow<String?> =
-        getMutablePinProtectedUserKeyFlow(userId)
-            .onSubscription { emit(getPinProtectedUserKey(userId = userId)) }
-
    override fun getTwoFactorToken(email: String): String? =
        getString(key = TWO_FACTOR_TOKEN_KEY.appendIdentifier(email))

@@ -454,69 +378,23 @@ class AuthDiskSourceImpl(
        getMutableAccountTokensFlow(userId = userId).tryEmit(accountTokens)
    }

-    override fun getOnboardingStatus(userId: String): OnboardingStatus? {
-        return getString(key = ONBOARDING_STATUS_KEY.appendIdentifier(userId))?.let {
-            json.decodeFromStringOrNull(it)
-        }
-    }
-
-    override fun storeOnboardingStatus(userId: String, onboardingStatus: OnboardingStatus?) {
+    override fun storeEmailVerificationUrls(
+        userEmail: String,
+        urls: EnvironmentUrlDataJson,
+    ) {
        putString(
-            key = ONBOARDING_STATUS_KEY.appendIdentifier(userId),
-            value = onboardingStatus?.let { json.encodeToString(it) },
-        )
-        getMutableOnboardingStatusFlow(userId = userId).tryEmit(onboardingStatus)
-    }
-
-    override fun getOnboardingStatusFlow(userId: String): Flow<OnboardingStatus?> {
-        return getMutableOnboardingStatusFlow(userId = userId)
-            .onSubscription { emit(getOnboardingStatus(userId = userId)) }
-    }
-
-    override fun getShowImportLogins(userId: String): Boolean? {
-        return getBoolean(SHOW_IMPORT_LOGINS_KEY.appendIdentifier(userId))
-    }
-
-    override fun storeShowImportLogins(userId: String, showImportLogins: Boolean?) {
-        putBoolean(
-            key = SHOW_IMPORT_LOGINS_KEY.appendIdentifier(userId),
-            value = showImportLogins,
-        )
-        getMutableShowImportLoginsFlow(userId = userId).tryEmit(showImportLogins)
-    }
-
-    override fun getShowImportLoginsFlow(userId: String): Flow<Boolean?> =
-        getMutableShowImportLoginsFlow(userId)
-            .onSubscription { emit(getShowImportLogins(userId)) }
-
-    override fun getNewDeviceNoticeState(userId: String): NewDeviceNoticeState {
-        return getString(key = NEW_DEVICE_NOTICE_STATE.appendIdentifier(userId))?.let {
-            json.decodeFromStringOrNull(it)
-        } ?: NewDeviceNoticeState(
-            displayStatus = NewDeviceNoticeDisplayStatus.HAS_NOT_SEEN,
-            lastSeenDate = null,
+            key = EMAIL_VERIFICATION_URLS.appendIdentifier(userEmail),
+            value = json.encodeToString(urls),
        )
    }

-    override fun storeNewDeviceNoticeState(userId: String, newState: NewDeviceNoticeState?) {
-        putString(
-            key = NEW_DEVICE_NOTICE_STATE.appendIdentifier(userId),
-            value = newState?.let { json.encodeToString(it) },
-        )
-    }
-
-    override fun getLastLockTimestamp(userId: String): Instant? {
-        return getLong(key = LAST_LOCK_TIMESTAMP.appendIdentifier(userId))?.let {
-            Instant.ofEpochMilli(it)
-        }
-    }
-
-    override fun storeLastLockTimestamp(userId: String, lastLockTimestamp: Instant?) {
-        putLong(
-            key = LAST_LOCK_TIMESTAMP.appendIdentifier(userId),
-            value = lastLockTimestamp?.toEpochMilli(),
-        )
-    }
+    override fun getEmailVerificationUrls(
+        userEmail: String,
+    ): EnvironmentUrlDataJson? =
+        getString(key = EMAIL_VERIFICATION_URLS.appendIdentifier(userEmail))
+            ?.let {
+                json.decodeFromStringOrNull(it)
+            }

    private fun generateAndStoreUniqueAppId(): String =
        UUID
@@ -526,20 +404,6 @@ class AuthDiskSourceImpl(
                putString(key = UNIQUE_APP_ID_KEY, value = it)
            }

-    private fun getMutableOnboardingStatusFlow(
-        userId: String,
-    ): MutableSharedFlow<OnboardingStatus?> =
-        mutableOnboardingStatusFlowMap.getOrPut(userId) {
-            bufferedMutableSharedFlow(replay = 1)
-        }
-
-    private fun getMutableShouldUseKeyConnectorFlowMap(
-        userId: String,
-    ): MutableSharedFlow<Boolean?> =
-        mutableShouldUseKeyConnectorFlowMap.getOrPut(userId) {
-            bufferedMutableSharedFlow(replay = 1)
-        }
-
    private fun getMutableOrganizationsFlow(
        userId: String,
    ): MutableSharedFlow<List<SyncResponseJson.Profile.Organization>?> =
@@ -561,24 +425,6 @@ class AuthDiskSourceImpl(
            bufferedMutableSharedFlow(replay = 1)
        }

-    private fun getMutableShowImportLoginsFlow(
-        userId: String,
-    ): MutableSharedFlow<Boolean?> = mutableShowImportLoginsFlowMap.getOrPut(userId) {
-        bufferedMutableSharedFlow(replay = 1)
-    }
-
-    private fun getMutableBiometricUnlockKeyFlow(
-        userId: String,
-    ): MutableSharedFlow<String?> = mutableBiometricUnlockKeyFlowMap.getOrPut(userId) {
-        bufferedMutableSharedFlow(replay = 1)
-    }
-
-    private fun getMutablePinProtectedUserKeyFlow(
-        userId: String,
-    ): MutableSharedFlow<String?> = mutablePinProtectedUserKeyFlowMap.getOrPut(userId) {
-        bufferedMutableSharedFlow(replay = 1)
-    }
-
    private fun migrateAccountTokens() {
        userState
            ?.accounts
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/model/AccountJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/model/AccountJson.kt
@@ -2,12 +2,8 @@ package com.x8bit.bitwarden.data.auth.datasource.disk.model

 import com.x8bit.bitwarden.data.auth.datasource.network.model.KdfTypeJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.UserDecryptionOptionsJson
-import kotlinx.serialization.Contextual
-import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonNames
-import java.time.ZonedDateTime

 /**
 * Represents the current account information for a given user.
@@ -37,7 +33,6 @@ data class AccountJson(
     * @property userId The ID of the user.
     * @property email The user's email address.
     * @property isEmailVerified Whether or not the user's email is verified.
-     * @property isTwoFactorEnabled If the profile has two factor authentication enabled.
     * @property name The user's name (if applicable).
     * @property stamp The account's security stamp (if applicable).
     * @property organizationId The ID of the associated organization (if applicable).
@@ -49,9 +44,7 @@ data class AccountJson(
     * @property kdfMemory The amount of memory to use when calculating a password hash (MB).
     * @property kdfParallelism The number of threads to use when calculating a password hash.
     * @property userDecryptionOptions The options available to a user for decryption.
-     * @property creationDate The creation date of the account.
     */
-    @OptIn(ExperimentalSerializationApi::class)
    @Serializable
    data class Profile(
        @SerialName("userId")
@@ -63,9 +56,6 @@ data class AccountJson(
        @SerialName("emailVerified")
        val isEmailVerified: Boolean?,

-        @SerialName("isTwoFactorEnabled")
-        val isTwoFactorEnabled: Boolean?,
-
        @SerialName("name")
        val name: String?,

@@ -96,13 +86,8 @@ data class AccountJson(
        @SerialName("kdfParallelism")
        val kdfParallelism: Int?,

-        @SerialName("userDecryptionOptions")
-        @JsonNames("accountDecryptionOptions")
+        @SerialName("accountDecryptionOptions")
        val userDecryptionOptions: UserDecryptionOptionsJson?,
-
-        @SerialName("creationDate")
-        @Contextual
-        val creationDate: ZonedDateTime?,
    )

    /**
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/model/EnvironmentUrlDataJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/model/EnvironmentUrlDataJson.kt
@@ -7,7 +7,6 @@ import kotlinx.serialization.Serializable
 * Represents URLs for various Bitwarden domains.
 *
 * @property base The overall base URL.
- * @property keyUri A Uri containing the alias and host of the key used for mutual TLS.
 * @property api Separate base URL for the "/api" domain (if applicable).
 * @property identity Separate base URL for the "/identity" domain (if applicable).
 * @property icon Separate base URL for the icon domain (if applicable).
@@ -20,9 +19,6 @@ data class EnvironmentUrlDataJson(
    @SerialName("base")
    val base: String,

-    @SerialName("keyUri")
-    val keyUri: String? = null,
-
    @SerialName("api")
    val api: String? = null,

@@ -41,7 +37,6 @@ data class EnvironmentUrlDataJson(
    @SerialName("events")
    val events: String? = null,
 ) {
-    @Suppress("UndocumentedPublicClass")
    companion object {
        /**
         * Default [EnvironmentUrlDataJson] for the US region.
@@ -55,7 +50,6 @@ data class EnvironmentUrlDataJson(
         */
        val DEFAULT_LEGACY_US: EnvironmentUrlDataJson = EnvironmentUrlDataJson(
            base = "https://vault.bitwarden.com",
-            keyUri = null,
            api = "https://api.bitwarden.com",
            identity = "https://identity.bitwarden.com",
            icon = "https://icons.bitwarden.net",
@@ -76,7 +70,6 @@ data class EnvironmentUrlDataJson(
         */
        val DEFAULT_LEGACY_EU: EnvironmentUrlDataJson = EnvironmentUrlDataJson(
            base = "https://vault.bitwarden.eu",
-            keyUri = null,
            api = "https://api.bitwarden.eu",
            identity = "https://identity.bitwarden.eu",
            icon = "https://icons.bitwarden.eu",
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/model/NewDeviceNoticeDisplayStatus.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/model/NewDeviceNoticeDisplayStatus.kt
@@ -1,60 +0,0 @@
-package com.x8bit.bitwarden.data.auth.datasource.disk.model
-
-import kotlinx.serialization.Contextual
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import java.time.ZonedDateTime
-
-/**
- * Describes the current display status of the new device notice screen.
- */
-@Serializable
-enum class NewDeviceNoticeDisplayStatus {
-    /**
-     * The user has seen the screen and indicated they can access their email.
-     */
-    @SerialName("canAccessEmail")
-    CAN_ACCESS_EMAIL,
-
-    /**
-     * The user has indicated they can access their email
-     * as specified by the Permanent mode of the notice.
-     */
-    @SerialName("canAccessEmailPermanent")
-    CAN_ACCESS_EMAIL_PERMANENT,
-
-    /**
-     * The user has not seen the screen.
-     */
-    @SerialName("hasNotSeen")
-    HAS_NOT_SEEN,
-
-    /**
-     * The user has seen the screen and selected "remind me later".
-     */
-    @SerialName("hasSeen")
-    HAS_SEEN,
-}
-
-/**
- * The state of the new device notice screen.
- */
-@Suppress("MagicNumber")
-@Serializable
-data class NewDeviceNoticeState(
-    @SerialName("displayStatus")
-    val displayStatus: NewDeviceNoticeDisplayStatus,
-
-    @SerialName("lastSeenDate")
-    @Contextual
-    val lastSeenDate: ZonedDateTime?,
-) {
-    /**
-     * Whether the [lastSeenDate] is at least 7 days old.
-     */
-    val shouldDisplayNoticeIfSeen = lastSeenDate
-        ?.isBefore(
-            ZonedDateTime.now().minusDays(7),
-        )
-        ?: false
-}
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/model/OnboardingStatus.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/model/OnboardingStatus.kt
@@ -1,41 +0,0 @@
-package com.x8bit.bitwarden.data.auth.datasource.disk.model
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-/**
- * Describes the current status of a user in the account onboarding steps.
- */
-@Serializable
-enum class OnboardingStatus {
-
-    /**
-     * Onboarding has not yet started.
-     */
-    @SerialName("notStarted")
-    NOT_STARTED,
-
-    /**
-     * The user is completing the account lock setup.
-     */
-    @SerialName("accountLockSetup")
-    ACCOUNT_LOCK_SETUP,
-
-    /**
-     * The user is completing the auto fill service setup.
-     */
-    @SerialName("autofillSetup")
-    AUTOFILL_SETUP,
-
-    /**
-     * The user is completing the final step of the onboarding process.
-     */
-    @SerialName("finalStep")
-    FINAL_STEP,
-
-    /**
-     * The user has completed all onboarding steps.
-     */
-    @SerialName("complete")
-    COMPLETE,
-}
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/model/PendingAuthRequestJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/model/PendingAuthRequestJson.kt
@@ -7,21 +7,13 @@ import kotlinx.serialization.Serializable
 * Container for the user's API tokens.
 *
 * @property requestId The ID of the pending Auth Request.
- * @property requestPrivateKey The private key of the pending Auth Request.
- * @property requestAccessCode The access code of the pending Auth Request.
- * @property requestFingerprint The fingerprint of the pending Auth Request.
+ * @property requestPrivateKey The private of the pending Auth Request.
 */
@Serializable
 data class PendingAuthRequestJson(
-    @SerialName("id")
+    @SerialName("Id")
    val requestId: String,

-    @SerialName("privateKey")
+    @SerialName("PrivateKey")
    val requestPrivateKey: String,
-
-    @SerialName("accessCode")
-    val requestAccessCode: String,
-
-    @SerialName("fingerprint")
-    val requestFingerprint: String,
 )
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/AccountsApi.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/AccountsApi.kt
@@ -0,0 +1,21 @@
+package com.x8bit.bitwarden.data.auth.datasource.network.api
+
+import com.x8bit.bitwarden.data.auth.datasource.network.model.PasswordHintRequestJson
+import com.x8bit.bitwarden.data.auth.datasource.network.model.ResendEmailRequestJson
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+/**
+ * Defines raw calls under the /accounts API.
+ */
+interface AccountsApi {
+    @POST("/accounts/password-hint")
+    suspend fun passwordHintRequest(
+        @Body body: PasswordHintRequestJson,
+    ): Result<Unit>
+
+    @POST("/two-factor/send-email-login")
+    suspend fun resendVerificationCodeEmail(
+        @Body body: ResendEmailRequestJson,
+    ): Result<Unit>
+}
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/AuthenticatedAccountsApi.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/AuthenticatedAccountsApi.kt
@@ -5,7 +5,6 @@ import com.x8bit.bitwarden.data.auth.datasource.network.model.DeleteAccountReque
 import com.x8bit.bitwarden.data.auth.datasource.network.model.ResetPasswordRequestJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.SetPasswordRequestJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifyOtpRequestJson
-import com.x8bit.bitwarden.data.platform.datasource.network.model.NetworkResult
 import retrofit2.http.Body
 import retrofit2.http.HTTP
 import retrofit2.http.POST
@@ -14,48 +13,41 @@ import retrofit2.http.POST
 * Defines raw calls under the /accounts API with authentication applied.
 */
 interface AuthenticatedAccountsApi {
-
-    /**
-     * Converts the currently active account to a key-connector account.
-     */
-    @POST("/accounts/convert-to-key-connector")
-    suspend fun convertToKeyConnector(): NetworkResult<Unit>
-
    /**
     * Creates the keys for the current account.
     */
    @POST("/accounts/keys")
-    suspend fun createAccountKeys(@Body body: CreateAccountKeysRequest): NetworkResult<Unit>
+    suspend fun createAccountKeys(@Body body: CreateAccountKeysRequest): Result<Unit>

    /**
     * Deletes the current account.
     */
    @HTTP(method = "DELETE", path = "/accounts", hasBody = true)
-    suspend fun deleteAccount(@Body body: DeleteAccountRequestJson): NetworkResult<Unit>
+    suspend fun deleteAccount(@Body body: DeleteAccountRequestJson): Result<Unit>

    @POST("/accounts/request-otp")
-    suspend fun requestOtp(): NetworkResult<Unit>
+    suspend fun requestOtp(): Result<Unit>

    @POST("/accounts/verify-otp")
    suspend fun verifyOtp(
        @Body body: VerifyOtpRequestJson,
-    ): NetworkResult<Unit>
+    ): Result<Unit>

    /**
     * Resets the temporary password.
     */
    @HTTP(method = "PUT", path = "/accounts/update-temp-password", hasBody = true)
-    suspend fun resetTempPassword(@Body body: ResetPasswordRequestJson): NetworkResult<Unit>
+    suspend fun resetTempPassword(@Body body: ResetPasswordRequestJson): Result<Unit>

    /**
     * Resets the password.
     */
    @HTTP(method = "POST", path = "/accounts/password", hasBody = true)
-    suspend fun resetPassword(@Body body: ResetPasswordRequestJson): NetworkResult<Unit>
+    suspend fun resetPassword(@Body body: ResetPasswordRequestJson): Result<Unit>

    /**
     * Sets the password.
     */
    @POST("/accounts/set-password")
-    suspend fun setPassword(@Body body: SetPasswordRequestJson): NetworkResult<Unit>
+    suspend fun setPassword(@Body body: SetPasswordRequestJson): Result<Unit>
 }
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/AuthenticatedAuthRequestsApi.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/AuthenticatedAuthRequestsApi.kt
@@ -3,7 +3,6 @@ package com.x8bit.bitwarden.data.auth.datasource.network.api
 import com.x8bit.bitwarden.data.auth.datasource.network.model.AuthRequestRequestJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.AuthRequestUpdateRequestJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.AuthRequestsResponseJson
-import com.x8bit.bitwarden.data.platform.datasource.network.model.NetworkResult
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.Header
@@ -23,7 +22,7 @@ interface AuthenticatedAuthRequestsApi {
    suspend fun createAdminAuthRequest(
        @Header("Device-Identifier") deviceIdentifier: String,
        @Body body: AuthRequestRequestJson,
-    ): NetworkResult<AuthRequestsResponseJson.AuthRequest>
+    ): Result<AuthRequestsResponseJson.AuthRequest>

    /**
     * Updates an authentication request.
@@ -32,13 +31,13 @@ interface AuthenticatedAuthRequestsApi {
    suspend fun updateAuthRequest(
        @Path("id") userId: String,
        @Body body: AuthRequestUpdateRequestJson,
-    ): NetworkResult<AuthRequestsResponseJson.AuthRequest>
+    ): Result<AuthRequestsResponseJson.AuthRequest>

    /**
     * Gets a list of auth requests for this device.
     */
    @GET("/auth-requests")
-    suspend fun getAuthRequests(): NetworkResult<AuthRequestsResponseJson>
+    suspend fun getAuthRequests(): Result<AuthRequestsResponseJson>

    /**
     * Retrieves an existing authentication request by ID.
@@ -46,5 +45,5 @@ interface AuthenticatedAuthRequestsApi {
    @GET("/auth-requests/{requestId}")
    suspend fun getAuthRequest(
        @Path("requestId") requestId: String,
-    ): NetworkResult<AuthRequestsResponseJson.AuthRequest>
+    ): Result<AuthRequestsResponseJson.AuthRequest>
 }
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/AuthenticatedDevicesApi.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/AuthenticatedDevicesApi.kt
@@ -3,7 +3,6 @@ package com.x8bit.bitwarden.data.auth.datasource.network.api
 import androidx.annotation.Keep
 import com.x8bit.bitwarden.data.auth.datasource.network.model.TrustedDeviceKeysRequestJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.TrustedDeviceKeysResponseJson
-import com.x8bit.bitwarden.data.platform.datasource.network.model.NetworkResult
 import retrofit2.http.Body
 import retrofit2.http.PUT
 import retrofit2.http.Path
@@ -17,5 +16,5 @@ interface AuthenticatedDevicesApi {
    suspend fun updateTrustedDeviceKeys(
        @Path(value = "appId") appId: String,
        @Body request: TrustedDeviceKeysRequestJson,
-    ): NetworkResult<TrustedDeviceKeysResponseJson>
+    ): Result<TrustedDeviceKeysResponseJson>
 }
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/AuthenticatedKeyConnectorApi.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/AuthenticatedKeyConnectorApi.kt
@@ -1,20 +0,0 @@
-package com.x8bit.bitwarden.data.auth.datasource.network.api
-
-import androidx.annotation.Keep
-import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorMasterKeyRequestJson
-import com.x8bit.bitwarden.data.platform.datasource.network.model.NetworkResult
-import retrofit2.http.Body
-import retrofit2.http.POST
-import retrofit2.http.Url
-
-/**
- * Defines raw calls specific for key connectors that use custom urls.
- */
-@Keep
-interface AuthenticatedKeyConnectorApi {
-    @POST
-    suspend fun storeMasterKeyToKeyConnector(
-        @Url url: String,
-        @Body body: KeyConnectorMasterKeyRequestJson,
-    ): NetworkResult<Unit>
-}
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/AuthenticatedOrganizationApi.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/AuthenticatedOrganizationApi.kt
@@ -3,7 +3,6 @@ package com.x8bit.bitwarden.data.auth.datasource.network.api
 import com.x8bit.bitwarden.data.auth.datasource.network.model.OrganizationAutoEnrollStatusResponseJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.OrganizationKeysResponseJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.OrganizationResetPasswordEnrollRequestJson
-import com.x8bit.bitwarden.data.platform.datasource.network.model.NetworkResult
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.PUT
@@ -21,7 +20,7 @@ interface AuthenticatedOrganizationApi {
        @Path("orgId") organizationId: String,
        @Path("userId") userId: String,
        @Body body: OrganizationResetPasswordEnrollRequestJson,
-    ): NetworkResult<Unit>
+    ): Result<Unit>

    /**
     * Checks whether this organization auto enrolls users in password reset.
@@ -29,7 +28,7 @@ interface AuthenticatedOrganizationApi {
    @GET("/organizations/{identifier}/auto-enroll-status")
    suspend fun getOrganizationAutoEnrollResponse(
        @Path("identifier") organizationIdentifier: String,
-    ): NetworkResult<OrganizationAutoEnrollStatusResponseJson>
+    ): Result<OrganizationAutoEnrollStatusResponseJson>

    /**
     * Gets the public and private keys for this organization.
@@ -37,5 +36,5 @@ interface AuthenticatedOrganizationApi {
    @GET("/organizations/{id}/keys")
    suspend fun getOrganizationKeys(
        @Path("id") organizationId: String,
-    ): NetworkResult<OrganizationKeysResponseJson>
+    ): Result<OrganizationKeysResponseJson>
 }
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/HaveIBeenPwnedApi.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/HaveIBeenPwnedApi.kt
@@ -1,6 +1,5 @@
 package com.x8bit.bitwarden.data.auth.datasource.network.api

-import com.x8bit.bitwarden.data.platform.datasource.network.model.NetworkResult
 import okhttp3.ResponseBody
 import retrofit2.http.GET
 import retrofit2.http.Path
@@ -15,5 +14,5 @@ interface HaveIBeenPwnedApi {
    suspend fun fetchBreachedPasswords(
        @Path("hashPrefix")
        hashPrefix: String,
-    ): NetworkResult<ResponseBody>
+    ): Result<ResponseBody>
 }
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/UnauthenticatedIdentityApi.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/UnauthenticatedIdentityApi.kt
@@ -9,9 +9,7 @@ import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterFinishRequ
 import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterRequestJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterResponseJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.SendVerificationEmailRequestJson
-import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifyEmailTokenRequestJson
-import com.x8bit.bitwarden.data.platform.datasource.network.model.NetworkResult
-import kotlinx.serialization.json.JsonPrimitive
+import okhttp3.ResponseBody
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.Field
@@ -24,7 +22,7 @@ import retrofit2.http.Query
 /**
 * Defines raw calls under the /identity API.
 */
-interface UnauthenticatedIdentityApi {
+interface IdentityApi {

    @POST("/connect/token")
    @Suppress("LongParameterList")
@@ -47,13 +45,12 @@ interface UnauthenticatedIdentityApi {
        @Field(value = "twoFactorProvider") twoFactorMethod: String?,
        @Field(value = "twoFactorRemember") twoFactorRemember: String?,
        @Field(value = "authRequest") authRequestId: String?,
-        @Field(value = "newDeviceOtp") newDeviceOtp: String?,
-    ): NetworkResult<GetTokenResponseJson.Success>
+    ): Result<GetTokenResponseJson.Success>

    @GET("/sso/prevalidate")
    suspend fun prevalidateSso(
        @Query("domainHint") organizationIdentifier: String,
-    ): NetworkResult<PrevalidateSsoResponseJson.Success>
+    ): Result<PrevalidateSsoResponseJson>

    /**
     * This call needs to be synchronous so we need it to return a [Call] directly. The identity
@@ -68,25 +65,14 @@ interface UnauthenticatedIdentityApi {
    ): Call<RefreshTokenResponseJson>

    @POST("/accounts/prelogin")
-    suspend fun preLogin(@Body body: PreLoginRequestJson): NetworkResult<PreLoginResponseJson>
+    suspend fun preLogin(@Body body: PreLoginRequestJson): Result<PreLoginResponseJson>

    @POST("/accounts/register")
-    suspend fun register(
-        @Body body: RegisterRequestJson,
-    ): NetworkResult<RegisterResponseJson.Success>
+    suspend fun register(@Body body: RegisterRequestJson): Result<RegisterResponseJson.Success>

    @POST("/accounts/register/finish")
-    suspend fun registerFinish(
-        @Body body: RegisterFinishRequestJson,
-    ): NetworkResult<RegisterResponseJson.Success>
+    suspend fun registerFinish(@Body body: RegisterFinishRequestJson): Result<RegisterResponseJson.Success>

    @POST("/accounts/register/send-verification-email")
-    suspend fun sendVerificationEmail(
-        @Body body: SendVerificationEmailRequestJson,
-    ): NetworkResult<JsonPrimitive?>
-
-    @POST("/accounts/register/verification-email-clicked")
-    suspend fun verifyEmailToken(
-        @Body body: VerifyEmailTokenRequestJson,
-    ): NetworkResult<Unit>
+    suspend fun sendVerificationEmail(@Body body: SendVerificationEmailRequestJson): Result<ResponseBody?>
 }
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/OrganizationApi.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/OrganizationApi.kt
@@ -0,0 +1,19 @@
+package com.x8bit.bitwarden.data.auth.datasource.network.api
+
+import com.x8bit.bitwarden.data.auth.datasource.network.model.OrganizationDomainSsoDetailsRequestJson
+import com.x8bit.bitwarden.data.auth.datasource.network.model.OrganizationDomainSsoDetailsResponseJson
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+/**
+ * Defines raw calls under the /organizations API.
+ */
+interface OrganizationApi {
+    /**
+     * Checks for the claimed domain organization of an email for SSO purposes.
+     */
+    @POST("/organizations/domain/sso/details")
+    suspend fun getClaimedDomainOrganizationDetails(
+        @Body body: OrganizationDomainSsoDetailsRequestJson,
+    ): Result<OrganizationDomainSsoDetailsResponseJson>
+}
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/UnauthenticatedAccountsApi.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/UnauthenticatedAccountsApi.kt
@@ -1,37 +0,0 @@
-package com.x8bit.bitwarden.data.auth.datasource.network.api
-
-import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorKeyRequestJson
-import com.x8bit.bitwarden.data.auth.datasource.network.model.PasswordHintRequestJson
-import com.x8bit.bitwarden.data.auth.datasource.network.model.ResendEmailRequestJson
-import com.x8bit.bitwarden.data.auth.datasource.network.model.ResendNewDeviceOtpRequestJson
-import com.x8bit.bitwarden.data.platform.datasource.network.model.NetworkResult
-import com.x8bit.bitwarden.data.platform.datasource.network.util.HEADER_KEY_AUTHORIZATION
-import retrofit2.http.Body
-import retrofit2.http.Header
-import retrofit2.http.POST
-
-/**
- * Defines raw calls under the /accounts API.
- */
-interface UnauthenticatedAccountsApi {
-    @POST("/accounts/password-hint")
-    suspend fun passwordHintRequest(
-        @Body body: PasswordHintRequestJson,
-    ): NetworkResult<Unit>
-
-    @POST("/two-factor/send-email-login")
-    suspend fun resendVerificationCodeEmail(
-        @Body body: ResendEmailRequestJson,
-    ): NetworkResult<Unit>
-
-    @POST("/accounts/set-key-connector-key")
-    suspend fun setKeyConnectorKey(
-        @Body body: KeyConnectorKeyRequestJson,
-        @Header(HEADER_KEY_AUTHORIZATION) bearerToken: String,
-    ): NetworkResult<Unit>
-
-    @POST("/accounts/resend-new-device-otp")
-    suspend fun resendNewDeviceOtp(
-        @Body body: ResendNewDeviceOtpRequestJson,
-    ): NetworkResult<Unit>
-}
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/UnauthenticatedAuthRequestsApi.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/UnauthenticatedAuthRequestsApi.kt
@@ -2,7 +2,6 @@ package com.x8bit.bitwarden.data.auth.datasource.network.api

 import com.x8bit.bitwarden.data.auth.datasource.network.model.AuthRequestRequestJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.AuthRequestsResponseJson
-import com.x8bit.bitwarden.data.platform.datasource.network.model.NetworkResult
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.Header
@@ -22,7 +21,7 @@ interface UnauthenticatedAuthRequestsApi {
    suspend fun createAuthRequest(
        @Header("Device-Identifier") deviceIdentifier: String,
        @Body body: AuthRequestRequestJson,
-    ): NetworkResult<AuthRequestsResponseJson.AuthRequest>
+    ): Result<AuthRequestsResponseJson.AuthRequest>

    /**
     * Queries for updates to a given auth request.
@@ -31,5 +30,5 @@ interface UnauthenticatedAuthRequestsApi {
    suspend fun getAuthRequestUpdate(
        @Path("requestId") requestId: String,
        @Query("code") accessCode: String,
-    ): NetworkResult<AuthRequestsResponseJson.AuthRequest>
+    ): Result<AuthRequestsResponseJson.AuthRequest>
 }
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/UnauthenticatedDevicesApi.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/UnauthenticatedDevicesApi.kt
@@ -1,6 +1,5 @@
 package com.x8bit.bitwarden.data.auth.datasource.network.api

-import com.x8bit.bitwarden.data.platform.datasource.network.model.NetworkResult
 import retrofit2.http.GET
 import retrofit2.http.Header

@@ -12,5 +11,5 @@ interface UnauthenticatedDevicesApi {
    suspend fun getIsKnownDevice(
        @Header(value = "X-Request-Email") emailAddress: String,
        @Header(value = "X-Device-Identifier") deviceId: String,
-    ): NetworkResult<Boolean>
+    ): Result<Boolean>
 }
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/UnauthenticatedKeyConnectorApi.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/UnauthenticatedKeyConnectorApi.kt
@@ -1,31 +0,0 @@
-package com.x8bit.bitwarden.data.auth.datasource.network.api
-
-import androidx.annotation.Keep
-import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorMasterKeyRequestJson
-import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorMasterKeyResponseJson
-import com.x8bit.bitwarden.data.platform.datasource.network.model.NetworkResult
-import com.x8bit.bitwarden.data.platform.datasource.network.util.HEADER_KEY_AUTHORIZATION
-import retrofit2.http.Body
-import retrofit2.http.GET
-import retrofit2.http.Header
-import retrofit2.http.POST
-import retrofit2.http.Url
-
-/**
- * Defines raw calls specific for key connectors that use custom urls.
- */
-@Keep
-interface UnauthenticatedKeyConnectorApi {
-    @POST
-    suspend fun storeMasterKeyToKeyConnector(
-        @Url url: String,
-        @Header(HEADER_KEY_AUTHORIZATION) bearerToken: String,
-        @Body body: KeyConnectorMasterKeyRequestJson,
-    ): NetworkResult<Unit>
-
-    @GET
-    suspend fun getMasterKeyFromKeyConnector(
-        @Url url: String,
-        @Header(HEADER_KEY_AUTHORIZATION) bearerToken: String,
-    ): NetworkResult<KeyConnectorMasterKeyResponseJson>
-}
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/UnauthenticatedOrganizationApi.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/UnauthenticatedOrganizationApi.kt
@@ -1,30 +0,0 @@
-package com.x8bit.bitwarden.data.auth.datasource.network.api
-
-import com.x8bit.bitwarden.data.auth.datasource.network.model.OrganizationDomainSsoDetailsRequestJson
-import com.x8bit.bitwarden.data.auth.datasource.network.model.OrganizationDomainSsoDetailsResponseJson
-import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifiedOrganizationDomainSsoDetailsRequest
-import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifiedOrganizationDomainSsoDetailsResponse
-import com.x8bit.bitwarden.data.platform.datasource.network.model.NetworkResult
-import retrofit2.http.Body
-import retrofit2.http.POST
-
-/**
- * Defines raw calls under the /organizations API.
- */
-interface UnauthenticatedOrganizationApi {
-    /**
-     * Checks for the claimed domain organization of an email for SSO purposes.
-     */
-    @POST("/organizations/domain/sso/details")
-    suspend fun getClaimedDomainOrganizationDetails(
-        @Body body: OrganizationDomainSsoDetailsRequestJson,
-    ): NetworkResult<OrganizationDomainSsoDetailsResponseJson>
-
-    /**
-     * Checks for the verfied organization domains of an email for SSO purposes.
-     */
-    @POST("/organizations/domain/sso/verified")
-    suspend fun getVerifiedOrganizationDomainsByEmail(
-        @Body body: VerifiedOrganizationDomainSsoDetailsRequest,
-    ): NetworkResult<VerifiedOrganizationDomainSsoDetailsResponse>
-}
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/di/AuthNetworkModule.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/di/AuthNetworkModule.kt
@@ -36,12 +36,8 @@ object AuthNetworkModule {
        retrofits: Retrofits,
        json: Json,
    ): AccountsService = AccountsServiceImpl(
-        unauthenticatedAccountsApi = retrofits.unauthenticatedApiRetrofit.create(),
+        accountsApi = retrofits.unauthenticatedApiRetrofit.create(),
        authenticatedAccountsApi = retrofits.authenticatedApiRetrofit.create(),
-        unauthenticatedKeyConnectorApi = retrofits.createStaticRetrofit().create(),
-        authenticatedKeyConnectorApi = retrofits
-            .createStaticRetrofit(isAuthenticated = true)
-            .create(),
        json = json,
    )

@@ -68,7 +64,7 @@ object AuthNetworkModule {
        retrofits: Retrofits,
        json: Json,
    ): IdentityService = IdentityServiceImpl(
-        unauthenticatedIdentityApi = retrofits.unauthenticatedIdentityRetrofit.create(),
+        api = retrofits.unauthenticatedIdentityRetrofit.create(),
        json = json,
    )

@@ -77,8 +73,10 @@ object AuthNetworkModule {
    fun providesHaveIBeenPwnedService(
        retrofits: Retrofits,
    ): HaveIBeenPwnedService = HaveIBeenPwnedServiceImpl(
-        api = retrofits
-            .createStaticRetrofit(baseUrl = "https://api.pwnedpasswords.com")
+        retrofits
+            .staticRetrofitBuilder
+            .baseUrl("https://api.pwnedpasswords.com")
+            .build()
            .create(),
    )

@@ -97,6 +95,6 @@ object AuthNetworkModule {
        retrofits: Retrofits,
    ): OrganizationService = OrganizationServiceImpl(
        authenticatedOrganizationApi = retrofits.authenticatedApiRetrofit.create(),
-        unauthenticatedOrganizationApi = retrofits.unauthenticatedApiRetrofit.create(),
+        organizationApi = retrofits.unauthenticatedApiRetrofit.create(),
    )
 }
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/AuthRequestTypeJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/AuthRequestTypeJson.kt
@@ -21,7 +21,5 @@ enum class AuthRequestTypeJson {
 }

@Keep
-private class AuthRequestTypeSerializer : BaseEnumeratedIntSerializer<AuthRequestTypeJson>(
-    className = "AuthRequestTypeJson",
-    values = AuthRequestTypeJson.entries.toTypedArray(),
-)
+private class AuthRequestTypeSerializer :
+    BaseEnumeratedIntSerializer<AuthRequestTypeJson>(AuthRequestTypeJson.entries.toTypedArray())
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/GetTokenResponseJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/GetTokenResponseJson.kt
@@ -28,7 +28,6 @@ sealed class GetTokenResponseJson {
     * this token will be cached and used for future auth requests.
     * @property masterPasswordPolicyOptions The options available for a user's master password.
     * @property userDecryptionOptions The options available to a user for decryption.
-     * @property keyConnectorUrl URL to the user's key connector.
     */
    @Serializable
    data class Success(
@@ -76,9 +75,6 @@ sealed class GetTokenResponseJson {

        @SerialName("UserDecryptionOptions")
        val userDecryptionOptions: UserDecryptionOptionsJson?,
-
-        @SerialName("KeyConnectorUrl")
-        val keyConnectorUrl: String?,
    ) : GetTokenResponseJson()

    /**
@@ -96,39 +92,9 @@ sealed class GetTokenResponseJson {
    @Serializable
    data class Invalid(
        @SerialName("ErrorModel")
-        val errorModel: ErrorModel?,
-        @SerialName("errorModel")
-        val legacyErrorModel: LegacyErrorModel?,
+        val errorModel: ErrorModel,
    ) : GetTokenResponseJson() {

-        /**
-         * The error message returned from the server, or null.
-         */
-        val errorMessage: String?
-            get() = errorModel?.errorMessage ?: legacyErrorModel?.errorMessage
-
-        /**
-         * The type of invalid responses that can be received.
-         */
-        sealed class InvalidType {
-            /**
-             * Represents an invalid response indicating that a new device verification is required.
-             */
-            data object NewDeviceVerification : InvalidType()
-
-            /**
-             * Represents generic invalid response
-             */
-            data object GenericInvalid : InvalidType()
-        }
-
-        val invalidType: InvalidType
-            get() = if (errorMessage?.lowercase() == "new device verification required") {
-                InvalidType.NewDeviceVerification
-            } else {
-                InvalidType.GenericInvalid
-            }
-
        /**
         * The error body of an invalid request containing a message.
         */
@@ -137,18 +103,6 @@ sealed class GetTokenResponseJson {
            @SerialName("Message")
            val errorMessage: String,
        )
-
-        /**
-         * The legacy error body of an invalid request containing a message.
-         *
-         * This model is used to support older versions of the error response model that used
-         * lower-case keys.
-         */
-        @Serializable
-        data class LegacyErrorModel(
-            @SerialName("message")
-            val errorMessage: String,
-        )
    }

    /**
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/KdfTypeJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/KdfTypeJson.kt
@@ -18,7 +18,5 @@ enum class KdfTypeJson {
 }

@Keep
-private class KdfTypeSerializer : BaseEnumeratedIntSerializer<KdfTypeJson>(
-    className = "KdfTypeJson",
-    values = KdfTypeJson.entries.toTypedArray(),
-)
+private class KdfTypeSerializer :
+    BaseEnumeratedIntSerializer<KdfTypeJson>(KdfTypeJson.entries.toTypedArray())
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/KeyConnectorKeyRequestJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/KeyConnectorKeyRequestJson.kt
@@ -1,33 +0,0 @@
-package com.x8bit.bitwarden.data.auth.datasource.network.model
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-/**
- * Represents the request body used to create the key connector keys for an account.
- */
-@Serializable
-data class KeyConnectorKeyRequestJson(
-    @SerialName("key") val userKey: String,
-    @SerialName("keys") val keys: Keys,
-    @SerialName("kdf") val kdfType: KdfTypeJson,
-    @SerialName("kdfIterations") val kdfIterations: Int?,
-    @SerialName("kdfMemory") val kdfMemory: Int?,
-    @SerialName("kdfParallelism") val kdfParallelism: Int?,
-    @SerialName("orgIdentifier") val organizationIdentifier: String,
-) {
-    /**
-     * A keys object containing public and private keys.
-     *
-     * @param publicKey the public key (encrypted).
-     * @param encryptedPrivateKey the private key (encrypted).
-     */
-    @Serializable
-    data class Keys(
-        @SerialName("publicKey")
-        val publicKey: String,
-
-        @SerialName("encryptedPrivateKey")
-        val encryptedPrivateKey: String,
-    )
-}
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/KeyConnectorMasterKeyRequestJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/KeyConnectorMasterKeyRequestJson.kt
@@ -1,12 +0,0 @@
-package com.x8bit.bitwarden.data.auth.datasource.network.model
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-/**
- * Represents the request body used to store the master key in the cloud.
- */
-@Serializable
-data class KeyConnectorMasterKeyRequestJson(
-    @SerialName("Key") val masterKey: String,
-)
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/KeyConnectorMasterKeyResponseJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/KeyConnectorMasterKeyResponseJson.kt
@@ -1,12 +0,0 @@
-package com.x8bit.bitwarden.data.auth.datasource.network.model
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-/**
- * Represents the response body used to retrieve the master key from the cloud.
- */
-@Serializable
-data class KeyConnectorMasterKeyResponseJson(
-    @SerialName("key") val masterKey: String,
-)
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/KeyConnectorUserDecryptionOptionsJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/KeyConnectorUserDecryptionOptionsJson.kt
@@ -1,19 +1,15 @@
 package com.x8bit.bitwarden.data.auth.datasource.network.model

-import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonNames

 /**
 * Decryption options related to a user's key connector.
 *
 * @property keyConnectorUrl URL to the user's key connector.
 */
-@OptIn(ExperimentalSerializationApi::class)
@Serializable
 data class KeyConnectorUserDecryptionOptionsJson(
-    @SerialName("keyConnectorUrl")
-    @JsonNames("KeyConnectorUrl")
+    @SerialName("KeyConnectorUrl")
    val keyConnectorUrl: String,
 )
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/OrganizationDomainSsoDetailsResponseJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/OrganizationDomainSsoDetailsResponseJson.kt
@@ -9,18 +9,17 @@ import java.time.ZonedDateTime
 * Response object returned when requesting organization domain SSO details.
 *
 * @property isSsoAvailable Whether or not SSO is available for this domain.
+ * @property domainName The organization's domain name.
 * @property organizationIdentifier The organization's identifier.
- * @property verifiedDate The date the domain was verified.
+ * @property isSsoRequired Whether or not SSO is required.
+ * @property verifiedDate The date these details were verified.
 */
@Serializable
 data class OrganizationDomainSsoDetailsResponseJson(
-    @SerialName("ssoAvailable")
-    val isSsoAvailable: Boolean,
-
-    @SerialName("organizationIdentifier")
-    val organizationIdentifier: String,
-
-    @SerialName("verifiedDate")
+    @SerialName("ssoAvailable") val isSsoAvailable: Boolean,
+    @SerialName("domainName") val domainName: String,
+    @SerialName("organizationIdentifier") val organizationIdentifier: String,
+    @SerialName("ssoRequired") val isSsoRequired: Boolean,
    @Contextual
-    val verifiedDate: ZonedDateTime?,
+    @SerialName("verifiedDate") val verifiedDate: ZonedDateTime?,
 )
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/PrevalidateSsoResponseJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/PrevalidateSsoResponseJson.kt
@@ -7,20 +7,6 @@ import kotlinx.serialization.Serializable
 * Response body from the SSO prevalidate request.
 */
@Serializable
-sealed class PrevalidateSsoResponseJson {
-    /**
-     * Models json body of a successful response.
-     */
-    @Serializable
-    data class Success(
-        @SerialName("token") val token: String?,
-    ) : PrevalidateSsoResponseJson()
-
-    /**
-     * Models json body of an error response.
-     */
-    @Serializable
-    data class Error(
-        @SerialName("message") val message: String?,
-    ) : PrevalidateSsoResponseJson()
-}
+data class PrevalidateSsoResponseJson(
+    @SerialName("token") val token: String?,
+)
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/RegisterResponseJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/RegisterResponseJson.kt
@@ -46,6 +46,7 @@ sealed class RegisterResponseJson {
    /**
     * Represents the json body of an invalid register request.
     *
+     * @param message
     * @param validationErrors a map where each value is a list of error messages for each key.
     * The values in the array should be used for display to the user, since the keys tend to come
     * back as nonsense. (eg: empty string key)
@@ -53,17 +54,18 @@ sealed class RegisterResponseJson {
    @Serializable
    data class Invalid(
        @SerialName("message")
-        private val invalidMessage: String? = null,
-
-        @SerialName("Message")
-        private val errorMessage: String? = null,
+        val message: String?,

        @SerialName("validationErrors")
        val validationErrors: Map<String, List<String>>?,
-    ) : RegisterResponseJson() {
-        /**
-         * A generic error message.
-         */
-        val message: String? get() = invalidMessage ?: errorMessage
-    }
+    ) : RegisterResponseJson()
+
+    /**
+     * A different register error with a message.
+     */
+    @Serializable
+    data class Error(
+        @SerialName("Message")
+        val message: String?,
+    ) : RegisterResponseJson()
 }
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/ResendNewDeviceOtpRequestJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/ResendNewDeviceOtpRequestJson.kt
@@ -1,20 +0,0 @@
-package com.x8bit.bitwarden.data.auth.datasource.network.model
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-/**
- * Hold the information necessary to resend the email with the
- * new device verification code.
- *
- * @property email The user's email address.
- * @property passwordHash The master password hash
- */
-@Serializable
-data class ResendNewDeviceOtpRequestJson(
-    @SerialName("Email")
-    val email: String,
-
-    @SerialName("MasterPasswordHash")
-    val passwordHash: String?,
-)
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/SendVerificationEmailRequestJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/SendVerificationEmailRequestJson.kt
@@ -21,3 +21,4 @@ data class SendVerificationEmailRequestJson(
    @SerialName("receiveMarketingEmails")
    val receiveMarketingEmails: Boolean,
 )
+
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/SendVerificationEmailResponseJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/SendVerificationEmailResponseJson.kt
@@ -3,9 +3,6 @@ package com.x8bit.bitwarden.data.auth.datasource.network.model
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

-/**
- * The response body for sending a verification email.
- */
@Serializable
 sealed class SendVerificationEmailResponseJson {

@@ -22,6 +19,7 @@ sealed class SendVerificationEmailResponseJson {
    /**
     * Represents the json body of an invalid request.
     *
+     * @param message
     * @param validationErrors a map where each value is a list of error messages for each key.
     * The values in the array should be used for display to the user, since the keys tend to come
     * back as nonsense. (eg: empty string key)
@@ -29,17 +27,18 @@ sealed class SendVerificationEmailResponseJson {
    @Serializable
    data class Invalid(
        @SerialName("message")
-        private val invalidMessage: String? = null,
-
-        @SerialName("Message")
-        private val errorMessage: String? = null,
+        val message: String?,

        @SerialName("validationErrors")
        val validationErrors: Map<String, List<String>>?,
-    ) : SendVerificationEmailResponseJson() {
-        /**
-         * A generic error message.
-         */
-        val message: String? get() = invalidMessage ?: errorMessage
-    }
-}
+    ) : SendVerificationEmailResponseJson()
+
+    /**
+     * A different error with a message.
+     */
+    @Serializable
+    data class Error(
+        @SerialName("Message")
+        val message: String?,
+    ) : SendVerificationEmailResponseJson()
+}
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/TrustedDeviceUserDecryptionOptionsJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/TrustedDeviceUserDecryptionOptionsJson.kt
@@ -1,9 +1,7 @@
 package com.x8bit.bitwarden.data.auth.datasource.network.model

-import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonNames

 /**
 * Decryption options related to a user's trusted device.
@@ -15,26 +13,20 @@ import kotlinx.serialization.json.JsonNames
 * @property hasManageResetPasswordPermission Whether or not the user has manage reset password
 * permission.
 */
-@OptIn(ExperimentalSerializationApi::class)
@Serializable
 data class TrustedDeviceUserDecryptionOptionsJson(
-    @SerialName("encryptedPrivateKey")
-    @JsonNames("EncryptedPrivateKey")
+    @SerialName("EncryptedPrivateKey")
    val encryptedPrivateKey: String?,

-    @SerialName("encryptedUserKey")
-    @JsonNames("EncryptedUserKey")
+    @SerialName("EncryptedUserKey")
    val encryptedUserKey: String?,

-    @SerialName("hasAdminApproval")
-    @JsonNames("HasAdminApproval")
+    @SerialName("HasAdminApproval")
    val hasAdminApproval: Boolean,

-    @SerialName("hasLoginApprovingDevice")
-    @JsonNames("HasLoginApprovingDevice")
+    @SerialName("HasLoginApprovingDevice")
    val hasLoginApprovingDevice: Boolean,

-    @SerialName("hasManageResetPasswordPermission")
-    @JsonNames("HasManageResetPasswordPermission")
+    @SerialName("HasManageResetPasswordPermission")
    val hasManageResetPasswordPermission: Boolean,
 )
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/TwoFactorAuthMethod.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/TwoFactorAuthMethod.kt
@@ -39,7 +39,5 @@ enum class TwoFactorAuthMethod(val value: UInt) {
 }

@Keep
-private class TwoFactorAuthMethodSerializer : BaseEnumeratedIntSerializer<TwoFactorAuthMethod>(
-    className = "TwoFactorAuthMethod",
-    values = TwoFactorAuthMethod.entries.toTypedArray(),
-)
+private class TwoFactorAuthMethodSerializer :
+    BaseEnumeratedIntSerializer<TwoFactorAuthMethod>(TwoFactorAuthMethod.entries.toTypedArray())
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/UserDecryptionOptionsJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/UserDecryptionOptionsJson.kt
@@ -1,9 +1,7 @@
 package com.x8bit.bitwarden.data.auth.datasource.network.model

-import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonNames

 /**
 * The options available to a user for decryption.
@@ -14,18 +12,14 @@ import kotlinx.serialization.json.JsonNames
 * device.
 * @property keyConnectorUserDecryptionOptions Decryption options related to a user's key connector.
 */
-@OptIn(ExperimentalSerializationApi::class)
@Serializable
 data class UserDecryptionOptionsJson(
-    @SerialName("hasMasterPassword")
-    @JsonNames("HasMasterPassword")
+    @SerialName("HasMasterPassword")
    val hasMasterPassword: Boolean,

-    @SerialName("trustedDeviceOption")
-    @JsonNames("TrustedDeviceOption")
+    @SerialName("TrustedDeviceOption")
    val trustedDeviceUserDecryptionOptions: TrustedDeviceUserDecryptionOptionsJson?,

-    @SerialName("keyConnectorOption")
-    @JsonNames("KeyConnectorOption")
+    @SerialName("KeyConnectorOption")
    val keyConnectorUserDecryptionOptions: KeyConnectorUserDecryptionOptionsJson?,
 )
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/VerifiedOrganizationDomainSsoDetailsRequest.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/VerifiedOrganizationDomainSsoDetailsRequest.kt
@@ -1,14 +0,0 @@
-package com.x8bit.bitwarden.data.auth.datasource.network.model
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-/**
- * Request body object when retrieving organization verified domain SSO info.
- *
- * @param email The email address to check against.
- */
-@Serializable
-data class VerifiedOrganizationDomainSsoDetailsRequest(
-    @SerialName("email") val email: String,
-)
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/VerifiedOrganizationDomainSsoDetailsResponse.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/VerifiedOrganizationDomainSsoDetailsResponse.kt
@@ -1,35 +0,0 @@
-package com.x8bit.bitwarden.data.auth.datasource.network.model
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-/**
- * Response object returned when requesting organization verified domain SSO details.
- *
- * @property verifiedOrganizationDomainSsoDetails The list of verified organization domain SSO
- * details.
- */
-@Serializable
-data class VerifiedOrganizationDomainSsoDetailsResponse(
-    @SerialName("data")
-    val verifiedOrganizationDomainSsoDetails: List<VerifiedOrganizationDomainSsoDetail>,
-) {
-    /**
-     * Response body for an organization verified domain SSO details.
-     *
-     * @property organizationName The name of the organization.
-     * @property organizationIdentifier The identifier of the organization.
-     * @property domainName The name of the domain.
-     */
-    @Serializable
-    data class VerifiedOrganizationDomainSsoDetail(
-        @SerialName("organizationName")
-        val organizationName: String,
-
-        @SerialName("organizationIdentifier")
-        val organizationIdentifier: String,
-
-        @SerialName("domainName")
-        val domainName: String,
-    )
-}
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/VerifyEmailTokenRequestJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/VerifyEmailTokenRequestJson.kt
@@ -1,18 +0,0 @@
-package com.x8bit.bitwarden.data.auth.datasource.network.model
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-/**
- * Models the request body for verify email token endpoint.
- *
- * @param email the email address of the user to verify.
- * @param token the provided email verification token.
- */
-@Serializable
-data class VerifyEmailTokenRequestJson(
-    @SerialName("email")
-    val email: String,
-    @SerialName("emailVerificationToken")
-    val token: String,
-)
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/VerifyEmailTokenResponseJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/VerifyEmailTokenResponseJson.kt
@@ -1,38 +0,0 @@
-package com.x8bit.bitwarden.data.auth.datasource.network.model
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-/**
- * Model the response of a verify email token request.
- *
- * A valid response will be a [VerifyEmailTokenResponseJson.Valid]
- *
- * an invalid response will be a [VerifyEmailTokenResponseJson.Invalid] with a message.
- */
-@Serializable
-sealed class VerifyEmailTokenResponseJson {
-
-    /**
-     * The token is confirmed as valid from the response.
-     */
-    @Serializable
-    data object Valid : VerifyEmailTokenResponseJson()
-
-    /**
-     * The response is invalid.
-     *
-     * @property message The error message. Expected to explain the reason why the token is invalid.
-     */
-    @Serializable
-    data class Invalid(
-        @SerialName("message")
-        val message: String,
-    ) : VerifyEmailTokenResponseJson()
-
-    /**
-     * The token has expired. This is special case of similar to [Invalid].
-     */
-    @Serializable
-    data object TokenExpired : VerifyEmailTokenResponseJson()
-}
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsService.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsService.kt
@@ -1,25 +1,16 @@
 package com.x8bit.bitwarden.data.auth.datasource.network.service

 import com.x8bit.bitwarden.data.auth.datasource.network.model.DeleteAccountResponseJson
-import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorKeyRequestJson
-import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorMasterKeyResponseJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.PasswordHintResponseJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.ResendEmailRequestJson
-import com.x8bit.bitwarden.data.auth.datasource.network.model.ResendNewDeviceOtpRequestJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.ResetPasswordRequestJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.SetPasswordRequestJson

 /**
 * Provides an API for querying accounts endpoints.
 */
-@Suppress("TooManyFunctions")
 interface AccountsService {

-    /**
-     * Converts the currently active account to a key-connector account.
-     */
-    suspend fun convertToKeyConnector(): Result<Unit>
-
    /**
     * Creates a new account's keys.
     */
@@ -53,60 +44,13 @@ interface AccountsService {
     */
    suspend fun resendVerificationCodeEmail(body: ResendEmailRequestJson): Result<Unit>

-    /**
-     * Resend the email with the verification code for new devices
-     */
-    suspend fun resendNewDeviceOtp(body: ResendNewDeviceOtpRequestJson): Result<Unit>
-
    /**
     * Reset the password.
     */
    suspend fun resetPassword(body: ResetPasswordRequestJson): Result<Unit>

-    /**
-     * Set the key connector key.
-     *
-     * This API requires the [accessToken] to be passed in manually because it occurs during the
-     * login process.
-     */
-    suspend fun setKeyConnectorKey(
-        accessToken: String,
-        body: KeyConnectorKeyRequestJson,
-    ): Result<Unit>
-
    /**
     * Set the password.
     */
    suspend fun setPassword(body: SetPasswordRequestJson): Result<Unit>
-
-    /**
-     * Retrieves the master key from the key connector.
-     *
-     * This API requires the [accessToken] to be passed in manually because it occurs during the
-     * login process.
-     */
-    suspend fun getMasterKeyFromKeyConnector(
-        url: String,
-        accessToken: String,
-    ): Result<KeyConnectorMasterKeyResponseJson>
-
-    /**
-     * Stores the master key to the key connector.
-     */
-    suspend fun storeMasterKeyToKeyConnector(
-        url: String,
-        masterKey: String,
-    ): Result<Unit>
-
-    /**
-     * Stores the master key to the key connector.
-     *
-     * This API requires the [accessToken] to be passed in manually because it occurs during the
-     * login process.
-     */
-    suspend fun storeMasterKeyToKeyConnector(
-        url: String,
-        accessToken: String,
-        masterKey: String,
-    ): Result<Unit>
 }
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsServiceImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsServiceImpl.kt
@@ -1,60 +1,36 @@
 package com.x8bit.bitwarden.data.auth.datasource.network.service

+import com.x8bit.bitwarden.data.auth.datasource.network.api.AccountsApi
 import com.x8bit.bitwarden.data.auth.datasource.network.api.AuthenticatedAccountsApi
-import com.x8bit.bitwarden.data.auth.datasource.network.api.AuthenticatedKeyConnectorApi
-import com.x8bit.bitwarden.data.auth.datasource.network.api.UnauthenticatedAccountsApi
-import com.x8bit.bitwarden.data.auth.datasource.network.api.UnauthenticatedKeyConnectorApi
 import com.x8bit.bitwarden.data.auth.datasource.network.model.CreateAccountKeysRequest
 import com.x8bit.bitwarden.data.auth.datasource.network.model.DeleteAccountRequestJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.DeleteAccountResponseJson
-import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorKeyRequestJson
-import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorMasterKeyRequestJson
-import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorMasterKeyResponseJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.PasswordHintRequestJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.PasswordHintResponseJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.ResendEmailRequestJson
-import com.x8bit.bitwarden.data.auth.datasource.network.model.ResendNewDeviceOtpRequestJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.ResetPasswordRequestJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.SetPasswordRequestJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifyOtpRequestJson
 import com.x8bit.bitwarden.data.platform.datasource.network.model.toBitwardenError
-import com.x8bit.bitwarden.data.platform.datasource.network.util.HEADER_VALUE_BEARER_PREFIX
 import com.x8bit.bitwarden.data.platform.datasource.network.util.parseErrorBodyOrNull
-import com.x8bit.bitwarden.data.platform.datasource.network.util.toResult
 import kotlinx.serialization.json.Json

-/**
- * The default implementation of the [AccountsService].
- */
-@Suppress("TooManyFunctions")
 class AccountsServiceImpl(
-    private val unauthenticatedAccountsApi: UnauthenticatedAccountsApi,
+    private val accountsApi: AccountsApi,
    private val authenticatedAccountsApi: AuthenticatedAccountsApi,
-    private val unauthenticatedKeyConnectorApi: UnauthenticatedKeyConnectorApi,
-    private val authenticatedKeyConnectorApi: AuthenticatedKeyConnectorApi,
    private val json: Json,
 ) : AccountsService {

-    /**
-     * Converts the currently active account to a key-connector account.
-     */
-    override suspend fun convertToKeyConnector(): Result<Unit> =
-        authenticatedAccountsApi
-            .convertToKeyConnector()
-            .toResult()
-
    override suspend fun createAccountKeys(
        publicKey: String,
        encryptedPrivateKey: String,
    ): Result<Unit> =
-        authenticatedAccountsApi
-            .createAccountKeys(
-                body = CreateAccountKeysRequest(
-                    publicKey = publicKey,
-                    encryptedPrivateKey = encryptedPrivateKey,
-                ),
-            )
-            .toResult()
+        authenticatedAccountsApi.createAccountKeys(
+            body = CreateAccountKeysRequest(
+                publicKey = publicKey,
+                encryptedPrivateKey = encryptedPrivateKey,
+            ),
+        )

    override suspend fun deleteAccount(
        masterPasswordHash: String?,
@@ -67,8 +43,9 @@ class AccountsServiceImpl(
                    oneTimePassword = oneTimePassword,
                ),
            )
-            .toResult()
-            .map { DeleteAccountResponseJson.Success }
+            .map {
+                DeleteAccountResponseJson.Success
+            }
            .recoverCatching { throwable ->
                throwable
                    .toBitwardenError()
@@ -80,25 +57,20 @@ class AccountsServiceImpl(
            }

    override suspend fun requestOneTimePasscode(): Result<Unit> =
-        authenticatedAccountsApi
-            .requestOtp()
-            .toResult()
+        authenticatedAccountsApi.requestOtp()

    override suspend fun verifyOneTimePasscode(passcode: String): Result<Unit> =
-        authenticatedAccountsApi
-            .verifyOtp(
-                VerifyOtpRequestJson(
-                    oneTimePasscode = passcode,
-                ),
-            )
-            .toResult()
+        authenticatedAccountsApi.verifyOtp(
+            VerifyOtpRequestJson(
+                oneTimePasscode = passcode,
+            ),
+        )

    override suspend fun requestPasswordHint(
        email: String,
    ): Result<PasswordHintResponseJson> =
-        unauthenticatedAccountsApi
+        accountsApi
            .passwordHintRequest(PasswordHintRequestJson(email))
-            .toResult()
            .map { PasswordHintResponseJson.Success }
            .recoverCatching { throwable ->
                throwable
@@ -111,75 +83,17 @@ class AccountsServiceImpl(
            }

    override suspend fun resendVerificationCodeEmail(body: ResendEmailRequestJson): Result<Unit> =
-        unauthenticatedAccountsApi
-            .resendVerificationCodeEmail(body = body)
-            .toResult()
+        accountsApi.resendVerificationCodeEmail(body = body)

-    override suspend fun resendNewDeviceOtp(body: ResendNewDeviceOtpRequestJson): Result<Unit> =
-        unauthenticatedAccountsApi
-            .resendNewDeviceOtp(body = body)
-            .toResult()
-
-    override suspend fun resetPassword(body: ResetPasswordRequestJson): Result<Unit> =
-        if (body.currentPasswordHash == null) {
-            authenticatedAccountsApi
-                .resetTempPassword(body = body)
-                .toResult()
+    override suspend fun resetPassword(body: ResetPasswordRequestJson): Result<Unit> {
+        return if (body.currentPasswordHash == null) {
+            authenticatedAccountsApi.resetTempPassword(body = body)
        } else {
-            authenticatedAccountsApi
-                .resetPassword(body = body)
-                .toResult()
+            authenticatedAccountsApi.resetPassword(body = body)
        }
-
-    override suspend fun setKeyConnectorKey(
-        accessToken: String,
-        body: KeyConnectorKeyRequestJson,
-    ): Result<Unit> =
-        unauthenticatedAccountsApi
-            .setKeyConnectorKey(
-                body = body,
-                bearerToken = "$HEADER_VALUE_BEARER_PREFIX$accessToken",
-            )
-            .toResult()
+    }

    override suspend fun setPassword(
        body: SetPasswordRequestJson,
-    ): Result<Unit> = authenticatedAccountsApi
-        .setPassword(body)
-        .toResult()
-
-    override suspend fun getMasterKeyFromKeyConnector(
-        url: String,
-        accessToken: String,
-    ): Result<KeyConnectorMasterKeyResponseJson> =
-        unauthenticatedKeyConnectorApi
-            .getMasterKeyFromKeyConnector(
-                url = "$url/user-keys",
-                bearerToken = "$HEADER_VALUE_BEARER_PREFIX$accessToken",
-            )
-            .toResult()
-
-    override suspend fun storeMasterKeyToKeyConnector(
-        url: String,
-        masterKey: String,
-    ): Result<Unit> =
-        authenticatedKeyConnectorApi
-            .storeMasterKeyToKeyConnector(
-                url = "$url/user-keys",
-                body = KeyConnectorMasterKeyRequestJson(masterKey = masterKey),
-            )
-            .toResult()
-
-    override suspend fun storeMasterKeyToKeyConnector(
-        url: String,
-        accessToken: String,
-        masterKey: String,
-    ): Result<Unit> =
-        unauthenticatedKeyConnectorApi
-            .storeMasterKeyToKeyConnector(
-                url = "$url/user-keys",
-                bearerToken = "$HEADER_VALUE_BEARER_PREFIX$accessToken",
-                body = KeyConnectorMasterKeyRequestJson(masterKey = masterKey),
-            )
-            .toResult()
+    ): Result<Unit> = authenticatedAccountsApi.setPassword(body)
 }
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AuthRequestsServiceImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AuthRequestsServiceImpl.kt
@@ -3,22 +3,17 @@ package com.x8bit.bitwarden.data.auth.datasource.network.service
 import com.x8bit.bitwarden.data.auth.datasource.network.api.AuthenticatedAuthRequestsApi
 import com.x8bit.bitwarden.data.auth.datasource.network.model.AuthRequestUpdateRequestJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.AuthRequestsResponseJson
-import com.x8bit.bitwarden.data.platform.datasource.network.util.toResult

 class AuthRequestsServiceImpl(
    private val authenticatedAuthRequestsApi: AuthenticatedAuthRequestsApi,
 ) : AuthRequestsService {
    override suspend fun getAuthRequests(): Result<AuthRequestsResponseJson> =
-        authenticatedAuthRequestsApi
-            .getAuthRequests()
-            .toResult()
+        authenticatedAuthRequestsApi.getAuthRequests()

    override suspend fun getAuthRequest(
        requestId: String,
    ): Result<AuthRequestsResponseJson.AuthRequest> =
-        authenticatedAuthRequestsApi
-            .getAuthRequest(requestId = requestId)
-            .toResult()
+        authenticatedAuthRequestsApi.getAuthRequest(requestId = requestId)

    override suspend fun updateAuthRequest(
        requestId: String,
@@ -27,15 +22,13 @@ class AuthRequestsServiceImpl(
        deviceId: String,
        isApproved: Boolean,
    ): Result<AuthRequestsResponseJson.AuthRequest> =
-        authenticatedAuthRequestsApi
-            .updateAuthRequest(
-                userId = requestId,
-                body = AuthRequestUpdateRequestJson(
-                    key = key,
-                    masterPasswordHash = masterPasswordHash,
-                    deviceId = deviceId,
-                    isApproved = isApproved,
-                ),
-            )
-            .toResult()
+        authenticatedAuthRequestsApi.updateAuthRequest(
+            userId = requestId,
+            body = AuthRequestUpdateRequestJson(
+                key = key,
+                masterPasswordHash = masterPasswordHash,
+                deviceId = deviceId,
+                isApproved = isApproved,
+            ),
+        )
 }
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesServiceImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesServiceImpl.kt
@@ -5,7 +5,6 @@ import com.x8bit.bitwarden.data.auth.datasource.network.api.UnauthenticatedDevic
 import com.x8bit.bitwarden.data.auth.datasource.network.model.TrustedDeviceKeysRequestJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.TrustedDeviceKeysResponseJson
 import com.x8bit.bitwarden.data.platform.datasource.network.util.base64UrlEncode
-import com.x8bit.bitwarden.data.platform.datasource.network.util.toResult

 class DevicesServiceImpl(
    private val authenticatedDevicesApi: AuthenticatedDevicesApi,
@@ -14,26 +13,22 @@ class DevicesServiceImpl(
    override suspend fun getIsKnownDevice(
        emailAddress: String,
        deviceId: String,
-    ): Result<Boolean> = unauthenticatedDevicesApi
-        .getIsKnownDevice(
-            emailAddress = emailAddress.base64UrlEncode(),
-            deviceId = deviceId,
-        )
-        .toResult()
+    ): Result<Boolean> = unauthenticatedDevicesApi.getIsKnownDevice(
+        emailAddress = emailAddress.base64UrlEncode(),
+        deviceId = deviceId,
+    )

    override suspend fun trustDevice(
        appId: String,
        encryptedUserKey: String,
        encryptedDevicePublicKey: String,
        encryptedDevicePrivateKey: String,
-    ): Result<TrustedDeviceKeysResponseJson> = authenticatedDevicesApi
-        .updateTrustedDeviceKeys(
-            appId = appId,
-            request = TrustedDeviceKeysRequestJson(
-                encryptedUserKey = encryptedUserKey,
-                encryptedDevicePublicKey = encryptedDevicePublicKey,
-                encryptedDevicePrivateKey = encryptedDevicePrivateKey,
-            ),
-        )
-        .toResult()
+    ): Result<TrustedDeviceKeysResponseJson> = authenticatedDevicesApi.updateTrustedDeviceKeys(
+        appId = appId,
+        request = TrustedDeviceKeysRequestJson(
+            encryptedUserKey = encryptedUserKey,
+            encryptedDevicePublicKey = encryptedDevicePublicKey,
+            encryptedDevicePrivateKey = encryptedDevicePrivateKey,
+        ),
+    )
 }
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/HaveIBeenPwnedServiceImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/HaveIBeenPwnedServiceImpl.kt
@@ -1,7 +1,6 @@
 package com.x8bit.bitwarden.data.auth.datasource.network.service

 import com.x8bit.bitwarden.data.auth.datasource.network.api.HaveIBeenPwnedApi
-import com.x8bit.bitwarden.data.platform.datasource.network.util.toResult
 import java.security.MessageDigest

 class HaveIBeenPwnedServiceImpl(private val api: HaveIBeenPwnedApi) : HaveIBeenPwnedService {
@@ -18,7 +17,6 @@ class HaveIBeenPwnedServiceImpl(private val api: HaveIBeenPwnedApi) : HaveIBeenP

        return api
            .fetchBreachedPasswords(hashPrefix = hashPrefix)
-            .toResult()
            .mapCatching { responseBody ->
                responseBody.string()
                    // First split the response by newline: each hashed password is on a new line.
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityService.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityService.kt
@@ -9,10 +9,8 @@ import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterFinishRequ
 import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterRequestJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterResponseJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.SendVerificationEmailRequestJson
-import com.x8bit.bitwarden.data.auth.datasource.network.model.SendVerificationEmailResponseJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.TwoFactorDataModel
-import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifyEmailTokenRequestJson
-import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifyEmailTokenResponseJson
+import okhttp3.ResponseBody

 /**
 * Provides an API for querying identity endpoints.
@@ -29,6 +27,11 @@ interface IdentityService {
     */
    suspend fun register(body: RegisterRequestJson): Result<RegisterResponseJson>

+    /**
+     * Register a new account to Bitwarden using email verification flow.
+     */
+    suspend fun registerFinish(body: RegisterFinishRequestJson): Result<RegisterResponseJson>
+
    /**
     * Make request to get an access token.
     *
@@ -46,7 +49,6 @@ interface IdentityService {
        authModel: IdentityTokenAuthModel,
        captchaToken: String?,
        twoFactorData: TwoFactorDataModel? = null,
-        newDeviceOtp: String? = null,
    ): Result<GetTokenResponseJson>

    /**
@@ -68,20 +70,5 @@ interface IdentityService {
    /**
     * Send a verification email.
     */
-    suspend fun sendVerificationEmail(
-        body: SendVerificationEmailRequestJson,
-    ): Result<SendVerificationEmailResponseJson>
-
-    /**
-     * Register a new account to Bitwarden using email verification flow.
-     */
-    suspend fun registerFinish(body: RegisterFinishRequestJson): Result<RegisterResponseJson>
-
-    /**
-     * Makes request to verify email registration token. If the token provided is
-     * still valid will return success.
-     */
-    suspend fun verifyEmailRegistrationToken(
-        body: VerifyEmailTokenRequestJson,
-    ): Result<VerifyEmailTokenResponseJson>
+    suspend fun sendVerificationEmail(body: SendVerificationEmailRequestJson): Result<ResponseBody?>
 }
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceImpl.kt
@@ -1,6 +1,6 @@
 package com.x8bit.bitwarden.data.auth.datasource.network.service

-import com.x8bit.bitwarden.data.auth.datasource.network.api.UnauthenticatedIdentityApi
+import com.x8bit.bitwarden.data.auth.datasource.network.api.IdentityApi
 import com.x8bit.bitwarden.data.auth.datasource.network.model.GetTokenResponseJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.IdentityTokenAuthModel
 import com.x8bit.bitwarden.data.auth.datasource.network.model.PreLoginRequestJson
@@ -11,46 +11,55 @@ import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterFinishRequ
 import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterRequestJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterResponseJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.SendVerificationEmailRequestJson
-import com.x8bit.bitwarden.data.auth.datasource.network.model.SendVerificationEmailResponseJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.TwoFactorDataModel
-import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifyEmailTokenRequestJson
-import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifyEmailTokenResponseJson
 import com.x8bit.bitwarden.data.platform.datasource.network.model.toBitwardenError
 import com.x8bit.bitwarden.data.platform.datasource.network.util.base64UrlEncode
-import com.x8bit.bitwarden.data.platform.datasource.network.util.executeForNetworkResult
+import com.x8bit.bitwarden.data.platform.datasource.network.util.executeForResult
 import com.x8bit.bitwarden.data.platform.datasource.network.util.parseErrorBodyOrNull
-import com.x8bit.bitwarden.data.platform.datasource.network.util.toResult
 import com.x8bit.bitwarden.data.platform.util.DeviceModelProvider
 import kotlinx.serialization.json.Json
+import okhttp3.ResponseBody

 class IdentityServiceImpl(
-    private val unauthenticatedIdentityApi: UnauthenticatedIdentityApi,
+    private val api: IdentityApi,
    private val json: Json,
    private val deviceModelProvider: DeviceModelProvider = DeviceModelProvider(),
 ) : IdentityService {

    override suspend fun preLogin(email: String): Result<PreLoginResponseJson> =
-        unauthenticatedIdentityApi
-            .preLogin(PreLoginRequestJson(email = email))
-            .toResult()
+        api.preLogin(PreLoginRequestJson(email = email))

    @Suppress("MagicNumber")
    override suspend fun register(body: RegisterRequestJson): Result<RegisterResponseJson> =
-        unauthenticatedIdentityApi
+        api
            .register(body)
-            .toResult()
            .recoverCatching { throwable ->
                val bitwardenError = throwable.toBitwardenError()
-                bitwardenError
-                    .parseErrorBodyOrNull<RegisterResponseJson.CaptchaRequired>(
-                        code = 400,
-                        json = json,
-                    )
-                    ?: bitwardenError.parseErrorBodyOrNull<RegisterResponseJson.Invalid>(
-                        codes = listOf(400, 429),
-                        json = json,
-                    )
-                    ?: throw throwable
+                bitwardenError.parseErrorBodyOrNull<RegisterResponseJson.CaptchaRequired>(
+                    code = 400,
+                    json = json,
+                ) ?: bitwardenError.parseErrorBodyOrNull<RegisterResponseJson.Invalid>(
+                    codes = listOf(400, 429),
+                    json = json,
+                ) ?: bitwardenError.parseErrorBodyOrNull<RegisterResponseJson.Error>(
+                    code = 429,
+                    json = json,
+                ) ?: throw throwable
+            }
+
+    @Suppress("MagicNumber")
+    override suspend fun registerFinish(body: RegisterFinishRequestJson): Result<RegisterResponseJson> =
+        api
+            .registerFinish(body)
+            .recoverCatching { throwable ->
+                val bitwardenError = throwable.toBitwardenError()
+                bitwardenError.parseErrorBodyOrNull<RegisterResponseJson.Invalid>(
+                    codes = listOf(400, 429),
+                    json = json,
+                ) ?: bitwardenError.parseErrorBodyOrNull<RegisterResponseJson.Error>(
+                    code = 429,
+                    json = json,
+                ) ?: throw throwable
            }

    @Suppress("MagicNumber")
@@ -60,8 +69,7 @@ class IdentityServiceImpl(
        authModel: IdentityTokenAuthModel,
        captchaToken: String?,
        twoFactorData: TwoFactorDataModel?,
-        newDeviceOtp: String?,
-    ): Result<GetTokenResponseJson> = unauthenticatedIdentityApi
+    ): Result<GetTokenResponseJson> = api
        .getToken(
            scope = "api offline_access",
            clientId = "mobile",
@@ -80,120 +88,41 @@ class IdentityServiceImpl(
            twoFactorRemember = twoFactorData?.remember?.let { if (it) "1" else "0 " },
            captchaResponse = captchaToken,
            authRequestId = authModel.authRequestId,
-            newDeviceOtp = newDeviceOtp,
        )
-        .toResult()
        .recoverCatching { throwable ->
            val bitwardenError = throwable.toBitwardenError()
-            bitwardenError
-                .parseErrorBodyOrNull<GetTokenResponseJson.CaptchaRequired>(
-                    code = 400,
-                    json = json,
-                )
-                ?: bitwardenError.parseErrorBodyOrNull<GetTokenResponseJson.TwoFactorRequired>(
-                    code = 400,
-                    json = json,
-                )
-                ?: bitwardenError.parseErrorBodyOrNull<GetTokenResponseJson.Invalid>(
-                    code = 400,
-                    json = json,
-                )
-                ?: throw throwable
+            bitwardenError.parseErrorBodyOrNull<GetTokenResponseJson.CaptchaRequired>(
+                code = 400,
+                json = json,
+            ) ?: bitwardenError.parseErrorBodyOrNull<GetTokenResponseJson.TwoFactorRequired>(
+                code = 400,
+                json = json,
+            ) ?: bitwardenError.parseErrorBodyOrNull<GetTokenResponseJson.Invalid>(
+                code = 400,
+                json = json,
+            ) ?: throw throwable
        }

-    @Suppress("MagicNumber")
    override suspend fun prevalidateSso(
        organizationIdentifier: String,
-    ): Result<PrevalidateSsoResponseJson> = unauthenticatedIdentityApi
+    ): Result<PrevalidateSsoResponseJson> = api
        .prevalidateSso(
            organizationIdentifier = organizationIdentifier,
        )
-        .toResult()
-        .recoverCatching { throwable ->
-            val bitwardenError = throwable.toBitwardenError()
-            bitwardenError
-                .parseErrorBodyOrNull<PrevalidateSsoResponseJson.Error>(
-                    code = 400,
-                    json = json,
-                )
-                ?: throw throwable
-        }

    override fun refreshTokenSynchronously(
        refreshToken: String,
-    ): Result<RefreshTokenResponseJson> = unauthenticatedIdentityApi
+    ): Result<RefreshTokenResponseJson> = api
        .refreshTokenCall(
            clientId = "mobile",
            grantType = "refresh_token",
            refreshToken = refreshToken,
        )
-        .executeForNetworkResult()
-        .toResult()
+        .executeForResult()

-    @Suppress("MagicNumber")
-    override suspend fun registerFinish(
-        body: RegisterFinishRequestJson,
-    ): Result<RegisterResponseJson> =
-        unauthenticatedIdentityApi
-            .registerFinish(body)
-            .toResult()
-            .recoverCatching { throwable ->
-                val bitwardenError = throwable.toBitwardenError()
-                bitwardenError
-                    .parseErrorBodyOrNull<RegisterResponseJson.Invalid>(
-                        codes = listOf(400, 429),
-                        json = json,
-                    )
-                    ?: throw throwable
-            }
-
-    @Suppress("MagicNumber")
    override suspend fun sendVerificationEmail(
        body: SendVerificationEmailRequestJson,
-    ): Result<SendVerificationEmailResponseJson> {
-        return unauthenticatedIdentityApi
-            .sendVerificationEmail(body = body)
-            .toResult()
-            .map { SendVerificationEmailResponseJson.Success(it?.content) }
-            .recoverCatching { throwable ->
-                throwable
-                    .toBitwardenError()
-                    .parseErrorBodyOrNull<SendVerificationEmailResponseJson.Invalid>(
-                        code = 400,
-                        json = json,
-                    )
-                    ?: throw throwable
-            }
+    ): Result<ResponseBody?> {
+        return api.sendVerificationEmail(body = body)
    }
-
-    @Suppress("MagicNumber")
-    override suspend fun verifyEmailRegistrationToken(
-        body: VerifyEmailTokenRequestJson,
-    ): Result<VerifyEmailTokenResponseJson> = unauthenticatedIdentityApi
-        .verifyEmailToken(
-            body = body,
-        )
-        .toResult()
-        .map { VerifyEmailTokenResponseJson.Valid }
-        .recoverCatching { throwable ->
-            val bitwardenError = throwable.toBitwardenError()
-            bitwardenError
-                .parseErrorBodyOrNull<VerifyEmailTokenResponseJson.Invalid>(
-                    code = 400,
-                    json = json,
-                )
-                ?.checkForExpiredMessage()
-                ?: throw throwable
-        }
 }
-
-/**
- * If the message body contains text related to the token being expired, return
- * the TokenExpired type. Otherwise, return the original Invalid response.
- */
-private fun VerifyEmailTokenResponseJson.Invalid.checkForExpiredMessage() =
-    if (message.contains(other = "expired", ignoreCase = true)) {
-        VerifyEmailTokenResponseJson.TokenExpired
-    } else {
-        this
-    }
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/NewAuthRequestServiceImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/NewAuthRequestServiceImpl.kt
@@ -5,7 +5,6 @@ import com.x8bit.bitwarden.data.auth.datasource.network.api.UnauthenticatedAuthR
 import com.x8bit.bitwarden.data.auth.datasource.network.model.AuthRequestRequestJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.AuthRequestTypeJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.AuthRequestsResponseJson
-import com.x8bit.bitwarden.data.platform.datasource.network.util.toResult
 import com.x8bit.bitwarden.data.platform.util.asFailure

 /**
@@ -25,19 +24,17 @@ class NewAuthRequestServiceImpl(
    ): Result<AuthRequestsResponseJson.AuthRequest> =
        when (authRequestType) {
            AuthRequestTypeJson.LOGIN_WITH_DEVICE -> {
-                unauthenticatedAuthRequestsApi
-                    .createAuthRequest(
-                        deviceIdentifier = deviceId,
-                        body = AuthRequestRequestJson(
-                            email = email,
-                            publicKey = publicKey,
-                            deviceId = deviceId,
-                            accessCode = accessCode,
-                            fingerprint = fingerprint,
-                            type = authRequestType,
-                        ),
-                    )
-                    .toResult()
+                unauthenticatedAuthRequestsApi.createAuthRequest(
+                    deviceIdentifier = deviceId,
+                    body = AuthRequestRequestJson(
+                        email = email,
+                        publicKey = publicKey,
+                        deviceId = deviceId,
+                        accessCode = accessCode,
+                        fingerprint = fingerprint,
+                        type = authRequestType,
+                    ),
+                )
            }

            AuthRequestTypeJson.UNLOCK -> {
@@ -46,19 +43,17 @@ class NewAuthRequestServiceImpl(
            }

            AuthRequestTypeJson.ADMIN_APPROVAL -> {
-                authenticatedAuthRequestsApi
-                    .createAdminAuthRequest(
-                        deviceIdentifier = deviceId,
-                        body = AuthRequestRequestJson(
-                            email = email,
-                            publicKey = publicKey,
-                            deviceId = deviceId,
-                            accessCode = accessCode,
-                            fingerprint = fingerprint,
-                            type = authRequestType,
-                        ),
-                    )
-                    .toResult()
+                authenticatedAuthRequestsApi.createAdminAuthRequest(
+                    deviceIdentifier = deviceId,
+                    body = AuthRequestRequestJson(
+                        email = email,
+                        publicKey = publicKey,
+                        deviceId = deviceId,
+                        accessCode = accessCode,
+                        fingerprint = fingerprint,
+                        type = authRequestType,
+                    ),
+                )
            }
        }

@@ -68,15 +63,11 @@ class NewAuthRequestServiceImpl(
        isSso: Boolean,
    ): Result<AuthRequestsResponseJson.AuthRequest> =
        if (isSso) {
-            authenticatedAuthRequestsApi
-                .getAuthRequest(requestId = requestId)
-                .toResult()
+            authenticatedAuthRequestsApi.getAuthRequest(requestId)
        } else {
-            unauthenticatedAuthRequestsApi
-                .getAuthRequestUpdate(
-                    requestId = requestId,
-                    accessCode = accessCode,
-                )
-                .toResult()
+            unauthenticatedAuthRequestsApi.getAuthRequestUpdate(
+                requestId = requestId,
+                accessCode = accessCode,
+            )
        }
 }
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/OrganizationService.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/OrganizationService.kt
@@ -3,7 +3,6 @@ package com.x8bit.bitwarden.data.auth.datasource.network.service
 import com.x8bit.bitwarden.data.auth.datasource.network.model.OrganizationAutoEnrollStatusResponseJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.OrganizationDomainSsoDetailsResponseJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.OrganizationKeysResponseJson
-import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifiedOrganizationDomainSsoDetailsResponse

 /**
 * Provides an API for querying organization endpoints.
@@ -39,12 +38,4 @@ interface OrganizationService {
    suspend fun getOrganizationKeys(
        organizationId: String,
    ): Result<OrganizationKeysResponseJson>
-
-    /**
-     * Request organization verified domain details for an [email] needed for SSO
-     * requests.
-     */
-    suspend fun getVerifiedOrganizationDomainSsoDetails(
-        email: String,
-    ): Result<VerifiedOrganizationDomainSsoDetailsResponse>
 }
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/OrganizationServiceImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/OrganizationServiceImpl.kt
@@ -1,22 +1,19 @@
 package com.x8bit.bitwarden.data.auth.datasource.network.service

 import com.x8bit.bitwarden.data.auth.datasource.network.api.AuthenticatedOrganizationApi
-import com.x8bit.bitwarden.data.auth.datasource.network.api.UnauthenticatedOrganizationApi
+import com.x8bit.bitwarden.data.auth.datasource.network.api.OrganizationApi
 import com.x8bit.bitwarden.data.auth.datasource.network.model.OrganizationAutoEnrollStatusResponseJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.OrganizationDomainSsoDetailsRequestJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.OrganizationDomainSsoDetailsResponseJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.OrganizationKeysResponseJson
 import com.x8bit.bitwarden.data.auth.datasource.network.model.OrganizationResetPasswordEnrollRequestJson
-import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifiedOrganizationDomainSsoDetailsRequest
-import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifiedOrganizationDomainSsoDetailsResponse
-import com.x8bit.bitwarden.data.platform.datasource.network.util.toResult

 /**
 * Default implementation of [OrganizationService].
 */
 class OrganizationServiceImpl(
    private val authenticatedOrganizationApi: AuthenticatedOrganizationApi,
-    private val unauthenticatedOrganizationApi: UnauthenticatedOrganizationApi,
+    private val organizationApi: OrganizationApi,
 ) : OrganizationService {
    override suspend fun organizationResetPasswordEnroll(
        organizationId: String,
@@ -32,17 +29,15 @@ class OrganizationServiceImpl(
                resetPasswordKey = resetPasswordKey,
            ),
        )
-        .toResult()

    override suspend fun getOrganizationDomainSsoDetails(
        email: String,
-    ): Result<OrganizationDomainSsoDetailsResponseJson> = unauthenticatedOrganizationApi
+    ): Result<OrganizationDomainSsoDetailsResponseJson> = organizationApi
        .getClaimedDomainOrganizationDetails(
            body = OrganizationDomainSsoDetailsRequestJson(
                email = email,
            ),
        )
-        .toResult()

    override suspend fun getOrganizationAutoEnrollStatus(
        organizationIdentifier: String,
@@ -50,7 +45,6 @@ class OrganizationServiceImpl(
        .getOrganizationAutoEnrollResponse(
            organizationIdentifier = organizationIdentifier,
        )
-        .toResult()

    override suspend fun getOrganizationKeys(
        organizationId: String,
@@ -58,15 +52,4 @@ class OrganizationServiceImpl(
        .getOrganizationKeys(
            organizationId = organizationId,
        )
-        .toResult()
-
-    override suspend fun getVerifiedOrganizationDomainSsoDetails(
-        email: String,
-    ): Result<VerifiedOrganizationDomainSsoDetailsResponse> = unauthenticatedOrganizationApi
-        .getVerifiedOrganizationDomainsByEmail(
-            body = VerifiedOrganizationDomainSsoDetailsRequest(
-                email = email,
-            ),
-        )
-        .toResult()
 }
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSource.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSource.kt
@@ -1,7 +1,6 @@
 package com.x8bit.bitwarden.data.auth.datasource.sdk

 import com.bitwarden.core.AuthRequestResponse
-import com.bitwarden.core.KeyConnectorResponse
 import com.bitwarden.core.MasterPasswordPolicyOptions
 import com.bitwarden.core.RegisterKeyResponse
 import com.bitwarden.core.RegisterTdeKeyResponse
@@ -38,11 +37,6 @@ interface AuthSdkSource {
        purpose: HashPurpose,
    ): Result<String>

-    /**
-     * Creates a set of encryption key information for use with a key connector.
-     */
-    suspend fun makeKeyConnectorKeys(): Result<KeyConnectorResponse>
-
    /**
     * Creates a set of encryption key information for registration.
     */
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSourceImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSourceImpl.kt
@@ -2,31 +2,29 @@ package com.x8bit.bitwarden.data.auth.datasource.sdk

 import com.bitwarden.core.AuthRequestResponse
 import com.bitwarden.core.FingerprintRequest
-import com.bitwarden.core.KeyConnectorResponse
 import com.bitwarden.core.MasterPasswordPolicyOptions
 import com.bitwarden.core.RegisterKeyResponse
 import com.bitwarden.core.RegisterTdeKeyResponse
 import com.bitwarden.crypto.HashPurpose
 import com.bitwarden.crypto.Kdf
-import com.bitwarden.sdk.AuthClient
+import com.bitwarden.sdk.Client
+import com.bitwarden.sdk.ClientAuth
 import com.x8bit.bitwarden.data.auth.datasource.sdk.model.PasswordStrength
 import com.x8bit.bitwarden.data.auth.datasource.sdk.util.toPasswordStrengthOrNull
 import com.x8bit.bitwarden.data.auth.datasource.sdk.util.toUByte
-import com.x8bit.bitwarden.data.platform.datasource.sdk.BaseSdkSource
 import com.x8bit.bitwarden.data.platform.manager.SdkClientManager

 /**
 * Primary implementation of [AuthSdkSource] that serves as a convenience wrapper around a
- * [AuthClient].
+ * [ClientAuth].
 */
 class AuthSdkSourceImpl(
-    sdkClientManager: SdkClientManager,
-) : BaseSdkSource(sdkClientManager = sdkClientManager),
-    AuthSdkSource {
+    private val sdkClientManager: SdkClientManager,
+) : AuthSdkSource {

    override suspend fun getNewAuthRequest(
        email: String,
-    ): Result<AuthRequestResponse> = runCatchingWithLogs {
+    ): Result<AuthRequestResponse> = runCatching {
        getClient()
            .auth()
            .newAuthRequest(
@@ -37,7 +35,7 @@ class AuthSdkSourceImpl(
    override suspend fun getUserFingerprint(
        email: String,
        publicKey: String,
-    ): Result<String> = runCatchingWithLogs {
+    ): Result<String> = runCatching {
        getClient()
            .platform()
            .fingerprint(
@@ -53,7 +51,7 @@ class AuthSdkSourceImpl(
        password: String,
        kdf: Kdf,
        purpose: HashPurpose,
-    ): Result<String> = runCatchingWithLogs {
+    ): Result<String> = runCatching {
        getClient()
            .auth()
            .hashPassword(
@@ -64,18 +62,11 @@ class AuthSdkSourceImpl(
            )
    }

-    override suspend fun makeKeyConnectorKeys(): Result<KeyConnectorResponse> =
-        runCatchingWithLogs {
-            getClient()
-                .auth()
-                .makeKeyConnectorKeys()
-        }
-
    override suspend fun makeRegisterKeys(
        email: String,
        password: String,
        kdf: Kdf,
-    ): Result<RegisterKeyResponse> = runCatchingWithLogs {
+    ): Result<RegisterKeyResponse> = runCatching {
        getClient()
            .auth()
            .makeRegisterKeys(
@@ -90,7 +81,7 @@ class AuthSdkSourceImpl(
        email: String,
        orgPublicKey: String,
        rememberDevice: Boolean,
-    ): Result<RegisterTdeKeyResponse> = runCatchingWithLogs {
+    ): Result<RegisterTdeKeyResponse> = runCatching {
        getClient(userId = userId)
            .auth()
            .makeRegisterTdeKeys(
@@ -104,7 +95,7 @@ class AuthSdkSourceImpl(
        email: String,
        password: String,
        additionalInputs: List<String>,
-    ): Result<PasswordStrength> = runCatchingWithLogs {
+    ): Result<PasswordStrength> = runCatching {
        @Suppress("UnsafeCallOnNullableType")
        getClient()
            .auth()
@@ -120,7 +111,7 @@ class AuthSdkSourceImpl(
        password: String,
        passwordStrength: PasswordStrength,
        policy: MasterPasswordPolicyOptions,
-    ): Result<Boolean> = runCatchingWithLogs {
+    ): Result<Boolean> = runCatching {
        getClient()
            .auth()
            .satisfiesPolicy(
@@ -129,4 +120,8 @@ class AuthSdkSourceImpl(
                policy = policy,
            )
    }
+
+    private suspend fun getClient(
+        userId: String? = null,
+    ): Client = sdkClientManager.getOrCreateClient(userId = userId)
 }
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AddTotpItemFromAuthenticatorManager.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AddTotpItemFromAuthenticatorManager.kt
@@ -1,15 +0,0 @@
-package com.x8bit.bitwarden.data.auth.manager
-
-import com.x8bit.bitwarden.ui.vault.model.TotpData
-
-/**
- * Manager for keeping track of requests from the Bitwarden Authenticator app to add a TOTP
- * item.
- */
-interface AddTotpItemFromAuthenticatorManager {
-
-    /**
-     * Current pending [TotpData] to be added from the Authenticator app.
-     */
-    var pendingAddTotpLoginItemData: TotpData?
-}
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AddTotpItemFromAuthenticatorManagerImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AddTotpItemFromAuthenticatorManagerImpl.kt
@@ -1,11 +0,0 @@
-package com.x8bit.bitwarden.data.auth.manager
-
-import com.x8bit.bitwarden.ui.vault.model.TotpData
-
-/**
- * Default in memory implementation for [AddTotpItemFromAuthenticatorManager].
- */
-class AddTotpItemFromAuthenticatorManagerImpl : AddTotpItemFromAuthenticatorManager {
-
-    override var pendingAddTotpLoginItemData: TotpData? = null
-}
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManager.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManager.kt
@@ -10,7 +10,7 @@ import com.x8bit.bitwarden.data.auth.manager.model.CreateAuthRequestResult
 import kotlinx.coroutines.flow.Flow

 /**
- * A manager class for handling authentication for logging in with remote device.
+ * A manager class for handling authentication fo logging in with remote device.
 */
 interface AuthRequestManager {
    /**
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerImpl.kt
@@ -17,7 +17,6 @@ import com.x8bit.bitwarden.data.auth.manager.model.CreateAuthRequestResult
 import com.x8bit.bitwarden.data.auth.manager.util.isSso
 import com.x8bit.bitwarden.data.auth.manager.util.toAuthRequestTypeJson
 import com.x8bit.bitwarden.data.platform.util.asFailure
-import com.x8bit.bitwarden.data.platform.util.asSuccess
 import com.x8bit.bitwarden.data.platform.util.flatMap
 import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource
 import kotlinx.coroutines.currentCoroutineContext
@@ -66,7 +65,7 @@ class AuthRequestManagerImpl(
        email: String,
        authRequestType: AuthRequestType,
    ): Flow<CreateAuthRequestResult> = flow {
-        val initialResult = createNewAuthRequestIfNecessary(
+        val initialResult = createNewAuthRequest(
            email = email,
            authRequestType = authRequestType.toAuthRequestTypeJson(),
        )
@@ -75,6 +74,7 @@ class AuthRequestManagerImpl(
                emit(CreateAuthRequestResult.Error)
                return@flow
            }
+        val authRequestResponse = initialResult.authRequestResponse
        var authRequest = initialResult.authRequest
        emit(CreateAuthRequestResult.Update(authRequest))

@@ -84,7 +84,7 @@ class AuthRequestManagerImpl(
            newAuthRequestService
                .getAuthRequestUpdate(
                    requestId = authRequest.id,
-                    accessCode = initialResult.accessCode,
+                    accessCode = authRequestResponse.accessCode,
                    isSso = authRequestType.isSso,
                )
                .map { request ->
@@ -112,8 +112,7 @@ class AuthRequestManagerImpl(
                                emit(
                                    CreateAuthRequestResult.Success(
                                        authRequest = updateAuthRequest,
-                                        privateKey = initialResult.privateKey,
-                                        accessCode = initialResult.accessCode,
+                                        authRequestResponse = authRequestResponse,
                                    ),
                                )
                            }
@@ -355,52 +354,6 @@ class AuthRequestManagerImpl(
            )
    }

-    /**
-     * Creates a new auth request for the given email and returns a [NewAuthRequestData].
-     * If the auth request type is [AuthRequestTypeJson.ADMIN_APPROVAL], check for a
-     * pending auth request and return it if it exists we should return that request.
-     */
-    private suspend fun createNewAuthRequestIfNecessary(
-        email: String,
-        authRequestType: AuthRequestTypeJson,
-    ): Result<NewAuthRequestData> {
-        return if (authRequestType == AuthRequestTypeJson.ADMIN_APPROVAL) {
-            authDiskSource
-                .getPendingAuthRequest(requireNotNull(activeUserId))
-                ?.let { pendingAuthRequest ->
-                    authRequestsService
-                        .getAuthRequest(pendingAuthRequest.requestId)
-                        .map {
-                            NewAuthRequestData(
-                                authRequest = AuthRequest(
-                                    id = it.id,
-                                    publicKey = it.publicKey,
-                                    platform = it.platform,
-                                    ipAddress = it.ipAddress,
-                                    key = it.key,
-                                    masterPasswordHash = it.masterPasswordHash,
-                                    creationDate = it.creationDate,
-                                    responseDate = it.responseDate,
-                                    requestApproved = it.requestApproved ?: false,
-                                    originUrl = it.originUrl,
-                                    fingerprint = pendingAuthRequest.requestFingerprint,
-                                ),
-                                privateKey = pendingAuthRequest.requestPrivateKey,
-                                accessCode = pendingAuthRequest.requestAccessCode,
-                            )
-                                .asSuccess()
-                        }
-                        .getOrNull()
-                }
-                ?: createNewAuthRequest(email = email, authRequestType = authRequestType)
-        } else {
-            createNewAuthRequest(
-                email = email,
-                authRequestType = authRequestType,
-            )
-        }
-    }
-
    /**
     * Attempts to create a new auth request for the given email and returns a [NewAuthRequestData]
     * with the [AuthRequest] and [AuthRequestResponse].
@@ -428,8 +381,6 @@ class AuthRequestManagerImpl(
                                pendingAuthRequest = PendingAuthRequestJson(
                                    requestId = it.id,
                                    requestPrivateKey = authRequestResponse.privateKey,
-                                    requestAccessCode = authRequestResponse.accessCode,
-                                    requestFingerprint = authRequestResponse.fingerprint,
                                ),
                            )
                        }
@@ -449,13 +400,7 @@ class AuthRequestManagerImpl(
                            fingerprint = authRequestResponse.fingerprint,
                        )
                    }
-                    .map {
-                        NewAuthRequestData(
-                            authRequest = it,
-                            privateKey = authRequestResponse.privateKey,
-                            accessCode = authRequestResponse.accessCode,
-                        )
-                    }
+                    .map { NewAuthRequestData(it, authRequestResponse) }
            }

    private suspend fun getFingerprintPhrase(
@@ -475,6 +420,5 @@ class AuthRequestManagerImpl(
 */
 private data class NewAuthRequestData(
    val authRequest: AuthRequest,
-    val privateKey: String,
-    val accessCode: String,
+    val authRequestResponse: AuthRequestResponse,
 )
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
André Bispo	155d107ce4	[PM-9933] Update copy for marketing emails	2024-07-23 12:12:13 +01:00
André Bispo	3251d776a2	Merge branch 'main' into pm-6702/registration-flows # Conflicts: # app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/intent/IntentManager.kt	2024-07-23 10:38:55 +01:00
André Bispo	c5df4c115b	[PM-6702] Tests code clean up	2024-07-23 10:37:44 +01:00
André Bispo	fd1ecbb759	Merge branch 'main' into pm-6702/registration-flows # Conflicts: # app/src/test/java/com/x8bit/bitwarden/MainViewModelTest.kt	2024-07-22 18:32:43 +01:00
André Bispo	8484d111a6	[PM-6702] Fix typos	2024-07-22 18:00:03 +01:00
André Bispo	fd8068f5f7	[PM-6702] Code format	2024-07-22 17:02:00 +01:00
André Bispo	20b1ac2a79	[PM-6702] Code format	2024-07-22 16:59:43 +01:00
André Bispo	61f7daddf3	[PM-6702] Open email app instead of opening the app on compose email	2024-07-22 16:43:09 +01:00
André Bispo	2cbede24b5	[PM-6702] Refactor timestamp property	2024-07-22 15:08:45 +01:00
André Bispo	cde639de8c	[PM-6702] Fix tests of CompleteRegistration	2024-07-22 14:49:06 +01:00
André Bispo	5a225fb786	[PM-6702] Handle no body response from SendVerificationEmail	2024-07-22 14:48:41 +01:00
André Bispo	64af6eac55	[PM-6702] Save the environment in which a user started the registration process. Load the environment to complete registration in that environment.	2024-07-19 20:42:17 +01:00
André Bispo	78031e306f	[PM-6702] Fix tests for StartRegistration	2024-07-19 15:24:44 +01:00
André Bispo	45159f2e1b	[PM-6702] Fix StartRegistration tests	2024-07-19 12:28:47 +01:00
André Bispo	1ee216cb7d	[PM-6702] Sanitize AppLink Uri by removing the fragment char	2024-07-19 12:28:18 +01:00
André Bispo	0c878956d2	[PM-6702] Change CompleteRegistration navigate to login, to navigate to landing	2024-07-19 12:26:03 +01:00
André Bispo	e819043c9e	[PM-6702] Remove captcha from StartRegistration	2024-07-19 12:22:05 +01:00
André Bispo	99c496e300	[PM-6702] Move register finish from api to identity	2024-07-19 12:20:53 +01:00
André Bispo	6c78ecf297	[PM-6702] Change send verification email response.	2024-07-11 17:06:40 +01:00
André Bispo	fbbb3379ca	[PM-6702] Rename register finish request params	2024-07-11 17:05:14 +01:00
André Bispo	54d232e3b0	[PM-6702] Hide marketing switch if region is self-hosted	2024-07-05 18:47:06 +01:00
André Bispo	bcaeb82623	Merge branch 'main' into pm-6702/registration-flows # Conflicts: # app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt	2024-07-03 11:43:37 +01:00
André Bispo	fa94904028	[PM-6702] Add CheckEmail tests	2024-07-03 11:42:12 +01:00
André Bispo	be5bc73e5b	[PM-6702] Add CompleteRegistration tests	2024-07-02 21:13:53 +01:00
André Bispo	b95f456e11	[PM-6702] Add StartRegistration tests	2024-07-02 15:15:22 +01:00
André Bispo	3b93014b70	[PM-6702] Make name optional on start registration	2024-07-02 15:14:44 +01:00
André Bispo	ca3bbb54b7	[PM-6702] Fix unit tests	2024-07-01 11:48:24 +01:00
André Bispo	e5dded89ef	Merge branch 'main' into pm-6702/registration-flows # Conflicts: # app/src/main/res/values/strings.xml	2024-06-28 17:30:56 +01:00
André Bispo	de2b374619	[PM-6702] Add updated service calls for start registration and complete registration	2024-06-28 17:29:28 +01:00
André Bispo	68eb8b716c	[PM-6702] Add fromEmail parameter from email URL AppLink	2024-06-28 17:28:49 +01:00
André Bispo	75c2f0e97e	[Pm-6702] Pass arguments from AppLink to Complete registration. Compute region from url domain	2024-06-25 23:34:11 +01:00
André Bispo	ec8c1e36b6	[Pm-6702] Fix AppLink flow to complete registration	2024-06-24 15:38:12 +01:00
André Bispo	12db5ee610	[PM-6702] Add AppLink support to open links sent to email to complete account registration (cherry picked from commit `b867079ced`)	2024-06-22 15:26:41 +01:00
André Bispo	51f9e3f24c	[PM-6702] Fix clickable text font weight (cherry picked from commit `2556217432`)	2024-06-22 15:25:14 +01:00
André Bispo	37822f48f5	[PM-6702] Fix password strength indicator component package name (cherry picked from commit `fe9c7794ce`)	2024-06-22 15:25:03 +01:00
André Bispo	066a352095	[PM-6702] Add Check your email screen used for cloud registration flow. (cherry picked from commit `fa8a5b80a2`)	2024-06-22 15:24:45 +01:00
André Bispo	363998a624	[PM-8947] Add marketing toggle and rewrite terms and conditions UI (cherry picked from commit `53430cdf8a`)	2024-06-22 15:24:23 +01:00
André Bispo	9094f6f1d0	[PM-6701] Add Complete Registration screen (cherry picked from commit `da27115906`)	2024-06-22 15:24:10 +01:00
André Bispo	6f7b6fea6d	[PM-6701] Add start registration screen and all the navigation logic necessary in landing screen (cherry picked from commit `bc44043bfc`)	2024-06-22 15:23:25 +01:00
André Bispo	6994ced5d2	[PM-6701] Extract environment selector to its own file for reusability (cherry picked from commit `a417e5cc11`)	2024-06-22 15:23:00 +01:00
				`@@ -0,0 +1 @@`
				`shroud.reportKover 'App', 'app/build/reports/kover/reportStandardDebug.xml', 80, 80, false`