From aafebfc54674f06a6d7c660b4b9dfc466ae32f18 Mon Sep 17 00:00:00 2001 From: Niels van Velzen Date: Mon, 15 Jul 2024 16:14:52 +0200 Subject: [PATCH] Improve intro loading in SdkPlaybackHelper --- .../androidtv/util/sdk/SdkPlaybackHelper.kt | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 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 index c3f30c2e3..97eeed3a7 100644 --- 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) } }