mirror/jellyfin-android
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-android.git synced 2026-07-30 09:10:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Store user playback position in MediaItem extras to avoid extra API call

Browse Source
This commit is contained in:
Niels van Velzen
2026-06-20 09:56:23 +02:00
committed by Niels van Velzen
parent f0e1c8283a
commit e637337eff
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/org/jellyfin/mobile/sessionbrowser/SessionBrowserCallback.kt
View File

@@ -54,6 +54,7 @@ class SessionBrowserCallback(
) : MediaLibrarySession.Callback {
companion object {
const val MAX_PAGE_SIZE = 250
const val MEDIA_ITEM_EXTRA_START_POSITION = "start_position"
}
val pages = listOf(
@@ -100,6 +101,9 @@ class SessionBrowserCallback(
setMediaId(Json.encodeToString<LibraryMediaId>(LibraryMediaId.Route(action.route)))
} else if (action is LibraryItemAction.Play) {
setMediaId(Json.encodeToString<LibraryMediaId>(LibraryMediaId.Item(action.item.id, route)))
action.item.userData?.playbackPositionTicks?.ticks?.inWholeMilliseconds?.let {
extras.putLong(MEDIA_ITEM_EXTRA_START_POSITION, it)
}
}
setMediaMetadata(
@@ -375,17 +379,17 @@ class SessionBrowserCallback(
}
}
var resumePositionMs = startPositionMs
val currentLibraryMediaId = expandedItems.getOrNull(newStartIndex)?.mediaId?.let {
runCatching { Json.decodeFromString<LibraryMediaId>(it) }.getOrNull()
}
if (currentLibraryMediaId is LibraryMediaId.Item && (startPositionMs == 0L || startPositionMs == C.TIME_UNSET)) {
val item by api.userLibraryApi.getItem(itemId = currentLibraryMediaId.itemId)
val positionMs = item.userData?.playbackPositionTicks?.ticks?.inWholeMilliseconds ?: 0L
if (positionMs > 0L) resumePositionMs = positionMs
// Use the server-side stored position if there is no requested start position
val newStartPositionMs = when (startPositionMs) {
0L, C.TIME_UNSET -> expandedItems.firstOrNull()?.mediaMetadata?.extras?.getLong(
MEDIA_ITEM_EXTRA_START_POSITION,
startPositionMs
) ?: startPositionMs
else -> startPositionMs
}
expandedItems = onAddMediaItems(mediaSession, controller, expandedItems).await()
MediaSession.MediaItemsWithStartPosition(expandedItems, newStartIndex, resumePositionMs)
MediaSession.MediaItemsWithStartPosition(expandedItems, newStartIndex, newStartPositionMs)
}
}