#814 feat: show system dialog to remove Key Mapper from background op…

…timisation [2]
keymapperorg · Nov 4, 2021 · c41c9a4 · c41c9a4
1 parent a074dc4
commit c41c9a4
Showing 1 changed file with 15 additions and 18 deletions.
diff --git a/app/src/main/java/io/github/sds100/keymapper/system/permissions/RequestPermissionDelegate.kt b/app/src/main/java/io/github/sds100/keymapper/system/permissions/RequestPermissionDelegate.kt
@@ -207,17 +207,7 @@ class RequestPermissionDelegate(
                 messageResource = R.string.dialog_message_disable_battery_optimisation
 
                 positiveButton(R.string.pos_turn_off_stock_battery_optimisation) {
-
-                    try {
-                        val intent = Intent(
-                            Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
-                            Uri.parse("package:${Constants.PACKAGE_NAME}")
-                        )
-
-                        activity.startActivity(intent)
-                    } catch (e: ActivityNotFoundException) {
-                        activity.longToast(R.string.error_battery_optimisation_activity_not_found)
-                    }
+                    showBatteryOptimisationExemptionSystemDialog()
                 }
 
                 negativeButton(R.string.neg_cancel) { it.cancel() }
@@ -232,14 +222,21 @@ class RequestPermissionDelegate(
                 show()
             }
         } else {
-            try {
-                val intent =
-                    Intent(Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS)
+            showBatteryOptimisationExemptionSystemDialog()
+        }
+    }
 
-                activity.startActivity(intent)
-            } catch (e: ActivityNotFoundException) {
-                longToast(R.string.error_battery_optimisation_activity_not_found)
-            }
+    @RequiresApi(Build.VERSION_CODES.M)
+    private fun showBatteryOptimisationExemptionSystemDialog() {
+        try {
+            val intent = Intent(
+                Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
+                Uri.parse("package:${Constants.PACKAGE_NAME}")
+            )
+
+            activity.startActivity(intent)
+        } catch (e: ActivityNotFoundException) {
+            activity.longToast(R.string.error_battery_optimisation_activity_not_found)
         }
     }
 }