norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

bring back removeFromPlaylist()

Browse Source
This commit is contained in:
Adrian Ulrich 2016-11-21 15:08:14 +01:00
parent 4e1101b2da
commit d35992f3c4
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ch/blinkenlights/android/medialibrary/MediaLibrary.java
View File

@ -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
*

2
src/ch/blinkenlights/android/vanilla/PlaybackActivity.java
View File

@ -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);

22
src/ch/blinkenlights/android/vanilla/Playlist.java
View File

@ -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);
}
/**