sync up with media3 patches

Author: nift4

app/src/main/java/org/akanework/gramophone/logic/GramophonePlaybackService.kt

@@ -695,7 +695,8 @@ class GramophonePlaybackService : MediaLibraryService(), MediaSessionService.Lis
 
     override fun onPlaybackResumption(
         mediaSession: MediaSession,
-        controller: MediaSession.ControllerInfo
+        controller: MediaSession.ControllerInfo,
+        isForPlayback: Boolean
     ): ListenableFuture<MediaItemsWithStartPosition> {
         val settable = SettableFuture.create<MediaItemsWithStartPosition>()
         lastPlayedManager.restore { items, factory ->
@@ -708,11 +709,14 @@ class GramophonePlaybackService : MediaLibraryService(), MediaSessionService.Lis
             } else if (items.mediaItems.isNotEmpty()) {
                 if (endedWorkaroundPlayer?.nextShuffleOrder != null)
                     throw IllegalStateException("shuffleFactory was found orphaned")
-                endedWorkaroundPlayer?.nextShuffleOrder = factory.toFactory()
-                // This call will only sometimes set the playlist on our controller (it won't if
-                // the system is just asking for the last played song for display purposes)
-                settable.set(items)
-                endedWorkaroundPlayer?.nextShuffleOrder = null
+                if (isForPlayback) {
+                    endedWorkaroundPlayer?.nextShuffleOrder = factory.toFactory()
+                    settable.set(items)
+                    if (endedWorkaroundPlayer?.nextShuffleOrder != null)
+                        throw IllegalStateException("shuffleFactory was not consumed during resumption")
+                } else {
+                    settable.set(items)
+                }
             } else {
                 settable.setException(
                     IndexOutOfBoundsException(

app/src/main/java/org/akanework/gramophone/logic/utils/GramophoneShuffleOrder.kt

@@ -160,6 +160,11 @@ class CircularShuffleOrder private constructor(
             .also { listener.onShuffleOrderChanged(it) }
     }
 
+    override fun cloneAndMove(indexFrom: Int, indexToExclusive: Int, newIndexFrom: Int): ShuffleOrder {
+        return cloneAndRemove(indexFrom, indexToExclusive)
+            .cloneAndInsert(newIndexFrom, indexToExclusive - indexFrom)
+    }
+
     override fun cloneAndClear(): ShuffleOrder {
         return cloneAndRemove(0, shuffled.size)
     }

app/src/main/java/org/akanework/gramophone/logic/utils/exoplayer/EndedWorkaroundPlayer.kt

@@ -70,25 +70,4 @@ class EndedWorkaroundPlayer(player: ExoPlayer) : ForwardingPlayer(player), Playe
     fun onShuffleOrderChanged(shuffleOrder: CircularShuffleOrder) {
         this.shuffleOrder = shuffleOrder
     }
-
-    override fun moveMediaItems(fromIndex: Int, toIndex: Int, newIndex: Int) {
-        super.moveMediaItems(fromIndex, toIndex, newIndex)
-        try {
-            shuffleOrder?.let {
-                exoPlayer.setShuffleOrder(
-                    it.cloneAndRemove(fromIndex, toIndex)
-                        .cloneAndInsert(newIndex, toIndex - fromIndex)
-                )
-            }
-        } catch (e: Exception) {
-            Log.e(TAG, Log.getStackTraceString(e))
-            throw e
-        }
-    }
-
-    override fun moveMediaItem(currentIndex: Int, newIndex: Int) {
-        if (currentIndex != newIndex) {
-            moveMediaItems(currentIndex, currentIndex + 1, newIndex)
-        }
-    }
 }