[PM-37255] feat: Integrate fill-assist targeting rules into autofill parser #7066
+1,180
−44
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| package com.x8bit.bitwarden.data.autofill.util | ||
|
|
||
| import android.app.assist.AssistStructure | ||
| import com.x8bit.bitwarden.data.autofill.model.AutofillView | ||
| import com.x8bit.bitwarden.data.autofill.model.FillAssistRules | ||
|
|
||
| /** | ||
| * Traverses the [AssistStructure] and returns a list of [AutofillView]s classified by the | ||
| * provided [hostRules]. Only view nodes whose [android.view.ViewStructure.HtmlInfo] attributes | ||
| * match a [FillAssistRules.SelectorClause] are included; unmatched nodes are omitted (no | ||
| * heuristic fallback). | ||
| */ | ||
| internal fun AssistStructure.buildFillAssistViews( | ||
| hostRules: List<FillAssistRules.HostRule>, | ||
| urlBarWebsite: String?, | ||
| ): List<AutofillView> = | ||
| (0 until windowNodeCount) | ||
| .mapNotNull { getWindowNodeAt(it).rootViewNode } | ||
| .flatMap { it.traverseForFillAssist(hostRules = hostRules, parentWebsite = urlBarWebsite) } | ||
|
|
||
| private fun AssistStructure.ViewNode.traverseForFillAssist( | ||
| hostRules: List<FillAssistRules.HostRule>, | ||
| parentWebsite: String?, | ||
| ): List<AutofillView> { | ||
| val website = this.website ?: parentWebsite | ||
| val ownView = autofillId?.let { id -> | ||
| hostRules | ||
| .flatMap { it.fields.entries } | ||
| .filter { (_, alternatives) -> | ||
| alternatives.any { | ||
| htmlInfo?.matchesSelectorClause(it) ?: false | ||
| } | ||
| } | ||
| .takeIf { it.isNotEmpty() } | ||
| ?.let { matchingEntries -> | ||
| val data = toAutofillViewData(autofillId = id, website = website) | ||
| matchingEntries.firstNotNullOfOrNull { (key, _) -> | ||
| key.toAutofillViewForFieldKey( | ||
| data, | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| val childViews = (0 until childCount) | ||
| .flatMap { index -> | ||
| getChildAt(index).traverseForFillAssist( | ||
| hostRules = hostRules, | ||
| parentWebsite = website, | ||
| ) | ||
| } | ||
| return listOfNotNull(ownView) + childViews | ||
| } | ||
|
|
||
| private fun String.toAutofillViewForFieldKey(data: AutofillView.Data): AutofillView? = when (this) { | ||
| "username" -> AutofillView.Login.Username(data = data) | ||
| "password", "newPassword" -> AutofillView.Login.Password(data = data) | ||
| "cardNumber" -> AutofillView.Card.Number(data = data) | ||
| "cardholderName" -> AutofillView.Card.CardholderName(data = data) | ||
| "cardExpirationDate" -> AutofillView.Card.ExpirationDate(data = data) | ||
| "cardExpirationMonth" -> AutofillView.Card.ExpirationMonth(data = data, monthValue = null) | ||
| "cardExpirationYear" -> AutofillView.Card.ExpirationYear(data = data, yearValue = null) | ||
| "cardCvv" -> AutofillView.Card.SecurityCode(data = data) | ||
| "cardType" -> AutofillView.Card.Brand(data = data, brandValue = null) | ||
| else -> null | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The new
buildFillAssistViewsis awfully similar to the existing logic for parsing the assist structure. It's hard for me to tell if it is possible but can we optimize this to parse the structure only once?