Skip to content

Merge upstream Wholphin v1.1.1 (Jellyfin 12 SDK) - #56

Merged
perlingon merged 5 commits into
mainfrom
claude/project-thread-82bg1a
Nov 11, 2026
Merged

perlingon merged 5 commits into
mainfrom
claude/project-thread-82bg1a

Conversation

@perlingon

Copy link
Copy Markdown
Owner

Requested by Per · project thread

Description

Merges the 4 new upstream commits from damontecres/Wholphin main into the fork.

Upstream changes

Conflict decisions

File Decision
libs.versions.toml Kept AGP 9.4.1, because Per's Android Studio supports AGP up to 9.4.x. Took the other upstream bumps
Trickplay overlays (3 files) Kept the fork's Spacing imports and took TrickplayInfoDto
EpisodeViewModel Took upstream's import change

The 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

damontecres and others added 5 commits November 5, 2026 17:13
## 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
@perlingon perlingon self-assigned this Nov 11, 2026
@perlingon
perlingon merged commit 46f323e into main Nov 11, 2026
2 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.

3 participants