From 184391599b3b2946a485fc31e3b6896d2ab6f303 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 28 May 2022 01:48:39 +0530 Subject: Fix ClipboardService crash (#1928) * Fix clipboard service crash on API 31 * all: use ints directly for SDK version checks I much prefer it this way --- .../main/java/dev/msfjarvis/aps/ui/settings/AutofillSettings.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'app/src/main/java/dev/msfjarvis/aps/ui/settings/AutofillSettings.kt') diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/settings/AutofillSettings.kt b/app/src/main/java/dev/msfjarvis/aps/ui/settings/AutofillSettings.kt index 10dae205..80dce577 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/settings/AutofillSettings.kt +++ b/app/src/main/java/dev/msfjarvis/aps/ui/settings/AutofillSettings.kt @@ -35,11 +35,11 @@ class AutofillSettings(private val activity: FragmentActivity) : SettingsProvide private val isAutofillServiceEnabled: Boolean get() { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return false + if (Build.VERSION.SDK_INT < 26) return false return activity.autofillManager?.hasEnabledAutofillServices() == true } - @RequiresApi(Build.VERSION_CODES.O) + @RequiresApi(26) private fun showAutofillDialog(pref: SwitchPreference) { val observer = LifecycleEventObserver { _, event -> when (event) { @@ -95,10 +95,10 @@ class AutofillSettings(private val activity: FragmentActivity) : SettingsProvide builder.apply { switch(PreferenceKeys.AUTOFILL_ENABLE) { titleRes = R.string.pref_autofill_enable_title - visible = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O + visible = Build.VERSION.SDK_INT >= 26 defaultValue = isAutofillServiceEnabled onClick { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return@onClick true + if (Build.VERSION.SDK_INT < 26) return@onClick true if (isAutofillServiceEnabled) { activity.autofillManager?.disableAutofillServices() } else { -- cgit v1.2.3