rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve hint "on" and "off" recognition

Browse Source
This commit is contained in:
J-Jamet
2020-03-19 15:18:06 +01:00
parent aae9f9e1cb
commit b792a61bf9
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/com/kunzisoft/keepass/autofill/StructureParser.kt
View File

@@ -34,6 +34,7 @@ import java.util.*
internal class StructureParser(private val structure: AssistStructure) { internal class StructureParser(private val structure: AssistStructure) {
private var result: Result? = null private var result: Result? = null
private var usernameCandidate: AutofillId? = null private var usernameCandidate: AutofillId? = null
private var lockHint: Boolean = false
fun parse(): Result? { fun parse(): Result? {
result = Result() result = Result()
@@ -85,19 +86,25 @@ internal class StructureParser(private val structure: AssistStructure) {
val autofillId = node.autofillId val autofillId = node.autofillId
node.autofillHints?.forEach { node.autofillHints?.forEach {
when { when {
it == View.AUTOFILL_HINT_USERNAME it.toLowerCase(Locale.ENGLISH) == View.AUTOFILL_HINT_USERNAME
|| it == View.AUTOFILL_HINT_EMAIL_ADDRESS || it.toLowerCase(Locale.ENGLISH) == View.AUTOFILL_HINT_EMAIL_ADDRESS
|| it == View.AUTOFILL_HINT_PHONE -> { || it.toLowerCase(Locale.ENGLISH) == View.AUTOFILL_HINT_PHONE -> {
result?.usernameId = autofillId result?.usernameId = autofillId
Log.d(TAG, "Autofill username hint") Log.d(TAG, "Autofill username hint")
} }
it == View.AUTOFILL_HINT_PASSWORD it.toLowerCase(Locale.ENGLISH) == View.AUTOFILL_HINT_PASSWORD
|| it.contains("password") -> { || it.toLowerCase(Locale.ENGLISH).contains("password") -> {
result?.passwordId = autofillId result?.passwordId = autofillId
Log.d(TAG, "Autofill password hint") Log.d(TAG, "Autofill password hint")
return true return true
} }
it == "on" -> { it.toLowerCase(Locale.ENGLISH) == "off" -> {
Log.d(TAG, "Autofill OFF hint")
lockHint = true
return false
}
it.toLowerCase(Locale.ENGLISH) == "on" -> {
Log.d(TAG, "Autofill ON hint")
if (parseNodeByHtmlAttributes(node)) if (parseNodeByHtmlAttributes(node))
return true return true
} }
@@ -108,6 +115,8 @@ internal class StructureParser(private val structure: AssistStructure) {
} }
private fun parseNodeByHtmlAttributes(node: AssistStructure.ViewNode): Boolean { private fun parseNodeByHtmlAttributes(node: AssistStructure.ViewNode): Boolean {
if (lockHint)
return false
val autofillId = node.autofillId val autofillId = node.autofillId
val nodHtml = node.htmlInfo val nodHtml = node.htmlInfo
when (nodHtml?.tag?.toLowerCase(Locale.ENGLISH)) { when (nodHtml?.tag?.toLowerCase(Locale.ENGLISH)) {