From f9cd2e8a2e61ee357cda26e30e671b41a80eb360 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Mon, 23 Mar 2015 20:06:44 +0100 Subject: [PATCH] Bugfixes --- .../kabouzeid/gramophone/loader/AlbumLoader.java | 10 +++++----- .../kabouzeid/gramophone/loader/ArtistLoader.java | 10 +++++----- .../gramophone/loader/PlaylistLoader.java | 10 +++++----- .../kabouzeid/gramophone/loader/SongLoader.java | 14 +++++++------- .../main/res/layout/activity_music_controller.xml | 9 ++------- 5 files changed, 24 insertions(+), 29 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/loader/AlbumLoader.java b/app/src/main/java/com/kabouzeid/gramophone/loader/AlbumLoader.java index 3cf8b9cd..abdbf040 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/loader/AlbumLoader.java +++ b/app/src/main/java/com/kabouzeid/gramophone/loader/AlbumLoader.java @@ -40,10 +40,10 @@ public class AlbumLoader { } public static final Cursor makeAlbumCursor(final Context context) { - return makeAlbumCursor(context, null); + return makeAlbumCursor(context, null, null); } - public static final Cursor makeAlbumCursor(final Context context, String selection) { + public static final Cursor makeAlbumCursor(final Context context, final String selection, final String[] values) { return context.getContentResolver().query(MediaStore.Audio.Albums.EXTERNAL_CONTENT_URI, new String[]{ /* 0 */ @@ -58,11 +58,11 @@ public class AlbumLoader { MediaStore.Audio.AlbumColumns.NUMBER_OF_SONGS, /* 5 */ MediaStore.Audio.AlbumColumns.FIRST_YEAR - }, selection, null, PreferenceUtils.getInstace(context).getAlbumSortOrder()); + }, selection, values, PreferenceUtils.getInstace(context).getAlbumSortOrder()); } public static Album getAlbum(Context context, int albumId) { - Cursor cursor = makeAlbumCursor(context, BaseColumns._ID + "=" + albumId); + Cursor cursor = makeAlbumCursor(context, BaseColumns._ID + "=?", new String[]{String.valueOf(albumId)}); Album album = new Album(); if (cursor != null && cursor.moveToFirst()) { final int id = cursor.getInt(0); @@ -82,7 +82,7 @@ public class AlbumLoader { } public static List getAlbums(Context context, String query) { - Cursor cursor = makeAlbumCursor(context, MediaStore.Audio.AlbumColumns.ALBUM + " LIKE '%" + query + "%'"); + Cursor cursor = makeAlbumCursor(context, MediaStore.Audio.AlbumColumns.ALBUM + " LIKE ?", new String[]{"%"+query+"%"}); List albums = new ArrayList<>(); if (cursor != null && cursor.moveToFirst()) { do { diff --git a/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistLoader.java b/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistLoader.java index e49c1b7d..e040a7ed 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistLoader.java +++ b/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistLoader.java @@ -38,10 +38,10 @@ public class ArtistLoader { } public static final Cursor makeArtistCursor(final Context context) { - return makeArtistCursor(context, null); + return makeArtistCursor(context, null, null); } - public static final Cursor makeArtistCursor(final Context context, String selection) { + public static final Cursor makeArtistCursor(final Context context, final String selection, final String[] values) { return context.getContentResolver().query(MediaStore.Audio.Artists.EXTERNAL_CONTENT_URI, new String[]{ /* 0 */ @@ -52,11 +52,11 @@ public class ArtistLoader { MediaStore.Audio.ArtistColumns.NUMBER_OF_ALBUMS, /* 3 */ MediaStore.Audio.ArtistColumns.NUMBER_OF_TRACKS - }, selection, null, PreferenceUtils.getInstace(context).getArtistSortOrder()); + }, selection, values, PreferenceUtils.getInstace(context).getArtistSortOrder()); } public static Artist getArtist(Context context, int artistId) { - Cursor cursor = makeArtistCursor(context, BaseColumns._ID + "=" + artistId); + Cursor cursor = makeArtistCursor(context, BaseColumns._ID + "=?", new String[]{String.valueOf(artistId)}); Artist artist = new Artist(); if (cursor != null && cursor.moveToFirst()) { final int id = cursor.getInt(0); @@ -74,7 +74,7 @@ public class ArtistLoader { } public static List getArtists(Context context, String query) { - Cursor cursor = makeArtistCursor(context, MediaStore.Audio.ArtistColumns.ARTIST + " LIKE '%" + query + "%'"); + Cursor cursor = makeArtistCursor(context, MediaStore.Audio.ArtistColumns.ARTIST + " LIKE ?", new String[]{"%"+query+"%"}); List artists = new ArrayList<>(); if (cursor != null && cursor.moveToFirst()) { do { diff --git a/app/src/main/java/com/kabouzeid/gramophone/loader/PlaylistLoader.java b/app/src/main/java/com/kabouzeid/gramophone/loader/PlaylistLoader.java index 944cd9cd..c1457101 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/loader/PlaylistLoader.java +++ b/app/src/main/java/com/kabouzeid/gramophone/loader/PlaylistLoader.java @@ -12,9 +12,9 @@ import java.util.ArrayList; import java.util.List; public class PlaylistLoader { - public static Playlist getPlaylist(final Context context, final int playlistID) { + public static Playlist getPlaylist(final Context context, final int playlistId) { Playlist playlist = new Playlist(); - Cursor cursor = makePlaylistCursor(context, BaseColumns._ID + "=" + playlistID); + Cursor cursor = makePlaylistCursor(context, BaseColumns._ID + "=?", new String[]{String.valueOf(playlistId)}); if (cursor != null && cursor.moveToFirst()) { final int id = cursor.getInt(0); @@ -29,7 +29,7 @@ public class PlaylistLoader { public static List getAllPlaylists(final Context context) { List playlists = new ArrayList<>(); - Cursor cursor = makePlaylistCursor(context, null); + Cursor cursor = makePlaylistCursor(context, null, null); if (cursor != null && cursor.moveToFirst()) { do { @@ -45,13 +45,13 @@ public class PlaylistLoader { return playlists; } - public static Cursor makePlaylistCursor(final Context context, final String selection) { + public static Cursor makePlaylistCursor(final Context context, final String selection, final String[] values) { return context.getContentResolver().query(MediaStore.Audio.Playlists.EXTERNAL_CONTENT_URI, new String[]{ /* 0 */ BaseColumns._ID, /* 1 */ PlaylistsColumns.NAME - }, selection, null, MediaStore.Audio.Playlists.DEFAULT_SORT_ORDER); + }, selection, values, MediaStore.Audio.Playlists.DEFAULT_SORT_ORDER); } } diff --git a/app/src/main/java/com/kabouzeid/gramophone/loader/SongLoader.java b/app/src/main/java/com/kabouzeid/gramophone/loader/SongLoader.java index c798096a..c8196f6d 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/loader/SongLoader.java +++ b/app/src/main/java/com/kabouzeid/gramophone/loader/SongLoader.java @@ -41,10 +41,10 @@ public class SongLoader { } public static final Cursor makeSongCursor(final Context context) { - return makeSongCursor(context, (MediaStore.Audio.AudioColumns.IS_MUSIC + "=1")); + return makeSongCursor(context, MediaStore.Audio.AudioColumns.IS_MUSIC + "=?", new String[]{"1"}); } - public static final Cursor makeSongCursor(final Context context, final String selection) { + public static final Cursor makeSongCursor(final Context context, final String selection, final String[] values) { return context.getContentResolver().query(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, new String[]{ /* 0 */ @@ -63,11 +63,11 @@ public class SongLoader { MediaStore.Audio.AudioColumns.ARTIST_ID, /* 7 */ MediaStore.Audio.AudioColumns.ALBUM_ID - }, selection, null, PreferenceUtils.getInstace(context).getSongSortOrder()); + }, selection, values, PreferenceUtils.getInstace(context).getSongSortOrder()); } - public static List getSongs(Context context, String query) { - Cursor cursor = makeSongCursor(context, MediaStore.Audio.AudioColumns.TITLE + " LIKE '%" + query + "%'"); + public static List getSongs(final Context context, final String query) { + Cursor cursor = makeSongCursor(context, MediaStore.Audio.AudioColumns.TITLE + " LIKE ?", new String[]{"%"+query+"%"}); List songs = new ArrayList<>(); if (cursor != null && cursor.moveToFirst()) { do { @@ -91,8 +91,8 @@ public class SongLoader { return songs; } - public static Song getSong(Context context, int queryId) { - Cursor cursor = makeSongCursor(context, MediaStore.Audio.AudioColumns._ID + "=" + queryId); + public static Song getSong(final Context context, final int queryId) { + Cursor cursor = makeSongCursor(context, MediaStore.Audio.AudioColumns._ID + "=?", new String[]{String.valueOf(queryId)}); Song song = null; if (cursor != null && cursor.moveToFirst()) { final int id = cursor.getInt(0); diff --git a/app/src/main/res/layout/activity_music_controller.xml b/app/src/main/res/layout/activity_music_controller.xml index 34b37bf1..4dc261ff 100644 --- a/app/src/main/res/layout/activity_music_controller.xml +++ b/app/src/main/res/layout/activity_music_controller.xml @@ -60,7 +60,7 @@ android:layout_height="wrap_content" android:layout_above="@+id/media_controller_container" android:background="@color/materialmusic_default_bar_color" - android:elevation="1dp" + android:elevation="2dp" android:orientation="vertical" android:paddingBottom="16dp" android:paddingLeft="72dp" @@ -88,12 +88,6 @@ - -