Skip to content

[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
mainfrom
ccr-139f80a9-q9c79j
Closed

spartan-dou wants to merge 55 commits into
mainfrom
ccr-139f80a9-q9c79j

Conversation

@spartan-dou

@spartan-dou spartan-dou commented Nov 6, 2026 •

Copy link
Copy Markdown
Owner

CI only, do not merge. The base is main (the fork's old upstream base, 38bd690) only because against shield-fix the rewritten history conflicts and GitHub runs no pull_request workflow on a conflicted PR. Once CI is green, shield-fix is replaced by this branch (force-push) and this PR is closed.

Description

The nightly Sync upstream run has failed since Nov 4: rebasing shield-fix on damontecres/Wholphin main hit conflicts. This branch is that rebase, done by hand, on upstream bd46ff3 (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_offload and 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.
  • Quick Connect strings: they move from the end of strings.xml (where Weblate appends too, so every new translation conflicted) to strings_shield.xml in values/ and values-fr/, so future rebases stop tripping on them.

An extra commit formats the fork's Kotlin files with the repository's ktlint rules: pre-commit rejected them, which would have skipped the PR build.

Apart from the dropped Seerr fix, the Kotlin diff between the old shield-fix and this branch is exactly upstream's changes.

Related issues

Failed runs of sync-upstream.yml on Nov 4, 5 and 6.

Testing

  • pre-commit run --all-files passes locally.
  • No duplicate string resources in any values* folder; all string XML files parse.
  • The APK build and unit tests are left to this PR's CI (no Android SDK in the environment where the rebase was made).

The previous shield-fix stays available as tag shield-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

Priit Jõerüüt and others added 30 commits October 31, 2026 19:35
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/
idezentas and others added 24 commits November 2, 2026 06:27
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
@spartan-dou spartan-dou changed the title Rebase shield-fix on upstream v1.1.0 (fixes the nightly sync) [CI only, do not merge] Rebase shield-fix on upstream v1.1.0 (fixes the nightly sync) Nov 6, 2026
@spartan-dou
spartan-dou changed the base branch from shield-fix to main November 6, 2026 16:11
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
@spartan-dou spartan-dou closed this Nov 6, 2026
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.

4 participants