Merge branch 'main' into agalles/automate-android-fastlane-patch

Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>

.github/workflows/build-authenticator.yml

@@ -29,6 +29,10 @@ env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   JAVA_VERSION: 17
 
+permissions:
+  contents: read
+  packages: read
+
 jobs:
   build:
     name: Build Authenticator

.github/workflows/build.yml

@@ -30,6 +30,10 @@ env:
   JAVA_VERSION: 17
   GITHUB_ACTION_RUN_URL: "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
 
+permissions:
+  contents: read
+  packages: read
+
 jobs:
   build:
     name: Build
@@ -195,7 +199,7 @@ jobs:
 
       - name: Increment version
         run: |
-          DEFAULT_VERSION_CODE=$((11000+$GITHUB_RUN_NUMBER))
+          DEFAULT_VERSION_CODE=$((11000+GITHUB_RUN_NUMBER))
           bundle exec fastlane setBuildVersionInfo \
           versionCode:${{ inputs.version-code || '$DEFAULT_VERSION_CODE' }} \
           versionName:${{ inputs.version-name }}
@@ -481,7 +485,7 @@ jobs:
       # Start from 11000 to prevent collisions with mobile build version codes
       - name: Increment version
         run: |
-          DEFAULT_VERSION_CODE=$((11000+$GITHUB_RUN_NUMBER))
+          DEFAULT_VERSION_CODE=$((11000+GITHUB_RUN_NUMBER))
           VERSION_CODE="${{ inputs.version-code || '$DEFAULT_VERSION_CODE' }}"
           bundle exec fastlane setBuildVersionInfo \
           versionCode:$VERSION_CODE \

.github/workflows/crowdin-pull-authenticator.yml

@@ -1,56 +0,0 @@
-name: Crowdin Sync - Authenticator
-
-on:
-  workflow_dispatch:
-    inputs: {}
-  schedule:
-    - cron: '0 0 * * 5'
-
-jobs:
-  crowdin-sync:
-    name: Autosync
-    runs-on: ubuntu-24.04
-    env:
-      _CROWDIN_PROJECT_ID: "673718"
-    steps:
-      - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Log in to Azure - CI Subscription
-        uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
-        with:
-          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
-
-      - name: Retrieve secrets
-        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
-        with:
-          keyvault: "bitwarden-ci"
-          secrets: "github-gpg-private-key, github-gpg-private-key-passphrase"
-
-      - name: Generate GH App token
-        uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
-        id: app-token
-        with:
-          app-id: ${{ secrets.BW_GHAPP_ID }}
-          private-key: ${{ secrets.BW_GHAPP_KEY }}
-
-      - name: Download translations
-        uses: crowdin/github-action@b8012bd5491b8aa8578b73ab5b5f5e7c94aaa6e2 # v2.7.0
-        env:
-          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
-          CROWDIN_API_TOKEN: ${{ secrets.CROWDIN_API_TOKEN }}
-        with:
-          config: crowdin-bwa.yml
-          upload_sources: false
-          upload_translations: false
-          download_translations: true
-          github_user_name: "bitwarden-devops-bot"
-          github_user_email: "106330231+bitwarden-devops-bot@users.noreply.github.com"
-          commit_message: "Autosync the updated translations"
-          localization_branch_name: crowdin-auto-sync
-          create_pull_request: true
-          pull_request_title: "Autosync Crowdin Translations"
-          pull_request_body: "Autosync the updated translations"
-          gpg_private_key: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key }}
-          gpg_passphrase: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key-passphrase }}

.github/workflows/crowdin-pull.yml

@@ -1,17 +1,29 @@
-name: Crowdin Sync
+name: Cron / Crowdin Pull
+run-name: Crowdin Pull - ${{ github.event_name == 'workflow_dispatch' && 'Manual' || 'Scheduled' }}
 
 on:
   workflow_dispatch:
-    inputs: {}
   schedule:
     - cron: '0 0 * * 5'
 
 jobs:
   crowdin-sync:
-    name: Autosync
+    name: Crowdin Pull - ${{ matrix.name }} - ${{ github.event_name }}
     runs-on: ubuntu-24.04
-    env:
-      _CROWDIN_PROJECT_ID: "269690"
+    permissions:
+      contents: write
+      pull-requests: write
+    strategy:
+      matrix:
+        include:
+          - name: Password Manager
+            project_id: 269690
+            config: crowdin-bwpm.yml
+            branch: crowdin-pull-bwpm
+          - name: Authenticator
+            project_id: 673718
+            config: crowdin-bwa.yml
+            branch: crowdin-pull-bwa
     steps:
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -35,22 +47,23 @@ jobs:
           app-id: ${{ secrets.BW_GHAPP_ID }}
           private-key: ${{ secrets.BW_GHAPP_KEY }}
 
-      - name: Download translations
+      - name: Download translations for ${{ matrix.name }}
         uses: crowdin/github-action@b8012bd5491b8aa8578b73ab5b5f5e7c94aaa6e2 # v2.7.0
         env:
           GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
           CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
+          _CROWDIN_PROJECT_ID: ${{ matrix.project_id }}
         with:
-          config: crowdin.yml
+          config: ${{ matrix.config }}
           upload_sources: false
           upload_translations: false
           download_translations: true
           github_user_name: "bitwarden-devops-bot"
           github_user_email: "106330231+bitwarden-devops-bot@users.noreply.github.com"
-          commit_message: "Autosync the updated translations"
-          localization_branch_name: crowdin-auto-sync
+          commit_message: "Crowdin Pull - ${{ matrix.name }}"
+          localization_branch_name: ${{ matrix.branch }}
           create_pull_request: true
-          pull_request_title: "Autosync Crowdin Translations"
-          pull_request_body: "Autosync the updated translations"
+          pull_request_title: "Crowdin Pull - ${{ matrix.name }}"
+          pull_request_body: ":inbox_tray: New translations for ${{ matrix.name }} received!"
           gpg_private_key: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key }}
           gpg_passphrase: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key-passphrase }}

.github/workflows/crowdin-push-authenticator.yml

@@ -1,30 +0,0 @@
-name: Crowdin Push - Authenticator
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - "main"
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  JAVA_VERSION: 17
-
-jobs:
-  crowdin-push:
-    name: Crowdin Push
-    runs-on: ubuntu-24.04
-    env:
-      _CROWDIN_PROJECT_ID: "673718"
-    steps:
-      - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Upload sources
-        uses: crowdin/github-action@b8012bd5491b8aa8578b73ab5b5f5e7c94aaa6e2 # v2.7.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CROWDIN_API_TOKEN: ${{ secrets.CROWDIN_API_TOKEN }}
-        with:
-          config: crowdin-bwa.yml
-          upload_sources: true
-          upload_translations: false

.github/workflows/crowdin-push.yml

@@ -1,17 +1,18 @@
-name: Crowdin Push
+name: CI / Crowdin Push
+run-name: Crowdin Push - ${{ github.event_name == 'workflow_dispatch' && 'Manual' || 'CI' }}
 
 on:
   workflow_dispatch:
   push:
     branches:
-      - "main"
+      - main
 
 jobs:
   crowdin-push:
-    name: Crowdin Push
+    name: Crowdin Push - ${{ github.event_name }}
     runs-on: ubuntu-24.04
-    env:
-      _CROWDIN_PROJECT_ID: "269690"
+    permissions:
+      contents: read
     steps:
       - name: Check out repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -28,12 +29,24 @@ jobs:
           keyvault: "bitwarden-ci"
           secrets: "crowdin-api-token"
 
-      - name: Upload sources
+      - name: Upload sources for Password Manager
         uses: crowdin/github-action@b8012bd5491b8aa8578b73ab5b5f5e7c94aaa6e2 # v2.7.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
+          _CROWDIN_PROJECT_ID: "269690"
         with:
-          config: crowdin.yml
+          config: crowdin-bwpm.yml
+          upload_sources: true
+          upload_translations: false
+
+      - name: Upload sources for Authenticator
+        uses: crowdin/github-action@b8012bd5491b8aa8578b73ab5b5f5e7c94aaa6e2 # v2.7.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
+          _CROWDIN_PROJECT_ID: "673718"
+        with:
+          config: crowdin-bwa.yml
           upload_sources: true
           upload_translations: false

.github/workflows/github-release.yml

@@ -41,7 +41,6 @@ jobs:
     runs-on: ubuntu-24.04
     permissions:
       contents: write
-      actions: read
 
     steps:
       - name: Check out repository

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

@@ -0,0 +1,12 @@
+name: Publish GitHub Release as newest
+
+on:
+  workflow_dispatch:
+
+jobs:
+  stub:
+    runs-on: ubuntu-24.04
+    name: Stub
+    steps:
+      - name: Stub
+        run: echo "This is a stub job to trigger the workflow."

.github/workflows/publish.yml

@@ -0,0 +1,142 @@
+
+name: Publish
+run-name: "Promoting ${{ inputs.product }} ${{ inputs.version-code }} from ${{ inputs.track-from }} to ${{ inputs.track-target }}"
+on:
+  workflow_dispatch:
+    inputs:
+      product:
+        description: "Which app is being released."
+        type: choice
+        options:
+          - Password Manager
+          - Authenticator
+      version-code:
+        description: "Build number to promote to production."
+        required: true
+        type: number
+      rollout-percentage:
+        description: "Percentage of users who will receive this version update."
+        required: true
+        type: choice
+        options:
+          - 10%
+          - 30%
+          - 50%
+          - 100%
+      release-notes:
+        description: "Change notes to be included with this release."
+        type: string
+        required: true
+      track-from:
+        description: "Track to promote from."
+        type: string
+        required: true
+        default: "internal"
+      track-target:
+        description: "Track to promote to."
+        type: string
+        required: true
+        default: "Fastlane Automation Testing Source"
+
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  GITHUB_ACTION_RUN_URL: "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+
+permissions:
+  contents: read
+  packages: read
+
+jobs:
+    promote:
+      runs-on: ubuntu-24.04
+      name: Promote build to Production in Play Store
+
+      steps:
+        - name: Display Options
+          run: |
+            echo "product: ${{ inputs.product }}"
+            echo "version-code: ${{ inputs.version-code }}"
+            echo "rollout-percentage: ${{ inputs.rollout-percentage }}"
+            echo "release-notes: ${{ inputs.release-notes }}"
+            echo "track-from: ${{ inputs.track-from }}"
+            echo "track-target: ${{ inputs.track-target }}"
+
+        - name: Check out repo
+          uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+        - name: Configure Ruby
+          uses: ruby/setup-ruby@ca041f971d66735f3e5ff1e21cc13e2d51e7e535 # v1.233.0
+          with:
+            bundler-cache: true
+
+        - name: Install Fastlane
+          run: |
+            gem install bundler:2.2.27
+            bundle config path vendor/bundle
+            bundle install --jobs 4 --retry 3
+
+        - name: Log in to Azure
+          uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
+          with:
+            creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+
+        - name: Retrieve secrets
+          env:
+            ACCOUNT_NAME: bitwardenci
+            CONTAINER_NAME: mobile
+          run: |
+            mkdir -p ${{ github.workspace }}/secrets
+            mkdir -p ${{ github.workspace }}/app/src/standardRelease
+
+            az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
+            --name app_play-keystore.jks --file ${{ github.workspace }}/keystores/app_play-keystore.jks --output none
+            az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
+            --name app_upload-keystore.jks --file ${{ github.workspace }}/keystores/app_upload-keystore.jks --output none
+            az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
+            --name play_creds.json --file ${{ github.workspace }}/secrets/play_creds.json --output none
+            az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
+            --name app_beta_play-keystore.jks --file ${{ github.workspace }}/keystores/app_beta_play-keystore.jks --output none
+            az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
+            --name app_beta_upload-keystore.jks --file ${{ github.workspace }}/keystores/app_beta_upload-keystore.jks --output none
+            az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
+            --name google-services.json --file ${{ github.workspace }}/app/src/standardRelease/google-services.json --output none
+
+        - name: Format Release Notes
+          run: |
+            FORMATTED_MESSAGE="$( "${{ inputs.release-notes }}" | sed 's/  /\n/g')"
+            echo "RELEASE_NOTES<<EOF" >> $GITHUB_ENV
+            echo "$FORMATTED_MESSAGE" >> $GITHUB_ENV
+            echo "EOF" >> $GITHUB_ENV
+
+        - name: Promote Play Store version to production
+          env:
+            PLAY_KEYSTORE_PASSWORD: ${{ secrets.PLAY_BETA_KEYSTORE_PASSWORD }}
+            PLAY_KEY_PASSWORD: ${{ secrets.PLAY_BETA_KEY_PASSWORD }}
+            VERSION_CODE: ${{ inputs.version-code }}
+            ROLLOUT_PERCENTAGE: ${{ inputs.rollout-percentage }}
+            PRODUCT: ${{ inputs.product }}
+            TRACK_FROM: ${{ inputs.track-from }}
+            TRACK_TARGET: ${{ inputs.track-target }}
+          run: |
+            if [ "$PRODUCT" = "Password Manager" ]; then
+              PACKAGE_NAME="com.x8bit.bitwarden"
+            elif [ "$PRODUCT" = "Authenticator" ]; then
+              PACKAGE_NAME="com.bitwarden.authenticator"
+            else
+              echo "Unsupported product: $PRODUCT"
+              exit 1
+            fi
+
+            decimal=$(echo "scale=2; ${ROLLOUT_PERCENTAGE/\%/} / 100" | bc)
+
+            bundle exec fastlane updateReleaseNotes \
+              releaseNotes:"$RELEASE_NOTES" \
+              versionCode:"$VERSION_CODE"
+
+            bundle exec fastlane promoteToProduction \
+              versionCode:"$VERSION_CODE" \
+              rolloutPercentage:$decimal \
+              packageName:"$PACKAGE_NAME"\
+              releaseNotes:"$RELEASE_NOTES"\
+              track:"$TRACK_FROM"\
+              trackPromoteTo:"$TRACK_TARGET"

.github/workflows/scan.yml

@@ -15,6 +15,7 @@ jobs:
   check-run:
     name: Check PR run
     uses: bitwarden/gh-actions/.github/workflows/check-run.yml@main
+    permissions: read-all
 
   sast:
     name: SAST scan

.github/workflows/test-device.yml

@@ -0,0 +1,16 @@
+name: Test Device
+
+on:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    name: Test Device
+    runs-on: ubuntu-24.04
+
+    steps:
+    - name: Placeholder step
+      run: echo "Placeholder workflow step"

.github/workflows/test.yml

@@ -9,7 +9,7 @@ on:
   pull_request:
     types: [opened, synchronize]
   merge_group:
-    type: [checks_requested]
+    types: [checks_requested]
   workflow_dispatch:
 
 env:
@@ -110,7 +110,7 @@ jobs:
           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
+          if [ -n "$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

Gemfile.lock

@@ -10,18 +10,18 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.2)
-    aws-partitions (1.1102.0)
-    aws-sdk-core (3.223.0)
+    aws-partitions (1.1107.0)
+    aws-sdk-core (3.224.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.100.0)
+    aws-sdk-kms (1.101.0)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.185.0)
+    aws-sdk-s3 (1.186.1)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -165,7 +165,7 @@ GEM
     httpclient (2.9.0)
       mutex_m
     jmespath (1.6.2)
-    json (2.11.3)
+    json (2.12.2)
     jwt (2.10.1)
       base64
     logger (1.7.0)

annotation/.gitignore

@@ -0,0 +1 @@
+/build

annotation/build.gradle.kts

@@ -0,0 +1,42 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+}
+
+android {
+    namespace = "com.bitwarden.annotation"
+    compileSdk = libs.versions.compileSdk.get().toInt()
+
+    defaultConfig {
+        minSdk = libs.versions.minSdkBwa.get().toInt()
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro",
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility(libs.versions.jvmTarget.get())
+        targetCompatibility(libs.versions.jvmTarget.get())
+    }
+    @Suppress("UnstableApiUsage")
+    testFixtures {
+        enable = true
+    }
+}
+
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
+    }
+}

annotation/src/main/kotlin/com/bitwarden/annotation/OmitFromCoverage.kt

@@ -1,4 +1,4 @@
-package com.bitwarden.core.annotation
+package com.bitwarden.annotation
 
 /**
  * Used to omit the annotated class from test coverage reporting. This should be used sparingly and

app/build.gradle.kts

@@ -213,6 +213,7 @@ dependencies {
 
     implementation(files("libs/authenticatorbridge-1.0.1-release.aar"))
 
+    implementation(project(":annotation"))
     implementation(project(":core"))
     implementation(project(":data"))
     implementation(project(":network"))

app/src/main/AndroidManifest.xml

@@ -37,15 +37,18 @@
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
+        android:intentMatchingFlags="enforceIntentFilter"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/LaunchTheme"
+        tools:ignore="CredentialDependency"
         tools:replace="appComponentFactory"
-        tools:targetApi="33">
+        tools:targetApi="36">
         <activity
             android:name=".MainActivity"
+            android:configChanges="uiMode"
             android:exported="true"
             android:launchMode="@integer/launchModeAPIlevel"
             android:theme="@style/LaunchTheme"

app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/OrganizationDomainSsoDetailsResult.kt

@@ -1,28 +0,0 @@
-package com.x8bit.bitwarden.data.auth.repository.model
-
-import java.time.ZonedDateTime
-
-/**
- * Response types when checking for an email's claimed domain organization.
- */
-sealed class OrganizationDomainSsoDetailsResult {
-    /**
-     * The request was successful.
-     *
-     * @property isSsoAvailable Indicates if SSO is available for the email address.
-     * @property organizationIdentifier The claimed organization identifier for the email address.
-     * @property verifiedDate The date and time when the domain was verified.
-     */
-    data class Success(
-        val isSsoAvailable: Boolean,
-        val organizationIdentifier: String,
-        val verifiedDate: ZonedDateTime?,
-    ) : OrganizationDomainSsoDetailsResult()
-
-    /**
-     * The request failed.
-     */
-    data class Failure(
-        val error: Throwable,
-    ) : OrganizationDomainSsoDetailsResult()
-}

app/src/main/java/com/x8bit/bitwarden/ui/platform/util/SpanStyleUtil.kt

@@ -1,31 +0,0 @@
-package com.x8bit.bitwarden.ui.platform.util
-
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.TextStyle
-
-/**
- * Creates a new [SpanStyle] from the specified [color] and [textStyle].
- */
-fun spanStyleOf(
-    color: Color,
-    textStyle: TextStyle,
-): SpanStyle =
-    SpanStyle(
-        color = color,
-        fontSize = textStyle.fontSize,
-        fontWeight = textStyle.fontWeight,
-        fontStyle = textStyle.fontStyle,
-        fontSynthesis = textStyle.fontSynthesis,
-        fontFamily = textStyle.fontFamily,
-        fontFeatureSettings = textStyle.fontFeatureSettings,
-        letterSpacing = textStyle.letterSpacing,
-        baselineShift = textStyle.baselineShift,
-        textGeometricTransform = textStyle.textGeometricTransform,
-        localeList = textStyle.localeList,
-        background = textStyle.background,
-        textDecoration = textStyle.textDecoration,
-        shadow = textStyle.shadow,
-        platformStyle = textStyle.platformStyle?.spanStyle,
-        drawStyle = textStyle.drawStyle,
-    )

app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendNavigation.kt

@@ -1,90 +0,0 @@
-package com.x8bit.bitwarden.ui.tools.feature.send.addsend
-
-import androidx.lifecycle.SavedStateHandle
-import androidx.navigation.NavController
-import androidx.navigation.NavGraphBuilder
-import androidx.navigation.NavOptions
-import androidx.navigation.toRoute
-import com.bitwarden.ui.platform.base.util.composableWithSlideTransitions
-import com.x8bit.bitwarden.ui.tools.feature.send.addsend.model.AddSendType
-import kotlinx.serialization.Serializable
-
-/**
- * The type-safe route for the add send screen.
- */
-@Serializable
-data class AddSendRoute(
-    val type: ModeType,
-    val editSendId: String?,
-)
-
-/**
- * Indicates the mode of send to be displayed.
- */
-@Serializable
-enum class ModeType {
-    ADD,
-    EDIT,
-}
-
-/**
- * Class to retrieve send add & edit arguments from the [SavedStateHandle].
- */
-data class AddSendArgs(
-    val sendAddType: AddSendType,
-)
-
-/**
- * Constructs a [AddSendArgs] from the [SavedStateHandle] and internal route data.
- */
-fun SavedStateHandle.toAddSendArgs(): AddSendArgs {
-    val route = this.toRoute<AddSendRoute>()
-    return AddSendArgs(
-        sendAddType = when (route.type) {
-            ModeType.ADD -> AddSendType.AddItem
-            ModeType.EDIT -> AddSendType.EditItem(sendItemId = requireNotNull(route.editSendId))
-        },
-    )
-}
-
-private fun SavedStateHandle.toAddSendType(): AddSendType {
-    val route = this.toRoute<AddSendRoute>()
-    return when (route.type) {
-        ModeType.ADD -> AddSendType.AddItem
-        ModeType.EDIT -> AddSendType.EditItem(sendItemId = requireNotNull(route.editSendId))
-    }
-}
-
-/**
- * Add the new send screen to the nav graph.
- */
-fun NavGraphBuilder.addSendDestination(
-    onNavigateBack: () -> Unit,
-    onNavigateUpToRoot: () -> Unit,
-) {
-    composableWithSlideTransitions<AddSendRoute> {
-        AddSendScreen(
-            onNavigateBack = onNavigateBack,
-            onNavigateUpToRoot = onNavigateUpToRoot,
-        )
-    }
-}
-
-/**
- * Navigate to the new send screen.
- */
-fun NavController.navigateToAddSend(
-    sendAddType: AddSendType,
-    navOptions: NavOptions? = null,
-) {
-    this.navigate(
-        route = AddSendRoute(
-            type = when (sendAddType) {
-                AddSendType.AddItem -> ModeType.ADD
-                is AddSendType.EditItem -> ModeType.EDIT
-            },
-            editSendId = (sendAddType as? AddSendType.EditItem)?.sendItemId,
-        ),
-        navOptions = navOptions,
-    )
-}

app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/handlers/AddSendHandlers.kt

@@ -1,64 +0,0 @@
-package com.x8bit.bitwarden.ui.tools.feature.send.addsend.handlers
-
-import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
-import com.x8bit.bitwarden.ui.tools.feature.send.addsend.AddSendAction
-import com.x8bit.bitwarden.ui.tools.feature.send.addsend.AddSendViewModel
-import java.time.ZonedDateTime
-
-/**
- * A collection of handler functions for managing actions within the context of adding
- * send items.
- */
-data class AddSendHandlers(
-    val onNameChange: (String) -> Unit,
-    val onFileTypeSelect: () -> Unit,
-    val onTextTypeSelect: () -> Unit,
-    val onChooseFileClick: (hasPermission: Boolean) -> Unit,
-    val onFileChoose: (IntentManager.FileData) -> Unit,
-    val onTextChange: (String) -> Unit,
-    val onIsHideByDefaultToggle: (Boolean) -> Unit,
-    val onMaxAccessCountChange: (Int) -> Unit,
-    val onPasswordChange: (String) -> Unit,
-    val onNoteChange: (String) -> Unit,
-    val onHideEmailToggle: (Boolean) -> Unit,
-    val onDeactivateSendToggle: (Boolean) -> Unit,
-    val onDeletionDateChange: (ZonedDateTime) -> Unit,
-    val onDeleteClick: () -> Unit,
-) {
-    @Suppress("UndocumentedPublicClass")
-    companion object {
-        /**
-         * Creates an instance of [AddSendHandlers] by binding actions to the provided
-         * [AddSendViewModel].
-         */
-        fun create(
-            viewModel: AddSendViewModel,
-        ): AddSendHandlers =
-            AddSendHandlers(
-                onNameChange = { viewModel.trySendAction(AddSendAction.NameChange(it)) },
-                onFileTypeSelect = { viewModel.trySendAction(AddSendAction.FileTypeClick) },
-                onTextTypeSelect = { viewModel.trySendAction(AddSendAction.TextTypeClick) },
-                onChooseFileClick = { viewModel.trySendAction(AddSendAction.ChooseFileClick(it)) },
-                onFileChoose = { viewModel.trySendAction(AddSendAction.FileChoose(it)) },
-                onTextChange = { viewModel.trySendAction(AddSendAction.TextChange(it)) },
-                onIsHideByDefaultToggle = {
-                    viewModel.trySendAction(AddSendAction.HideByDefaultToggle(it))
-                },
-                onMaxAccessCountChange = {
-                    viewModel.trySendAction(AddSendAction.MaxAccessCountChange(it))
-                },
-                onPasswordChange = { viewModel.trySendAction(AddSendAction.PasswordChange(it)) },
-                onNoteChange = { viewModel.trySendAction(AddSendAction.NoteChange(it)) },
-                onHideEmailToggle = {
-                    viewModel.trySendAction(AddSendAction.HideMyEmailToggle(it))
-                },
-                onDeactivateSendToggle = {
-                    viewModel.trySendAction(AddSendAction.DeactivateThisSendToggle(it))
-                },
-                onDeletionDateChange = {
-                    viewModel.trySendAction(AddSendAction.DeletionDateChange(it))
-                },
-                onDeleteClick = { viewModel.trySendAction(AddSendAction.DeleteClick) },
-            )
-    }
-}

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

@@ -2,7 +2,7 @@ package com.x8bit.bitwarden
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.bitwarden.core.annotation.OmitFromCoverage
+import com.bitwarden.annotation.OmitFromCoverage
 
 /**
  * An activity to be launched and then immediately closed so that the OS Shade can be collapsed

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

@@ -4,7 +4,7 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import com.bitwarden.core.annotation.OmitFromCoverage
+import com.bitwarden.annotation.OmitFromCoverage
 import dagger.hilt.android.AndroidEntryPoint
 
 /**

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

@@ -4,7 +4,7 @@ import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
-import com.bitwarden.core.annotation.OmitFromCoverage
+import com.bitwarden.annotation.OmitFromCoverage
 import com.x8bit.bitwarden.data.autofill.manager.AutofillCompletionManager
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.launchIn

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

@@ -5,7 +5,7 @@ import android.content.Intent
 import android.os.Build
 import androidx.annotation.Keep
 import androidx.core.app.AppComponentFactory
-import com.bitwarden.core.annotation.OmitFromCoverage
+import com.bitwarden.annotation.OmitFromCoverage
 import com.x8bit.bitwarden.data.autofill.BitwardenAutofillService
 import com.x8bit.bitwarden.data.autofill.accessibility.BitwardenAccessibilityService
 import com.x8bit.bitwarden.data.credentials.BitwardenCredentialProviderService

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

@@ -1,7 +1,7 @@
 package com.x8bit.bitwarden
 
 import android.app.Application
-import com.bitwarden.core.annotation.OmitFromCoverage
+import com.bitwarden.annotation.OmitFromCoverage
 import com.x8bit.bitwarden.data.auth.manager.AuthRequestNotificationManager
 import com.x8bit.bitwarden.data.platform.manager.LogsManager
 import com.x8bit.bitwarden.data.platform.manager.event.OrganizationEventManager

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

@@ -11,15 +11,18 @@ import androidx.activity.compose.setContent
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.compose.runtime.Composable
 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.NavController
 import androidx.navigation.compose.NavHost
-import com.bitwarden.core.annotation.OmitFromCoverage
+import com.bitwarden.annotation.OmitFromCoverage
 import com.bitwarden.ui.platform.base.util.EventsEffect
 import com.bitwarden.ui.platform.theme.BitwardenTheme
+import com.bitwarden.ui.platform.util.setupEdgeToEdge
 import com.x8bit.bitwarden.data.autofill.accessibility.manager.AccessibilityCompletionManager
 import com.x8bit.bitwarden.data.autofill.manager.AutofillActivityManager
 import com.x8bit.bitwarden.data.autofill.manager.AutofillCompletionManager
@@ -35,6 +38,7 @@ import com.x8bit.bitwarden.ui.platform.feature.rootnav.rootNavDestination
 import com.x8bit.bitwarden.ui.platform.feature.settings.appearance.model.AppLanguage
 import com.x8bit.bitwarden.ui.platform.util.appLanguage
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
 /**
@@ -62,66 +66,29 @@ class MainActivity : AppCompatActivity() {
     @Inject
     lateinit var debugLaunchManager: DebugMenuLaunchManager
 
-    @Suppress("LongMethod")
     override fun onCreate(savedInstanceState: Bundle?) {
         var shouldShowSplashScreen = true
         installSplashScreen().setKeepOnScreenCondition { shouldShowSplashScreen }
         super.onCreate(savedInstanceState)
 
         if (savedInstanceState == null) {
-            mainViewModel.trySendAction(
-                MainAction.ReceiveFirstIntent(
-                    intent = intent,
-                ),
-            )
+            mainViewModel.trySendAction(MainAction.ReceiveFirstIntent(intent = intent))
         }
 
         // Within the app the 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.
         AppCompatDelegate.setDefaultNightMode(settingsRepository.appTheme.osValue)
+        setupEdgeToEdge(appThemeFlow = mainViewModel.stateFlow.map { it.theme })
         setContent {
-            val state by mainViewModel.stateFlow.collectAsStateWithLifecycle()
             val navController = rememberBitwardenNavController(name = "MainActivity")
-            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)
-                    }
-                }
-            }
+            SetupEventsEffect(navController = navController)
+            val state by mainViewModel.stateFlow.collectAsStateWithLifecycle()
             updateScreenCapture(isScreenCaptureAllowed = state.isScreenCaptureAllowed)
             LocalManagerProvider(featureFlagsState = state.featureFlagsState) {
                 ObserveScreenDataEffect(
                     onDataUpdate = remember(mainViewModel) {
-                        {
-                            mainViewModel.trySendAction(
-                                MainAction.ResumeScreenDataReceived(it),
-                            )
-                        }
+                        { mainViewModel.trySendAction(MainAction.ResumeScreenDataReceived(it)) }
                     },
                 )
                 BitwardenTheme(
@@ -148,11 +115,7 @@ class MainActivity : AppCompatActivity() {
 
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
-        mainViewModel.trySendAction(
-            action = MainAction.ReceiveNewIntent(
-                intent = intent,
-            ),
-        )
+        mainViewModel.trySendAction(action = MainAction.ReceiveNewIntent(intent = intent))
     }
 
     override fun onResume() {
@@ -199,6 +162,34 @@ class MainActivity : AppCompatActivity() {
         .takeIf { it }
         ?: super.dispatchKeyEvent(event)
 
+    @Composable
+    private fun SetupEventsEffect(navController: NavController) {
+        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)
+            }
+        }
+    }
+
     private fun sendOpenDebugMenuEvent() {
         mainViewModel.trySendAction(MainAction.OpenDebugMenu)
     }

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

@@ -7,7 +7,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import com.bitwarden.core.annotation.OmitFromCoverage
+import com.bitwarden.annotation.OmitFromCoverage
 import com.bitwarden.data.manager.DispatcherManager
 import com.x8bit.bitwarden.R
 import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource

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

@@ -15,7 +15,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.LeaveOrganizationResult
 import com.x8bit.bitwarden.data.auth.repository.model.LoginResult
 import com.x8bit.bitwarden.data.auth.repository.model.LogoutReason
 import com.x8bit.bitwarden.data.auth.repository.model.NewSsoUserResult
-import com.x8bit.bitwarden.data.auth.repository.model.OrganizationDomainSsoDetailsResult
 import com.x8bit.bitwarden.data.auth.repository.model.PasswordHintResult
 import com.x8bit.bitwarden.data.auth.repository.model.PasswordStrengthResult
 import com.x8bit.bitwarden.data.auth.repository.model.PolicyInformation
@@ -353,13 +352,6 @@ interface AuthRepository : AuthenticatorProvider, AuthRequestManager {
      */
     fun setWebAuthResult(webAuthResult: WebAuthResult)
 
-    /**
-     * Checks for a claimed domain organization for the [email] that can be used for an SSO request.
-     */
-    suspend fun getOrganizationDomainSsoDetails(
-        email: String,
-    ): OrganizationDomainSsoDetailsResult
-
     /**
      * Get the verified organization domain SSO details for the given [email].
      */

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

@@ -65,7 +65,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.LeaveOrganizationResult
 import com.x8bit.bitwarden.data.auth.repository.model.LoginResult
 import com.x8bit.bitwarden.data.auth.repository.model.LogoutReason
 import com.x8bit.bitwarden.data.auth.repository.model.NewSsoUserResult
-import com.x8bit.bitwarden.data.auth.repository.model.OrganizationDomainSsoDetailsResult
 import com.x8bit.bitwarden.data.auth.repository.model.PasswordHintResult
 import com.x8bit.bitwarden.data.auth.repository.model.PasswordStrengthResult
 import com.x8bit.bitwarden.data.auth.repository.model.PolicyInformation
@@ -112,7 +111,6 @@ import com.x8bit.bitwarden.data.auth.util.YubiKeyResult
 import com.x8bit.bitwarden.data.auth.util.toSdkParams
 import com.x8bit.bitwarden.data.platform.error.MissingPropertyException
 import com.x8bit.bitwarden.data.platform.error.NoActiveUserException
-import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager
 import com.x8bit.bitwarden.data.platform.manager.FirstTimeActionManager
 import com.x8bit.bitwarden.data.platform.manager.LogsManager
 import com.x8bit.bitwarden.data.platform.manager.PolicyManager
@@ -173,7 +171,6 @@ class AuthRepositoryImpl(
     private val trustedDeviceManager: TrustedDeviceManager,
     private val userLogoutManager: UserLogoutManager,
     private val policyManager: PolicyManager,
-    private val featureFlagManager: FeatureFlagManager,
     firstTimeActionManager: FirstTimeActionManager,
     logsManager: LogsManager,
     pushManager: PushManager,
@@ -1201,23 +1198,6 @@ class AuthRepositoryImpl(
         webAuthResultChannel.trySend(webAuthResult)
     }
 
-    override suspend fun getOrganizationDomainSsoDetails(
-        email: String,
-    ): OrganizationDomainSsoDetailsResult = organizationService
-        .getOrganizationDomainSsoDetails(
-            email = email,
-        )
-        .fold(
-            onSuccess = {
-                OrganizationDomainSsoDetailsResult.Success(
-                    isSsoAvailable = it.isSsoAvailable,
-                    organizationIdentifier = it.organizationIdentifier,
-                    verifiedDate = it.verifiedDate,
-                )
-            },
-            onFailure = { OrganizationDomainSsoDetailsResult.Failure(error = it) },
-        )
-
     override suspend fun getVerifiedOrganizationDomainSsoDetails(
         email: String,
     ): VerifiedOrganizationDomainSsoDetailsResult = organizationService

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

@@ -15,7 +15,6 @@ import com.x8bit.bitwarden.data.auth.manager.TrustedDeviceManager
 import com.x8bit.bitwarden.data.auth.manager.UserLogoutManager
 import com.x8bit.bitwarden.data.auth.repository.AuthRepository
 import com.x8bit.bitwarden.data.auth.repository.AuthRepositoryImpl
-import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager
 import com.x8bit.bitwarden.data.platform.manager.FirstTimeActionManager
 import com.x8bit.bitwarden.data.platform.manager.LogsManager
 import com.x8bit.bitwarden.data.platform.manager.PolicyManager
@@ -59,7 +58,6 @@ object AuthRepositoryModule {
         userLogoutManager: UserLogoutManager,
         pushManager: PushManager,
         policyManager: PolicyManager,
-        featureFlagManager: FeatureFlagManager,
         firstTimeActionManager: FirstTimeActionManager,
         logsManager: LogsManager,
     ): AuthRepository = AuthRepositoryImpl(
@@ -82,7 +80,6 @@ object AuthRepositoryModule {
         userLogoutManager = userLogoutManager,
         pushManager = pushManager,
         policyManager = policyManager,
-        featureFlagManager = featureFlagManager,
         firstTimeActionManager = firstTimeActionManager,
         logsManager = logsManager,
     )

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

@@ -12,6 +12,8 @@ import com.bitwarden.network.model.OrganizationType
  * @property shouldUseKeyConnector Indicates that the organization uses a key connector.
  * @property role The user's role in the organization.
  * @property keyConnectorUrl The key connector domain (if applicable).
+ * @property userIsClaimedByOrganization Indicates that the user is claimed by the organization.
+ * @property limitItemDeletion Indicates that the organization limits item deletion.
  */
 data class Organization(
     val id: String,
@@ -21,4 +23,5 @@ data class Organization(
     val role: OrganizationType,
     val keyConnectorUrl: String?,
     val userIsClaimedByOrganization: Boolean,
+    val limitItemDeletion: Boolean = false,
 )