Skip to content

StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.

Merge branch 'pr-85' into test/pr-85-2026-06-06

David Nashash07410de430ef
diff --cc app/src/main/java/com/streamvault/app/ui/screens/player/PlayerLifecycleActions.kt
index c15df7ff,fe726654..28a87912
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerLifecycleActions.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerLifecycleActions.kt
@@@ -177,11 -176,32 +178,32 @@@ internal fun PlayerViewModel.cleanupAft
inFlightThumbnailPreloadKey = null
lastCompletedThumbnailPreloadKey = null
seekThumbnailProvider.clearCache()
- livePreviewHandoffManager.clear(playerEngine)
- if (playerEngine === mainPlayerEngine) {
+
+ val activeEngine = playerEngine
+ val channel = currentChannel.value
+ val streamInfo = currentResolvedStreamInfo
+ val canReverseHandoff = currentContentType == ContentType.LIVE
+ && !isCatchUpPlayback.value
+ && activeEngine !== mainPlayerEngine
+ && channel != null
+ && streamInfo != null
+ && activeEngine.playbackState.value != PlaybackState.ERROR
+
+ if (canReverseHandoff) {
+ livePreviewHandoffManager.beginReverseHandoff(
+ channel = channel!!,
+ streamInfo = streamInfo!!,
+ engine = activeEngine,
+ source = adoptedHandoffSource ?: com.streamvault.app.player.PreviewHandoffSource.HOME
+ )
mainPlayerEngine.resetForReuse()
} else {
- playerEngine.release()
- mainPlayerEngine.resetForReuse()
+ livePreviewHandoffManager.clear(activeEngine)
+ if (activeEngine === mainPlayerEngine) {
+ mainPlayerEngine.resetForReuse()
+ } else {
+ activeEngine.release()
+ mainPlayerEngine.resetForReuse()
+ }
}
-}
+}
diff --cc app/src/main/java/com/streamvault/app/ui/screens/player/PlayerViewModel.kt
index 4a7fbe51,a4dd3071..f03c18d8
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerViewModel.kt
@@@ -256,11 -249,8 +256,12 @@@ class PlayerViewModel @Inject construct
internal var readySideEffectsRequestVersion: Long? = null
internal var currentArtworkUrl: String? = null
internal var currentResolvedPlaybackUrl: String = ""
+ set(value) {
+ field = value
+ _externalPlaybackUrl.value = value.trim()
+ }
internal var currentResolvedStreamInfo: StreamInfo? = null
+ internal var adoptedHandoffSource: com.streamvault.app.player.PreviewHandoffSource? = null
internal var pendingCatchUpUrls: List<String> = emptyList()
internal var channelNumberingMode: ChannelNumberingMode = ChannelNumberingMode.GROUP
set(value) {