From f504e83cbf731f07041119477a85214b3ff76862 Mon Sep 17 00:00:00 2001
From: Adrian Campos <dev.adriancampos@live.com>
Date: Tue, 4 Apr 2017 09:07:15 -0700
Subject: [PATCH] Fixes issue 111.

Instead of calling play() when the playlist is empty, show a toast
---
 .../java/com/kabouzeid/gramophone/service/MusicService.java | 6 ++++--
 app/src/main/res/values/strings.xml                         | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
index a5bd9076..83efdc80 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
@@ -298,7 +298,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
                         break;
                     case ACTION_PLAY:
                         ArrayList<Song> songs = intent.getParcelableArrayListExtra(INTENT_EXTRA_SONGS);
-                        if (songs != null) {
+                        if (songs != null && !songs.isEmpty()) {
                             int shuffleMode = intent.getIntExtra(INTENT_EXTRA_SHUFFLE_MODE, getShuffleMode());
                             if (intent.hasExtra(INTENT_EXTRA_SHUFFLE_MODE) && intent.getIntExtra(INTENT_EXTRA_SHUFFLE_MODE, 0) == SHUFFLE_MODE_SHUFFLE) {
                                 int startPosition = 0;
@@ -310,8 +310,10 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
                             } else {
                                 openQueue(songs, 0, false);
                             }
+                            play();
+                        } else {
+                            Toast.makeText(getApplicationContext(), R.string.no_songs_in_playlist, Toast.LENGTH_LONG).show();
                         }
-                        play();
                         break;
                     case ACTION_REWIND:
                         back(true);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6eef7d46..e3d2be94 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -288,4 +288,6 @@
     
     <string name="app_shortcut_last_added_long">@string/last_added</string>
     <string name="app_shortcut_last_added_short">@string/last_added</string>
+
+    <string name="no_songs_in_playlist">No songs in playlist</string>
 </resources>