From d35992f3c40c1f781d60a49ed67678a27c411b9f Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Mon, 21 Nov 2016 15:08:14 +0100
Subject: [PATCH] bring back removeFromPlaylist()

---
 .../android/medialibrary/MediaLibrary.java    | 12 ++++++++++
 .../android/vanilla/PlaybackActivity.java     |  2 +-
 .../android/vanilla/Playlist.java             | 22 ++++++++-----------
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/ch/blinkenlights/android/medialibrary/MediaLibrary.java b/src/ch/blinkenlights/android/medialibrary/MediaLibrary.java
index 088f301d..4cb124ff 100644
--- a/src/ch/blinkenlights/android/medialibrary/MediaLibrary.java
+++ b/src/ch/blinkenlights/android/medialibrary/MediaLibrary.java
@@ -161,6 +161,18 @@ public class MediaLibrary  {
 		return getBackend(context).bulkInsert(MediaLibrary.TABLE_PLAYLISTS_SONGS, null, bulk);
 	}
 
+	/**
+	 * Removes a set of items from a playlist
+	 *
+	 * @param context the context to use
+	 * @param selection the selection for the items to drop
+	 * @param selectionArgs arguments for `selection'
+	 * @return the number of deleted rows, -1 on error
+	 */
+	public static int removeFromPlaylist(Context context, String selection, String[] selectionArgs) {
+		return getBackend(context).delete(MediaLibrary.TABLE_PLAYLISTS_SONGS, selection, selectionArgs);
+	}
+
 	/**
 	 * Registers a new content observer for the media library
 	 *
diff --git a/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java b/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java
index 84b0bb3a..7b08c8fe 100644
--- a/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java
@@ -524,7 +524,7 @@ public abstract class PlaybackActivity extends Activity
 		}
 
 		if (playlistTask.audioIds != null) {
-			count += Playlist.removeFromPlaylist(getContentResolver(), playlistTask.playlistId, playlistTask.audioIds);
+			count += Playlist.removeFromPlaylist(getApplicationContext(), playlistTask.playlistId, playlistTask.audioIds);
 		}
 
 		String message = getResources().getQuantityString(R.plurals.removed_from_playlist, count, count, playlistTask.name);
diff --git a/src/ch/blinkenlights/android/vanilla/Playlist.java b/src/ch/blinkenlights/android/vanilla/Playlist.java
index 4d349607..eb02b11e 100644
--- a/src/ch/blinkenlights/android/vanilla/Playlist.java
+++ b/src/ch/blinkenlights/android/vanilla/Playlist.java
@@ -28,7 +28,7 @@ import ch.blinkenlights.android.medialibrary.MediaLibrary;
 import android.content.Context;
 import android.content.ContentValues;
 import android.database.Cursor;
-
+import android.text.TextUtils;
 import java.util.ArrayList;
 
 import android.content.ContentResolver;
@@ -135,23 +135,19 @@ public class Playlist {
 	 * Removes a set of audioIds from the given playlist. Should be
 	 * run on a background thread.
 	 *
-	 * @param resolver A ContentResolver to use.
-	 * @param playlistId The MediaStore.Audio.Playlist id of the playlist to
+	 * @param context the context to use
+	 * @param playlistId id of the playlist to
 	 * modify.
-	 * @param audioIds An ArrayList with all IDs to add
-	 * @return The number of songs that were added to the playlist.
+	 * @param audioIds An ArrayList with all IDs to drop
+	 * @return The number of songs that were removed from the playlist
 	 */
-	public static int removeFromPlaylist(ContentResolver resolver, long playlistId, ArrayList<Long> audioIds) {
+	public static int removeFromPlaylist(Context context, long playlistId, ArrayList<Long> audioIds) {
 		if (playlistId == -1)
 			return 0;
 
-		int count = 0;
-		Uri uri = MediaStore.Audio.Playlists.Members.getContentUri("external", playlistId);
-		for (long id : audioIds) {
-			String where = MediaStore.Audio.Playlists.Members.AUDIO_ID + "=" + id;
-			count += resolver.delete(uri, where, null);
-		}
-		return count;
+		String idList = TextUtils.join(", ", audioIds);
+		String selection = MediaLibrary.PlaylistSongColumns.SONG_ID+" IN ("+idList+") AND "+MediaLibrary.PlaylistSongColumns.PLAYLIST_ID+"="+playlistId;
+		return MediaLibrary.removeFromPlaylist(context, selection, null);
 	}
 
 	/**