Fix queue not adding songs when already present

Signed-off-by: enricocid <[email protected]>
enricocid · Mar 10, 2024 · 80bc3be · 80bc3be
1 parent ba6aae9
commit 80bc3be
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/project/app/src/main/java/com/iven/musicplayergo/ui/MainActivity.kt b/project/app/src/main/java/com/iven/musicplayergo/ui/MainActivity.kt
@@ -884,13 +884,22 @@ class MainActivity : BaseActivity(), UIControlInterface, MediaControlInterface {
                     } else {
                         queueSongs.add(songToQueue)
                     }
-                    Toast.makeText(
-                        this@MainActivity,
-                        getString(R.string.queue_song_add, songToQueue.title),
-                        Toast.LENGTH_SHORT
-                    ).show()
+                } else {
+                    // song is already present but queue is already started
+                    // move the song next to the played song
+                    if (isQueue != null && !canRestoreQueue && isQueueStarted) {
+                        queueSongs.remove(songToQueue)
+                        val currentPosition = queueSongs.findIndex(currentSong)
+                        queueSongs.add(currentPosition+1, songToQueue)
+                    }
                 }
 
+                Toast.makeText(
+                    this@MainActivity,
+                    getString(R.string.queue_song_add, songToQueue.title),
+                    Toast.LENGTH_SHORT
+                ).show()
+
                 if (canRestoreQueue && restoreQueueSong == null) {
                     restoreQueueSong = songToQueue
                 }