StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
Fix series playback provider split and countdown overlay focus
David Nashash3922dcb7824b
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.ktindex adfbb099..d631f973 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt@@ -166,7 +166,6 @@ fun PlayerScreen(val currentChannel by viewModel.currentChannel.collectAsStateWithLifecycle()val currentSeries by viewModel.currentSeries.collectAsStateWithLifecycle()val currentEpisode by viewModel.currentEpisode.collectAsStateWithLifecycle()- val nextEpisodeForAutoPlay by viewModel.nextEpisode.collectAsStateWithLifecycle()val autoPlayCountdown by viewModel.autoPlayCountdown.collectAsStateWithLifecycle()val playbackTitle by viewModel.playbackTitle.collectAsStateWithLifecycle()val resumePrompt by viewModel.resumePrompt.collectAsStateWithLifecycle()@@ -305,7 +304,8 @@ fun PlayerScreen(// Consolidated focus management for all overlaysval liveOverlayVisible = contentType == "LIVE" && (showChannelListOverlay || showCategoryListOverlay || showEpgOverlay || showChannelInfoOverlay)- val anyOverlayVisible = liveOverlayVisible || showTrackSelection != null || showVariantSelection || showSpeedSelection || showAudioVideoOffsetDialog || showStopPlaybackTimerDialog || showIdleStandbyTimerDialog || showProgramHistory || showSplitDialog || showEpisodePicker || showDiagnostics+ val nextEpisodeCountdownVisible = !isInPictureInPictureMode && autoPlayCountdown != null+ val anyOverlayVisible = liveOverlayVisible || nextEpisodeCountdownVisible || showTrackSelection != null || showVariantSelection || showSpeedSelection || showAudioVideoOffsetDialog || showStopPlaybackTimerDialog || showIdleStandbyTimerDialog || showProgramHistory || showSplitDialog || showEpisodePicker || showDiagnosticsLaunchedEffect(contentType, showCategoryListOverlay, showChannelListOverlay, showEpgOverlay, showChannelInfoOverlay) {if (contentType == "LIVE" && (showCategoryListOverlay || showChannelListOverlay || showEpgOverlay || showChannelInfoOverlay)) {@@ -446,6 +446,7 @@ fun PlayerScreen(}val handleBackPress = remember(+ autoPlayCountdown,playerNotice,showProgramHistory,showSplitDialog,@@ -467,6 +468,7 @@ fun PlayerScreen({when {viewModel.hasPendingNumericChannelInput() -> viewModel.clearNumericChannelInput()+ autoPlayCountdown != null -> viewModel.cancelAutoPlay()playerNotice != null -> viewModel.dismissPlayerNotice()showProgramHistory -> showProgramHistory = falseshowSplitDialog -> showSplitDialog = false@@ -531,6 +533,9 @@ fun PlayerScreen(return@onPreviewKeyEvent false}viewModel.notifyUserActivity()+ if (nextEpisodeCountdownVisible) {+ return@onPreviewKeyEvent false+ }if (contentType != "LIVE") {return@onPreviewKeyEvent false}@@ -570,6 +575,15 @@ fun PlayerScreen(// Only handle KeyDown to avoid double actionsif (event.nativeKeyEvent.action == KeyEvent.ACTION_DOWN) {viewModel.notifyUserActivity()+ if (nextEpisodeCountdownVisible) {+ return@onKeyEvent when (event.nativeKeyEvent.keyCode) {+ KeyEvent.KEYCODE_BACK -> {+ viewModel.cancelAutoPlay()+ true+ }+ else -> true+ }+ }if (showTrackSelection != null || showVariantSelection || showSpeedSelection || showAudioVideoOffsetDialog || showStopPlaybackTimerDialog || showIdleStandbyTimerDialog) {if (showAudioVideoOffsetDialog) {return@onKeyEvent when (event.nativeKeyEvent.keyCode) {@@ -1014,17 +1028,16 @@ fun PlayerScreen(}// Auto-Play Next Episode countdown overlay- val countdownSeconds = autoPlayCountdown- val countdownEpisode = nextEpisodeForAutoPlay- if (!isInPictureInPictureMode && countdownSeconds != null && countdownEpisode != null) {+ val countdownState = autoPlayCountdown+ if (!isInPictureInPictureMode && countdownState != null) {Box(modifier = Modifier.align(Alignment.BottomEnd).padding(end = 32.dp, bottom = 32.dp)) {NextEpisodeCountdownOverlay(- nextEpisode = countdownEpisode,- secondsRemaining = countdownSeconds,+ nextEpisode = countdownState.episode,+ secondsRemaining = countdownState.secondsRemaining,onPlayNow = { viewModel.playNextEpisodeNow() },onCancel = { viewModel.cancelAutoPlay() })diff --git 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.ktindex ff5dde33..6cfc65f1 100644--- 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@@ -13,6 +13,7 @@ import com.streamvault.app.ui.model.orderedByRequestedRawIdsimport com.streamvault.app.util.isPlaybackCompleteimport com.streamvault.app.tv.LauncherRecommendationsManagerimport com.streamvault.app.tv.WatchNextManager+import com.streamvault.data.remote.stalker.StalkerUrlFactoryimport com.streamvault.data.remote.xtream.XtreamStreamUrlResolverimport com.streamvault.data.security.CredentialDecryptionExceptionimport com.streamvault.domain.manager.RecordingManager@@ -151,8 +152,8 @@ class PlayerViewModel @Inject constructor(private val _nextEpisode = MutableStateFlow<Episode?>(null)val nextEpisode: StateFlow<Episode?> = _nextEpisode.asStateFlow()- private val _autoPlayCountdown = MutableStateFlow<Int?>(null)- val autoPlayCountdown: StateFlow<Int?> = _autoPlayCountdown.asStateFlow()+ private val _autoPlayCountdown = MutableStateFlow<AutoPlayCountdownUiState?>(null)+ val autoPlayCountdown: StateFlow<AutoPlayCountdownUiState?> = _autoPlayCountdown.asStateFlow()internal val playbackTitleFlow = MutableStateFlow("")val playbackTitle: StateFlow<String> = playbackTitleFlow.asStateFlow()@@ -1118,7 +1119,9 @@ class PlayerViewModel @Inject constructor(.sanitizedForPlayer().sortedBy { it.seasonNumber }.flatMap { season -> season.episodes.sortedBy { it.episodeNumber } }- return episodes.firstOrNull { it.id == episodeId }+ return episodes.firstOrNull {+ it.id == episodeId || it.matchesPlaybackEpisode(episodeId, seasonNumber, episodeNumber)+ }?: episodes.firstOrNull { it.seasonNumber == seasonNumber && it.episodeNumber == episodeNumber }}@@ -1127,10 +1130,30 @@ class PlayerViewModel @Inject constructor(.sanitizedForPlayer().sortedBy { it.seasonNumber }.flatMap { season -> season.episodes.sortedBy { it.episodeNumber } }- val currentIndex = orderedEpisodes.indexOfFirst { it.id == episode.id }+ val currentIndex = orderedEpisodes.indexOfFirst {+ it.id == episode.id ||+ it.playbackEpisodeIdentity() == episode.playbackEpisodeIdentity() ||+ (it.seasonNumber == episode.seasonNumber && it.episodeNumber == episode.episodeNumber)+ }return orderedEpisodes.getOrNull(currentIndex + 1)}+ private fun Episode.playbackEpisodeIdentity(): Long =+ episodeId.takeIf { it > 0L } ?: id++ private fun Episode.matchesPlaybackEpisode(+ requestedEpisodeId: Long,+ requestedSeasonNumber: Int?,+ requestedEpisodeNumber: Int?+ ): Boolean {+ val identity = playbackEpisodeIdentity()+ return (requestedEpisodeId > 0L && identity == requestedEpisodeId) ||+ (requestedSeasonNumber != null &&+ requestedEpisodeNumber != null &&+ seasonNumber == requestedSeasonNumber &&+ episodeNumber == requestedEpisodeNumber)+ }+private fun buildEpisodePlaybackTitle(episode: Episode): String ="${episode.title} - S${episode.seasonNumber}E${episode.episodeNumber}"@@ -1235,7 +1258,10 @@ class PlayerViewModel @Inject constructor(autoPlayCountdownJob?.cancel()autoPlayCountdownJob = viewModelScope.launch {for (remaining in AUTO_PLAY_COUNTDOWN_SECONDS downTo 1) {- _autoPlayCountdown.value = remaining+ _autoPlayCountdown.value = AutoPlayCountdownUiState(+ episode = episode,+ secondsRemaining = remaining+ )delay(1_000L)}_autoPlayCountdown.value = null@@ -1250,7 +1276,7 @@ class PlayerViewModel @Inject constructor(}fun playNextEpisodeNow() {- val episode = _nextEpisode.value ?: return+ val episode = _autoPlayCountdown.value?.episode ?: _nextEpisode.value ?: returncancelAutoPlay()playEpisode(episode, showResumePrompt = false)}@@ -1566,21 +1592,37 @@ class PlayerViewModel @Inject constructor(var playbackLogicalUrl = streamUrlvar playbackContentId = internalChannelIdif (currentContentType == ContentType.SERIES_EPISODE && providerId > 0 && currentSeriesId != null) {- val resolvedEpisode = loadSeriesEpisodeContext(- requestVersion = requestVersion,- providerId = providerId,- seriesId = currentSeriesId ?: -1L,- episodeId = internalChannelId,- seasonNumber = seasonNumber,- episodeNumber = episodeNumber- )- if (!isActivePlaybackSession(requestVersion, streamUrl)) return@launch- resolvedEpisode?.streamUrl- ?.takeIf { it.isNotBlank() }- ?.let { refreshedUrl -> playbackLogicalUrl = refreshedUrl }- resolvedEpisode?.id- ?.takeIf { it > 0L }- ?.let { resolvedId -> playbackContentId = resolvedId }+ val providerType = providerRepository.getProvider(providerId)?.type+ val shouldAwaitRefreshedEpisode = providerType == ProviderType.STALKER_PORTAL ||+ StalkerUrlFactory.isInternalStreamUrl(streamUrl)+ if (shouldAwaitRefreshedEpisode) {+ val resolvedEpisode = loadSeriesEpisodeContext(+ requestVersion = requestVersion,+ providerId = providerId,+ seriesId = currentSeriesId ?: -1L,+ episodeId = internalChannelId,+ seasonNumber = seasonNumber,+ episodeNumber = episodeNumber+ )+ if (!isActivePlaybackSession(requestVersion, streamUrl)) return@launch+ resolvedEpisode?.streamUrl+ ?.takeIf { it.isNotBlank() }+ ?.let { refreshedUrl -> playbackLogicalUrl = refreshedUrl }+ resolvedEpisode?.id+ ?.takeIf { it > 0L }+ ?.let { resolvedId -> playbackContentId = resolvedId }+ } else {+ launch {+ loadSeriesEpisodeContext(+ requestVersion = requestVersion,+ providerId = providerId,+ seriesId = currentSeriesId ?: -1L,+ episodeId = internalChannelId,+ seasonNumber = seasonNumber,+ episodeNumber = episodeNumber+ )+ }+ }}val streamInfo = resolvePlaybackStreamInfo(playbackLogicalUrl,diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerViewModelModels.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerViewModelModels.ktindex fa661a16..caf5edcd 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerViewModelModels.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerViewModelModels.kt@@ -3,6 +3,7 @@ package com.streamvault.app.ui.screens.playerimport android.graphics.Bitmapimport com.streamvault.domain.model.Channelimport com.streamvault.domain.model.ChannelQualityOption+import com.streamvault.domain.model.Episodeimport com.streamvault.domain.model.Seasonimport com.streamvault.domain.model.Seriesimport com.streamvault.domain.model.DecoderMode@@ -97,6 +98,11 @@ data class SleepTimerUiState(get() = idleTimerActive && idleRemainingMs <= 60_000L}+data class AutoPlayCountdownUiState(+ val episode: Episode,+ val secondsRemaining: Int+)+enum class PlayerRecoveryType {NETWORK,SOURCE,diff --git a/data/src/main/java/com/streamvault/data/remote/stalker/StalkerProvider.kt b/data/src/main/java/com/streamvault/data/remote/stalker/StalkerProvider.ktindex bb84768b..a39b942a 100644--- a/data/src/main/java/com/streamvault/data/remote/stalker/StalkerProvider.kt+++ b/data/src/main/java/com/streamvault/data/remote/stalker/StalkerProvider.kt@@ -750,7 +750,7 @@ class StalkerProvider()} ?: directStreamUrl.orEmpty()return Episode(- id = 0L,+ id = numericId,title = title.ifBlank { "Episode $fallbackEpisodeNumber" },episodeNumber = episodeNumber.coerceAtLeast(1),seasonNumber = seasonNumber.takeIf { it > 0 } ?: fallbackSeasonNumber.coerceAtLeast(1),diff --git a/data/src/test/java/com/streamvault/data/repository/MovieRepositoryImplTest.kt b/data/src/test/java/com/streamvault/data/repository/MovieRepositoryImplTest.ktindex 8cfecf5a..4227e5dd 100644--- a/data/src/test/java/com/streamvault/data/repository/MovieRepositoryImplTest.kt+++ b/data/src/test/java/com/streamvault/data/repository/MovieRepositoryImplTest.kt@@ -39,6 +39,7 @@ import kotlinx.coroutines.flow.flowimport kotlinx.coroutines.flow.flowOfimport kotlinx.coroutines.test.runTestimport org.junit.Test+import org.mockito.Mockito.timeoutimport org.mockito.kotlin.anyimport org.mockito.kotlin.anyOrNullimport org.mockito.kotlin.argumentCaptor@@ -347,7 +348,7 @@ class MovieRepositoryImplTest {repository.getCategoryPreviewRows(7L, listOf(42L), 18).first()- verify(stalkerApiService).getVodStreamsPage(any(), any(), anyOrNull(), eq(1))+ verify(stalkerApiService, timeout(1_000)).getVodStreamsPage(any(), any(), anyOrNull(), eq(1))verify(stalkerApiService, never()).getVodStreamsPage(any(), any(), anyOrNull(), eq(2))}