Apple can try again now

Lambada10 · Nov 1, 2024 · 5269e12 · 5269e12
1 parent 2d7784b
commit 5269e12
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/app/src/main/java/pl/lambada/songsync/data/remote/lyrics_providers/LyricsProviderService.kt b/app/src/main/java/pl/lambada/songsync/data/remote/lyrics_providers/LyricsProviderService.kt
@@ -64,7 +64,7 @@ class LyricsProviderService {
                     neteaseID = it?.neteaseID ?: 0
                 } ?: throw NoTrackFoundException()
 
-                Providers.APPLE -> AppleAPI().getSongInfo(query).also {
+                Providers.APPLE -> AppleAPI().getSongInfo(query, offset).also {
                     appleID = it?.appleID ?: 0
                 } ?: throw NoTrackFoundException()
 

diff --git a/app/src/main/java/pl/lambada/songsync/data/remote/lyrics_providers/others/AppleAPI.kt b/app/src/main/java/pl/lambada/songsync/data/remote/lyrics_providers/others/AppleAPI.kt
@@ -16,7 +16,7 @@ import java.net.URLEncoder
 class AppleAPI {
     private val baseURL = "https://paxsenix.alwaysdata.net/"
 
-    suspend fun getSongInfo(query: SongInfo): SongInfo? {
+    suspend fun getSongInfo(query: SongInfo, offset: Int = 0): SongInfo? {
         val search = withContext(Dispatchers.IO) {
             URLEncoder.encode(
                 "${query.songName} ${query.artistName}",
@@ -41,7 +41,11 @@ class AppleAPI {
             return null
         }
 
-        val result = json[0]
+        val result = try {
+            json[offset]
+        } catch (e: IndexOutOfBoundsException) {
+            return null
+        }
 
         return SongInfo(
             songName = result.songName,

diff --git a/app/src/main/java/pl/lambada/songsync/ui/screens/lyricsFetch/LyricsFetchScreen.kt b/app/src/main/java/pl/lambada/songsync/ui/screens/lyricsFetch/LyricsFetchScreen.kt
@@ -184,7 +184,6 @@ fun SharedTransitionScope.LyricsFetchScreen(
                         animatedVisibilityScope = animatedVisibilityScope,
                         disableMarquee = viewModel.userSettingsController.disableMarquee,
                         allowTryingAgain =
-                            viewModel.userSettingsController.selectedProvider != Providers.APPLE &&
                             viewModel.userSettingsController.selectedProvider != Providers.MUSIXMATCH
                     )