From 75a4648e13a6053d20bdf899f358f1e9a1195384 Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Thu, 9 Jun 2022 01:06:56 +0530
Subject: [PATCH] Fixed CrossFade duration not changing instantly

---
 .../retromusic/fragments/other/LyricsFragment.kt  | 15 +--------------
 .../monkey/retromusic/service/MusicService.kt     |  2 ++
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/LyricsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/LyricsFragment.kt
index 8dbaab6a7..e2eaf6c9b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/LyricsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/other/LyricsFragment.kt
@@ -77,14 +77,6 @@ class LyricsFragment : AbsMainActivityFragment(R.layout.fragment_lyrics) {
             baseUrl += query
             return baseUrl
         }
-    private val syairSearchLrcUrl: String
-        get() {
-            var baseUrl = "https://www.syair.info/search?"
-            var query = song.title + "+" + song.artistName
-            query = "q=" + query.replace(" ", "+")
-            baseUrl += query
-            return baseUrl
-        }
 
     private lateinit var normalLyricsLauncher: ActivityResultLauncher<IntentSenderRequest>
     private lateinit var newSyncedLyricsLauncher: ActivityResultLauncher<Intent>
@@ -201,12 +193,7 @@ class LyricsFragment : AbsMainActivityFragment(R.layout.fragment_lyrics) {
 
     override fun onMenuItemSelected(item: MenuItem): Boolean {
         if (item.itemId == R.id.action_search) {
-            openUrl(when (binding.lyricsPager.currentItem) {
-                    0 -> syairSearchLrcUrl
-                    1 -> googleSearchLrcUrl
-                    else -> googleSearchLrcUrl
-                }
-            )
+            openUrl(googleSearchLrcUrl)
         }
         return false
     }
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 512cd3839..16a550136 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
@@ -632,6 +632,8 @@ class MusicService : MediaBrowserServiceCompat(),
 
                 if (playbackManager.maybeSwitchToCrossFade(crossFadeDuration)) {
                     restorePlaybackState(wasPlaying, progress)
+                } else {
+                    playbackManager.setCrossFadeDuration(crossFadeDuration)
                 }
             }
             ALBUM_ART_ON_LOCK_SCREEN, BLURRED_ALBUM_ART -> updateMediaSessionMetaData(::updateMediaSessionPlaybackState)