Fixed get related track conflicting

maxrave-dev · Sep 2, 2023 · d5c8915 · d5c8915
1 parent f77fdbb
commit d5c8915
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/queue/Queue.kt b/app/src/main/java/com/maxrave/simpmusic/data/queue/Queue.kt
@@ -16,7 +16,6 @@ object Queue {
         return queue
     }
     fun clear() {
-        queue = ArrayList()
         queue.clear()
     }
     fun setNowPlaying(song: Track) {

diff --git a/app/src/main/java/com/maxrave/simpmusic/service/test/source/FetchQueue.kt b/app/src/main/java/com/maxrave/simpmusic/service/test/source/FetchQueue.kt
@@ -11,6 +11,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -67,15 +68,18 @@ class FetchQueue: Service() {
                             }
                         }
                     }
+                    stopSelf()
                 }
             }
         }
         return START_NOT_STICKY
     }
 
     override fun onDestroy() {
-        job.cancel()
         super.onDestroy()
+        job.cancel()
+        scope.cancel()
+        Log.d("FetchQueue", "onDestroy: ")
     }
 
 }
diff --git a/app/src/main/java/com/maxrave/simpmusic/ui/fragment/player/NowPlayingFragment.kt b/app/src/main/java/com/maxrave/simpmusic/ui/fragment/player/NowPlayingFragment.kt
@@ -957,7 +957,9 @@ class NowPlayingFragment : Fragment() {
                         }
                     }
                     Log.d("Queue", "getRelated: ${listWithoutDuplicateElements.size}")
+                    Queue.clear()
                     Queue.addAll(listWithoutDuplicateElements)
+                    Log.d("Queue", "getRelated: ${Queue.getQueue().size}")
                     if (!requireContext().isMyServiceRunning(FetchQueue::class.java)) {
                         requireActivity().startService(
                             Intent(