OSDN Git Service

Apollo: Ignore playlist when name is null.
authorKyrylo Mikos <kiril.mik.os@gmail.com>
Mon, 24 Jun 2013 18:11:49 +0000 (21:11 +0300)
committerGerrit Code Review <gerrit@cyanogenmod.org>
Wed, 3 Jul 2013 20:06:50 +0000 (13:06 -0700)
This will avoid nex crash:

FATAL EXCEPTION: main
java.lang.IllegalArgumentException: the bind value at index 1 is null
  at android.database.DatabaseUtils.readExceptionFromParcel(DatabaseUtils.java:167)
  at android.database.DatabaseUtils.readExceptionFromParcel(DatabaseUtils.java:137)
  at android.content.ContentProviderProxy.query(ContentProviderNative.java:366)
  at android.content.ContentResolver.query(ContentResolver.java:372)
  at android.content.ContentResolver.query(ContentResolver.java:315)
  at com.andrew.apollo.utils.MusicUtils.getIdForPlaylist(MusicUtils.java:669)
  at com.andrew.apollo.utils.MusicUtils.makePlaylistMenu(MusicUtils.java:1146)
  at com.andrew.apollo.ui.fragments.QueueFragment.onCreateContextMenu(QueueFragment.java:215)

Change-Id: Ib60a55f54fedf18cf900c6e492c5b4135e5c86d8

src/com/andrew/apollo/utils/MusicUtils.java

index 12bfd13..65bd1f4 100644 (file)
@@ -1156,9 +1156,12 @@ public final class MusicUtils {
         if (cursor != null && cursor.getCount() > 0 && cursor.moveToFirst()) {
             while (!cursor.isAfterLast()) {
                 final Intent intent = new Intent();
-                intent.putExtra("playlist", getIdForPlaylist(context, cursor.getString(1)));
-                subMenu.add(groupId, FragmentMenuItems.PLAYLIST_SELECTED, Menu.NONE,
-                        cursor.getString(1)).setIntent(intent);
+                String name = cursor.getString(1);
+                if (name != null) {
+                    intent.putExtra("playlist", getIdForPlaylist(context, name));
+                    subMenu.add(groupId, FragmentMenuItems.PLAYLIST_SELECTED, Menu.NONE,
+                            name).setIntent(intent);
+                }
                 cursor.moveToNext();
             }
         }