bitwarden · SaintPatrck · Nov 19, 2025 · May 12, 2025 · May 12, 2025 · May 12, 2025
@@ -303,9 +303,9 @@ tasks {
         useJUnitPlatform()
         maxHeapSize = "2g"
         maxParallelForks = Runtime.getRuntime().availableProcessors()
-        jvmArgs = jvmArgs.orEmpty() + "-XX:+UseParallelGC" + 
-            // Explicitly setting the user Country and Language because tests assume en-US 
-            "-Duser.country=US" + 
+        jvmArgs = jvmArgs.orEmpty() + "-XX:+UseParallelGC" +
+            // Explicitly setting the user Country and Language because tests assume en-US
+            "-Duser.country=US" +
             "-Duser.language=en"
     }
 }

@@ -86,6 +86,7 @@
             <intent-filter>
                 <action android:name="com.x8bit.bitwarden.credentials.ACTION_CREATE_PASSKEY" />
                 <action android:name="com.x8bit.bitwarden.credentials.ACTION_GET_PASSKEY" />
+                <action android:name="com.x8bit.bitwarden.credentials.ACTION_CREATE_PASSWORD" />
                 <action android:name="com.x8bit.bitwarden.credentials.ACTION_GET_PASSWORD" />
                 <action android:name="com.x8bit.bitwarden.credentials.ACTION_UNLOCK_ACCOUNT" />
 

@@ -58,6 +58,13 @@ interface CredentialManagerPendingIntentManager {
         userId: String,
     ): PendingIntent
 
+    /**
+     * Creates a pending intent to use when providing options for Password credential creation.
+     */
+    fun createPasswordCreationPendingIntent(
+        userId: String,
+    ): PendingIntent
+
     /**
      * Creates a pending intent to use when providing options for Password credential filling.
      */

@@ -75,6 +75,24 @@ class CredentialManagerPendingIntentManagerImpl(
         )
     }
 
+    /**
+     * Creates a pending intent to use when providing options for FIDO 2 credential creation.
+     */
+    override fun createPasswordCreationPendingIntent(
+        userId: String,
+    ): PendingIntent {
+        val intent = Intent(CREATE_PASSWORD_ACTION)
+            .setPackage(context.packageName)
+            .putExtra(EXTRA_KEY_USER_ID, userId)
+
+        return PendingIntent.getActivity(
+            /* context = */ context,
+            /* requestCode = */ Random.nextInt(),
+            /* intent = */ intent,
+            /* flags = */ PendingIntent.FLAG_UPDATE_CURRENT.toPendingIntentMutabilityFlag(),
+        )
+    }
+
     /**
      * Creates a pending intent to use when providing options for Password credential filling.
      */
@@ -101,4 +119,5 @@ class CredentialManagerPendingIntentManagerImpl(
 private const val CREATE_PASSKEY_ACTION = "com.x8bit.bitwarden.credentials.ACTION_CREATE_PASSKEY"
 private const val UNLOCK_ACCOUNT_ACTION = "com.x8bit.bitwarden.credentials.ACTION_UNLOCK_ACCOUNT"
 private const val GET_PASSKEY_ACTION = "com.x8bit.bitwarden.credentials.ACTION_GET_PASSKEY"
+private const val CREATE_PASSWORD_ACTION = "com.x8bit.bitwarden.credentials.ACTION_CREATE_PASSWORD"
 private const val GET_PASSWORD_ACTION = "com.x8bit.bitwarden.credentials.ACTION_GET_PASSWORD"
@@ -2,6 +2,7 @@ package com.x8bit.bitwarden.data.credentials.model
 
 import android.os.Bundle
 import android.os.Parcelable
+import androidx.credentials.CreatePasswordRequest
 import androidx.credentials.CreatePublicKeyCredentialRequest
 import androidx.credentials.provider.CallingAppInfo
 import androidx.credentials.provider.ProviderCreateCredentialRequest
@@ -48,6 +49,15 @@ data class CreateCredentialRequest(
         providerRequest.callingRequest as? CreatePublicKeyCredentialRequest
     }
 
+    /**
+     * The [CreatePasswordRequest] of the [providerRequest], or null if the calling
+     * request is not a [CreatePasswordRequest].
+     */
+    @IgnoredOnParcel
+    val createPasswordCredentialRequest: CreatePasswordRequest? by lazy {
+        providerRequest.callingRequest as? CreatePasswordRequest
+    }
+
     /**
      * The [requestJson] of the [createPublicKeyCredentialRequest], or null if the calling request
      * is not a [CreatePublicKeyCredentialRequest].

@@ -19,6 +19,7 @@ import androidx.credentials.exceptions.GetCredentialUnknownException
 import androidx.credentials.provider.AuthenticationAction
 import androidx.credentials.provider.BeginCreateCredentialRequest
 import androidx.credentials.provider.BeginCreateCredentialResponse
+import androidx.credentials.provider.BeginCreatePasswordCredentialRequest
 import androidx.credentials.provider.BeginCreatePublicKeyCredentialRequest
 import androidx.credentials.provider.BeginGetCredentialRequest
 import androidx.credentials.provider.BeginGetCredentialResponse
@@ -69,7 +70,7 @@ class CredentialProviderProcessorImpl(
         }
 
         val createCredentialJob = ioScope.launch {
-            processCreateCredentialRequest(request = request)
+            (handleCreatePasskeyQuery(request) ?: handleCreatePasswordQuery(request))
                 ?.let { callback.onResult(it) }
                 ?: callback.onError(CreateCredentialUnknownException())
         }
@@ -137,21 +138,11 @@ class CredentialProviderProcessorImpl(
         callback.onError(ClearCredentialUnsupportedException())
     }
 
-    private fun processCreateCredentialRequest(
+    private fun handleCreatePasskeyQuery(
         request: BeginCreateCredentialRequest,
     ): BeginCreateCredentialResponse? {
-        return when (request) {
-            is BeginCreatePublicKeyCredentialRequest -> {
-                handleCreatePasskeyQuery(request)
-            }
-
-            else -> null
-        }
-    }
+        if (request !is BeginCreatePublicKeyCredentialRequest) return null
 
-    private fun handleCreatePasskeyQuery(
-        request: BeginCreatePublicKeyCredentialRequest,
-    ): BeginCreateCredentialResponse? {
         val requestJson = request
             .candidateQueryData
             .getString("androidx.credentials.BUNDLE_KEY_REQUEST_JSON")
@@ -161,14 +152,19 @@ class CredentialProviderProcessorImpl(
         val userState = authRepository.userStateFlow.value ?: return null
 
         return BeginCreateCredentialResponse.Builder()
-            .setCreateEntries(userState.accounts.toCreateEntries(userState.activeUserId))
+            .setCreateEntries(
+                userState.accounts.toCreatePasskeyEntry(userState.activeUserId),
+            )
             .build()
     }
 
-    private fun List<UserState.Account>.toCreateEntries(activeUserId: String) =
-        map { it.toCreateEntry(isActive = activeUserId == it.userId) }
+    private fun List<UserState.Account>.toCreatePasskeyEntry(
+        activeUserId: String,
+    ): List<CreateEntry> = map { it.toCreatePasskeyEntry(isActive = activeUserId == it.userId) }
 
-    private fun UserState.Account.toCreateEntry(isActive: Boolean): CreateEntry {
+    private fun UserState.Account.toCreatePasskeyEntry(
+        isActive: Boolean,
+    ): CreateEntry {
         val accountName = name ?: email
         val entryBuilder = CreateEntry
             .Builder(
@@ -196,6 +192,54 @@ class CredentialProviderProcessorImpl(
         return entryBuilder.build()
     }
 
+    private fun handleCreatePasswordQuery(
+        request: BeginCreateCredentialRequest,
+    ): BeginCreateCredentialResponse? {
+        if (request !is BeginCreatePasswordCredentialRequest) return null
+
+        val userState = authRepository.userStateFlow.value ?: return null
+
+        return BeginCreateCredentialResponse.Builder()
+            .setCreateEntries(
+                userState.accounts.toCreatePasswordEntry(userState.activeUserId),
+            )
+            .build()
+    }
+
+    private fun List<UserState.Account>.toCreatePasswordEntry(
+        activeUserId: String,
+    ) = map { it.toCreatePasswordEntry(isActive = activeUserId == it.userId) }
+
+    private fun UserState.Account.toCreatePasswordEntry(
+        isActive: Boolean,
+    ): CreateEntry {
+        val accountName = name ?: email
+        val entryBuilder = CreateEntry
+            .Builder(
+                accountName = accountName,
+                pendingIntent = pendingIntentManager.createPasswordCreationPendingIntent(
+                    userId = userId,
+                ),
+            )
+            .setDescription(
+                context.getString(
+                    BitwardenString.your_password_will_be_saved_to_your_bitwarden_vault_for_x,
+                    accountName,
+                ),
+            )
+            // Set the last used time to "now" so the active account is the default option in the
+            // system prompt.
+            .setLastUsedTime(if (isActive) clock.instant() else null)
+            .setAutoSelectAllowed(true)
+
+        if (isVaultUnlocked) {
+            biometricsEncryptionManager
+                .getOrCreateCipher(userId)
+                ?.let { entryBuilder.setBiometricPromptDataIfSupported(cipher = it) }
+        }
+        return entryBuilder.build()
+    }
+
     private fun CreateEntry.Builder.setBiometricPromptDataIfSupported(
         cipher: Cipher,
     ): CreateEntry.Builder {

@@ -1,19 +1,19 @@
 package com.x8bit.bitwarden.ui.credentials.manager
 
 import com.x8bit.bitwarden.ui.credentials.manager.model.AssertFido2CredentialResult
+import com.x8bit.bitwarden.ui.credentials.manager.model.CreateCredentialResult
 import com.x8bit.bitwarden.ui.credentials.manager.model.GetCredentialsResult
 import com.x8bit.bitwarden.ui.credentials.manager.model.GetPasswordCredentialResult
-import com.x8bit.bitwarden.ui.credentials.manager.model.RegisterFido2CredentialResult
 
 /**
- * A manager for completing the FIDO 2 creation process.
+ * A manager for completing the credential creation process.
  */
 interface CredentialProviderCompletionManager {
 
     /**
-     * Completes the FIDO 2 registration process with the provided [result].
+     * Completes the credential registration process with the provided [result].
      */
-    fun completeFido2Registration(result: RegisterFido2CredentialResult)
+    fun completeCredentialRegistration(result: CreateCredentialResult)
 
     /**
      * Complete the FIDO 2 credential assertion process with the provided [result].

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Build
 import androidx.annotation.RequiresApi
+import androidx.credentials.CreatePasswordResponse
 import androidx.credentials.CreatePublicKeyCredentialResponse
 import androidx.credentials.GetCredentialResponse
 import androidx.credentials.PasswordCredential
@@ -15,9 +16,9 @@ import androidx.credentials.exceptions.GetCredentialUnknownException
 import androidx.credentials.provider.BeginGetCredentialResponse
 import androidx.credentials.provider.PendingIntentHandler
 import com.x8bit.bitwarden.ui.credentials.manager.model.AssertFido2CredentialResult
+import com.x8bit.bitwarden.ui.credentials.manager.model.CreateCredentialResult
 import com.x8bit.bitwarden.ui.credentials.manager.model.GetCredentialsResult
 import com.x8bit.bitwarden.ui.credentials.manager.model.GetPasswordCredentialResult
-import com.x8bit.bitwarden.ui.credentials.manager.model.RegisterFido2CredentialResult
 
 /**
  * Primary implementation of [CredentialProviderCompletionManager] when the build version is
@@ -28,11 +29,11 @@ class CredentialProviderCompletionManagerImpl(
     private val activity: Activity,
 ) : CredentialProviderCompletionManager {
 
-    override fun completeFido2Registration(result: RegisterFido2CredentialResult) {
+    override fun completeCredentialRegistration(result: CreateCredentialResult) {
         activity.also {
             val intent = Intent()
             when (result) {
-                is RegisterFido2CredentialResult.Error -> {
+                is CreateCredentialResult.Error -> {
                     PendingIntentHandler
                         .setCreateCredentialException(
                             intent = intent,
@@ -42,7 +43,7 @@ class CredentialProviderCompletionManagerImpl(
                         )
                 }
 
-                is RegisterFido2CredentialResult.Success -> {
+                is CreateCredentialResult.Success.Fido2CredentialRegistered -> {
                     PendingIntentHandler
                         .setCreateCredentialResponse(
                             intent = intent,
@@ -52,7 +53,15 @@ class CredentialProviderCompletionManagerImpl(
                         )
                 }
 
-                is RegisterFido2CredentialResult.Cancelled -> {
+                is CreateCredentialResult.Success.PasswordCreated -> {
+                    PendingIntentHandler
+                        .setCreateCredentialResponse(
+                            intent = intent,
+                            response = CreatePasswordResponse(),
+                        )
+                }
+
+                is CreateCredentialResult.Cancelled -> {
                     PendingIntentHandler
                         .setCreateCredentialException(
                             intent = intent,

@@ -3,17 +3,17 @@ package com.x8bit.bitwarden.ui.credentials.manager
 import androidx.credentials.CredentialProvider
 import com.bitwarden.annotation.OmitFromCoverage
 import com.x8bit.bitwarden.ui.credentials.manager.model.AssertFido2CredentialResult
+import com.x8bit.bitwarden.ui.credentials.manager.model.CreateCredentialResult
 import com.x8bit.bitwarden.ui.credentials.manager.model.GetCredentialsResult
 import com.x8bit.bitwarden.ui.credentials.manager.model.GetPasswordCredentialResult
-import com.x8bit.bitwarden.ui.credentials.manager.model.RegisterFido2CredentialResult
 
 /**
  * A no-op implementation of [CredentialProviderCompletionManagerImpl] provided when the build
  * version is below UPSIDE_DOWN_CAKE (34). These versions do not support [CredentialProvider].
  */
 @OmitFromCoverage
 object CredentialProviderCompletionManagerUnsupportedApiImpl : CredentialProviderCompletionManager {
-    override fun completeFido2Registration(result: RegisterFido2CredentialResult) = Unit
+    override fun completeCredentialRegistration(result: CreateCredentialResult) = Unit
 
     override fun completeFido2Assertion(result: AssertFido2CredentialResult) = Unit
 

@@ -0,0 +1,34 @@
+package com.x8bit.bitwarden.ui.credentials.manager.model
+
+import com.bitwarden.ui.util.Text
+
+/**
+ * Represents the result of a credential creation attempt.
+ */
+sealed class CreateCredentialResult {
+
+    /**
+     * Represents a successful credential creation attempt.
+     */
+    sealed class Success : CreateCredentialResult() {
+        /**
+         * Indicates that the FIDO2 registration was successful.
+         */
+        data class Fido2CredentialRegistered(val responseJson: String) : Success()
+
+        /**
+         * Indicates that the Password creation was successful.
+         */
+        data object PasswordCreated : Success()
+    }
+
+    /**
+     * Indicates that an error occurred during credential creation.
+     */
+    data class Error(val message: Text) : CreateCredentialResult()
+
+    /**
+     * Indicates that credential creation was cancelled by the user.
+     */
+    data object Cancelled : CreateCredentialResult()
+}
@@ -6,21 +6,22 @@ import com.bitwarden.ui.platform.components.dialog.BitwardenTwoButtonDialog
 import com.bitwarden.ui.platform.resource.BitwardenString
 
 /**
- * A reusable dialog for confirming whether or not the user wants to overwrite an existing FIDO 2
- * credential.
+ * A reusable dialog for confirming whether or not the user wants to overwrite an existing credential.
  *
  * @param onConfirmClick A callback for when the overwrite confirmation button is clicked.
  * @param onDismissRequest A callback for when the dialog is requesting dismissal.
  */
 @Suppress("MaxLineLength")
 @Composable
-fun BitwardenOverwritePasskeyConfirmationDialog(
+fun BitwardenOverwriteCredentialConfirmationDialog(
+    title: String,
+    message: String,
     onConfirmClick: () -> Unit,
     onDismissRequest: () -> Unit,
 ) {
     BitwardenTwoButtonDialog(
-        title = stringResource(id = BitwardenString.overwrite_passkey),
-        message = stringResource(id = BitwardenString.this_item_already_contains_a_passkey_are_you_sure_you_want_to_overwrite_the_current_passkey),
+        title = title,
+        message = message,
         confirmButtonText = stringResource(id = BitwardenString.okay),
         dismissButtonText = stringResource(id = BitwardenString.cancel),
         onConfirmClick = onConfirmClick,