From b971dbbe4badef34a2aa494b4dc9c422a7e26514 Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Fri, 20 May 2022 23:11:31 +0530
Subject: [PATCH] Fix player not working after quitting from notification

---
 .../player/gradient/GradientPlayerFragment.kt    | 16 +++++++++-------
 .../monkey/retromusic/service/MusicService.kt    |  1 -
 .../monkey/retromusic/service/PlaybackManager.kt |  4 +---
 .../retromusic/service/ThrottledSeekHandler.kt   |  1 -
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt
index 15a3ccc66..6a1dddedf 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt
@@ -99,7 +99,8 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
         override fun onStateChanged(bottomSheet: View, newState: Int) {
             when (newState) {
                 STATE_EXPANDED,
-                STATE_DRAGGING -> {
+                STATE_DRAGGING,
+                -> {
                     mainActivity.getBottomSheetBehavior().isDraggable = false
                 }
                 STATE_COLLAPSED -> {
@@ -312,7 +313,6 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
         super.onServiceConnected()
         updateSong()
         updatePlayPauseDrawableState()
-        updatePlayPauseDrawableState()
         updateQueue()
         updateIsFavoriteIcon()
     }
@@ -379,15 +379,17 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
 
     private fun setUpPlayPauseFab() {
         binding.playbackControlsFragment.playPauseButton.setOnClickListener(
-            PlayPauseButtonOnClickHandler()
-        )
+            PlayPauseButtonOnClickHandler())
     }
 
     @SuppressLint("ClickableViewAccessibility")
     private fun setUpPrevNext() {
         updatePrevNextColor()
-        binding.playbackControlsFragment.nextButton.setOnTouchListener(MusicSeekSkipTouchListener(requireActivity(), true))
-        binding.playbackControlsFragment.previousButton.setOnTouchListener(MusicSeekSkipTouchListener(requireActivity(), false))
+        binding.playbackControlsFragment.nextButton.setOnTouchListener(MusicSeekSkipTouchListener(
+            requireActivity(),
+            true))
+        binding.playbackControlsFragment.previousButton.setOnTouchListener(
+            MusicSeekSkipTouchListener(requireActivity(), false))
     }
 
     private fun updatePrevNextColor() {
@@ -469,7 +471,7 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
         oldLeft: Int,
         oldTop: Int,
         oldRight: Int,
-        oldBottom: Int
+        oldBottom: Int,
     ) {
         val panel = getQueuePanel()
         if (panel.state == STATE_COLLAPSED) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
index 86dd51f76..481e4c027 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
@@ -851,7 +851,6 @@ class MusicService : MediaBrowserServiceCompat(),
         stopForeground(true)
         isForeground = false
         notificationManager?.cancel(PlayingNotification.NOTIFICATION_ID)
-        playbackManager.release()
         AudioManagerCompat.abandonAudioFocusRequest(audioManager!!,
             AudioFocusRequestCompat.Builder(AudioManagerCompat.AUDIOFOCUS_GAIN)
                 .setOnAudioFocusChangeListener(audioFocusListener)
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/PlaybackManager.kt b/app/src/main/java/code/name/monkey/retromusic/service/PlaybackManager.kt
index 1ee3f727a..8abc43328 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/PlaybackManager.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/PlaybackManager.kt
@@ -118,9 +118,7 @@ class PlaybackManager(val context: Context) {
     }
 
     fun release() {
-        if (playback != null) {
-            playback?.release()
-        }
+        playback?.release()
         playback = null
         closeAudioEffectSession()
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/ThrottledSeekHandler.kt b/app/src/main/java/code/name/monkey/retromusic/service/ThrottledSeekHandler.kt
index 28b4bb8fd..9fcda73cb 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/ThrottledSeekHandler.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/ThrottledSeekHandler.kt
@@ -25,7 +25,6 @@ class ThrottledSeekHandler(
 
     fun notifySeek() {
         musicService.updateMediaSessionPlaybackState()
-        musicService.updateMediaSessionMetaData()
         handler.removeCallbacks(this)
         handler.postDelayed(this, THROTTLE)
     }