Repository navigation
[CI only, do not merge] Rebase shield-fix on upstream v1.1.0 (fixes the nightly sync) - #1
Closed
spartan-dou wants to merge 55 commits into
Closed
spartan-dou wants to merge 55 commits into
spartan-dou wants to merge 55 commits into
Conversation
Currently translated at 99.8% (669 of 670 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/et/
Currently translated at 100.0% (670 of 670 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/zh_Hant/
Currently translated at 100.0% (670 of 670 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/it/
Currently translated at 100.0% (670 of 670 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/tr/
Currently translated at 100.0% (670 of 670 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/de/
Currently translated at 100.0% (670 of 670 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/et/
Currently translated at 100.0% (670 of 670 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/sk/
Currently translated at 100.0% (670 of 670 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/fr/
Currently translated at 100.0% (670 of 670 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/pl/
Currently translated at 100.0% (670 of 670 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/id/
Currently translated at 20.4% (137 of 670 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/sr/
Currently translated at 72.9% (489 of 670 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/hu/
Currently translated at 100.0% (670 of 670 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/es/
Currently translated at 100.0% (670 of 670 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/he/
Currently translated at 91.0% (629 of 691 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/sv/
Currently translated at 100.0% (691 of 691 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/et/
Currently translated at 100.0% (691 of 691 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/fr/
Currently translated at 99.4% (687 of 691 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/zh_Hant/
Currently translated at 100.0% (691 of 691 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/pl/
Currently translated at 82.9% (573 of 691 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/hu/
Currently translated at 100.0% (693 of 693 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/et/
Currently translated at 100.0% (693 of 693 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/ru/
Currently translated at 99.5% (690 of 693 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/de/
Currently translated at 100.0% (693 of 693 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/it/
Currently translated at 100.0% (693 of 693 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/tr/
Currently translated at 100.0% (695 of 695 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/et/
Currently translated at 99.1% (689 of 695 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/zh_Hant/
Currently translated at 100.0% (696 of 696 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/de/
Currently translated at 99.8% (695 of 696 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/pt/
Currently translated at 100.0% (696 of 696 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/tr/
Currently translated at 100.0% (696 of 696 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/et/
Currently translated at 100.0% (696 of 696 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/fr/
Currently translated at 100.0% (696 of 696 strings) Translation: Wholphin/Wholphin Translate-URL: https://translate.codeberg.org/projects/wholphin/wholphin/pl/
…damontecres#2163) ## Description I was having trouble playing HDHomeRun channels through Jellyfin in Wholphin. They started quickly in the official Jellyfin app, but Wholphin would sometimes spin or fall back when switching channels. This change includes the live stream ID returned by Jellyfin when building the Direct Play URL. It also adds a regression test. ### Related issues Related to damontecres#2014 and possibly damontecres#1903. My testing was with an HDHomeRun; I haven’t verified the TVHeadend setups in those reports. ### Testing Tested on a Google TV Streamer with multiple local channels, FAST channels, and movie playback. The tested content used Direct Play, and the HDHomeRun tuners were released after stopping. All 18 playback tests and the formatting check passed after the requested test cleanup. ## Screenshots No UI changes. ## AI or LLM usage I used OpenAI Codex to help investigate the issue, implement the change in PlaybackViewModel.kt, add the regression test in PlaybackViewModelTests.kt, and run validation. Codex also helped draft this description.
## Description - Fixes typo that could prevent restoring a page with artists or album artists - Clarified some javadocs ### Related issues N/A ### Testing Emulator ## Screenshots N/A ## AI or LLM usage None
Update translations as of 2026-11-03 A big thank you to all of the contributors!
## Description If the server plugin is not installed, trying to add Seerr server will show an endless loading page. This PR fixes that. ### Related issues Fixes damontecres#2177 ### Testing Emulator against server with & without the plugin ## Screenshots N/A ## AI or LLM usage None
…audio diagnostics Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
The skip button animated a colour read during composition (recomposing every frame) and drew an oversized filled shape. It now draws a breathing outline in the draw phase only. Debug builds use a shared throwaway key so CI APKs can update each other. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
…e, updater on the fork Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
…and locales Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
…p defaults to 10s during credits Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
…tings Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
…riginal repository [skip ci] Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
pre-commit (ktlint 1.8.0) rejected the fork's files, which skipped the PR build. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01HzyKDxHjRb3RAFwGT8nUfc
A failed scheduled run alone went unnoticed for three nights. The issue names the commit the rebase stopped at and the conflicting files, one per upstream revision. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01HzyKDxHjRb3RAFwGT8nUfc
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
The nightly
Sync upstreamrun has failed since Nov 4: rebasingshield-fixondamontecres/Wholphinmain hit conflicts. This branch is that rebase, done by hand, on upstreambd46ff3(v1.1.0 + 41 commits).Conflicts and how they were resolved:
values-fr/strings.xml: Weblate now ships French translations for the 6 strings the fork added (prefer_dovi_over_hdr10_plus,convert_dovi_profile_7,disable_audio_offloadand their summaries). The upstream translations are kept and the fork's copies are dropped, since keeping both would be duplicate resources.SwitchSeerrViewModel.kt: upstream merged the same fix as the fork's "show the login form when the server plugin is not installed" (Fix adding Seerr server if plugin is not installed damontecres/Wholphin#2179). The upstream version is kept, so the fork commit disappears.strings.xml(where Weblate appends too, so every new translation conflicted) tostrings_shield.xmlinvalues/andvalues-fr/, so future rebases stop tripping on them.An extra commit formats the fork's Kotlin files with the repository's ktlint rules:
pre-commitrejected them, which would have skipped the PR build.Apart from the dropped Seerr fix, the Kotlin diff between the old
shield-fixand this branch is exactly upstream's changes.Related issues
Failed runs of
sync-upstream.ymlon Nov 4, 5 and 6.Testing
pre-commit run --all-filespasses locally.values*folder; all string XML files parse.The previous
shield-fixstays available as tagshield-10.AI or LLM usage
Rebase, conflict resolution and the ktlint pass were done by Claude Code; the checks above are what was run.
🤖 Generated with Claude Code
https://claude.ai/code/session_01HzyKDxHjRb3RAFwGT8nUfc