kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Fix Autofill regression caused by empty dataset (#1184)

Browse source
This commit is contained in:
Fabian Henneke 2020-11-03 17:40:31 +01:00 committed by GitHub
parent 73648b39d0
commit 0a71cc8aa5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/zeapo/pwdstore/autofill/oreo/AutofillResponseBuilder.kt
View file

@ -62,14 +62,14 @@ class AutofillResponseBuilder(form: FillableForm) {
} }
private fun makeMatchDataset(context: Context, file: File, imeSpec: InlinePresentationSpec?): Dataset? { private fun makeMatchDataset(context: Context, file: File, imeSpec: InlinePresentationSpec?): Dataset? {
if (scenario.hasFieldsToFillOn(AutofillAction.Match)) return null if (!scenario.hasFieldsToFillOn(AutofillAction.Match)) return null
val metadata = makeFillMatchMetadata(context, file) val metadata = makeFillMatchMetadata(context, file)
val intentSender = AutofillDecryptActivity.makeDecryptFileIntentSender(file, context) val intentSender = AutofillDecryptActivity.makeDecryptFileIntentSender(file, context)
return makeIntentDataset(context, AutofillAction.Match, intentSender, metadata, imeSpec) return makeIntentDataset(context, AutofillAction.Match, intentSender, metadata, imeSpec)
} }
private fun makeSearchDataset(context: Context, imeSpec: InlinePresentationSpec?): Dataset? { private fun makeSearchDataset(context: Context, imeSpec: InlinePresentationSpec?): Dataset? {
if (scenario.hasFieldsToFillOn(AutofillAction.Search)) return null if (!scenario.hasFieldsToFillOn(AutofillAction.Search)) return null
val metadata = makeSearchAndFillMetadata(context) val metadata = makeSearchAndFillMetadata(context)
val intentSender = val intentSender =
AutofillFilterView.makeMatchAndDecryptFileIntentSender(context, formOrigin) AutofillFilterView.makeMatchAndDecryptFileIntentSender(context, formOrigin)
@ -77,14 +77,14 @@ class AutofillResponseBuilder(form: FillableForm) {
} }
private fun makeGenerateDataset(context: Context, imeSpec: InlinePresentationSpec?): Dataset? { private fun makeGenerateDataset(context: Context, imeSpec: InlinePresentationSpec?): Dataset? {
if (scenario.hasFieldsToFillOn(AutofillAction.Generate)) return null if (!scenario.hasFieldsToFillOn(AutofillAction.Generate)) return null
val metadata = makeGenerateAndFillMetadata(context) val metadata = makeGenerateAndFillMetadata(context)
val intentSender = AutofillSaveActivity.makeSaveIntentSender(context, null, formOrigin) val intentSender = AutofillSaveActivity.makeSaveIntentSender(context, null, formOrigin)
return makeIntentDataset(context, AutofillAction.Generate, intentSender, metadata, imeSpec) return makeIntentDataset(context, AutofillAction.Generate, intentSender, metadata, imeSpec)
} }
private fun makeFillOtpFromSmsDataset(context: Context, imeSpec: InlinePresentationSpec?): Dataset? { private fun makeFillOtpFromSmsDataset(context: Context, imeSpec: InlinePresentationSpec?): Dataset? {
if (scenario.hasFieldsToFillOn(AutofillAction.FillOtpFromSms)) return null if (!scenario.hasFieldsToFillOn(AutofillAction.FillOtpFromSms)) return null
if (!AutofillSmsActivity.shouldOfferFillFromSms(context)) return null if (!AutofillSmsActivity.shouldOfferFillFromSms(context)) return null
val metadata = makeFillOtpFromSmsMetadata(context) val metadata = makeFillOtpFromSmsMetadata(context)
val intentSender = AutofillSmsActivity.makeFillOtpFromSmsIntentSender(context) val intentSender = AutofillSmsActivity.makeFillOtpFromSmsIntentSender(context)