From 82dd9e2b738b336b444ba229cdedd8a93ce0bfb4 Mon Sep 17 00:00:00 2001 From: Fabian Henneke Date: Tue, 3 Nov 2020 17:40:31 +0100 Subject: Fix Autofill regression caused by empty dataset (#1184) --- .../com/zeapo/pwdstore/autofill/oreo/AutofillResponseBuilder.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/AutofillResponseBuilder.kt b/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/AutofillResponseBuilder.kt index c186ecd8..7c2c1ca9 100644 --- a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/AutofillResponseBuilder.kt +++ b/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/AutofillResponseBuilder.kt @@ -53,14 +53,14 @@ class AutofillResponseBuilder(form: FillableForm) { } private fun makeMatchDataset(context: Context, file: File): Dataset? { - if (scenario.hasFieldsToFillOn(AutofillAction.Match)) return null + if (!scenario.hasFieldsToFillOn(AutofillAction.Match)) return null val remoteView = makeFillMatchRemoteView(context, file, formOrigin) val intentSender = AutofillDecryptActivity.makeDecryptFileIntentSender(file, context) return makePlaceholderDataset(remoteView, intentSender, AutofillAction.Match) } private fun makeSearchDataset(context: Context): Dataset? { - if (scenario.hasFieldsToFillOn(AutofillAction.Search)) return null + if (!scenario.hasFieldsToFillOn(AutofillAction.Search)) return null val remoteView = makeSearchAndFillRemoteView(context, formOrigin) val intentSender = AutofillFilterView.makeMatchAndDecryptFileIntentSender(context, formOrigin) @@ -68,14 +68,14 @@ class AutofillResponseBuilder(form: FillableForm) { } private fun makeGenerateDataset(context: Context): Dataset? { - if (scenario.hasFieldsToFillOn(AutofillAction.Generate)) return null + if (!scenario.hasFieldsToFillOn(AutofillAction.Generate)) return null val remoteView = makeGenerateAndFillRemoteView(context, formOrigin) val intentSender = AutofillSaveActivity.makeSaveIntentSender(context, null, formOrigin) return makePlaceholderDataset(remoteView, intentSender, AutofillAction.Generate) } private fun makeFillOtpFromSmsDataset(context: Context): Dataset? { - if (scenario.hasFieldsToFillOn(AutofillAction.FillOtpFromSms)) return null + if (!scenario.hasFieldsToFillOn(AutofillAction.FillOtpFromSms)) return null if (!AutofillSmsActivity.shouldOfferFillFromSms(context)) return null val remoteView = makeFillOtpFromSmsRemoteView(context, formOrigin) val intentSender = AutofillSmsActivity.makeFillOtpFromSmsIntentSender(context) -- cgit v1.2.3