From 09a1523d574cac1ecb90b7f9248ee508521d6f92 Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Fri, 10 Jul 2015 21:44:15 +0200
Subject: [PATCH] Fixed playlist song loader loading wrong playlistId which
 caused that it was no longer possible to delete songs from playlists

---
 .../kabouzeid/gramophone/loader/PlaylistSongLoader.java    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/loader/PlaylistSongLoader.java b/app/src/main/java/com/kabouzeid/gramophone/loader/PlaylistSongLoader.java
index f85d8ce3..ef4e9fe7 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/loader/PlaylistSongLoader.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/loader/PlaylistSongLoader.java
@@ -19,7 +19,7 @@ public class PlaylistSongLoader {
 
         if (cursor != null && cursor.moveToFirst()) {
             do {
-                songs.add(getPlaylistSongFromCursorImpl(cursor));
+                songs.add(getPlaylistSongFromCursorImpl(cursor, playlistId));
             } while (cursor.moveToNext());
         }
         if (cursor != null) {
@@ -29,7 +29,7 @@ public class PlaylistSongLoader {
     }
 
     @NonNull
-    private static PlaylistSong getPlaylistSongFromCursorImpl(@NonNull Cursor cursor) {
+    private static PlaylistSong getPlaylistSongFromCursorImpl(@NonNull Cursor cursor, int playlistId) {
         final int id = cursor.getInt(0);
         final String songName = cursor.getString(1);
         final String artist = cursor.getString(2);
@@ -40,7 +40,6 @@ public class PlaylistSongLoader {
         final int artistId = cursor.getInt(7);
         final String data = cursor.getString(8);
         final int idInPlaylist = cursor.getInt(9);
-        final int playlistId = cursor.getInt(10);
 
         return new PlaylistSong(id, albumId, artistId, songName, artist, album, duration, trackNumber, data, playlistId, idInPlaylist);
     }
@@ -68,8 +67,6 @@ public class PlaylistSongLoader {
                         /* 8 */
                         AudioColumns.DATA,
                         /* 9 */
-                        MediaStore.Audio.Playlists.Members.PLAYLIST_ID,
-                        /* 10 */
                         MediaStore.Audio.Playlists.Members._ID
                 }, SongLoader.BASE_SELECTION, null,
                 MediaStore.Audio.Playlists.Members.DEFAULT_SORT_ORDER);