From 98f9931cff216b37f631c89cd8164663c25ab002 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Thu, 14 Jul 2022 14:06:49 +0200
Subject: [PATCH] make strobo and SOS toggling more reliable

---
 .../flashlight/helpers/MyCameraImpl.kt        | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MyCameraImpl.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MyCameraImpl.kt
index 79147ff..6ee4288 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MyCameraImpl.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MyCameraImpl.kt
@@ -25,6 +25,8 @@ class MyCameraImpl(val context: Context) {
         private var params: Camera.Parameters? = null
         private var isMarshmallow = false
         private var shouldEnableFlashlight = false
+        private var shouldEnableStroboscope = false
+        private var shouldEnableSOS = false
         private var isStroboSOS = false     // are we sending SOS, or casual stroboscope?
 
         private var marshmallowCamera: MarshmallowCamera? = null
@@ -55,7 +57,7 @@ class MyCameraImpl(val context: Context) {
     fun toggleStroboscope(): Boolean {
         if (isSOSRunning) {
             stopSOS()
-            toggleStroboscope()
+            shouldEnableStroboscope = true
             return true
         }
 
@@ -85,7 +87,7 @@ class MyCameraImpl(val context: Context) {
     fun toggleSOS(): Boolean {
         if (isStroboscopeRunning) {
             stopStroboscope()
-            toggleSOS()
+            shouldEnableSOS = true
             return true
         }
 
@@ -324,9 +326,19 @@ class MyCameraImpl(val context: Context) {
             isStroboscopeRunning = false
         }
 
-        if (shouldEnableFlashlight) {
-            enableFlashlight()
-            shouldEnableFlashlight = false
+        when {
+            shouldEnableFlashlight -> {
+                enableFlashlight()
+                shouldEnableFlashlight = false
+            }
+            shouldEnableSOS -> {
+                toggleSOS()
+                shouldEnableSOS = false
+            }
+            shouldEnableStroboscope -> {
+                toggleStroboscope()
+                shouldEnableStroboscope = false
+            }
         }
     }
 }