fix half of providers not working

Lambada10 · Sep 25, 2024 · ae4f5c1 · ae4f5c1
1 parent 775a5c3
commit ae4f5c1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 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
@@ -81,15 +81,15 @@ class LyricsProviderService {
      * @return The synced lyrics as a string.
      */
     suspend fun getSyncedLyrics(
-        songLink: String,
+        songLink: String?,
         version: String,
         provider: Providers,
         // TODO providers could be a sealed interface to include such parameters
         includeTranslationNetEase: Boolean = false
     ): String? {
         return try {
             when (provider) {
-                Providers.SPOTIFY -> SpotifyLyricsAPI().getSyncedLyrics(songLink, version)
+                Providers.SPOTIFY -> SpotifyLyricsAPI().getSyncedLyrics(songLink!!, version)
                 Providers.LRCLIB -> LRCLibAPI().getSyncedLyrics(lrcLibID)
                 Providers.NETEASE -> NeteaseAPI().getSyncedLyrics(
                     neteaseID,

diff --git a/app/src/main/java/pl/lambada/songsync/ui/screens/home/HomeViewModel.kt b/app/src/main/java/pl/lambada/songsync/ui/screens/home/HomeViewModel.kt
@@ -272,7 +272,7 @@ class HomeViewModel(
     suspend fun getSongInfo(query: SongInfo): SongInfo? =
         lyricsProviderService.getSongInfo(query, provider = userSettingsController.selectedProvider)
 
-    suspend fun getSyncedLyrics(link: String, version: String): String? =
+    suspend fun getSyncedLyrics(link: String?, version: String): String? =
         lyricsProviderService.getSyncedLyrics(link, version, provider = userSettingsController.selectedProvider)
 
     fun selectSong(song: Song, newValue: Boolean) {

diff --git a/app/src/main/java/pl/lambada/songsync/ui/screens/lyricsFetch/LyricsFetchViewModel.kt b/app/src/main/java/pl/lambada/songsync/ui/screens/lyricsFetch/LyricsFetchViewModel.kt
@@ -42,7 +42,7 @@ class LyricsFetchViewModel(
 
     var lyricsFetchState by mutableStateOf<LyricsFetchState>(LyricsFetchState.NotSubmitted)
 
-    private suspend fun getSyncedLyrics(link: String, version: String): String? =
+    private suspend fun getSyncedLyrics(link: String?, version: String): String? =
         lyricsProviderService.getSyncedLyrics(
             link,
             version,
@@ -106,7 +106,7 @@ class LyricsFetchViewModel(
 
             try {
                 val lyrics = getSyncedLyrics(
-                    link = songLink ?: throw IllegalStateException("Attempted lyrics retrieval with empty URL"),
+                    link = songLink,
                     version = context.getVersion()
                 ) ?: throw NullPointerException("Lyrics result is null")
 

diff --git a/app/src/main/java/pl/lambada/songsync/util/LyricsUtils.kt b/app/src/main/java/pl/lambada/songsync/util/LyricsUtils.kt
@@ -233,7 +233,7 @@ private suspend fun downloadLyricsForSong(
             runCatching {
                 viewModel
                     .getSyncedLyrics(
-                        link = songInfo.songLink ?: error("attempted to get lyrics without link"),
+                        link = songInfo.songLink,
                         version = context.getVersion()
                     )
                     ?: throw NullPointerException("Lyrics result is null")