From 184391599b3b2946a485fc31e3b6896d2ab6f303 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
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 ++++----
 .../main/java/dev/msfjarvis/aps/ui/settings/GeneralSettings.kt    | 2 +-
 app/src/main/java/dev/msfjarvis/aps/ui/settings/MiscSettings.kt   | 2 +-
 .../main/java/dev/msfjarvis/aps/ui/settings/RepositorySettings.kt | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'app/src/main/java/dev/msfjarvis/aps/ui/settings')

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 {
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/settings/GeneralSettings.kt b/app/src/main/java/dev/msfjarvis/aps/ui/settings/GeneralSettings.kt
index 6d8ab5f6..21ecd55c 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/settings/GeneralSettings.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/settings/GeneralSettings.kt
@@ -97,7 +97,7 @@ class GeneralSettings(private val activity: FragmentActivity) : SettingsProvider
               }
             }
           }
-          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+          if (Build.VERSION.SDK_INT >= 25) {
             activity.getSystemService<ShortcutManager>()?.apply {
               removeDynamicShortcuts(dynamicShortcuts.map { it.id }.toMutableList())
             }
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/settings/MiscSettings.kt b/app/src/main/java/dev/msfjarvis/aps/ui/settings/MiscSettings.kt
index 8921317b..5bb50cd8 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/settings/MiscSettings.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/settings/MiscSettings.kt
@@ -47,7 +47,7 @@ class MiscSettings(activity: FragmentActivity) : SettingsProvider {
             putExtra("uri", uri)
           }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        if (Build.VERSION.SDK_INT >= 26) {
           activity.startForegroundService(service)
         } else {
           activity.startService(service)
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/settings/RepositorySettings.kt b/app/src/main/java/dev/msfjarvis/aps/ui/settings/RepositorySettings.kt
index ffd0f851..df34b145 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/settings/RepositorySettings.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/settings/RepositorySettings.kt
@@ -166,7 +166,7 @@ class RepositorySettings(private val activity: FragmentActivity) : SettingsProvi
                 }
                 .onFailure { it.message?.let { message -> activity.snackbar(message = message) } }
 
-              if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+              if (Build.VERSION.SDK_INT >= 25) {
                 activity.getSystemService<ShortcutManager>()?.apply {
                   removeDynamicShortcuts(dynamicShortcuts.map { it.id }.toMutableList())
                 }
-- 
cgit v1.2.3