From 60d82c16d7f51adf9eb4975e0a5006e82fd5b517 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Thu, 22 Oct 2020 00:29:44 +0900
Subject: [PATCH] fix minor issue with playback state

---
 .../java/com/dkanada/gramophone/service/MultiPlayer.java    | 1 +
 .../java/com/dkanada/gramophone/service/MusicService.java   | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/dkanada/gramophone/service/MultiPlayer.java b/app/src/main/java/com/dkanada/gramophone/service/MultiPlayer.java
index 445787aa..f4c4fd44 100644
--- a/app/src/main/java/com/dkanada/gramophone/service/MultiPlayer.java
+++ b/app/src/main/java/com/dkanada/gramophone/service/MultiPlayer.java
@@ -87,6 +87,7 @@ public class MultiPlayer implements Playback {
 
             if (exoPlayer.isPlaying() || requestPlay && playbackState == ExoPlayer.STATE_READY) {
                 requestPlay = false;
+                isPlaying = true;
 
                 exoPlayer.setPlayWhenReady(true);
                 callbacks.onTrackStarted();
diff --git a/app/src/main/java/com/dkanada/gramophone/service/MusicService.java b/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
index 3c933e4f..02ae00c3 100644
--- a/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
+++ b/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
@@ -1033,14 +1033,14 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
     public void onTrackWentToNext() {
         playerHandler.sendEmptyMessage(TRACK_WENT_TO_NEXT);
         progressHandler.sendEmptyMessage(TRACK_WENT_TO_NEXT);
+
+        acquireWakeLock(30000);
     }
 
     @Override
     public void onTrackEnded() {
         playerHandler.sendEmptyMessage(TRACK_ENDED);
         progressHandler.sendEmptyMessage(TRACK_ENDED);
-
-        acquireWakeLock(30000);
     }
 
     private static final class PlaybackHandler extends Handler {
@@ -1124,9 +1124,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
                     break;
 
                 case PLAY_SONG:
-                    service.progressHandler.sendEmptyMessage(PLAY_SONG);
                     service.playSongAtImpl(msg.arg1);
-                    // notification progress needs to be reset
                     service.notifyChange(STATE_CHANGED);
                     break;