Improve intro loading in SdkPlaybackHelper

jellyfin · Jul 15, 2024 · aafebfc · aafebfc
1 parent 540b5e6
commit aafebfc
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/app/src/main/java/org/jellyfin/androidtv/util/sdk/SdkPlaybackHelper.kt b/app/src/main/java/org/jellyfin/androidtv/util/sdk/SdkPlaybackHelper.kt
@@ -212,14 +212,19 @@ class SdkPlaybackHelper(
 			}
 		}
 
-		else -> if (allowIntros && !playbackLauncher.useExternalPlayer(mainItem.type) && userPreferences[UserPreferences.cinemaModeEnabled]) {
-			val response by api.userLibraryApi.getIntros(mainItem.id)
-			buildList {
-				addAll(response.items.orEmpty())
-				addAll(getParts(mainItem))
+		else -> {
+			val parts = getParts(mainItem)
+			val addIntros = allowIntros && userPreferences[UserPreferences.cinemaModeEnabled]
+
+			if (addIntros) {
+				val intros = runCatching {
+					api.userLibraryApi.getIntros(mainItem.id).content.items
+				}.getOrNull().orEmpty()
+
+				intros + parts
+			} else {
+				parts
 			}
-		} else {
-			getParts(mainItem)
 		}
 	}