From 23d561cc440285fac76cb5de9085810d54dad387 Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Sat, 17 Feb 2024 13:37:02 -0700
Subject: [PATCH] playback: save when service closes

This time, actually wait for the save to complete before stopping the
foreground state. This requires some checks to make sure that we don't
have any "randomly smashing on buttons" errors, but I'm unsure if that
will be enough.

The last case in which this becomes an issue is when the service
is killed outright. I can't do much here to make the state more sane
unless I did some playback position monitoring.
---
 .../auxio/playback/system/PlaybackService.kt  | 36 +++++++++++++------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt b/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt
index a84b5775c..ba54a1f18 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt
@@ -194,6 +194,7 @@ class PlaybackService :
     override fun onTaskRemoved(rootIntent: Intent?) {
         super.onTaskRemoved(rootIntent)
         if (!playbackManager.progression.isPlaying) {
+            playbackManager.playing(false)
             endSession()
         }
     }
@@ -533,6 +534,7 @@ class PlaybackService :
     ) {
         super.onPositionDiscontinuity(oldPosition, newPosition, reason)
         if (reason == Player.DISCONTINUITY_REASON_SEEK) {
+            // TODO: Once position also naturally drifts by some threshold, save
             deferSave()
         }
     }
@@ -638,18 +640,21 @@ class PlaybackService :
     // --- OTHER FUNCTIONS ---
 
     private fun deferSave() {
+        saveJob {
+            logD("Waiting for save buffer")
+            delay(SAVE_BUFFER)
+            yield()
+            logD("Committing saved state")
+            persistenceRepository.saveState(playbackManager.toSavedState())
+        }
+    }
+
+    private fun saveJob(block: suspend () -> Unit) {
         currentSaveJob?.let {
             logD("Discarding prior save job")
             it.cancel()
         }
-        currentSaveJob =
-            saveScope.launch {
-                logD("Waiting for save buffer")
-                delay(SAVE_BUFFER)
-                yield()
-                logD("Committing saved state")
-                persistenceRepository.saveState(playbackManager.toSavedState())
-            }
+        currentSaveJob = saveScope.launch { block() }
     }
 
     private fun broadcastAudioEffectAction(event: String) {
@@ -664,8 +669,19 @@ class PlaybackService :
     private fun endSession() {
         // This session has ended, so we need to reset this flag for when the next
         // session starts.
-        hasPlayed = false
-        foregroundManager.tryStopForeground()
+        saveJob {
+            logD("Committing saved state")
+            persistenceRepository.saveState(playbackManager.toSavedState())
+            withContext(Dispatchers.Main) {
+                // User could feasibly start playing again if they were fast enough, so
+                // we need to avoid stopping the foreground state if that's the case.
+                if (!player.isPlaying) {
+                    hasPlayed = false
+                    playbackManager.playing(false)
+                    foregroundManager.tryStopForeground()
+                }
+            }
+        }
     }
 
     /**