Repository navigation
Conversation
…arker The Show Next Up setting offers "At end" and "N seconds before end", but on an episode with a credits marker both apps opened the card at the credits start whatever was chosen. The TV player never read the setting at all. Both players now open Up Next when playback crosses the chosen number of seconds before the end of the file, and only when the stream ends for "At end", as the iOS and tvOS player already does. Credits markers still drive Skip Credits; skipping credits that run to the end ends the stream, which opens the card. The TV settings screen now assumes the same 30-second default as the settings store and the server. Fixes Silo-Server#910
…credits Moving Up Next to the end of the file also moved the point at which the TV player treats an episode as finished for the series page. Leaving during the closing credits then opened the series on the episode just watched, and leaving after an early prompt during the final scene opened it on the next one. Record the closing-credits crossing on its own again, and count the Up Next prompt only when the stream has ended. Update the comments that still described the credits-based trigger.
Viewers who would rather go back to the series at the end of an episode cannot turn the Next Up card off; Auto-play Next only stops its countdown. The Show Next Up picker on phone and TV now offers Off first. It writes playback.next_up_enabled (settings revision 30), and choosing a time turns Next Up back on. With Off the player opens no card before or at the end and closes the way Back does when playback ends; a shuffle still moves on. One control owns both Next Up keys, so Use profile setting clears them together. A server whose settings manifest lacks the key is never sent it: the picker hides Off and Next Up stays on there, as with the buffering quality mode. The settings bindings and the vendored manifest move to revision 30.
|
Warning Review limit reachedThis organization requires a seat for paid usage-based reviews, including automatic and on-demand reviews. Ask an admin to assign a seat or enable paid usage-based reviews for users without a seat in Billing. Next included review available in 1 minute. View limit details
|
Silo Kody — review completeReview finished. Check the inline comments for findings and verify each suggestion against the code and tests. Reviewing changes in Silo
Review settingsReview OptionsThe following review options are enabled or disabled:
|
|
Visible changes lack reviewable evidence:
Name the device and build or commit for each capture. The reported emulator check and view-model tests do not show these visible changes. Suggested fix: replace the placeholder with the required screenshots and recordings, or attach them under Evidence. Automated check: Macroscope check run agent (gpt-6-luna). Evidence was not reviewed for correctness. Posted via Macroscope — Visible change evidence |
| if (!currentlyEnabled) store.setNextUpEnabled(true) | ||
| store.setNextUpPromptSeconds(choice) |
There was a problem hiding this comment.
Timing choices do not override an inherited enabled setting
A later profile change to Off disables Next Up despite the device's explicit timing choice. Call store.setNextUpEnabled(true) whenever a timing choice is selected.
Prompt for LLM
File android-shared/src/androidMain/kotlin/org/siloserver/silo/common/settings/NextUpChoice.kt, lines 32-33:
Timing choices do not override an inherited enabled setting
Selecting a timing while the inherited profile value is enabled writes only the timing override, so a later profile change to Off disables Next Up despite the device's explicit timing choice. Write an enabled device override whenever a timing choice is selected.
Suggested code:
store.setNextUpEnabled(true)
store.setNextUpPromptSeconds(choice)
Talk to Kody by mentioning @kody
Was this suggestion helpful? React with 👍 or 👎 to help Kody learn from this interaction.
There was a problem hiding this comment.
Fixed in fa22e02. Where the server stores Off, choosing a time now writes next_up_enabled = true as well as the seconds, so the picker's choice is this device's whole choice. On a server without the key only a saved Off is turned back on, so the key is still never sent there. NextUpChoiceTest covers the writes.
There was a problem hiding this comment.
Thanks for the update. Writing both values when the server supports the setting addresses the inherited-setting concern, while preserving compatibility with older servers. The added NextUpChoiceTest coverage is helpful.
I haven’t independently verified the commit or run the tests.
| if (videoEnded) { | ||
| if (_uiState.value.showNextUp) { | ||
| _uiState.update { it.copy(nextUpVideoEnded = true) } |
There was a problem hiding this comment.
Disabling Next Up leaves an active TV countdown running
An existing countdown can advance to the next episode after Next Up is disabled. Cancel nextUpCountdownJob and clear nextUpCountdownSeconds when handling the disabled setting.
Prompt for LLM
File androidTvApp/src/androidMain/kotlin/org/siloserver/silo/tv/ui/screens/player/TvPlayerViewModel.kt, lines 5422-5424:
Disabling Next Up leaves an active TV countdown running
If Next Up is disabled after the automatic overlay has opened, the end event marks the overlay ended without canceling its existing countdown, which then automatically advances to the next episode. Cancel the countdown and clear its displayed value when handling the disabled setting.
Suggested code:
if (_uiState.value.showNextUp) {
nextUpCountdownJob?.cancel()
nextUpCountdownJob = null
_uiState.update { it.copy(nextUpVideoEnded = true, nextUpCountdownSeconds = null) }
}
Talk to Kody by mentioning @kody
Was this suggestion helpful? React with 👍 or 👎 to help Kody learn from this interaction.
There was a problem hiding this comment.
Not realistic: the overlay covers the TV screen while it counts down, so the viewer cannot reach Settings, and the setting is read when playback starts. Only a background settings refresh landing in that last minute or two could flip it. The branch exists for the overlay the viewer opened by hand, which has no countdown. Leaving it.
There was a problem hiding this comment.
Understood. The countdown scenario depends on a background settings refresh during a narrow window, while the intended manual-overlay case has no countdown. Given that tradeoff, leaving the code as-is is reasonable.
| val promptStart = duration - promptSeconds | ||
| return previousPosition < promptStart && position >= promptStart |
There was a problem hiding this comment.
Short files never trigger their before-end Next Up prompt
When the lead time is at least the file duration, playback cannot cross promptStart, so the card appears only at the end. Handle the initial playback sample when promptStart is at or before zero.
Prompt for LLM
File shared/src/commonMain/kotlin/org/siloserver/silo/domain/player/NextUpPrompt.kt, lines 22-23:
Short files never trigger their before-end Next Up prompt
When the configured lead time is at least the file duration, the prompt point is zero or negative and playback starting at zero can never cross it, so the card appears only at the end instead of before it. Handle the initial playback sample when the computed prompt point is at or before zero.
Talk to Kody by mentioning @kody
Was this suggestion helpful? React with 👍 or 👎 to help Kody learn from this interaction.
There was a problem hiding this comment.
Duplicate of the finding on #994 at the same line: a file no longer than the lead time gets Up Next when playback ends, as on main.
Choosing a time wrote only the seconds while Next Up was already on, so next_up_enabled stayed inherited from the profile. Turning Next Up off for the profile elsewhere then turned it off on this device too, although its picker showed a choice of its own. Where the server stores Off, a time now writes both keys.
Silo Kody — review completeReview finished. Check the inline comments for findings and verify each suggestion against the code and tests. Reviewing changes in Silo
Review settingsReview OptionsThe following review options are enabled or disabled:
|
Problem
Related issue: Silo-Server/silo-server Discussion #4443
Validation tasks: changes #347 C9, #348 C9 (Next Up; not run yet)
Other clients: Apple Silo-Server/silo-apple#1219; Roku Silo-Server/silo-roku#97; Web Silo-Server/silo-server#4503
Depends on #994 (Up Next from the end of the file) and Silo-Server/silo-server#4501 (the setting). Until #994 merges this branch carries its two commits; the change here is the last commit.
Viewers cannot turn Up Next off on Android. Auto-Play Next Episode only stops the countdown; the card still opens before or at the end of every episode.
Show Next Up on the phone and TV now offers Off. With Off, the player opens no Up Next card before or at the end and starts no next episode; when playback ends it closes the way Back does. A shuffle still moves on, since the viewer asked for one.
Approach
playback.next_up_enabledfalse (settings revision 30, feat(settings): add a setting that turns Next Up off silo-server#4501) and leaves the stored seconds alone; choosing a time turns Next Up back on. One picker owns both keys, so Use profile setting clears both together.Validation
./gradlew testDebugUnitTest: shared 2,510, android-shared 2,314 and Android TV 1,407 tests pass. On the phone module, 1,012 tests ran and threeFormattersTestcases failed; they compare decimal output ("1.0") under the build machine's locale and touch nothing in this change.lintDebugfor all three modules,lintVitalReleasefor both apps) passes with no new findings. Both apps build withassembleDebug. Supply-chain checks pass.Evidence
Evidence: https://evidence.siloserver.org/r/silo-android/pr-995/
Phone and TV Settings → Playback → Show Next Up, from this branch. Before, the same picker had no Off. Phone, tablet and foldable share the phone settings layout.
Risks
None beyond the SOURCE re-point above.
Checklist
AI Disclosure
Note
Add setting to let viewers turn Next Up off on phone and TV players
NextUpEnabledsetting key with manifest detection. Servers that do not support the key still show Next Up enabled; the stored Off value is kept and applies once support appears (PlaybackSettingsKeys.kt, AndroidPlayerSettingsStore.kt).NextUpChoicemodel, shown only when the server supports the key or Off is already selected.NextUpPrompt.crossesPromptPoint, which fires at the configured seconds before file end (NextUpPrompt.kt).Macroscope summarized fa22e02.