From f5d3c330866b1b14c96b1f49d18fdd48f161df0e Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Fri, 6 Sep 2024 21:59:55 +0200
Subject: [PATCH] make playlist item deletion more reliable

---
 .../src/main/java/net/newpipe/newplayer/NewPlayer.kt | 12 +++++++++---
 .../newpipe/newplayer/model/VideoPlayerViewModel.kt  |  2 +-
 .../newplayer/model/VideoPlayerViewModelImpl.kt      |  4 ++--
 .../newplayer/model/ViewoPlayerViewModelDummy.kt     |  4 ++--
 .../newplayer/ui/videoplayer/StreamSelectUI.kt       |  2 +-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/new-player/src/main/java/net/newpipe/newplayer/NewPlayer.kt b/new-player/src/main/java/net/newpipe/newplayer/NewPlayer.kt
index 7b897c7..3bb436d 100644
--- a/new-player/src/main/java/net/newpipe/newplayer/NewPlayer.kt
+++ b/new-player/src/main/java/net/newpipe/newplayer/NewPlayer.kt
@@ -96,7 +96,7 @@ interface NewPlayer {
     fun pause()
     fun addToPlaylist(item: String)
     fun movePlaylistItem(fromIndex: Int, toIndex: Int)
-    fun removePlaylistItem(index: Int)
+    fun removePlaylistItem(uniqueId: Long)
     fun playStream(item: String, playMode: PlayMode)
     fun selectChapter(index: Int)
     fun playStream(item: String, streamVariant: String, playMode: PlayMode)
@@ -338,8 +338,14 @@ class NewPlayerImpl(
         internalPlayer.moveMediaItem(fromIndex, toIndex)
     }
 
-    override fun removePlaylistItem(index: Int) {
-        internalPlayer.removeMediaItem(index)
+    override fun removePlaylistItem(uniqueId: Long) {
+        for(i in 0..<internalPlayer.mediaItemCount) {
+            val id = internalPlayer.getMediaItemAt(i).mediaId.toLong()
+            if(id == uniqueId) {
+                internalPlayer.removeMediaItem(i)
+                break
+            }
+        }
     }
 
     override fun playStream(item: String, playMode: PlayMode) {
diff --git a/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModel.kt b/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModel.kt
index fecb119..4c2dc3c 100644
--- a/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModel.kt
+++ b/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModel.kt
@@ -62,7 +62,7 @@ interface VideoPlayerViewModel {
     fun toggleShuffle()
     fun onStorePlaylist()
     fun movePlaylistItem(from: Int, to: Int)
-    fun removePlaylistItem(index: Int)
+    fun removePlaylistItem(uniqueId: Long)
     fun onStreamItemDragFinished()
     fun dialogVisible(visible: Boolean)
 }
\ No newline at end of file
diff --git a/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModelImpl.kt b/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModelImpl.kt
index 1613fb3..53758d7 100644
--- a/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModelImpl.kt
+++ b/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModelImpl.kt
@@ -543,8 +543,8 @@ class VideoPlayerViewModelImpl @Inject constructor(
         }
     }
 
-    override fun removePlaylistItem(index: Int) {
-        newPlayer?.removePlaylistItem(index)
+    override fun removePlaylistItem(uniqueId: Long) {
+        newPlayer?.removePlaylistItem(uniqueId)
     }
 
 
diff --git a/new-player/src/main/java/net/newpipe/newplayer/model/ViewoPlayerViewModelDummy.kt b/new-player/src/main/java/net/newpipe/newplayer/model/ViewoPlayerViewModelDummy.kt
index 1e1ee49..c67ce8d 100644
--- a/new-player/src/main/java/net/newpipe/newplayer/model/ViewoPlayerViewModelDummy.kt
+++ b/new-player/src/main/java/net/newpipe/newplayer/model/ViewoPlayerViewModelDummy.kt
@@ -108,8 +108,8 @@ open class VideoPlayerViewModelDummy : VideoPlayerViewModel {
         println("dummy impl")
     }
 
-    override fun removePlaylistItem(index: Int) {
-        println("dummy impl")
+    override fun removePlaylistItem(uniqueId: Long) {
+        println("dummy impl delete uniqueId: $uniqueId")
     }
 
     override fun onStreamItemDragFinished() {
diff --git a/new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/StreamSelectUI.kt b/new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/StreamSelectUI.kt
index 806a754..bf2ed7b 100644
--- a/new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/StreamSelectUI.kt
+++ b/new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/StreamSelectUI.kt
@@ -159,7 +159,7 @@ fun ReorderableStreamItemsList(
                     isDragging = isDragging,
                     isCurrentlyPlaying = playlistItem.uniqueId == uiState.currentlyPlaying.uniqueId,
                     onDelete = {
-                        viewModel.removePlaylistItem(index)
+                        viewModel.removePlaylistItem(playlistItem.uniqueId)
                     }
                 )
             }