Improve behavior when no playable items found

jellyfin · Aug 20, 2024 · 948e980 · 948e980
1 parent a9ff992
commit 948e980
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/FullDetailsFragment.java b/app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/FullDetailsFragment.java
@@ -1186,6 +1186,10 @@ void play(final BaseItemDto item, final int pos, final boolean shuffle) {
  @Override
  public void onResponse(List<BaseItemDto> response) {
  if (!getActive()) return;
+ if (response.isEmpty()) {
+ Timber.e("No items to play - ignoring play request.");
+ return;
+ }
 
  if (item.getType() == BaseItemKind.MUSIC_ARTIST) {
  mediaManager.getValue().playNow(requireContext(), response, 0, shuffle);
@@ -1196,7 +1200,6 @@ public void onResponse(List<BaseItemDto> response) {
  }
  }
  });
-
  }
 
  void play(final List<BaseItemDto> items, final int pos, final boolean shuffle) {

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
@@ -55,7 +55,9 @@ class SdkPlaybackHelper(
  ) {
  getScope(context).launch {
  runCatching {
- getItems(mainItem, allowIntros, shuffle)
+ val items = getItems(mainItem, allowIntros, shuffle)
+ if (items.isEmpty() && !mainItem.mediaSources.isNullOrEmpty()) listOf(mainItem)
+ else items
  }.fold(
  onSuccess = { items -> outerResponse.onResponse(items) },
  onFailure = { exception ->