fix: only remove track from the selected playlist (#332)

Refs: #69

Author: jguegel

CHANGELOG.md

@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Tapping notification now launches the "Now playing" screen ([#179])
 
+### Fixed
+- Fixed an issue where removing a track from a playlist removed it from all playlists ([#69])
+
 ## [1.6.0] - 2025-11-09
 ### Changed
 - Player now respects play/pause state when seeking ([#97])
@@ -91,6 +94,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#45]: https://github.com/FossifyOrg/Music-Player/issues/45
 [#47]: https://github.com/FossifyOrg/Music-Player/issues/47
 [#65]: https://github.com/FossifyOrg/Music-Player/issues/65
+[#69]: https://github.com/FossifyOrg/Music-Player/issues/69
 [#97]: https://github.com/FossifyOrg/Music-Player/issues/97
 [#179]: https://github.com/FossifyOrg/Music-Player/issues/179
 [#206]: https://github.com/FossifyOrg/Music-Player/issues/206

app/src/main/kotlin/org/fossify/musicplayer/adapters/TracksAdapter.kt

@@ -87,7 +87,7 @@ class TracksAdapter(
             R.id.cab_add_to_queue -> addToQueue()
             R.id.cab_properties -> showProperties()
             R.id.cab_rename -> displayEditDialog()
-            R.id.cab_remove_from_playlist -> removeFromPlaylist()
+            R.id.cab_remove_from_playlist -> removeFromPlaylist(playlist)
             R.id.cab_delete -> askConfirmDelete()
             R.id.cab_share -> shareFiles()
             R.id.cab_select_all -> selectAll()
@@ -107,7 +107,9 @@ class TracksAdapter(
         }
     }
 
-    private fun removeFromPlaylist() {
+    private fun removeFromPlaylist(playlist: Playlist?) {
+        if (playlist == null) return
+
         ensureBackgroundThread {
             val positions = ArrayList<Int>()
             val selectedTracks = getSelectedTracks()
@@ -118,7 +120,8 @@ class TracksAdapter(
                 }
             }
 
-            context.audioHelper.deleteTracks(selectedTracks)
+            val mediaIds = selectedTracks.map { it.mediaStoreId }
+            context.audioHelper.removeTracksFromPlaylist(playlist.id, mediaIds)
             // this is to make sure these tracks aren't automatically re-added to the 'All tracks' playlist on rescan
             val removedTrackIds = selectedTracks.filter { it.playListId == ALL_TRACKS_PLAYLIST_ID }.map { it.mediaStoreId.toString() }
             if (removedTrackIds.isNotEmpty()) {

app/src/main/kotlin/org/fossify/musicplayer/helpers/AudioHelper.kt

@@ -71,6 +71,11 @@ class AudioHelper(private val context: Context) {
         }
     }
 
+    fun removeTracksFromPlaylist(playlistId: Int, mediaStoreIds: List<Long>) {
+        if (mediaStoreIds.isEmpty()) return
+        context.tracksDAO.removeTracksFromPlaylist(playlistId, mediaStoreIds)
+    }
+
     fun insertArtists(artists: List<Artist>) {
         context.artistDAO.insertAll(artists)
     }

app/src/main/kotlin/org/fossify/musicplayer/interfaces/SongsDao.kt

@@ -44,6 +44,9 @@ interface SongsDao {
     @Query("DELETE FROM tracks WHERE playlist_id = :playlistId")
     fun removePlaylistSongs(playlistId: Int)
 
+    @Query("DELETE FROM tracks WHERE playlist_id = :playlistId AND media_store_id IN (:mediaStoreIds)")
+    fun removeTracksFromPlaylist(playlistId: Int, mediaStoreIds: List<Long>)
+
     @Query("UPDATE tracks SET path = :newPath, artist = :artist, title = :title WHERE path = :oldPath")
     fun updateSongInfo(newPath: String, artist: String, title: String, oldPath: String)