Fix crash when checking whether a person is a folder or not

(cherry picked from commit efc6be8)
jellyfin · Feb 25, 2024 · f9eeae6 · f9eeae6
1 parent c2e33b9
commit f9eeae6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/browsing/CollectionFragment.java b/app/src/main/java/org/jellyfin/androidtv/ui/browsing/CollectionFragment.java
@@ -21,12 +21,28 @@ protected void setupQueries(RowLoader rowLoader) {
         movies.setIncludeItemTypes(new String[]{BaseItemKind.MOVIE.getSerialName()});
         mRows.add(new BrowseRowDef(getString(R.string.lbl_movies), movies, 100));
 
-        StdItemQuery series = new StdItemQuery();
+        StdItemQuery series = new StdItemQuery(new ItemFields[]{
+                ItemFields.PrimaryImageAspectRatio,
+                ItemFields.Overview,
+                ItemFields.ItemCounts,
+                ItemFields.DisplayPreferencesId,
+                ItemFields.ChildCount,
+                ItemFields.MediaStreams,
+                ItemFields.MediaSources
+        });
         series.setParentId(mFolder.getId().toString());
         series.setIncludeItemTypes(new String[]{BaseItemKind.SERIES.getSerialName()});
         mRows.add(new BrowseRowDef(getString(R.string.lbl_tv_series), series, 100));
 
-        StdItemQuery others = new StdItemQuery();
+        StdItemQuery others = new StdItemQuery(new ItemFields[]{
+                ItemFields.PrimaryImageAspectRatio,
+                ItemFields.Overview,
+                ItemFields.ItemCounts,
+                ItemFields.DisplayPreferencesId,
+                ItemFields.ChildCount,
+                ItemFields.MediaStreams,
+                ItemFields.MediaSources
+        });
         others.setParentId(mFolder.getId().toString());
         others.setExcludeItemTypes(new String[]{BaseItemKind.MOVIE.getSerialName(), BaseItemKind.SERIES.getSerialName()});
         mRows.add(new BrowseRowDef(getString(R.string.lbl_other), others, 100));

diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/itemhandling/ItemLauncher.java b/app/src/main/java/org/jellyfin/androidtv/ui/itemhandling/ItemLauncher.java
@@ -141,7 +141,7 @@ public static void launch(final BaseRowItem rowItem, ItemRowAdapter adapter, int
                 }
 
                 // or generic handling
-                if (baseItem.isFolder()) {
+                if (Utils.isTrue(baseItem.isFolder())) {
                     // Some items don't have a display preferences id, but it's required for StdGridFragment
                     // Use the id of the item as a workaround, it's a unique key for the specific item
                     // Which is exactly what we want