bitwarden/android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-12-11 22:52:20 -06:00
Code Issues Packages Projects Releases 169 Wiki Activity

Fix autofill overwriting user data with empty field values (#5649)

Browse Source
This commit is contained in:
Igorro 2025-08-19 16:47:31 +03:00 committed by GitHub
parent 44410efe56
commit 20dea9b5ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/util/AutofillViewExtensions.kt
View File

@ -11,29 +11,34 @@ import com.x8bit.bitwarden.data.autofill.model.FilledItem
fun AutofillView.buildFilledItemOrNull( fun AutofillView.buildFilledItemOrNull(
value: String, value: String,
): FilledItem? = ): FilledItem? =
when (this.data.autofillType) { // Do not try to autofill fields that are empty in the vault
View.AUTOFILL_TYPE_DATE -> { if (value.isEmpty()) {
value null
.toLongOrNull() } else {
?.let { AutofillValue.forDate(it) } when (this.data.autofillType) {
} View.AUTOFILL_TYPE_DATE -> {
value
.toLongOrNull()
?.let { AutofillValue.forDate(it) }
}
View.AUTOFILL_TYPE_LIST -> this.buildListAutofillValueOrNull(value = value) View.AUTOFILL_TYPE_LIST -> this.buildListAutofillValueOrNull(value = value)
View.AUTOFILL_TYPE_TEXT -> AutofillValue.forText(value) View.AUTOFILL_TYPE_TEXT -> AutofillValue.forText(value)
View.AUTOFILL_TYPE_TOGGLE -> { View.AUTOFILL_TYPE_TOGGLE -> {
value value
.toBooleanStrictOrNull() .toBooleanStrictOrNull()
?.let { AutofillValue.forToggle(it) } ?.let { AutofillValue.forToggle(it) }
} }
else -> null else -> null
}
?.let { autofillValue ->
FilledItem(
autofillId = this.data.autofillId,
value = autofillValue,
)
}
} }
?.let { autofillValue ->
FilledItem(
autofillId = this.data.autofillId,
value = autofillValue,
)
}
/** /**
* Build a list [AutofillValue] out of [value] or return null if not possible. * Build a list [AutofillValue] out of [value] or return null if not possible.

20
app/src/test/kotlin/com/x8bit/bitwarden/data/autofill/util/AutofillViewExtensionsTest.kt
View File

@ -329,4 +329,24 @@ class AutofillViewExtensionsTest {
// Verify // Verify
assertNull(actual) assertNull(actual)
} }
@Test
fun `buildFilledItemOrNull should return null when value is empty`() {
// Setup
val value = ""
val autofillViewData = autofillViewData.copy(
autofillType = View.AUTOFILL_TYPE_TEXT,
)
val autofillView = AutofillView.Login.Username(
data = autofillViewData,
)
// Test
val actual = autofillView.buildFilledItemOrNull(
value = value,
)
// Verify
assertNull(actual)
}
} }