Merge pull request 'Merge upstream Wholphin v1.1.1' (#53 ) from fm/wolfskin-upstream-1-1-1 into main

Merge current main into upstream integration
Merge pull request 'Implement option B card metadata (stacked on #51 )' (#54 ) from fm/tv-card-meta-build into main
2026-11-07 17:05:40 +01:00 · 2026-11-07 16:02:58 +01:00 · 2026-11-07 16:01:06 +01:00 · 2026-11-07 02:31:05 +01:00 · 2026-11-07 02:16:52 +01:00 · 2026-11-06 15:37:29 -05:00
2 changed files with 12 additions and 0 deletions
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/setup/seerr/SwitchSeerrViewModel.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/setup/seerr/SwitchSeerrViewModel.kt
@ -52,6 +52,9 @@ class SwitchSeerrViewModel
                        _state.update { it.copy(loading = LoadingState.Success) }
                    }
                }
+            } else {
+                // Nothing to check so set success
+                _state.update { it.copy(loading = LoadingState.Success) }
            }
        }

--- a/docker/README.md
+++ b/docker/README.md
@ -185,6 +185,15 @@ not the working tree. An uncommitted merge still builds with the old version nam
 Neither an upstream merge nor its validation build authorizes a release or TV
 installation.

+## Upstream v1.1.1 integration
+
+The patch release makes manual Seerr setup available when the optional companion
+plugin is absent: setup is marked ready immediately rather than remaining pending.
+With the plugin installed, an empty settings response or a failed settings read
+still reaches the existing ready-state fallback; plugin URL prefill is unchanged.
+There are no new Room migrations (schema remains 41), player, layout, session,
+DNS/client, dependency, branding or signing changes relative to v1.1.0.
+
 ## Wolfskin shell

 Wolfskin UI lives in `app/src/wolfskin/java`, beside upstream source. The signed-in
Author	SHA1	Message	Date
justinzeus	271cee2cea	Merge pull request 'Merge upstream Wholphin v1.1.1' (#53 ) from fm/wolfskin-upstream-1-1-1 into main	2026-11-07 17:05:40 +01:00
justinzeus	e189d9318a	Merge current main into upstream integration All checks were successful review/code-claude Reviewed at 00e8e83b; delta is a clean merge of main (diff vs main still 2 files, +12); full gate green except the known WatchReturnTest flake	2026-11-07 16:02:58 +01:00
justinzeus	19bb587c95	Merge pull request 'Implement option B card metadata (stacked on #51 )' (#54 ) from fm/tv-card-meta-build into main	2026-11-07 16:01:06 +01:00
justinzeus	00e8e83bb6	Document upstream v1.1.1 setup fix All checks were successful review/code-claude No blocking findings on 00e8e83b; waits for Justin go	2026-11-07 02:31:05 +01:00
justinzeus	b80b67f736	v1.1.1 -----BEGIN SSH SIGNATURE----- U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgrqffh93Kw9xITbVISXK/jkih9K Q1NSQeC6TBqiLCg2oAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5 AAAAQMNewXnxMn5HlyJcrG3vlqPg4lBjF2q9uyedLQQ2S+G4PZQf1XxPTy4q9DKBcT8UIN XSrDmvm0HJci43S6FMTgE= -----END SSH SIGNATURE----- Merge tag 'v1.1.1' into fm/wolfskin-upstream-1-1-1 v1.1.1 # -----BEGIN SSH SIGNATURE----- # U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgrqffh93Kw9xITbVISXK/jkih9K # Q1NSQeC6TBqiLCg2oAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5 # AAAAQMNewXnxMn5HlyJcrG3vlqPg4lBjF2q9uyedLQQ2S+G4PZQf1XxPTy4q9DKBcT8UIN # XSrDmvm0HJci43S6FMTgE= # -----END SSH SIGNATURE----- # gpg verification failed.	2026-11-07 02:16:52 +01:00
Damontecres	159edc875d	Release v1.1.1	2026-11-06 15:37:29 -05:00
Damontecres	bd46ff3e03	Fix adding Seerr server if plugin is not installed (#2179 ) ## 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 #2177 ### Testing Emulator against server with & without the plugin ## Screenshots N/A ## AI or LLM usage None	2026-11-05 17:13:09 -05:00