Skip to content

chore: integrate Wholphin upstream Stage B - #115

Merged
constbogdan merged 39 commits into
mainfrom
chore/upstream-stage-b
Nov 6, 2026
Merged

constbogdan merged 39 commits into
mainfrom
chore/upstream-stage-b

Conversation

@constbogdan

Copy link
Copy Markdown
Owner

Stage B local upstream integration

Authenticated scope

  • Mosaic protected main: 8c8000027fa92a4e4b6acb6c842325936356d00f.
  • Previous upstream anchor: 65954a99eb0aa318d9f88813d49768bd95cf37ee.
  • Exact Stage B target: 55960c24625ef03bc5ac71b58806efdd613ffcc7.
  • Observed upstream main: bd46ff3e03c9a9f100fefcc2554be7c245a08c68.
  • Local branch: chore/upstream-stage-b; isolated worktree:
    C:\Projects\Wholphin\mosaic-upstream-stage-b.
  • Native merge remains pending, with parents [protected main, Stage B target].
    No final merge commit, push, PR update, or publication is authorized.
  • PR chore: review upstream changes to action.yml, pr.yml and 12 more #114 remains the independent Stage D Draft, head
    b2c90b95a86031d60ef19a10e39215d9e909a887; its branch and evidence are untouched.
  • Stage C track persistence/image tags and Stage D are excluded.

Exact incoming inventory (37 commits)

Actual conflicts and decisions

Six paths conflicted, independently of the larger PR #114 conflict inventory:

Path Decision
.github/workflows/main.yml Preserve downstream-owned absence; do not restore upstream publisher.
.github/workflows/release.yml Preserve downstream-owned absence; do not restore upstream publisher.
services/IntentService.kt Keep Mosaic application-ID playback action plus legacy compatibility, with upstream session preparation and testing annotation.
services/UpdateChecker.kt Accept callback execution changes; preserve Mosaic canonical signed release/versioned Stable assets and Development matching. Reject upstream generic/ABI release fallback.
test/TestUpdateChecker.kt Retain all Mosaic channel/source/asset regressions and adapt the incoming regular-release fixture to assert rejection of foreign aliases.
gradle/wrapper/gradle-wrapper.properties Accept Gradle 9.8.1 with official distribution SHA-256 dce76f55f8e251a3a1f130eb120f30b3d271de2b76c9b0729d316b5a1b6dc01f.

The checksum was read from
https://services.gradle.org/distributions/gradle-9.8.1-bin.zip.sha256;
the wrapper downloaded and verified that distribution.

Clean semantic review and adaptations

  • MainActivity accepts upstream upgrade-before-intent handling, hot restoration,
    explicit restoration outcomes and protected-user picker routing. Mosaic foreground feature
    controller start/stop, updater source selection and navigation/playback identities remain.
  • ServerRepository accepts upstream remembered-session provider, distinct user observations and
    current-user websocket metadata updates. Metadata reads are fenced to the originating session;
    explicit foreign-server metadata is rejected. Stable user configuration retains the session's
    authoritative server ID even when the DTO omits it.
  • UserSwitchListener accepts collectLatest and suppresses timestamp-only work, but deduplicates by
    server plus user plus language. Cancelled old-user Seerr authentication propagates cancellation
    instead of publishing an old-session failure. Genuine failures retain existing error handling.
  • Workers using the new restore-last-session API must reject a restored user/server different
    from their scheduled input. Otherwise an old worker could query/cache using old IDs against a
    newly remembered session. Apply the exact cold-restoration guard to Suggestions, Latest Next Up
    and TV Provider; preserve their warm-path behavior and scheduling.
    Correct the existing currentUser test fixture to pass both identities to user(): it previously
    treated the requested user UUID as a server UUID and generated a random user UUID, concealing
    identity mismatches. Keep the worker guard rather than weakening it for that malformed fixture.
  • AppUpgradeHandler migrates legacy remembered-session and Dolby Vision fields idempotently,
    without upstream version gates (Mosaic has an independent version stream). A newer remembered
    session and explicit HDR override win. Server-only sessions and newly selected servers are
    remembered without retaining an old user's credentials. A migration failure does not clear
    legacy identifiers first.
  • Home's Stage A stable configuration/reload/Acquiring collector remains unchanged. Upstream's
    season-aware header/title/logo refinement does not replace Acquiring presentation or focus keys.
  • SeriesViewModel accepts only the upstream initial-fetch error/cancellation handling. Missing
    Seasons request eligibility/editability, inactive-Seerr cleanup, persisted expectations, fresh
    Jellyfin integrity and shared acquisition projection remain intact. Episode focus restoration
    accepts the upstream specific episode-row focus target.
  • Preferences add resolution limits, HDR force overrides and the opt-in Dolby Vision/HDR10+
    bitstream preference. Existing enhanced-feature and update-channel protobuf field numbers,
    defaults and persistence remain intact; no Room schema, migration or database-module change.
  • Manifest retains explicit WorkManager ownership while restoring AndroidX Startup/profile
    initialization. WholphinApplication retains Mosaic initialization and accepts removing explicit
    OkHttp initialization. Build adds profileinstaller and accepts Kotlin/OpenAPI/Gradle updates;
    Mosaic package, version derivation, output naming and signing configuration remain unchanged.
  • Collection/folder ancestor display/sort inheritance, empty collection-row suppression,
    music metadata/context actions, playback next/previous wiring, backdrop color corrections and
    websocket handling remain inherited. The incoming Home Videos expression accidentally returned
    only PHOTO_ALBUM; combine VIDEO, PHOTO and PHOTO_ALBUM in one list to preserve ordinary videos.
  • Retain playback disconnect cancellation for the newly separate websocket job; moving it out of
    the original jobs list must not leave commands subscribed after release/backend replacement.
  • Keep the updated MainActivity tests in their existing Mosaic test package/path, so the unchanged
    focused validation policy continues to select them; upstream's package move is not required
    for its internal testing hooks.
  • Localized changes are additive/corrective. Mosaic resources remain. Updater test DI accepts
    the upstream provider but retains Mosaic database/test bindings. Fix its in-memory provider's
    clearUser assignment so tests exercise real clearing semantics.

The 29 baseline-overlap paths were inspected: two retired workflows; app build/manifest;
MainActivity; WholphinApplication; AppPreference; AppPreferencesSerializer; IntentService;
UpdateChecker; SeriesViewModel; HomePage; PreferencesContent; protobuf; eleven localized string
files (de/es/et/hr/pl/pt/sk/sv/tr/zh-rCN/zh-rTW); default strings; TestUpdateChecker; TestModule;
Gradle wrapper. Textual cleanliness was not treated as semantic acceptance.

Regression coverage and validation

Local validation (2026-11-06):

  • Kotlin production/test compilation passed with Gradle 9.8.1 and Kotlin 2.4.21.
  • Focused JVM run: 183 tests, 18 suites; zero failures/errors/skips. Its XML evidence is
    retained under .logs/stage-b/focused/. This preceded the final worker guard/fixture
    correction; the complete run below covers those changes.
  • Complete default-debug JVM run: 652 tests, 74 suites; zero failures/errors/skips.
    Command: gradlew.bat :app:compileDefaultDebugKotlin :app:testDefaultDebugUnitTest.
    Retain .logs/stage-b/complete-jvm-final.log and .logs/stage-b/complete/ XML reports.
  • Applicable offline tooling: 50 passed (repository identity 3, validation policy 29,
    version derivation 11, APK identity/verifier 7). These tools and workflows are unchanged.
  • The first complete run exposed one malformed shared currentUser fixture (651 passed,
    one failed); the corrected final complete run above is green. Intermediate nullable-access
    and playback-test constructor compile errors were corrected, not waived or skipped.
  • Final Fast validation runs changed-scope pre-commit, the focused classes below and whitespace
    checks. Its authoritative local result and stage logs are retained under .logs/validation/.
    No local Full, APK assembly, signing, install or publication is part of this validation.
.\scripts\validate-local.ps1 -Level Fast -TestFilter @('*AppUpgradeHandlerTest', '*UserSwitchListenerTest', '*ServerRepositoryTest', '*SuggestionsWorkerTest', '*TestMainActivityViewModel', '*PlaybackViewModelTests', '*HomeViewModelTest', '*TestUpdateChecker', '*CollectionFolderViewModelTest')

New local coverage extends ServerRepositoryTest, IntentServiceTest, SuggestionsWorkerTest,
CollectionFolderViewModelTest and PlaybackViewModelTests. AppUpgradeHandlerTest and
UserSwitchListenerTest cover distinct previously untested migration/listener boundaries.
Existing Home, acquisition, Missing Seasons,
season integrity, request, feature-gate and updater regressions are retained. Incoming HDR,
bitstream and profile tests remain.

Acceptance limitations

No device installation, APK signing, publication or production interaction occurs here.
Android TV cold/hot startup, protected profile/user/server switching, foreground/background
acquisition, deep links/Play Next, focus restoration, folder sort inheritance and HDR playback
still require device acceptance. Optional native FFmpeg/AV1/MPV components are unavailable locally;
the repository's MPV stub is used. Passing JVM/compilation is not device-level proof.

Complete changed-file inventory against protected main

Status is the staged native integration delta, not the upstream-only 81-path delta.
The two retired workflows are absent on both sides and therefore do not appear here.

M	app/build.gradle.kts
M	app/src/main/AndroidManifest.xml
M	app/src/main/java/com/github/damontecres/wholphin/MainActivity.kt
M	app/src/main/java/com/github/damontecres/wholphin/WholphinApplication.kt
M	app/src/main/java/com/github/damontecres/wholphin/WholphinDreamService.kt
A	app/src/main/java/com/github/damontecres/wholphin/data/MostRecentServer.kt
M	app/src/main/java/com/github/damontecres/wholphin/data/ServerRepository.kt
M	app/src/main/java/com/github/damontecres/wholphin/data/model/AudioItem.kt
M	app/src/main/java/com/github/damontecres/wholphin/data/model/BaseItem.kt
M	app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt
M	app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreferencesSerializer.kt
M	app/src/main/java/com/github/damontecres/wholphin/preferences/ExperimentalPreference.kt
A	app/src/main/java/com/github/damontecres/wholphin/preferences/HdrFormat.kt
A	app/src/main/java/com/github/damontecres/wholphin/preferences/MaxResolution.kt
M	app/src/main/java/com/github/damontecres/wholphin/services/AppUpgradeHandler.kt
M	app/src/main/java/com/github/damontecres/wholphin/services/BackdropService.kt
M	app/src/main/java/com/github/damontecres/wholphin/services/DeviceProfileService.kt
M	app/src/main/java/com/github/damontecres/wholphin/services/HomeSettingsService.kt
M	app/src/main/java/com/github/damontecres/wholphin/services/IntentService.kt
M	app/src/main/java/com/github/damontecres/wholphin/services/LatestNextUpWorker.kt
M	app/src/main/java/com/github/damontecres/wholphin/services/PlayerFactory.kt
M	app/src/main/java/com/github/damontecres/wholphin/services/ServerEventListener.kt
M	app/src/main/java/com/github/damontecres/wholphin/services/SuggestionsWorker.kt
M	app/src/main/java/com/github/damontecres/wholphin/services/UpdateChecker.kt
M	app/src/main/java/com/github/damontecres/wholphin/services/UserSwitchListener.kt
M	app/src/main/java/com/github/damontecres/wholphin/services/hilt/AppModule.kt
M	app/src/main/java/com/github/damontecres/wholphin/services/tvprovider/TvProviderWorker.kt
M	app/src/main/java/com/github/damontecres/wholphin/ui/components/CollectionFolderGrid.kt
M	app/src/main/java/com/github/damontecres/wholphin/ui/components/CollectionFolderView.kt
M	app/src/main/java/com/github/damontecres/wholphin/ui/components/ContextMenu.kt
M	app/src/main/java/com/github/damontecres/wholphin/ui/components/FocusableItemRow.kt
M	app/src/main/java/com/github/damontecres/wholphin/ui/components/TitleOrLogo.kt
M	app/src/main/java/com/github/damontecres/wholphin/ui/detail/collection/CollectionViewModel.kt
M	app/src/main/java/com/github/damontecres/wholphin/ui/detail/music/AlbumDetailsPage.kt
M	app/src/main/java/com/github/damontecres/wholphin/ui/detail/music/ArtistDetailsPage.kt
M	app/src/main/java/com/github/damontecres/wholphin/ui/detail/music/NowPlayingPage.kt
M	app/src/main/java/com/github/damontecres/wholphin/ui/detail/music/NowPlayingViewModel.kt
M	app/src/main/java/com/github/damontecres/wholphin/ui/detail/series/SeriesOverviewContent.kt
M	app/src/main/java/com/github/damontecres/wholphin/ui/detail/series/SeriesViewModel.kt
M	app/src/main/java/com/github/damontecres/wholphin/ui/main/HomePage.kt
M	app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackKeyHandler.kt
M	app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackPage.kt
M	app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackViewModel.kt
M	app/src/main/java/com/github/damontecres/wholphin/ui/preferences/PreferenceUtils.kt
M	app/src/main/java/com/github/damontecres/wholphin/ui/preferences/PreferencesContent.kt
A	app/src/main/java/com/github/damontecres/wholphin/util/BitstreamFilteringCodecAdapterFactory.kt
M	app/src/main/java/com/github/damontecres/wholphin/util/CrashReportSenderFactory.kt
A	app/src/main/java/com/github/damontecres/wholphin/util/Hdr10PlusSeiFilter.kt
M	app/src/main/java/com/github/damontecres/wholphin/util/profile/DeviceProfileUtils.kt
A	app/src/main/java/com/github/damontecres/wholphin/util/profile/WholphinVideoRangeType.kt
M	app/src/main/proto/WholphinDataStore.proto
M	app/src/main/res/values-de/strings.xml
M	app/src/main/res/values-en-rGB/strings.xml
M	app/src/main/res/values-es/strings.xml
M	app/src/main/res/values-et/strings.xml
M	app/src/main/res/values-hr/strings.xml
M	app/src/main/res/values-pl/strings.xml
M	app/src/main/res/values-pt/strings.xml
M	app/src/main/res/values-ru/strings.xml
M	app/src/main/res/values-sk/strings.xml
M	app/src/main/res/values-sv/strings.xml
M	app/src/main/res/values-tr/strings.xml
M	app/src/main/res/values-zh-rCN/strings.xml
M	app/src/main/res/values-zh-rTW/strings.xml
M	app/src/main/res/values/strings.xml
A	app/src/test/java/com/github/damontecres/wholphin/services/AppUpgradeHandlerTest.kt
M	app/src/test/java/com/github/damontecres/wholphin/services/IntentServiceTest.kt
M	app/src/test/java/com/github/damontecres/wholphin/services/ServerRepositoryTest.kt
M	app/src/test/java/com/github/damontecres/wholphin/services/SuggestionsWorkerTest.kt
A	app/src/test/java/com/github/damontecres/wholphin/services/UserSwitchListenerTest.kt
A	app/src/test/java/com/github/damontecres/wholphin/test/TestHdrFormat.kt
M	app/src/test/java/com/github/damontecres/wholphin/test/TestMainActivityViewModel.kt
M	app/src/test/java/com/github/damontecres/wholphin/test/TestUpdateChecker.kt
M	app/src/test/java/com/github/damontecres/wholphin/test/TestUtils.kt
M	app/src/test/java/com/github/damontecres/wholphin/ui/TestModule.kt
M	app/src/test/java/com/github/damontecres/wholphin/ui/components/CollectionFolderViewModelTest.kt
M	app/src/test/java/com/github/damontecres/wholphin/ui/playback/PlaybackViewModelTests.kt
A	app/src/test/java/com/github/damontecres/wholphin/util/BitstreamFilterChainTest.kt
A	app/src/test/java/com/github/damontecres/wholphin/util/BitstreamFilteringCodecAdapterTest.kt
A	app/src/test/java/com/github/damontecres/wholphin/util/Hdr10PlusSeiFilterTest.kt
A	app/src/test/java/com/github/damontecres/wholphin/util/profile/TestDeviceProfileUtils.kt
A	app/src/test/resources/release_v108.json
M	docs/CODEX_HANDOFF.md
M	docs/UPSTREAM_RESOLUTION_DECISIONS.md
A	docs/history/UPSTREAM_STAGE_B.md
M	gradle/libs.versions.toml
M	gradle/wrapper/gradle-wrapper.properties

Jycreyn and others added 30 commits September 29, 2026 12:41
…tecres#1876)

## Description

Adds a "Prefer Dolby Vision over HDR10+" switch (off by default) under
Experimental settings. That screen only shows up once "Experimental
settings" is enabled under Advanced, and until then the switch is read
as off: it goes through `experimentalPreferences.get {}`, so nothing is
wrapped and the playback path is untouched.

Most current 4K web releases carry both Dolby Vision (profile 8.1) RPUs
and HDR10+ dynamic metadata in the same HEVC stream. Some MediaTek based
devices (Philips and TCL TVs, some Fire TV models) latch onto the HDR10+
metadata on those files and never engage Dolby Vision, even though a
Dolby Vision decoder is selected.

I isolated this on my Philips 55OLED810 by playing the same episode
three ways, direct play in all three cases:

| | Stream | TV shows |
|---|---|---|
| A | MKV with DV 8.1 + HDR10+ | HDR10+ |
| B | Same MKV with the HDR10+ metadata removed using
[hdr10plus_tool](https://github.com/quietvoid/hdr10plus_tool), DV
untouched | Dolby Vision |
| C | Same stream remuxed to MP4, both kinds of metadata present |
HDR10+ |

The container doesn't matter and the Dolby Vision signaling is picked up
correctly. The only thing the app can do is keep the HDR10+ metadata
away from the decoder.

When the switch is on, and only when a Dolby Vision decoder was actually
selected, the HDR10+ SEI messages (SMPTE ST 2094-40, recognized by their
ITU-T T.35 header `B5 003C 0001`) are masked in each access unit before
it is queued to MediaCodec. The SEI payload type byte is overwritten
with an unused value (254), so the decoder skips the message. That is
one byte rewritten in place per message: the masking filter returns the
size it was given, so the access unit is queued exactly as long as it
came out of the extractor, which is what makes it safe with both the
synchronous and asynchronous MediaCodec adapters. media3 does the same
thing for HAGC metadata in `HevcSeiUtil`; this filter only targets ST
2094-40, so other T.35 SEI such as CEA-708 captions are not affected.
The filter was written from the H.265 spec, no Kodi or media3 code was
copied.

The hook is generic rather than HDR10+ specific, as asked in the thread.
`BitstreamFilteringCodecAdapterFactory` wraps the codec adapter with a
`List<BitstreamFilter>`, and a filter is `(ByteBuffer, offset, size) ->
Int` where the returned `Int` is the new size of the access unit: the
adapter queues the size the chain reports, and hands each filter the
size the previous one reported. A filter which only overwrites bytes
returns the size unchanged, which is what the HDR10+ masking does; a
filter which drops NAL units compacts what it keeps and reports the
shorter size. A reported size which is negative or larger than the one
the filter was given is ignored rather than queued. That is what lets
the Dolby Vision profile 7 to 8.1 conversion of damontecres#244 arrive later as one
more filter instead of a second copy of the adapter plumbing.

When the switch is off, the playback path is unchanged. On a device
without a Dolby Vision decoder (or a display without DV support) the
wrapper is never installed, so HDR10+ only devices keep their metadata.
Encrypted samples, codec config buffers and empty buffers are passed
through untouched.

Kodi has an equivalent option for the same reason: xbmc/xbmc@032cbfeb
and xbmc/xbmc@e2c54e7f.

### Related issues

Implements what was requested in damontecres#1855. The filter list is what damontecres#244
(Dolby Vision profile 7 direct play) needs, so that conversion can be
added as another filter. damontecres#1895 implemented the same masking
independently and was closed in favour of this PR; the device profile
part of it was not carried over, see the note under Testing. Upstream:
androidx/media#1895, where the maintainers say the bug is in the device
codecs and that they don't plan a workaround in ExoPlayer itself.

## AI or LLM usage

The implementation (bitstream filter, MediaCodecAdapter wiring, unit
tests) were written with AI assistance (Claude). I reviewed the changes
and validated the behavior myself on a real MediaTek TV (Philips
55OLED810), with the setting on and off, on hybrid and DV-only content.

---------

Co-authored-by: Jycreyn <github.2ilp7@passmail.com>
…amontecres#2012)

## Description
Add better error handling for server web socket messages that are
(technically) invalid.

For example, I talked to Niels and some third party plugins don't always
have the required fields. Since the server isn't as strict as the client
SDK, it's fine on the server but will generate an invalid message sent
to the client.

Also listens for server-side user configuration changes via web socket.

### Related issues
Fixes damontecres#1979

### Testing
Valid server messages are handled as normal and I did some manual
testing to push invalid JSON into the webSocketApi, but the code is
gnarly and not viable as an actual unit test

## Screenshots
N/A

## AI or LLM usage
None
## Description
Updates the home page header & card text when a Season type is shown,
such as in recently added for a TV Show library.

The title or logo for the series is shown with the season name as the
title. The "quick details" has the year of the season. The card shows
the unplayed count of episodes.

### Related issues
Closes damontecres#1958

### Testing
Emulator over a few days to see different seasons

## Screenshots
<img width="313" height="153" alt="image"
src="https://github.com/user-attachments/assets/c41e9edd-9f2a-4f62-b76d-e452e83dd8bf"
/>

## AI or LLM usage
None
…1955)

## Description
Adds a new setting to pick a maximum resolution (by height). Any
playback that has a larger resolution will be transcoded down to the
maximum resolution.

Playback equal or less than the maximum resolution will not be affected
and will direct play if otherwise able. This setting is also independent
of the maximum bitrate (ie if max resolution is 4K and max bitrate is
2mbps, playing 4K will transcode).

This setting is pretty much equivalent to the Web UI setting "Maximum
Allowed Video Transcoding Resolution" with "Limit maximum supported
video resolution" enabled.

Note: this setting does not affect which version is chosen by default

### Related issues
Closes damontecres#756
Closes damontecres#1594

### Testing
Manual emulator testing

## Screenshots
N/A

## AI or LLM usage
None
## Description

Wholphin already ships a baseline profile. AGP merges the profiles from the AndroidX libraries into `assets/dexopt/baseline.prof` on every release build, so a release APK built from `main` already has one at around 15 KB. It just never gets installed on the device.

The reason is in `app/src/main/AndroidManifest.xml`, which removes `androidx.startup.InitializationProvider` completely:

That was added in damontecres#372 so WorkManager could be set up on demand through `Configuration.Provider` and `HiltWorkerFactory`. The problem is that `androidx.profileinstaller` registers `ProfileInstallerInitializer` inside the same provider, so removing the provider removes that as well. 

### Related issues

damontecres#553

### Testing

API 34 AOSP emulator, `defaultRelease` signed with a debug key, clean install each time. With this change, logcat shows the profile being installed.

Not tested on a physical Fire TV device.

## Screenshots

None, there are no UI changes.

## AI or LLM usage

I used Claude for this one.

---------

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: Damontecres <damontecres@gmail.com>
## Description
Fixes a potential crash on any page that uses `HomePageContent`, such as
home page, recommended tab, & customize home page.

I think this is actually a bug in compose because it shouldn't pass
`Color.Unspecified` into the native color code. But similarly, using
`Color.Unspecified` in `animateColorAsState` doesn't make sense either.

### Related issues
Fixes damontecres#1995

### Testing
I was able to reproduce this consistently using the Purple theme on
customize home page by focusing on an empty row. This change doesn't
cause the crash.

## Screenshots
N/A

## AI or LLM usage
None
## Description
Collecting minor bug fixes in one PR:
- If error occurs fetching a series, show the error on the UI instead of
loading forever
- Use song's artists on Now Playing page
- Fixes settings wrap around scrolling when an update is available
- Fix backdrop not clearing for items without backdrop
- Fix not picking an ABI-specific APK when updating a regular release
(maybe related to damontecres#1966)
- Add "Go To" for album context menus
- Fix handling of next/previous media remote button presses during video
playback

### Related issues
Fixes damontecres#1990 
Fixes damontecres#1965

### Testing
Emulator mostly

## Screenshots
N/A

## AI or LLM usage
None
## Description
If a collection is using separated types and there were 2+ empty rows
between types, then the forward composition wouldn't trigger and the
next row would not appear. In practice this means if you have a
Collection that contained Movies and Videos, you might not be able to
scroll down from Movies to Videos.

The fix is to filter out the empty rows before composing.

### Related issues
Fixes damontecres#2046

### Testing
Emulator

## Screenshots
N/A

## AI or LLM usage
None
## Description
On the series overview page, if you play the second or third episode,
then return to the page, focus will move the first episode.

This did not happen in `v1.0.7` and the code for that page was minimally
changed, so I think this was caused by updating the compose version,
maybe the ordering on focus resolution or something.

This small change seems to reliably fix the issue though.

### Related issues
Fixes damontecres#2043

### Testing
Emulator

## Screenshots
N/A

## AI or LLM usage
None
Currently translated at 100.0% (659 of 659 strings)

Translation: Wholphin/Wholphin
Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/sk/
Currently translated at 100.0% (659 of 659 strings)

Translation: Wholphin/Wholphin
Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/zh_Hant/
Currently translated at 100.0% (659 of 659 strings)

Translation: Wholphin/Wholphin
Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/de/
Currently translated at 100.0% (659 of 659 strings)

Translation: Wholphin/Wholphin
Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/et/
Currently translated at 100.0% (659 of 659 strings)

Translation: Wholphin/Wholphin
Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/pt/
Currently translated at 99.8% (658 of 659 strings)

Translation: Wholphin/Wholphin
Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/tr/
Currently translated at 100.0% (659 of 659 strings)

Translation: Wholphin/Wholphin
Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/ru/
Currently translated at 100.0% (659 of 659 strings)

Translation: Wholphin/Wholphin
Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/hr/
Currently translated at 9.4% (62 of 659 strings)

Translation: Wholphin/Wholphin
Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/en_GB/
Currently translated at 92.7% (611 of 659 strings)

Translation: Wholphin/Wholphin
Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/sv/
Currently translated at 94.6% (624 of 659 strings)

Translation: Wholphin/Wholphin
Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/sv/
Currently translated at 100.0% (659 of 659 strings)

Translation: Wholphin/Wholphin
Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/ru/
Currently translated at 100.0% (659 of 659 strings)

Translation: Wholphin/Wholphin
Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/zh_Hans/
Currently translated at 100.0% (659 of 659 strings)

Translation: Wholphin/Wholphin
Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/es/
Currently translated at 100.0% (659 of 659 strings)

Translation: Wholphin/Wholphin
Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/es/
Currently translated at 94.8% (625 of 659 strings)

Translation: Wholphin/Wholphin
Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/sv/
Currently translated at 100.0% (659 of 659 strings)

Translation: Wholphin/Wholphin
Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/pl/
Currently translated at 94.9% (626 of 659 strings)

Translation: Wholphin/Wholphin
Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/sv/
Updates translations as of 2026-10-10

Thanks to everyone who contributed!

---------

Co-authored-by: n8llcaster <n8llcaster@noreply.codeberg.org>
Co-authored-by: SimonHung <simonhung@noreply.codeberg.org>
Co-authored-by: Sk4hnt42 <sk4hnt42@noreply.codeberg.org>
Co-authored-by: Priit Jõerüüt <jrtcdbrg@noreply.codeberg.org>
Co-authored-by: American_Jesus <american_jesus@noreply.codeberg.org>
Co-authored-by: idezentas <idezentas@noreply.codeberg.org>
Co-authored-by: Greeg0ry <greeg0ry@noreply.codeberg.org>
Co-authored-by: MrGegaz <mrgegaz@noreply.codeberg.org>
Co-authored-by: Andi Chandler <andi@gowling.com>
Co-authored-by: Prahlis <prahlis@noreply.codeberg.org>
Co-authored-by: SergeiAK <sergeiak@noreply.codeberg.org>
Co-authored-by: Outbreak2096 <outbreak2096@noreply.codeberg.org>
Co-authored-by: danpergal84 <danpergal84@noreply.codeberg.org>
Co-authored-by: TheMatrixan <thematrixan@noreply.codeberg.org>
## Description
When switching users, the current user's home page would start a reload
during the switch. This PR fixes that by comparing the user switch.

The underlying cause is that Room's flow is blunt and emits whenever the
table updates. So [during the user
switch](https://github.com/damontecres/Wholphin/blob/9b028040754acc58253b414c2c33a3ef4ca92d00/app/src/main/java/com/github/damontecres/wholphin/data/ServerRepository.kt#L117-L118)
the table is updated causing [current user to
emit](https://github.com/damontecres/Wholphin/blob/9b028040754acc58253b414c2c33a3ef4ca92d00/app/src/main/java/com/github/damontecres/wholphin/data/ServerRepository.kt#L71)
and the current user flow is updated causing the new user to emit.

### Related issues
N/A

### Testing
Emulator, switching users and switching locales

Can observe that `UserSwitchListener` only trigger once per user switch
instead of twice

## Screenshots
N/A

## AI or LLM usage
None
renovate Bot and others added 9 commits October 11, 2026 20:08
## Description
This PR reworks some of the internal handling of changing users and auto
sign in.

1. Most recently used server/user is migrated from `AppPreferences` to
`MostRecentServerProvider`
2. Checking if a user profile is protected occurs at a lower level in
`ServerRepository` so fewer services need to check for this
3. Now always defaults to the most recent server's user list in cases
where the most recent user can't be switched to such as if the profile
is protected, auto signin is disabled, or and error occurred

The default implementation for `MostRecentServerProvider` uses Android's
`SharedPreferences`. `SharedPreferences` was already was being used to
track the most recent server for crash reporting (the crash reporting
process cannot use the Hilt DI). This PR enhances this and adds a better
API for saving/retrieving.

This also removes the last bit of "user specific" data from
`AppPreferences`.

### Related issues
None specific, but there have been a few related to auto sign-in &
intents that were recently fixed. This PR is a more detailed approach to
those same problems.

### Testing
Manually via the emulator. There are also unit tests for most (all?) of
the different settings and state combinations.

## Screenshots
N/A

## AI or LLM usage
None
…ision formats (damontecres#1644)

Description
Adding per-format HDR override preferences (HDR10, HDR10+, Dolby Vision
Profile 5/7/8) to control device compatibility information sent to the
Jellyfin server, so users can force specific formats on or off
independently instead of disabling Dolby Vision as a whole.

Related issues
This is a common problem across the Jellyfin ecosystem, but there isn't
a specific issue for Wholphin. My experience is the issue is FireTV
(model and generation) + TV dependent + media dependent. I tested videos
from
https://kodi.wiki/view/Samples with the same DOVIWithHDR10 flag that
worked while other movies I have with It is a very frustrating user
experience and the current workaround of setting the bitrate really low
to force a transcode is sub-optimal IMO as it lowers the video quality.
This allows the user to maintain full quality while disabling only the
specific format(s) causing problems.

jellyfin/jellyfin-androidtv#4021
jellyfin/jellyfin-androidtv#4892
nova-video-player/aos-AVP#1503

https://www.reddit.com/r/jellyfin/comments/12jqoxh/dolby_vision_video_not_working_on_fire_stick_4k/

Testing

<!-- Describe how this change was tested and on what device(s) -->
FireTV 4K (gen 1) + Vizio
FireTV 4K Max (gen 1) + LG
FireTV 4K Max (gen 2) + Vizio
FireTV (gen 1) + Olevia


AI or LLM usage
Claude code assisted and wrote much of the code in this PR. I've
reviewed it all and run the pre-commit linting and formatting.

---------

Co-authored-by: Damontecres <damontecres@gmail.com>
## Description

This change applies only to subfolders that do not have their own saved
display settings.

When a subfolder has no saved settings, it now inherits the view type
and sort order from the closest ancestor with saved settings. Filter
settings are not inherited.

If the user changes the settings within a subfolder, those settings are
saved for that subfolder and take precedence over the inherited
settings.

### Related issues

Fixes damontecres#1768

### Testing

Tested an App Store flavor debug build on the following setup:

- Device: Xiaomi TV A Pro 43
- Jellyfin server version: 12.1
- Library: A hierarchical recording library stored on a NAS

I changed the view type and sort order at the top level of the library
and confirmed that both settings were inherited by untouched subfolders.

## Screenshots

N/A - no UI changes

## AI or LLM usage

Claude was used to write the changes in `CollectionFolderView.kt`.

I performed the testing on a physical Google TV device and verified the
behavior described above.

The commit also includes a `Co-Authored-By: Claude` trailer.

This description was written in Japanese and translated with an LLM.

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@constbogdan
constbogdan merged commit b8cf052 into main Nov 6, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants