From d26eb3cec0b0474249b981629fbcfd1570e9be75 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Tue, 4 Jan 2022 18:47:36 +0200
Subject: [PATCH] Check result of battery optimization setting

---
 app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt | 7 ++++++-
 app/src/main/res/values-fi/strings.xml                   | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
index 87c60071..9f35a892 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
@@ -76,11 +76,16 @@ class ConfigActivity : AppCompatActivity() {
 
         if (Build.VERSION.SDK_INT >= 23) {
             val pm = getSystemService(Context.POWER_SERVICE) as PowerManager
+            val androidSettingsRequest = registerForActivityResult(
+                    ActivityResultContracts.StartActivityForResult()
+            ) {
+                batteryOptimizations.isChecked = pm.isIgnoringBatteryOptimizations(packageName) == false
+            }
             batteryOptimizations = binding.BatteryOptimizations
             batteryOptimizations.isChecked = pm.isIgnoringBatteryOptimizations(packageName) == false
             batteryOptimizations.setOnCheckedChangeListener { _, _ ->
                 try {
-                    startActivity(Intent("android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS"))
+                    androidSettingsRequest.launch(Intent("android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS"))
                 } catch (e: ActivityNotFoundException) {
                         Log.e(TAG, "ActivityNotFound exception: $e")
                 }
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index b3c6f770..27f17961 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -279,7 +279,7 @@
     <string name="start_automatically">Käynnistä automaattisesti</string>
     <string name="start_automatically_help">Jos merkitty, baresip
     käynnistyy automaattisesti, kun laite käynnistyy.</string>
-    <string name="battery_optimizations">Akun käytön optiomointi</string>
+    <string name="battery_optimizations">Akun käytön optimointi</string>
     <string name="battery_optimizations_help">Ota akun käytön optimointi pois päältä (suositeltu),
         jos haluat vähentää todennäköisyyttä, että Android rajoittaa baresip-sovelluksen toimintaa
         ja pääsyä verkkoon.</string>