From 558eaf833a8ad875b91362898d533b29e1b46d52 Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Thu, 26 May 2022 19:45:31 +0530
Subject: [PATCH] Fix Playback

---
 .../monkey/retromusic/helper/MusicPlayerRemote.kt  | 14 +++++---------
 .../name/monkey/retromusic/service/MusicService.kt |  9 +++++----
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt b/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt
index 26d2470a5..7aea21b54 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt
@@ -28,7 +28,6 @@ import code.name.monkey.retromusic.extensions.showToast
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.repository.SongRepository
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.getExternalStorageDirectory
 import code.name.monkey.retromusic.util.logE
 import com.google.android.gms.cast.framework.CastSession
@@ -220,14 +219,9 @@ object MusicPlayerRemote : KoinComponent {
             ) && musicService != null
         ) {
             musicService?.openQueue(queue, startPosition, startPlaying)
-            if (PreferenceUtil.isShuffleModeOn)
-                setShuffleMode(MusicService.SHUFFLE_MODE_NONE)
         }
     }
 
-    /**
-     * Async
-     */
     @JvmStatic
     fun openAndShuffleQueue(queue: List<Song>, startPlaying: Boolean) {
         var startPosition = 0
@@ -448,9 +442,11 @@ object MusicPlayerRemote : KoinComponent {
             if (songs != null && songs.isNotEmpty()) {
                 openQueue(songs, 0, true)
             } else {
-                // TODO the file is not listed in the media store
-                context.showToast(R.string.unplayable_file)
-                logE("The file is not listed in the media store")
+                try {
+                    context.showToast(R.string.unplayable_file)
+                } catch (e: Exception) {
+                    logE("The file is not listed in the media store")
+                }
             }
         }
     }
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 54c5f35b0..8dbf598bb 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
@@ -765,12 +765,12 @@ class MusicService : MediaBrowserServiceCompat(),
     fun openTrackAndPrepareNextAt(position: Int, completion: (success: Boolean) -> Unit) {
         this.position = position
         openCurrent { success ->
+            completion(success)
+            notifyChange(META_CHANGED)
+            notHandledMetaChangedForCurrentTrack = false
             if (success) {
                 prepareNextImpl()
             }
-            notifyChange(META_CHANGED)
-            notHandledMetaChangedForCurrentTrack = false
-            completion(success)
         }
     }
 
@@ -829,12 +829,14 @@ class MusicService : MediaBrowserServiceCompat(),
 
     @Synchronized
     fun prepareNextImpl() {
+        val start = System.currentTimeMillis()
         try {
             val nextPosition = getNextPosition(false)
             playbackManager.setNextDataSource(getSongAt(nextPosition).uri.toString())
             this.nextPosition = nextPosition
         } catch (ignored: Exception) {
         }
+        println("Time Prepare Next: ${System.currentTimeMillis() - start}")
     }
 
     fun toggleFavorite() {
@@ -957,7 +959,6 @@ class MusicService : MediaBrowserServiceCompat(),
                     mediaSession?.setQueueTitle(getString(R.string.now_playing_queue))
                     mediaSession?.setQueue(playingQueue.toMediaSessionQueue())
                 }
-
             }
             queuesRestored = true
         }