From 510160aceb9d7de1ceff06bc3c3332e6f17dc830 Mon Sep 17 00:00:00 2001
From: Damontecres <damontecres@gmail.com>
Date: Mon, 25 May 2026 16:54:58 -0400
Subject: [PATCH] Fix issue with local trailers, cinema mode, prerolls, & next
 up (#1460)

## Description
Fixes an issue where local trailers wouldn't play (or show in the queue)
if Cinema Mode is enabled and the server has a preroll/intro.

Also fix building the playback queue when "Show next up" is "Never". The
queue is shown, but not automatically played and next item dialog popup
is never shown. But to indicate playback is over, the controller show.

### Related issues
Fixes #1348
Fixes #1303

### Testing
Emulator

## Screenshots
N/A

## AI or LLM usage
None
---
 .../wholphin/services/PlaylistCreator.kt            |  1 +
 .../wholphin/ui/playback/PlaybackViewModel.kt       | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/github/damontecres/wholphin/services/PlaylistCreator.kt b/app/src/main/java/com/github/damontecres/wholphin/services/PlaylistCreator.kt
index b0a7e106..bf5a1269 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/services/PlaylistCreator.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/services/PlaylistCreator.kt
@@ -248,6 +248,7 @@ class PlaylistCreator
                 BaseItemKind.MOVIE,
                 BaseItemKind.VIDEO,
                 BaseItemKind.MUSIC_VIDEO,
+                BaseItemKind.TRAILER,
                 -> {
                     val list =
                         buildList {
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackViewModel.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackViewModel.kt
index 9ae8bfdd..3667e03e 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackViewModel.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackViewModel.kt
@@ -330,10 +330,8 @@ class PlaybackViewModel
                                 navigationManager.goBack()
                                 return
                             }
-                            if (preferences.appPreferences.playbackPreferences.showNextUpWhen != ShowNextUpWhen.NEXT_UP_NEVER) {
-                                _state.update {
-                                    it.copy(playlist = r.playlist)
-                                }
+                            _state.update {
+                                it.copy(playlist = r.playlist)
                             }
                             r.playlist.items.first()
                         }
@@ -344,6 +342,7 @@ class PlaybackViewModel
 
             viewModelScope.launch(ExceptionHandler()) { controllerViewState.observe() }
 
+            playlistItem.item.type == BaseItemKind.TRAILER
             val intros =
                 // If not resuming playback & cinema mode is enabled, get potential intros
                 if (positionMs == 0L && preferences.appPreferences.playbackPreferences.cinemaMode) {
@@ -379,7 +378,7 @@ class PlaybackViewModel
                 playNextUp()
             }
 
-            if (!isPlaylist && preferences.appPreferences.playbackPreferences.showNextUpWhen != ShowNextUpWhen.NEXT_UP_NEVER) {
+            if (!isPlaylist) {
                 val result = playlistCreator.createFrom(queriedItem)
                 if (result is PlaylistCreationResult.Success && result.playlist.items.isNotEmpty()) {
                     _state.update {
@@ -1025,9 +1024,11 @@ class PlaybackViewModel
                             if (currentItem is PlaylistItem.Intro) {
                                 Timber.v("Current item is intro, so playing next up immediately")
                                 playNextUp()
-                            } else {
+                            } else if (preferences.appPreferences.playbackPreferences.showNextUpWhen != ShowNextUpWhen.NEXT_UP_NEVER) {
                                 Timber.v("Setting next up to ${nextItem.id}")
                                 _state.update { it.copy(nextUp = nextItem.item) }
+                            } else {
+                                controllerViewState.showControls()
                             }
                         }