Fix bug causing track to get queued at unexpected location

DRSchlaubi · Jun 16, 2024 · df0c88e · df0c88e
1 parent cd4f747
commit df0c88e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/music/build.gradle.kts b/music/build.gradle.kts
@@ -1,3 +1,3 @@
 subprojects {
-    version = "3.8.1-SNAPSHOT"
+    version = "3.8.2-SNAPSHOT"
 }
diff --git a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/Queue.kt b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/Queue.kt
@@ -45,8 +45,8 @@ class Queue(private var tracksList: MutableList<QueuedTrack> = mutableListOf())
 
     fun poll(): QueuedTrack {
         val queuedTrack = tracksList[order.poll()]
-        nextIndex = nextIndex.coerceAtMost(order.size)
-        if (order.size == 0) {
+        nextIndex--
+        if (order.isEmpty()) {
             shuffle = false
         }
         return queuedTrack

diff --git a/music/player/src/test/kotlin/QueueTest.kt b/music/player/src/test/kotlin/QueueTest.kt
@@ -185,6 +185,19 @@ class QueueTest {
 
         assertFalse(queue.shuffle)
     }
+
+    @Test
+    fun `test index gets updated after non-shuffle queue finishes`() {
+        val queue = makeMockQueue()
+        queue.shuffle = true
+        queue.addTracks(mockTrack(23))
+        queue.addTracks(mockTrack(24))
+        queue.addTracks(mockTrack(25))
+        repeat(3) { queue.poll() }
+        val track = mockTrack(26)
+        queue.addTracks(track)
+        assertEquals(track, queue.poll())
+    }
 }
 
 private fun makeMockQueue() = Queue(MutableList(10, ::mockTrack))