Fix compile errors, version check logic, & minor formatting tweaks

- BitwardenCredentialManagerImpl.kt: formatting.
- CredentialEntryBuilderExtensions.kt: fix compile error.
- CredentialEntryBuilderImpl.kt: use generic login icon for password credntial entry icon to match autofill items and better distinguish from passkeys.
- CredentialProviderIntentUtils.kt: invert build version check.
- provider.xml: Add public key credential capability so debug builds still handle passkeys.
- VaultItemListingViewModel.kt: formatting.

Author: SaintPatrck

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

@@ -2,5 +2,6 @@
 <credential-provider>
     <capabilities>
         <capability name="android.credentials.TYPE_PASSWORD_CREDENTIAL" />
+        <capability name="androidx.credentials.TYPE_PUBLIC_KEY_CREDENTIAL" />
     </capabilities>
 </credential-provider>

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

@@ -122,11 +122,7 @@ class CredentialEntryBuilderImpl(
                 )
                 .setDisplayName(cipherView.name)
                 .setAutoSelectAllowed(this.size == 1)
-                .setIcon(
-                    getCredentialEntryIcon(
-                        isPassword = true,
-                    ),
-                )
+                .setIcon(getCredentialEntryIcon())
                 .also { builder ->
                     if (!isUserVerified) {
                         builder.setBiometricPromptDataIfSupported(
@@ -143,13 +139,11 @@ class CredentialEntryBuilderImpl(
     // are addressed. See https://issuetracker.google.com/issues/355141766 for details.
     private fun getCredentialEntryIcon(
         isPasskey: Boolean = false,
-        isPassword: Boolean = false,
     ): Icon = IconCompat
         .createWithResource(
             context,
             when {
                 isPasskey -> BitwardenDrawable.ic_bw_passkey
-                isPassword -> BitwardenDrawable.ic_key
                 else -> BitwardenDrawable.ic_globe
             },
         )

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

@@ -186,19 +186,20 @@ class BitwardenCredentialManagerImpl(
                 }
             }
             .filter { it.isActiveWithFido2Credentials || it.isActiveWithPasswordCredentials }
-            .ifEmpty {
-                return@withContext emptyList<CredentialEntry>().asSuccess()
-            }
+            .ifEmpty { return@withContext emptyList<CredentialEntry>().asSuccess() }
 
-        val passwordCredentialResult =
-            getCredentialsRequest.callingAppInfo?.packageName?.let { packageName ->
+        val passwordCredentialResult = getCredentialsRequest
+            .callingAppInfo
+            ?.packageName
+            ?.let { packageName ->
                 getCredentialsRequest
                     .beginGetPasswordOptions
                     .toPasswordCredentialEntries(
                         userId = getCredentialsRequest.userId,
                         packageName = packageName,
                     )
-            } ?: emptyList()
+            }
+            ?: emptyList()
 
         val passkeyCredentialResult = getCredentialsRequest
             .beginGetPublicKeyCredentialOptions
@@ -351,11 +352,9 @@ class BitwardenCredentialManagerImpl(
     ): List<CredentialEntry> {
         if (this.isEmpty()) return emptyList()
 
-        val ciphers = autofillCipherProvider.getLoginAutofillCiphers(
-            packageName.toAndroidAppUriString(),
-        ).filter {
-            it.password.isNotEmpty()
-        }
+        val ciphers = autofillCipherProvider
+            .getLoginAutofillCiphers(packageName.toAndroidAppUriString())
+            .filter { it.password.isNotEmpty() }
 
         return credentialEntryBuilder
             .buildPasswordCredentialEntries(

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

@@ -33,7 +33,7 @@ fun PublicKeyCredentialEntry.Builder.setBiometricPromptDataIfSupported(
 fun PasswordCredentialEntry.Builder.setBiometricPromptDataIfSupported(
     cipher: Cipher?,
 ): PasswordCredentialEntry.Builder =
-    if (!isBuildVersionBelow(Build.VERSION_CODES.VANILLA_ICE_CREAM) && cipher != null) {
+    if (isBuildVersionAtLeast(Build.VERSION_CODES.VANILLA_ICE_CREAM) && cipher != null) {
         setBiometricPromptData(
             biometricPromptData = buildPromptDataWithCipher(cipher),
         )

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

@@ -12,7 +12,6 @@ import com.x8bit.bitwarden.data.credentials.model.CreateCredentialRequest
 import com.x8bit.bitwarden.data.credentials.model.Fido2CredentialAssertionRequest
 import com.x8bit.bitwarden.data.credentials.model.GetCredentialsRequest
 import com.x8bit.bitwarden.data.credentials.model.ProviderGetPasswordCredentialRequest
-import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow
 import com.x8bit.bitwarden.ui.platform.manager.intent.EXTRA_KEY_CIPHER_ID
 import com.x8bit.bitwarden.ui.platform.manager.intent.EXTRA_KEY_CREDENTIAL_ID
 import com.x8bit.bitwarden.ui.platform.manager.intent.EXTRA_KEY_USER_ID
@@ -86,7 +85,7 @@ fun Intent.getFido2AssertionRequestOrNull(): Fido2CredentialAssertionRequest? {
  * ongoing password credential GetPassword process.
  */
 fun Intent.getProviderGetPasswordRequestOrNull(): ProviderGetPasswordCredentialRequest? {
-    if (isBuildVersionBelow(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)) return null
+    if (!isBuildVersionAtLeast(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)) return null
 
     val systemRequest = PendingIntentHandler
         .retrieveProviderGetCredentialRequest(this)

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt

@@ -1691,7 +1691,8 @@ class VaultItemListingViewModel @Inject constructor(
                 sendEvent(
                     VaultItemListingEvent.CompleteProviderGetPasswordCredentialRequest(
                         result = GetPasswordCredentialResult.Success(
-                            credential = getCipherViewOrNull(cipherId = data.cipherId)?.login
+                            credential = getCipherViewOrNull(cipherId = data.cipherId)
+                                ?.login
                                 ?: return,
                         ),
                     ),
@@ -2161,24 +2162,24 @@ class VaultItemListingViewModel @Inject constructor(
             }
         }
 
-        data.firstOrNull { it.id == action.data.cipherId }?.let { cipher ->
-            if (state.hasMasterPassword &&
-                cipher.reprompt == CipherRepromptType.PASSWORD
-            ) {
-                repromptMasterPasswordForProviderGetCredential(action.data.cipherId)
-            } else {
-                val result = cipher.login?.let {
-                    GetPasswordCredentialResult.Success(it)
-                } ?: GetPasswordCredentialResult.Error(
-                    R.string.password_operation_failed_because_the_selected_item_does_not_exist
-                        .asText(),
-                )
-
-                sendEvent(
-                    VaultItemListingEvent.CompleteProviderGetPasswordCredentialRequest(result),
-                )
+        data
+            .firstOrNull { it.id == action.data.cipherId }
+            ?.let { cipher ->
+                if (state.hasMasterPassword && cipher.reprompt == CipherRepromptType.PASSWORD) {
+                    repromptMasterPasswordForProviderGetCredential(action.data.cipherId)
+                } else {
+                    val result = cipher.login
+                        ?.let { GetPasswordCredentialResult.Success(it) }
+                        ?: GetPasswordCredentialResult.Error(
+                            message = R.string
+                                .password_operation_failed_because_the_selected_item_does_not_exist
+                                .asText(),
+                        )
+                    sendEvent(
+                        VaultItemListingEvent.CompleteProviderGetPasswordCredentialRequest(result),
+                    )
+                }
             }
-        }
             ?: run {
                 showCredentialManagerErrorDialog(
                     R.string.password_operation_failed_because_no_item_was_selected.asText(),
@@ -2250,19 +2251,19 @@ class VaultItemListingViewModel @Inject constructor(
             bitwardenCredentialManager.isUserVerified = false
             clearDialogState()
 
-            val event = selectedCipher.login?.let { credential ->
-                VaultItemListingEvent.CompleteProviderGetPasswordCredentialRequest(
-                    GetPasswordCredentialResult.Success(
-                        credential = credential,
+            val event = selectedCipher.login
+                ?.let { credential ->
+                    VaultItemListingEvent.CompleteProviderGetPasswordCredentialRequest(
+                        GetPasswordCredentialResult.Success(credential = credential),
+                    )
+                }
+                ?: VaultItemListingEvent.CompleteProviderGetPasswordCredentialRequest(
+                    GetPasswordCredentialResult.Error(
+                        message = R.string
+                            .password_operation_failed_because_the_selected_item_does_not_exist
+                            .asText(),
                     ),
                 )
-            } ?: VaultItemListingEvent.CompleteProviderGetPasswordCredentialRequest(
-                GetPasswordCredentialResult.Error(
-                    message =
-                        R.string.password_operation_failed_because_the_selected_item_does_not_exist
-                            .asText(),
-                ),
-            )
 
             sendEvent(event)
         }

app/src/test/kotlin/com/x8bit/bitwarden/data/credentials/builder/CredentialEntryBuilderTest.kt

@@ -334,7 +334,7 @@ class CredentialEntryBuilderTest {
 
     @Test
     fun `buildPasswordCredentialEntries should set biometric prompt data correctly`() = runTest {
-        mockkStatic(::isBuildVersionBelow)
+        mockkStatic(::isBuildVersionAtLeast)
         val options = listOf(mockBeginGetPasswordOption)
         val passwordAutofillViews: List<AutofillCipher.Login> = listOf(
             createMockPasswordCredentialAutofillCipherLogin(),
@@ -343,7 +343,7 @@ class CredentialEntryBuilderTest {
         every {
             mockBiometricsEncryptionManager.getOrCreateCipher(any())
         } returns mockk(relaxed = true)
-        every { isBuildVersionBelow(any()) } returns false
+        every { isBuildVersionAtLeast(any()) } returns true
 
         // Verify biometric prompt data is set when buildVersion is >= 35, cipher is
         // not null, and user is not verified

app/src/test/kotlin/com/x8bit/bitwarden/data/credentials/util/CredentialManagerIntentUtilsTest.kt

@@ -339,7 +339,7 @@ class CredentialManagerIntentUtilsTest {
     fun `getProviderGetPasswordRequestOrNull should return null when build version is below 34`() {
         val intent = mockk<Intent>()
 
-        every { isBuildVersionBelow(34) } returns true
+        every { isBuildVersionAtLeast(34) } returns false
 
         val assertionRequest = intent.getProviderGetPasswordRequestOrNull()