From ff611d792eb14b3ec061a367f74c8c8fb5428154 Mon Sep 17 00:00:00 2001
From: vfsfitvnm <vfsfitvnm@protonmail.com>
Date: Mon, 10 Oct 2022 11:15:23 +0200
Subject: [PATCH] Use the correct setMediaItems overload to make
 onPlaybackStatsReady behave correctly

---
 .../main/kotlin/it/vfsfitvnm/vimusic/service/PlayerService.kt | 4 ++--
 app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/Player.kt      | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/service/PlayerService.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/service/PlayerService.kt
index bdf5cab..7231fe9 100644
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/service/PlayerService.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/service/PlayerService.kt
@@ -379,9 +379,9 @@ class PlayerService : InvincibleService(), Player.Listener, PlaybackStatsListene
                             .setCustomCacheKey(mediaItem.mediaItem.mediaId)
                             .build()
                     },
-                    true
+                    index,
+                    queuedSong[index].position ?: C.TIME_UNSET
                 )
-                player.seekTo(index, queuedSong[index].position ?: 0)
                 player.prepare()
 
                 isNotificationStarted = true
diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/Player.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/Player.kt
index 4f5da46..43e8130 100644
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/Player.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/Player.kt
@@ -43,9 +43,8 @@ fun Player.forcePlay(mediaItem: MediaItem) {
 fun Player.forcePlayAtIndex(mediaItems: List<MediaItem>, mediaItemIndex: Int) {
     if (mediaItems.isEmpty()) return
 
-    setMediaItems(mediaItems, true)
+    setMediaItems(mediaItems, mediaItemIndex, C.TIME_UNSET)
     playWhenReady = true
-    seekToDefaultPosition(mediaItemIndex)
     prepare()
 }