mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-11-24 18:36:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add support for AutoCompleteTextView as an input field (#3435)

Browse source
This commit is contained in:
David Perez 2024-07-10 11:40:46 -05:00 committed by GitHub
parent 0cdae9bccf
commit 4f3d42264d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/java/com/x8bit/bitwarden/data/autofill/util/ViewNodeExtensions.kt
View file

@ -2,14 +2,10 @@ package com.x8bit.bitwarden.data.autofill.util
import android.app.assist.AssistStructure
import android.view.View
import android.widget.EditText
import com.x8bit.bitwarden.data.autofill.model.AutofillView
import com.x8bit.bitwarden.ui.platform.base.util.orNullIfBlank
/**
* The class name of the android edit text field.
*/
private const val ANDROID_EDIT_TEXT_CLASS_NAME: String = "android.widget.EditText"
/**
* The default web URI scheme.
*/
@ -59,7 +55,18 @@ private val SUPPORTED_VIEW_HINTS: List<String> = listOf(
* Whether this [AssistStructure.ViewNode] represents an input field.
*/
private val AssistStructure.ViewNode.isInputField: Boolean
get() = className == ANDROID_EDIT_TEXT_CLASS_NAME || htmlInfo.isInputField
get() {
val isEditText = className
?.let {
try {
Class.forName(it)
} catch (e: ClassNotFoundException) {
null
}
}
?.let { EditText::class.java.isAssignableFrom(it) } == true
return isEditText || htmlInfo.isInputField
}
/**
* Attempt to convert this [AssistStructure.ViewNode] into an [AutofillView]. If the view node

24
app/src/test/java/com/x8bit/bitwarden/data/autofill/util/ViewNodeExtensionsTest.kt
View file

@ -177,13 +177,32 @@ class ViewNodeExtensionsTest {
@Suppress("MaxLineLength")
@Test
fun `toAutofillView should return AutofillView Login Username when is android text field and is isUsernameField`() {
fun `toAutofillView should return AutofillView Login Username when is EditText and isUsernameField`() {
// Setup
val expected = AutofillView.Login.Username(
data = autofillViewData,
)
setupUnsupportedInputFieldViewNode()
every { viewNode.className } returns ANDROID_EDIT_TEXT_CLASS_NAME
every { viewNode.className } returns "android.widget.EditText"
every { any<Int>().isPasswordInputType } returns false
every { any<Int>().isUsernameInputType } returns true
// Test
val actual = viewNode.toAutofillView()
// Verify
assertEquals(expected, actual)
}
@Suppress("MaxLineLength")
@Test
fun `toAutofillView should return AutofillView Login Username when is EditText subclass and isUsernameField`() {
// Setup
val expected = AutofillView.Login.Username(
data = autofillViewData,
)
setupUnsupportedInputFieldViewNode()
every { viewNode.className } returns "android.widget.AutoCompleteTextView"
every { any<Int>().isPasswordInputType } returns false
every { any<Int>().isUsernameInputType } returns true
@ -532,7 +551,6 @@ private val AUTOFILL_OPTIONS_LIST: List<String> = listOf(
AUTOFILL_OPTION_TWO,
)
private const val AUTOFILL_TYPE: Int = View.AUTOFILL_TYPE_LIST
private const val ANDROID_EDIT_TEXT_CLASS_NAME: String = "android.widget.EditText"
private val IGNORED_RAW_HINTS: List<String> = listOf(
"search",
"find",