From ac0dff7aa1c4ccde14753618ea05e48a34a0fa10 Mon Sep 17 00:00:00 2001
From: Coffeemakr <l34k@bk.ru>
Date: Tue, 27 Dec 2016 16:17:59 +0100
Subject: [PATCH] Make shure thread quits before service

---
 .../newpipe/player/BackgroundPlayer.java       | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java b/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java
index 21193ac55..eba1d57f2 100644
--- a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java
@@ -161,18 +161,20 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
             }
         }
 
-        private PlaybackState getPlaybackState() {
+        private synchronized PlaybackState getPlaybackState() {
             try {
                 return new PlaybackState(mediaPlayer.getDuration(), mediaPlayer.getCurrentPosition(), isPlaying());
             } catch (IllegalStateException e) {
                 // This isn't that nice way to handle this.
                 // maybe there is a better way
+                Log.w(TAG, this + ": Got illegal state exception while creating playback state", e);
                 return PlaybackState.UNPREPARED;
             }
         }
 
         private void broadcastState() {
             PlaybackState state = getPlaybackState();
+            if(state == null) return;
             Intent intent = new Intent(ACTION_PLAYBACK_STATE);
             intent.putExtra(EXTRA_PLAYBACK_STATE, state);
             sendBroadcast(intent);
@@ -284,9 +286,6 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
                         break;
                     case ACTION_PLAYBACK_STATE: {
                         PlaybackState playbackState = intent.getParcelableExtra(EXTRA_PLAYBACK_STATE);
-                        Log.d(TAG, "playback state recieved: " + playbackState);
-                        Log.d(TAG, "is unprepared: " + playbackState.equals(PlaybackState.UNPREPARED));
-                        Log.d(TAG, "playing: " + playbackState.getPlayedTime());
                         if(!playbackState.equals(PlaybackState.UNPREPARED)) {
                             noteBuilder.setProgress(playbackState.getDuration(), playbackState.getPlayedTime(), false);
                             noteBuilder.setIsPlaying(playbackState.isPlaying());
@@ -301,6 +300,8 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
         };
 
         private void afterPlayCleanup() {
+            // Notify thread to stop
+            setDonePlaying();
             //remove progress bar
             //noteBuilder.setProgress(0, 0, false);
 
@@ -314,7 +315,12 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
             wifiLock.release();
             //remove foreground status of service; make BackgroundPlayer killable
             stopForeground(true);
-
+            try {
+                // Wait for thread to stop
+                PlayerThread.this.join();
+            } catch (InterruptedException e) {
+                Log.e(TAG, "unable to join player thread", e);
+            }
             stopSelf();
         }
 
@@ -326,9 +332,7 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
 
             @Override
             public void onCompletion(MediaPlayer mp) {
-                setDonePlaying();
                 afterPlayCleanup();
-
             }
         }