fix: Differentiate between stopping and destroying -> destroy service after stoppind and saving last recording information

app/src/main/java/app/myzel394/alibi/services/RecorderService.kt

@@ -55,11 +55,6 @@ abstract class RecorderService : LifecycleService() {
 
     protected open suspend fun stop() {
         recordingTimeTimer.shutdown()
-
-        NotificationManagerCompat.from(this)
-            .cancel(NotificationHelper.RECORDER_CHANNEL_NOTIFICATION_ID)
-        stopForeground(STOP_FOREGROUND_REMOVE)
-        stopSelf()
     }
 
     protected abstract fun startForegroundService()
@@ -85,6 +80,13 @@ abstract class RecorderService : LifecycleService() {
         changeState(RecorderState.RECORDING)
     }
 
+    fun destroy() {
+        NotificationManagerCompat.from(this)
+            .cancel(NotificationHelper.RECORDER_CHANNEL_NOTIFICATION_ID)
+        stopForeground(STOP_FOREGROUND_REMOVE)
+        stopSelf()
+    }
+
     override fun onBind(intent: Intent): IBinder? {
         super.onBind(intent)
         return binder

app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/atoms/RecorderEventsHandler.kt

@@ -82,11 +82,10 @@ fun RecorderEventsHandler(
         }
     }
 
-    fun saveAsLastRecording(
+    suspend fun saveAsLastRecording(
         recorder: RecorderModel
     ) {
         if (!settings.deleteRecordingsImmediately) {
-            scope.launch {
             dataStore.updateData {
                 it.setLastRecording(
                     recorder.recorderService!!.getRecordingInformation()
@@ -94,7 +93,6 @@ fun RecorderEventsHandler(
             }
         }
     }
-    }
 
     val successMessage = stringResource(R.string.ui_audioRecorder_action_save_success)
     val openMessage = stringResource(R.string.ui_audioRecorder_action_save_openFolder)
@@ -189,15 +187,25 @@ fun RecorderEventsHandler(
     // Register audio recorder events
     DisposableEffect(key1 = audioRecorder, key2 = settings) {
         audioRecorder.onRecordingSave = {
+            scope.launch {
+                audioRecorder.stopRecording(context)
+
+                kotlin.runCatching {
                     saveAsLastRecording(audioRecorder as RecorderModel)
 
                     saveRecording(audioRecorder)
                 }
+
+                audioRecorder.destroyService(context)
+            }
+        }
         audioRecorder.onError = {
+            scope.launch {
                 saveAsLastRecording(audioRecorder as RecorderModel)
 
                 showRecorderError = true
             }
+        }
 
         onDispose {
             audioRecorder.onRecordingSave = {}
@@ -208,15 +216,25 @@ fun RecorderEventsHandler(
     // Register video recorder events
     DisposableEffect(key1 = videoRecorder, key2 = settings) {
         videoRecorder.onRecordingSave = {
+            scope.launch {
+                videoRecorder.stopRecording(context)
+
+                kotlin.runCatching {
                     saveAsLastRecording(videoRecorder as RecorderModel)
 
                     saveRecording(videoRecorder)
                 }
+
+                videoRecorder.destroyService(context)
+            }
+        }
         videoRecorder.onError = {
+            scope.launch {
                 saveAsLastRecording(videoRecorder as RecorderModel)
 
                 showRecorderError = true
             }
+        }
 
         onDispose {
             videoRecorder.onRecordingSave = {}

app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/AudioRecordingStatus.kt

@@ -89,11 +89,8 @@ fun AudioRecordingStatus(
                 }
             },
             onSave = {
-                scope.launch {
-                    audioRecorder.stopRecording(context)
                 audioRecorder.onRecordingSave()
             }
-            }
         )
 
         MicrophoneStatus(audioRecorder)

app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/VideoRecordingStatus.kt

@@ -115,11 +115,8 @@ fun VideoRecordingStatus(
                     }
                 },
                 onSave = {
-                    scope.launch {
-                        videoRecorder.stopRecording(context)
                     videoRecorder.onRecordingSave()
                 }
-                }
             )
         }
     }

app/src/main/java/app/myzel394/alibi/ui/models/BaseRecorderModel.kt

@@ -136,14 +136,9 @@ abstract class BaseRecorderModel<S : IntervalRecorderService.Settings, I, T : In
         // TODO: Also show what camera is in use while recording
         recorderService!!.stopRecording()
 
-        val intent = Intent(context, intentClass)
         runCatching {
             context.unbindService(connection)
         }
-        runCatching {
-            context.stopService(intent)
-        }
-        reset()
     }
 
     fun pauseRecording() {
@@ -154,6 +149,16 @@ abstract class BaseRecorderModel<S : IntervalRecorderService.Settings, I, T : In
         recorderService!!.resumeRecording()
     }
 
+    fun destroyService(context: Context) {
+        recorderService!!.destroy()
+        reset()
+        val intent = Intent(context, intentClass)
+
+        runCatching {
+            context.stopService(intent)
+        }
+    }
+
     // Bind functions used to manually bind to the service if the app
     // is closed and reopened for example
     fun bindToService(context: Context) {