Fixes issue 111.

Instead of calling play() when the playlist is empty, show a toast
oshmoun · Apr 23, 2017 · dcf988d · dcf988d
1 parent e8d5596
commit dcf988d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 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
@@ -299,7 +299,7 @@ public int onStartCommand(@Nullable Intent intent, int flags, int startId) {
                         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;
@@ -311,8 +311,10 @@ public int onStartCommand(@Nullable Intent intent, int flags, int startId) {
                             } 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
@@ -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>