From f78754e26c6274f997bbfe0798f47aa86f8f8133 Mon Sep 17 00:00:00 2001 From: "Danilo M." Date: Mon, 2 Nov 2026 13:31:30 +0100 Subject: build: drop the nonFree flavor, Sentry and Play Services The fork targets GrapheneOS and ships only FOSS builds. The nonFree flavor added Sentry crash reporting, wired to upstream's Sentry project, and Play Services SMS one-time-code autofill, which needs Google's servers. Neither is wanted, so remove the flavor dimension entirely: - Delete app/src/nonFree, the SentryPlugin, the sentry-stub module, the Sentry and Play Services catalog entries, and the Sentry scope setup in Application. - Move the free AutofillSmsActivity stub into main; it keeps the SMS OTP feature off exactly as the free build did. A ponytail note marks the FillOtpFromSms paths for later removal. - SlimTests no longer needs to skip a nonFree variant. - Workflows and docs use :app:assembleDebug / :app:assembleRelease. A bare assembleRelease would also verify library modules in release mode, where ui:compose fails on a pre-existing AppCompat attribute reference the old flavored task never touched. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/codeql_analysis.yml | 4 +- .github/workflows/pull_request.yml | 4 +- AGENTS.md | 16 +- CONTRIBUTING.md | 6 +- README.md | 6 +- app/build.gradle.kts | 5 - .../autofill/oreo/ui/AutofillSmsActivity.kt | 24 --- app/src/main/java/app/passwordstore/Application.kt | 11 -- .../autofill/oreo/ui/AutofillSmsActivity.kt | 26 ++++ app/src/nonFree/AndroidManifest.xml | 12 -- .../autofill/oreo/ui/AutofillSmsActivity.kt | 171 --------------------- .../res/layout/activity_oreo_autofill_sms.xml | 61 -------- app/src/nonFree/res/values-ar-rSA/strings.xml | 8 - app/src/nonFree/res/values-ar/strings.xml | 8 - app/src/nonFree/res/values-de/strings.xml | 8 - app/src/nonFree/res/values-es-rES/strings.xml | 8 - app/src/nonFree/res/values-es/strings.xml | 8 - app/src/nonFree/res/values-fi-rFI/strings.xml | 8 - app/src/nonFree/res/values-fi/strings.xml | 8 - app/src/nonFree/res/values-gl-rES/strings.xml | 8 - app/src/nonFree/res/values-gl/strings.xml | 8 - app/src/nonFree/res/values-hu-rHU/strings.xml | 8 - app/src/nonFree/res/values-hu/strings.xml | 8 - app/src/nonFree/res/values-it/strings.xml | 8 - app/src/nonFree/res/values-ko-rKR/strings.xml | 8 - app/src/nonFree/res/values-ko/strings.xml | 8 - app/src/nonFree/res/values-pl-rPL/strings.xml | 8 - app/src/nonFree/res/values-pl/strings.xml | 8 - app/src/nonFree/res/values-pt-rBR/strings.xml | 8 - app/src/nonFree/res/values-ru/strings.xml | 8 - app/src/nonFree/res/values-uk-rUA/strings.xml | 8 - app/src/nonFree/res/values-uk/strings.xml | 8 - app/src/nonFree/res/values/strings.xml | 9 -- build-logic/build.gradle.kts | 5 - .../app/passwordstore/gradle/ApplicationPlugin.kt | 8 - .../app/passwordstore/gradle/SentryPlugin.kt | 52 ------- .../passwordstore/gradle/flavors/ProductFlavors.kt | 15 -- .../app/passwordstore/gradle/flavors/SlimTests.kt | 16 +- gradle/libs.versions.toml | 3 - sentry-stub/build.gradle.kts | 5 - sentry-stub/lint-baseline.xml | 4 - sentry-stub/src/main/kotlin/io/sentry/Scope.kt | 16 -- sentry-stub/src/main/kotlin/io/sentry/Sentry.kt | 13 -- .../src/main/kotlin/io/sentry/protocol/User.kt | 17 -- settings.gradle.kts | 2 - 45 files changed, 47 insertions(+), 624 deletions(-) delete mode 100644 app/src/free/java/app/passwordstore/autofill/oreo/ui/AutofillSmsActivity.kt create mode 100644 app/src/main/java/app/passwordstore/autofill/oreo/ui/AutofillSmsActivity.kt delete mode 100644 app/src/nonFree/AndroidManifest.xml delete mode 100644 app/src/nonFree/java/app/passwordstore/autofill/oreo/ui/AutofillSmsActivity.kt delete mode 100644 app/src/nonFree/res/layout/activity_oreo_autofill_sms.xml delete mode 100644 app/src/nonFree/res/values-ar-rSA/strings.xml delete mode 100644 app/src/nonFree/res/values-ar/strings.xml delete mode 100644 app/src/nonFree/res/values-de/strings.xml delete mode 100644 app/src/nonFree/res/values-es-rES/strings.xml delete mode 100644 app/src/nonFree/res/values-es/strings.xml delete mode 100644 app/src/nonFree/res/values-fi-rFI/strings.xml delete mode 100644 app/src/nonFree/res/values-fi/strings.xml delete mode 100644 app/src/nonFree/res/values-gl-rES/strings.xml delete mode 100644 app/src/nonFree/res/values-gl/strings.xml delete mode 100644 app/src/nonFree/res/values-hu-rHU/strings.xml delete mode 100644 app/src/nonFree/res/values-hu/strings.xml delete mode 100644 app/src/nonFree/res/values-it/strings.xml delete mode 100644 app/src/nonFree/res/values-ko-rKR/strings.xml delete mode 100644 app/src/nonFree/res/values-ko/strings.xml delete mode 100644 app/src/nonFree/res/values-pl-rPL/strings.xml delete mode 100644 app/src/nonFree/res/values-pl/strings.xml delete mode 100644 app/src/nonFree/res/values-pt-rBR/strings.xml delete mode 100644 app/src/nonFree/res/values-ru/strings.xml delete mode 100644 app/src/nonFree/res/values-uk-rUA/strings.xml delete mode 100644 app/src/nonFree/res/values-uk/strings.xml delete mode 100644 app/src/nonFree/res/values/strings.xml delete mode 100644 build-logic/src/main/kotlin/app/passwordstore/gradle/SentryPlugin.kt delete mode 100644 build-logic/src/main/kotlin/app/passwordstore/gradle/flavors/ProductFlavors.kt delete mode 100644 sentry-stub/build.gradle.kts delete mode 100644 sentry-stub/lint-baseline.xml delete mode 100644 sentry-stub/src/main/kotlin/io/sentry/Scope.kt delete mode 100644 sentry-stub/src/main/kotlin/io/sentry/Sentry.kt delete mode 100644 sentry-stub/src/main/kotlin/io/sentry/protocol/User.kt diff --git a/.github/workflows/codeql_analysis.yml b/.github/workflows/codeql_analysis.yml index 8928d64e..63661320 100644 --- a/.github/workflows/codeql_analysis.yml +++ b/.github/workflows/codeql_analysis.yml @@ -5,8 +5,6 @@ on: schedule: - cron: '0 6 * * 1' -env: - SENTRY_DSN: 'https://public_key@example.com/project_id' jobs: analyze: @@ -29,7 +27,7 @@ jobs: - name: Build project shell: bash - run: ./gradlew assembleNonFreeRelease + run: ./gradlew :app:assembleRelease - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12 diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index b61a5320..8c1b3605 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -11,8 +11,6 @@ concurrency: group: ${{ github.head_ref || github.ref_name }} cancel-in-progress: true -env: - SENTRY_DSN: 'https://public_key@example.com/project_id' jobs: check-codestyle: @@ -64,7 +62,7 @@ jobs: - name: Build debug APKs shell: bash - run: ./gradlew assembleFreeDebug assembleNonFreeDebug assembleNonFreeRelease + run: ./gradlew :app:assembleDebug :app:assembleRelease - name: Upload Kotlin build report if: "${{ always() }}" diff --git a/AGENTS.md b/AGENTS.md index 2061f26f..619123c3 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -11,7 +11,7 @@ started in November 2026 from upstream's last commit. Kotlin, Gradle, about 18k Modules: `app` (UI, git sync, autofill service), `autofill-parser`, `crypto:common`, `crypto:pgpainless`, `format:common`, `passgen:diceware`, `passgen:random`, `ui:compose`, -`coroutine-utils`, `sentry-stub`. Build conventions live in `build-logic/`. +`coroutine-utils`. Build conventions live in `build-logic/`. The app name and `applicationId` (`app.passwordstore`) are still upstream's on purpose. Do not rename them unless asked: it is tied to the release-signing decision (see Releases). @@ -30,7 +30,7 @@ rename them unless asked: it is tied to the release-signing decision (see Releas Needs JDK 17 and the Android SDK. `local.properties` (gitignored) holds `sdk.dir`. - ./gradlew assembleFreeDebug # debug APK + ./gradlew :app:assembleDebug # debug APK ./gradlew test -PslimTests # unit tests, as CI runs them ./gradlew spotlessApply # formatting (ktfmt); CI runs spotlessCheck ./gradlew lint # all modules and variants, as CI runs it @@ -38,11 +38,13 @@ Needs JDK 17 and the Android SDK. `local.properties` (gitignored) holds `sdk.dir Prefix with `CI=1` to match CI: it turns Kotlin warnings into errors, so a deprecation warning that passes locally fails CI. Before committing, run: - CI=1 ./gradlew spotlessCheck test -PslimTests assembleFreeDebug assembleFreeRelease \ - assembleNonFreeDebug assembleNonFreeRelease lint metalavaCheckCompatibilityRelease + CI=1 ./gradlew spotlessCheck test -PslimTests :app:assembleDebug :app:assembleRelease \ + lint metalavaCheckCompatibilityRelease -Flavors: `free` (no proprietary dependencies, Sentry replaced by `sentry-stub`) and `nonFree` -(adds Sentry and Play Services SMS OTP). +No product flavors: the app has no proprietary dependencies, no Sentry and no Play Services +(the upstream `nonFree` flavor was removed). Scope `assemble*` to `:app`; a bare +`assembleRelease` also verifies library modules in release mode, where `ui:compose` fails on a +drawable using an AppCompat attribute it does not depend on. CI is `.github/workflows/pull_request.yml` (named "CI"), on push to `master`. Workflows use the `setup-gradle` composite action from this fork at `@master`. It checks the repository out @@ -61,7 +63,7 @@ in `local.properties`: $ANDROID_HOME/emulator/emulator -avd aps-test -no-window -no-audio -no-boot-anim \ -no-snapshot-save -gpu swiftshader_indirect & - ./gradlew installFreeDebug + ./gradlew installDebug Drive it with `adb shell input`, `uiautomator dump` and `screencap`. Decrypt screens set `FLAG_SECURE`, so screenshots of them are black; read them from the `uiautomator` dump. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 097c61dc..7f83d413 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -28,7 +28,6 @@ The source code is split across 12 modules and 1 subproject. - `format/common` handles parsing the `pass` file format. - `passgen/diceware` is our new password generator that implements the [Diceware](https://theworld.com/~reinhold/diceware.html) algorithm. - `passgen/random` contains the default password generator. -- `sentry-stub` contains no-op variants of [Sentry](https://sentry.io/) APIs that we use to ensure the FOSS-only, telemetry-free variant of APS continues to compile in absence of Sentry dependencies. - `ui/compose` has the theming code for building UI components in [Jetpack Compose](https://developer.android.com/jetpack/compose). - `app` is everything else that constitutes APS. @@ -47,11 +46,10 @@ We bundle a [`ignore-revs-file`](https://git-scm.com/docs/git-blame#Documentatio This document assumes that you already have an Android development environment ready. If not, refer to Google's documentation on [installing Android Studio](https://developer.android.com/studio/preview). APS will build with all editions of Android Studio, but development typically happens with the Canary channel. -The app comes in two 'flavors', a FOSS-only **free** variant and a **nonFree** variant that contains proprietary Google dependencies to facilitate some additional features as documented [here](https://android-password-store.github.io/docs/users/build-types). Decide what flavor you want to build, then run the following command to generate a debug APK. +Run the following command to generate a debug APK. ```shell -./gradlew collectFreeDebugApks # for 'free' flavor -./gradlew collectNonFreeDebugApks # for 'nonFree' flavor +./gradlew collectDebugApks ``` You can find the generated APK at `app/outputs`. diff --git a/README.md b/README.md index b9de0a24..2e04034b 100644 --- a/README.md +++ b/README.md @@ -24,12 +24,12 @@ Requires JDK 17 and the Android SDK command-line tools. Point Gradle at the SDK `local.properties` file (`sdk.dir=/path/to/Android/Sdk`), then: ``` -./gradlew assembleFreeDebug # APK in app/build/outputs/apk/free/debug/ +./gradlew :app:assembleDebug # APK in app/build/outputs/apk/debug/ ./gradlew test -PslimTests # unit tests ``` -The `free` flavor has no proprietary dependencies. The `nonFree` flavor adds Sentry crash -reporting and Google Play Services SMS OTP autofill. +The app has no proprietary dependencies: no crash reporting, no telemetry, no Google Play +Services. ## Issues diff --git a/app/build.gradle.kts b/app/build.gradle.kts index bff7d73a..0105bd4e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -8,7 +8,6 @@ plugins { id("com.github.android-password-store.android-application") id("com.github.android-password-store.kotlin-android") id("com.github.android-password-store.versioning-plugin") - id("com.github.android-password-store.sentry") id("com.github.android-password-store.rename-artifacts") alias(libs.plugins.hilt) alias(libs.plugins.ksp) @@ -100,10 +99,6 @@ dependencies { because("SSHJ now uses SLF4J 2.0 which we don't want") } - nonFreeImplementation(libs.thirdparty.nonfree.googlePlayAuthApiPhone) - nonFreeImplementation(libs.thirdparty.nonfree.sentry) - freeImplementation(projects.sentryStub) - testImplementation(libs.testing.robolectric) testImplementation(libs.testing.sharedPrefsMock) testImplementation(libs.bundles.testDependencies) diff --git a/app/src/free/java/app/passwordstore/autofill/oreo/ui/AutofillSmsActivity.kt b/app/src/free/java/app/passwordstore/autofill/oreo/ui/AutofillSmsActivity.kt deleted file mode 100644 index 83d1fdae..00000000 --- a/app/src/free/java/app/passwordstore/autofill/oreo/ui/AutofillSmsActivity.kt +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright © 2014-2024 The Android Password Store Authors. All Rights Reserved. - * SPDX-License-Identifier: GPL-3.0-only - */ -package app.passwordstore.autofill.oreo.ui - -import android.content.Context -import android.content.IntentSender -import androidx.appcompat.app.AppCompatActivity - -@Suppress("UNUSED_PARAMETER") -class AutofillSmsActivity : AppCompatActivity() { - - companion object { - - fun shouldOfferFillFromSms(context: Context): Boolean { - return false - } - - fun makeFillOtpFromSmsIntentSender(context: Context): IntentSender { - throw NotImplementedError("Filling OTPs from SMS requires non-free dependencies") - } - } -} diff --git a/app/src/main/java/app/passwordstore/Application.kt b/app/src/main/java/app/passwordstore/Application.kt index 9bc4c83e..8eb421f4 100644 --- a/app/src/main/java/app/passwordstore/Application.kt +++ b/app/src/main/java/app/passwordstore/Application.kt @@ -17,7 +17,6 @@ import app.passwordstore.injection.context.FilesDirPath import app.passwordstore.injection.prefs.SettingsPreferences import app.passwordstore.util.coroutines.DispatcherProvider import app.passwordstore.util.extensions.getString -import app.passwordstore.util.features.Feature import app.passwordstore.util.features.Features import app.passwordstore.util.git.sshj.setUpBouncyCastleForSshj import app.passwordstore.util.proxy.ProxyUtils @@ -26,8 +25,6 @@ import app.passwordstore.util.settings.PreferenceKeys import app.passwordstore.util.settings.runMigrations import com.google.android.material.color.DynamicColors import dagger.hilt.android.HiltAndroidApp -import io.sentry.Sentry -import io.sentry.protocol.User import java.util.concurrent.Executors import javax.inject.Inject import logcat.AndroidLogcatLogger @@ -67,14 +64,6 @@ class Application : android.app.Application(), SharedPreferences.OnSharedPrefere runMigrations(filesDirPath, prefs, gitSettings) proxyUtils.setDefaultProxy() DynamicColors.applyToActivitiesIfAvailable(this) - Sentry.configureScope { scope -> - val user = User() - user.data = - Feature.entries.associate { feature -> - "features.${feature.configKey}" to features.isEnabled(feature).toString() - } - scope.user = user - } setupScreenOffHandler() } diff --git a/app/src/main/java/app/passwordstore/autofill/oreo/ui/AutofillSmsActivity.kt b/app/src/main/java/app/passwordstore/autofill/oreo/ui/AutofillSmsActivity.kt new file mode 100644 index 00000000..7acc72f9 --- /dev/null +++ b/app/src/main/java/app/passwordstore/autofill/oreo/ui/AutofillSmsActivity.kt @@ -0,0 +1,26 @@ +/* + * Copyright © 2014-2024 The Android Password Store Authors. All Rights Reserved. + * SPDX-License-Identifier: GPL-3.0-only + */ +package app.passwordstore.autofill.oreo.ui + +import android.content.Context +import android.content.IntentSender +import androidx.appcompat.app.AppCompatActivity + +// ponytail: filling OTPs from SMS needed Play Services (removed with the nonFree flavor), so +// this stub keeps the feature off. Delete it together with the FillOtpFromSms autofill paths. +@Suppress("UNUSED_PARAMETER") +class AutofillSmsActivity : AppCompatActivity() { + + companion object { + + fun shouldOfferFillFromSms(context: Context): Boolean { + return false + } + + fun makeFillOtpFromSmsIntentSender(context: Context): IntentSender { + throw NotImplementedError("Filling OTPs from SMS requires non-free dependencies") + } + } +} diff --git a/app/src/nonFree/AndroidManifest.xml b/app/src/nonFree/AndroidManifest.xml deleted file mode 100644 index 8a03b626..00000000 --- a/app/src/nonFree/AndroidManifest.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/app/src/nonFree/java/app/passwordstore/autofill/oreo/ui/AutofillSmsActivity.kt b/app/src/nonFree/java/app/passwordstore/autofill/oreo/ui/AutofillSmsActivity.kt deleted file mode 100644 index 1f627c06..00000000 --- a/app/src/nonFree/java/app/passwordstore/autofill/oreo/ui/AutofillSmsActivity.kt +++ /dev/null @@ -1,171 +0,0 @@ -/* - * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved. - * SPDX-License-Identifier: GPL-3.0-only - */ -package app.passwordstore.autofill.oreo.ui - -import android.app.Activity -import android.app.PendingIntent -import android.content.BroadcastReceiver -import android.content.Context -import android.content.Intent -import android.content.IntentFilter -import android.content.IntentSender -import android.os.Build -import android.os.Bundle -import android.view.autofill.AutofillManager -import androidx.appcompat.app.AppCompatActivity -import androidx.core.content.ContextCompat -import androidx.lifecycle.lifecycleScope -import app.passwordstore.databinding.ActivityOreoAutofillSmsBinding -import app.passwordstore.util.autofill.AutofillResponseBuilder -import app.passwordstore.util.coroutines.DispatcherProvider -import app.passwordstore.util.extensions.viewBinding -import com.github.androidpasswordstore.autofillparser.AutofillAction -import com.github.androidpasswordstore.autofillparser.Credentials -import com.github.michaelbull.result.onFailure -import com.github.michaelbull.result.runCatching -import com.google.android.gms.auth.api.phone.SmsCodeRetriever -import com.google.android.gms.auth.api.phone.SmsRetriever -import com.google.android.gms.common.ConnectionResult -import com.google.android.gms.common.GoogleApiAvailability -import com.google.android.gms.common.api.ResolvableApiException -import com.google.android.gms.tasks.Task -import dagger.hilt.android.AndroidEntryPoint -import java.util.concurrent.ExecutionException -import javax.inject.Inject -import kotlin.coroutines.resume -import kotlin.coroutines.resumeWithException -import kotlin.coroutines.suspendCoroutine -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext -import logcat.LogPriority.ERROR -import logcat.LogPriority.WARN -import logcat.asLog -import logcat.logcat - -suspend fun Task.suspendableAwait() = - suspendCoroutine { cont -> - addOnSuccessListener { result: T -> cont.resume(result) } - addOnFailureListener { e -> - // Unwrap specific exceptions (e.g. ResolvableApiException) from ExecutionException. - val cause = (e as? ExecutionException)?.cause ?: e - cont.resumeWithException(cause) - } - } - -@AndroidEntryPoint -class AutofillSmsActivity : AppCompatActivity() { - - @Inject lateinit var dispatcherProvider: DispatcherProvider - - companion object { - - private var fillOtpFromSmsRequestCode = 1 - - fun shouldOfferFillFromSms(context: Context): Boolean { - if (Build.VERSION.SDK_INT < 28) return false - val googleApiAvailabilityInstance = GoogleApiAvailability.getInstance() - val googleApiStatus = googleApiAvailabilityInstance.isGooglePlayServicesAvailable(context) - if (googleApiStatus != ConnectionResult.SUCCESS) { - logcat(WARN) { - "Google Play Services unavailable or not updated: ${googleApiAvailabilityInstance.getErrorString(googleApiStatus)}" - } - return false - } - // https://developer.android.com/guide/topics/text/autofill-services#sms-autofill - if (googleApiAvailabilityInstance.getApkVersion(context) < 190056000) { - logcat(WARN) { "Google Play Service 19.0.56 or higher required for SMS OTP Autofill" } - return false - } - return true - } - - fun makeFillOtpFromSmsIntentSender(context: Context): IntentSender { - val intent = Intent(context, AutofillSmsActivity::class.java) - return PendingIntent.getActivity( - context, - fillOtpFromSmsRequestCode++, - intent, - PendingIntent.FLAG_CANCEL_CURRENT or PendingIntent.FLAG_IMMUTABLE, - ) - .intentSender - } - } - - private val binding by viewBinding(ActivityOreoAutofillSmsBinding::inflate) - - private lateinit var clientState: Bundle - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(binding.root) - setResult(RESULT_CANCELED) - binding.cancelButton.setOnClickListener { finish() } - } - - override fun onStart() { - super.onStart() - clientState = - intent?.getBundleExtra(AutofillManager.EXTRA_CLIENT_STATE) - ?: run { - logcat(WARN) { "AutofillSmsActivity started without EXTRA_CLIENT_STATE" } - finish() - return - } - - ContextCompat.registerReceiver( - this, - smsCodeRetrievedReceiver, - IntentFilter(SmsCodeRetriever.SMS_CODE_RETRIEVED_ACTION), - SmsRetriever.SEND_PERMISSION, - null, - ContextCompat.RECEIVER_EXPORTED, - ) - lifecycleScope.launch { waitForSms() } - } - - // Retry starting the SMS code retriever after a permission request. - @Deprecated("Deprecated in Java") - override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { - super.onActivityResult(requestCode, resultCode, data) - if (resultCode != Activity.RESULT_OK) return - lifecycleScope.launch { waitForSms() } - } - - private suspend fun waitForSms() { - val smsClient = SmsCodeRetriever.getAutofillClient(this@AutofillSmsActivity) - runCatching { - withContext(dispatcherProvider.io()) { - smsClient.startSmsCodeRetriever().suspendableAwait() - } - } - .onFailure { e -> - if (e is ResolvableApiException) { - e.startResolutionForResult(this@AutofillSmsActivity, 1) - } else { - logcat(ERROR) { e.asLog() } - withContext(dispatcherProvider.main()) { finish() } - } - } - } - - private val smsCodeRetrievedReceiver = - object : BroadcastReceiver() { - override fun onReceive(context: Context, intent: Intent) { - val smsCode = intent.getStringExtra(SmsCodeRetriever.EXTRA_SMS_CODE) - val fillInDataset = - AutofillResponseBuilder.makeFillInDataset( - this@AutofillSmsActivity, - Credentials(null, null, smsCode), - clientState, - AutofillAction.FillOtpFromSms, - ) - setResult( - RESULT_OK, - Intent().apply { putExtra(AutofillManager.EXTRA_AUTHENTICATION_RESULT, fillInDataset) }, - ) - finish() - } - } -} diff --git a/app/src/nonFree/res/layout/activity_oreo_autofill_sms.xml b/app/src/nonFree/res/layout/activity_oreo_autofill_sms.xml deleted file mode 100644 index aa921185..00000000 --- a/app/src/nonFree/res/layout/activity_oreo_autofill_sms.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - -