Skip to content
This repository was archived by the owner on Oct 15, 2024. It is now read-only.

Allow Autofill on custom views with Autofill hints #946

Merged
merged 4 commits into from
Jul 23, 2020
Merged

Allow Autofill on custom views with Autofill hints #946

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d40a5fb
Allow Autofill on custom views with Autofill hints
fmeum Jul 21, 2020
49cadb9
Merge branch 'develop' into enhancement/autofill_custom_views
msfjarvis Jul 22, 2020
be0126f
Merge branch 'develop' into enhancement/autofill_custom_views
FabianHenneke Jul 23, 2020
601e372
Merge branch 'develop' into enhancement/autofill_custom_views
FabianHenneke Jul 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions app/src/main/java/com/zeapo/pwdstore/autofill/oreo/FormField.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,8 @@ class FormField(
// TODO: Revisit this decision in the future
private val excludedByHints = excludedByAutofillHints

val relevantField = isTextField && hasAutofillTypeText && !excludedByHints
// Only offer to fill into custom views if they explicitly opted into Autofill.
val relevantField = hasAutofillTypeText && (isTextField || autofillHints.isNotEmpty()) && !excludedByHints

// Exclude fields based on hint, resource ID or HTML name.
// Note: We still report excluded fields as relevant since they count for adjacency heuristics,
Expand All @@ -232,7 +233,7 @@ class FormField(
if (isCertainPasswordField) CertaintyLevel.Certain else if (isLikelyPasswordField) CertaintyLevel.Likely else if (isPossiblePasswordField) CertaintyLevel.Possible else CertaintyLevel.Impossible

// OTP field heuristics (based only on the current field)
private val isPossibleOtpField = notExcluded && !isPossiblePasswordField && isTextField
private val isPossibleOtpField = notExcluded && !isPossiblePasswordField
private val isCertainOtpField = isPossibleOtpField && hasHintOtp
private val isLikelyOtpField = isPossibleOtpField && (
isCertainOtpField || OTP_HEURISTIC_TERMS.anyMatchesFieldInfo ||
Expand All @@ -241,7 +242,7 @@ class FormField(
if (isCertainOtpField) CertaintyLevel.Certain else if (isLikelyOtpField) CertaintyLevel.Likely else if (isPossibleOtpField) CertaintyLevel.Possible else CertaintyLevel.Impossible

// Username field heuristics (based only on the current field)
private val isPossibleUsernameField = notExcluded && !isPossiblePasswordField && !isCertainOtpField && isTextField
private val isPossibleUsernameField = notExcluded && !isPossiblePasswordField && !isCertainOtpField
private val isCertainUsernameField = isPossibleUsernameField && hasHintUsername
private val isLikelyUsernameField = isPossibleUsernameField && (isCertainUsernameField || (USERNAME_HEURISTIC_TERMS.anyMatchesFieldInfo))
val usernameCertainty =
Expand Down