Repository navigation
Merge upstream Wholphin v1.1.1 (Jellyfin 12 SDK) - #56
Merged
Merged
Conversation
## 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
## Description Updates the Jellyfin Kotlin SDK to `1.9.4` based on Jellyfin 12.4. For the most part this is just a ton of renamed references. **This drops support for Jellyfin 10.10 and 10.11!** ### Related issues This was planned in damontecres#1640 ### Testing Basics on the Emulator & unit tests ## Screenshots N/A ## AI or LLM usage None
## Description This PR drops support for Android 6, requiring Android 7 or newer. I also bumped many dependencies that also had an Android 7 minimum requirement. ### Effects In all cases, if you are on Android 7+, Wholphin will update like normal. If you installed via the Play store & on Android 6, you will not see the update and can continue using the latest compatible version. If you installed via GitHub & on Android 6, the attempt to install via the in-app update or via another method will fail, likely with an unhelpful error message. If you installed via Amazon Fire Store, there's no changes, the current minimum Fire OS 6 is based on Android 7.1. ### Related issues Discussed in damontecres#2152 & damontecres#1640 ### Testing Quick checks on the emulator ## Screenshots N/A ## AI or LLM usage None
Conflict decisions: - libs.versions.toml: keep AGP 9.4.1 (Per's Android Studio supports up to 9.4.x); take the other upstream bumps (minSdk 24, datastore, nav3...) - Trickplay overlays: keep Spacing imports, take TrickplayInfoDto - EpisodeViewModel: take upstream's import change - Fork-only code moved to the renamed SDK APIs: userLibraryApi -> libraryApi (CollectionCardGrid, PlaybackViewModel), playlistsApi -> playlistApi (WatchLaterService) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01CERN1WMTMhhjDvViKrrttD
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.
Requested by Per · project thread
Description
Merges the 4 new upstream commits from
damontecres/Wholphinmain into the fork.Upstream changes
userLibraryApi→libraryApi,playlistsApi→playlistApiandTrickplayInfo→TrickplayInfoDto.Conflict decisions
Spacingimports and tookTrickplayInfoDtoThe fork's own code (CollectionCardGrid, PlaybackViewModel, WatchLaterService) also needed the renamed SDK APIs.
Testing
CI builds the app and runs the unit tests. Nothing has been tested on a device yet.
AI or LLM usage
The merge and its conflict resolution were done by Claude Code.
Generated by Claude Code