fix embedded subtitles not loading when subtitle filter on library

jellyfin · Oct 7, 2023 · a9cec1e · a9cec1e
1 parent eb68107
commit a9cec1e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/playback/VideoManager.java b/app/src/main/java/org/jellyfin/androidtv/ui/playback/VideoManager.java
@@ -54,6 +54,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 import timber.log.Timber;
 
@@ -554,10 +555,11 @@ public boolean setExoPlayerTrack(int index, @Nullable org.jellyfin.sdk.model.api
 
         int chosenTrackType = streamType == org.jellyfin.sdk.model.api.MediaStreamType.SUBTITLE ? C.TRACK_TYPE_TEXT : C.TRACK_TYPE_AUDIO;
 
-        // Make sure the index is not out of bounds
-        if (index >= allStreams.size()) return false;
+        // Make sure the index is present
+        Optional<MediaStream> candidateOptional = allStreams.stream().filter(stream -> stream.getIndex() == index).findFirst();
+        if (!candidateOptional.isPresent()) return false;
 
-        org.jellyfin.sdk.model.api.MediaStream candidate = allStreams.get(index);
+        org.jellyfin.sdk.model.api.MediaStream candidate = candidateOptional.get();
         if (candidate.isExternal() || candidate.getType() != streamType)
             return false;