From 84f153d49a838f3a86d8b3b8756945e5ec58c35d Mon Sep 17 00:00:00 2001 From: Adrian Ulrich Date: Thu, 1 Jan 2015 08:53:18 +0100 Subject: [PATCH] check return value of getSong(0) --- .../android/vanilla/FullPlaybackActivity.java | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java b/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java index 5b1f5dec..0647f195 100644 --- a/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java +++ b/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java @@ -402,24 +402,27 @@ public class FullPlaybackActivity extends PlaybackActivity final PlaybackService playbackService = PlaybackService.get(this); final Song sng = playbackService.getSong(0); final PlaybackActivity activity = this; - String delete_message = getString(R.string.delete_item, sng.title); - AlertDialog.Builder dialog = new AlertDialog.Builder(this); - dialog.setTitle(R.string.delete); - dialog - .setMessage(delete_message) - .setPositiveButton(R.string.delete, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - shiftCurrentSong(SongTimeline.SHIFT_NEXT_SONG); - int count = playbackService.deleteMedia(MediaUtils.TYPE_SONG, sng.id); - String msg = getResources().getQuantityString(R.plurals.deleted, count, count); - Toast.makeText(activity, msg, Toast.LENGTH_SHORT).show(); - } - }) - .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - } - }); + + if (sng != null) { + String delete_message = getString(R.string.delete_item, sng.title); + AlertDialog.Builder dialog = new AlertDialog.Builder(this); + dialog.setTitle(R.string.delete); + dialog + .setMessage(delete_message) + .setPositiveButton(R.string.delete, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + shiftCurrentSong(SongTimeline.SHIFT_NEXT_SONG); + int count = playbackService.deleteMedia(MediaUtils.TYPE_SONG, sng.id); + String msg = getResources().getQuantityString(R.plurals.deleted, count, count); + Toast.makeText(activity, msg, Toast.LENGTH_SHORT).show(); + } + }) + .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + } + }); dialog.create().show(); + } break; case MENU_SHOW_QUEUE: startActivity(new Intent(this, ShowQueueActivity.class));