This repository has been archived by the owner on Oct 15, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 279
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(deps): update dependency com.android.tools.build:gradle to v8.3.0…
…-alpha05 (#2692) * fix(deps): update dependency com.android.tools.build:gradle to v8.3.0-alpha05 * refactor(autofill): workaround `RequiresApi` Lint --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Harsh Shandilya <[email protected]>
- Loading branch information
1 parent
079be4a
commit da17f0b
Showing
6 changed files
with
237 additions
and
204 deletions.
There are no files selected for viewing
26 changes: 26 additions & 0 deletions
26
app/src/main/java/app/passwordstore/injection/AutofillResponseBuilderModule.kt
This file contains 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,26 @@ | ||
| package app.passwordstore.injection | ||
|
|
||
| import android.os.Build | ||
| import app.passwordstore.util.autofill.Api26AutofillResponseBuilder | ||
| import app.passwordstore.util.autofill.Api30AutofillResponseBuilder | ||
| import app.passwordstore.util.autofill.AutofillResponseBuilder | ||
| import dagger.Module | ||
| import dagger.Provides | ||
| import dagger.Reusable | ||
| import dagger.hilt.InstallIn | ||
| import dagger.hilt.components.SingletonComponent | ||
|
|
||
| @Module | ||
| @InstallIn(SingletonComponent::class) | ||
| object AutofillResponseBuilderModule { | ||
|
|
||
| @Provides | ||
| @Reusable | ||
| fun provideAutofillResponseBuilder(): AutofillResponseBuilder.Factory { | ||
| return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { | ||
| Api30AutofillResponseBuilder.Factory | ||
| } else { | ||
| Api26AutofillResponseBuilder.Factory | ||
| } | ||
| } | ||
| } |
189 changes: 189 additions & 0 deletions
189
app/src/main/java/app/passwordstore/util/autofill/Api26AutofillResponseBuilder.kt
This file contains 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,189 @@ | ||
| /* | ||
| * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. | ||
| * SPDX-License-Identifier: GPL-3.0-only | ||
| */ | ||
| package app.passwordstore.util.autofill | ||
|
|
||
| import android.content.Context | ||
| import android.content.IntentSender | ||
| import android.os.Build | ||
| import android.service.autofill.Dataset | ||
| import android.service.autofill.FillCallback | ||
| import android.service.autofill.FillRequest | ||
| import android.service.autofill.FillResponse | ||
| import android.service.autofill.SaveInfo | ||
| import app.passwordstore.autofill.oreo.ui.AutofillSmsActivity | ||
| import app.passwordstore.ui.autofill.AutofillDecryptActivity | ||
| import app.passwordstore.ui.autofill.AutofillFilterView | ||
| import app.passwordstore.ui.autofill.AutofillPublisherChangedActivity | ||
| import app.passwordstore.ui.autofill.AutofillSaveActivity | ||
| import com.github.androidpasswordstore.autofillparser.AutofillAction | ||
| import com.github.androidpasswordstore.autofillparser.FillableForm | ||
| import com.github.androidpasswordstore.autofillparser.fillWith | ||
| import com.github.michaelbull.result.fold | ||
| import java.io.File | ||
| import logcat.LogPriority.ERROR | ||
| import logcat.asLog | ||
| import logcat.logcat | ||
|
|
||
| class Api26AutofillResponseBuilder | ||
| private constructor( | ||
| form: FillableForm, | ||
| ) : AutofillResponseBuilder { | ||
|
|
||
| object Factory : AutofillResponseBuilder.Factory { | ||
| override fun create( | ||
| form: FillableForm, | ||
| ): AutofillResponseBuilder = Api26AutofillResponseBuilder(form) | ||
| } | ||
|
|
||
| private val formOrigin = form.formOrigin | ||
| private val scenario = form.scenario | ||
| private val ignoredIds = form.ignoredIds | ||
| private val saveFlags = form.saveFlags | ||
| private val clientState = form.toClientState() | ||
|
|
||
| // We do not offer save when the only relevant field is a username field or there is no field. | ||
| private val scenarioSupportsSave = scenario.hasPasswordFieldsToSave | ||
| private val canBeSaved = saveFlags != null && scenarioSupportsSave | ||
|
|
||
| @Suppress("DEPRECATION") | ||
| private fun makeIntentDataset( | ||
| context: Context, | ||
| action: AutofillAction, | ||
| intentSender: IntentSender, | ||
| metadata: DatasetMetadata, | ||
| ): Dataset { | ||
| return Dataset.Builder(makeRemoteView(context, metadata)).run { | ||
| fillWith(scenario, action, credentials = null) | ||
| setAuthentication(intentSender) | ||
| build() | ||
| } | ||
| } | ||
|
|
||
| private fun makeMatchDataset(context: Context, file: File): Dataset? { | ||
| if (!scenario.hasFieldsToFillOn(AutofillAction.Match)) return null | ||
| val metadata = makeFillMatchMetadata(context, file) | ||
| val intentSender = AutofillDecryptActivity.makeDecryptFileIntentSender(file, context) | ||
| return makeIntentDataset(context, AutofillAction.Match, intentSender, metadata) | ||
| } | ||
|
|
||
| private fun makeSearchDataset(context: Context): Dataset? { | ||
| if (!scenario.hasFieldsToFillOn(AutofillAction.Search)) return null | ||
| val metadata = makeSearchAndFillMetadata(context) | ||
| val intentSender = AutofillFilterView.makeMatchAndDecryptFileIntentSender(context, formOrigin) | ||
| return makeIntentDataset(context, AutofillAction.Search, intentSender, metadata) | ||
| } | ||
|
|
||
| private fun makeGenerateDataset(context: Context): Dataset? { | ||
| if (!scenario.hasFieldsToFillOn(AutofillAction.Generate)) return null | ||
| val metadata = makeGenerateAndFillMetadata(context) | ||
| val intentSender = AutofillSaveActivity.makeSaveIntentSender(context, null, formOrigin) | ||
| return makeIntentDataset(context, AutofillAction.Generate, intentSender, metadata) | ||
| } | ||
|
|
||
| private fun makeFillOtpFromSmsDataset(context: Context): Dataset? { | ||
| if (!scenario.hasFieldsToFillOn(AutofillAction.FillOtpFromSms)) return null | ||
| if (!AutofillSmsActivity.shouldOfferFillFromSms(context)) return null | ||
| val metadata = makeFillOtpFromSmsMetadata(context) | ||
| val intentSender = AutofillSmsActivity.makeFillOtpFromSmsIntentSender(context) | ||
| return makeIntentDataset(context, AutofillAction.FillOtpFromSms, intentSender, metadata) | ||
| } | ||
|
|
||
| private fun makePublisherChangedDataset( | ||
| context: Context, | ||
| publisherChangedException: AutofillPublisherChangedException, | ||
| ): Dataset { | ||
| val metadata = makeWarningMetadata(context) | ||
| // If the user decides to trust the new publisher, they can choose reset the list of | ||
| // matches. In this case we need to immediately show a new `FillResponse` as if the app were | ||
| // autofilled for the first time. This `FillResponse` needs to be returned as a result from | ||
| // `AutofillPublisherChangedActivity`, which is why we create and pass it on here. | ||
| val fillResponseAfterReset = makeFillResponse(context, emptyList()) | ||
| val intentSender = | ||
| AutofillPublisherChangedActivity.makePublisherChangedIntentSender( | ||
| context, | ||
| publisherChangedException, | ||
| fillResponseAfterReset | ||
| ) | ||
| return makeIntentDataset(context, AutofillAction.Match, intentSender, metadata) | ||
| } | ||
|
|
||
| private fun makePublisherChangedResponse( | ||
| context: Context, | ||
| publisherChangedException: AutofillPublisherChangedException | ||
| ): FillResponse { | ||
| return FillResponse.Builder().run { | ||
| addDataset(makePublisherChangedDataset(context, publisherChangedException)) | ||
| setIgnoredIds(*ignoredIds.toTypedArray()) | ||
| build() | ||
| } | ||
| } | ||
|
|
||
| // TODO: Support multi-step authentication flows in apps via FLAG_DELAY_SAVE | ||
| // See: | ||
| // https://developer.android.com/reference/android/service/autofill/SaveInfo#FLAG_DELAY_SAVE | ||
| private fun makeSaveInfo(): SaveInfo? { | ||
| if (!canBeSaved) return null | ||
| check(saveFlags != null) | ||
| val idsToSave = scenario.fieldsToSave.toTypedArray() | ||
| if (idsToSave.isEmpty()) return null | ||
| var saveDataTypes = SaveInfo.SAVE_DATA_TYPE_PASSWORD | ||
| if (scenario.hasUsername) { | ||
| saveDataTypes = saveDataTypes or SaveInfo.SAVE_DATA_TYPE_USERNAME | ||
| } | ||
| return SaveInfo.Builder(saveDataTypes, idsToSave).run { | ||
| setFlags(saveFlags) | ||
| build() | ||
| } | ||
| } | ||
|
|
||
| private fun makeFillResponse(context: Context, matchedFiles: List<File>): FillResponse? { | ||
| var datasetCount = 0 | ||
| return FillResponse.Builder().run { | ||
| for (file in matchedFiles) { | ||
| makeMatchDataset(context, file)?.let { | ||
| datasetCount++ | ||
| addDataset(it) | ||
| } | ||
| } | ||
| makeGenerateDataset(context)?.let { | ||
| datasetCount++ | ||
| addDataset(it) | ||
| } | ||
| makeFillOtpFromSmsDataset(context)?.let { | ||
| datasetCount++ | ||
| addDataset(it) | ||
| } | ||
| makeSearchDataset(context)?.let { | ||
| datasetCount++ | ||
| addDataset(it) | ||
| } | ||
| if (datasetCount == 0) return null | ||
| if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { | ||
| setHeader( | ||
| makeRemoteView( | ||
| context, | ||
| makeHeaderMetadata(formOrigin.getPrettyIdentifier(context, untrusted = true)) | ||
| ) | ||
| ) | ||
| } | ||
| makeSaveInfo()?.let { setSaveInfo(it) } | ||
| setClientState(clientState) | ||
| setIgnoredIds(*ignoredIds.toTypedArray()) | ||
| build() | ||
| } | ||
| } | ||
|
|
||
| /** Creates and returns a suitable [FillResponse] to the Autofill framework. */ | ||
| override fun fillCredentials(context: Context, fillRequest: FillRequest, callback: FillCallback) { | ||
| AutofillMatcher.getMatchesFor(context, formOrigin) | ||
| .fold( | ||
| success = { matchedFiles -> callback.onSuccess(makeFillResponse(context, matchedFiles)) }, | ||
| failure = { e -> | ||
| logcat(ERROR) { e.asLog() } | ||
| callback.onSuccess(makePublisherChangedResponse(context, e)) | ||
| } | ||
| ) | ||
| } | ||
| } |
This file contains 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.