fix: Properly stop foreground service

Myzel394 · Aug 17, 2023 · 8dcefc5 · 8dcefc5
1 parent 3e41030
commit 8dcefc5
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/app/src/main/java/app/myzel394/alibi/ui/models/AudioRecorderModel.kt b/app/src/main/java/app/myzel394/alibi/ui/models/AudioRecorderModel.kt
@@ -37,7 +37,6 @@ class AudioRecorderModel: ViewModel() {
     val progress: Float
         get() = (recordingTime!! / recorderService!!.settings!!.maxDuration).toFloat()
 
-    private var intent: Intent? = null
     var recorderService: AudioRecorderService? = null
         private set
 
@@ -86,15 +85,13 @@ class AudioRecorderModel: ViewModel() {
     }
 
     fun startRecording(context: Context) {
-        reset()
-
         runCatching {
             context.unbindService(connection)
         }
 
-        intent = Intent(context, AudioRecorderService::class.java)
-        ContextCompat.startForegroundService(context, intent!!)
-        context.bindService(intent!!, connection, Context.BIND_AUTO_CREATE)
+        val intent = Intent(context, AudioRecorderService::class.java)
+        ContextCompat.startForegroundService(context, intent)
+        context.bindService(intent, connection, Context.BIND_AUTO_CREATE)
     }
 
     fun stopRecording(context: Context, saveAsLastRecording: Boolean = true) {
@@ -104,9 +101,11 @@ class AudioRecorderModel: ViewModel() {
 
         runCatching {
             context.unbindService(connection)
-            context.stopService(intent)
         }
 
+        val intent = Intent(context, AudioRecorderService::class.java)
+        context.stopService(intent)
+
         reset()
     }