Skip to content

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

Polish live playback and VOD fixes

David Nashash1d84a445fa24
diff --git a/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt b/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt
index 51b786bd..589a3751 100644
--- a/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt
+++ b/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt
@@ -361,7 +361,7 @@ fun AppNavigation(mainActivity: MainActivity) {
)
}
com.streamvault.domain.model.ContentType.SERIES -> {
- Routes.seriesDetail(history.seriesId ?: history.contentId, Routes.HOME)
+ Routes.seriesDetail(history.contentId, Routes.HOME)
}
com.streamvault.domain.model.ContentType.SERIES_EPISODE -> {
Routes.player(
diff --git a/app/src/main/java/com/streamvault/app/player/LivePreviewHandoffManager.kt b/app/src/main/java/com/streamvault/app/player/LivePreviewHandoffManager.kt
new file mode 100644
index 00000000..c9f3018b
--- /dev/null
+++ b/app/src/main/java/com/streamvault/app/player/LivePreviewHandoffManager.kt
@@ -0,0 +1,88 @@
+package com.streamvault.app.player
+
+import com.streamvault.domain.model.Channel
+import com.streamvault.domain.model.StreamInfo
+import com.streamvault.player.PlayerEngine
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+@Singleton
+class LivePreviewHandoffManager @Inject constructor() {
+ private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
+ private var pendingReleaseJob: Job? = null
+ private var session: LivePreviewHandoffSession? = null
+
+ fun registerPreviewSession(
+ channel: Channel,
+ streamInfo: StreamInfo,
+ engine: PlayerEngine
+ ) {
+ val previous = session
+ pendingReleaseJob?.cancel()
+ session = LivePreviewHandoffSession(
+ engine = engine,
+ channelId = channel.id,
+ providerId = channel.providerId,
+ streamInfo = streamInfo,
+ pendingFullscreen = false
+ )
+ if (previous != null && previous.engine !== engine) {
+ previous.engine.release()
+ }
+ }
+
+ fun beginFullscreenHandoff(channelId: Long, engine: PlayerEngine?): Boolean {
+ val current = session ?: return false
+ if (engine == null || current.engine !== engine || current.channelId != channelId) return false
+ pendingReleaseJob?.cancel()
+ session = current.copy(
+ pendingFullscreen = true,
+ updatedAtMs = System.currentTimeMillis()
+ )
+ pendingReleaseJob = scope.launch {
+ delay(PENDING_FULLSCREEN_TIMEOUT_MS)
+ val stale = session
+ if (stale?.pendingFullscreen == true) {
+ session = null
+ stale.engine.release()
+ }
+ }
+ return true
+ }
+
+ fun consumeFullscreenHandoff(channelId: Long, providerId: Long?): LivePreviewHandoffSession? {
+ val current = session ?: return null
+ if (!current.pendingFullscreen) return null
+ if (current.channelId != channelId) return null
+ if (providerId != null && providerId > 0L && current.providerId != providerId) return null
+ pendingReleaseJob?.cancel()
+ session = null
+ return current
+ }
+
+ fun clear(engine: PlayerEngine?) {
+ val current = session ?: return
+ if (engine != null && current.engine !== engine) return
+ pendingReleaseJob?.cancel()
+ session = null
+ }
+
+ data class LivePreviewHandoffSession(
+ val engine: PlayerEngine,
+ val channelId: Long,
+ val providerId: Long,
+ val streamInfo: StreamInfo,
+ val pendingFullscreen: Boolean,
+ val updatedAtMs: Long = System.currentTimeMillis()
+ )
+
+ private companion object {
+ const val PENDING_FULLSCREEN_TIMEOUT_MS = 15_000L
+ }
+}
diff --git a/app/src/main/java/com/streamvault/app/ui/components/shell/AppMediaCards.kt b/app/src/main/java/com/streamvault/app/ui/components/shell/AppMediaCards.kt
index 724b8e9c..662f1dce 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/shell/AppMediaCards.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/shell/AppMediaCards.kt
@@ -22,6 +22,7 @@ import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.LinearProgressIndicator
import androidx.compose.runtime.Composable
+import com.streamvault.domain.util.isPlaybackComplete
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
@@ -378,6 +379,9 @@ fun SeriesPosterCard(series: Series, modifier: Modifier = Modifier) {
fun EpisodeRowCard(episode: Episode, modifier: Modifier = Modifier) {
val screenWidth = LocalConfiguration.current.screenWidthDp.dp
val previewWidth = if (screenWidth < 700.dp) 124.dp else 164.dp
+ val durationMs = episode.durationSeconds.toLong() * 1000L
+ val showProgress = episode.watchProgress > 5000L && durationMs > 0L &&
+ !isPlaybackComplete(episode.watchProgress, durationMs)
Box(
modifier = modifier
.fillMaxWidth()
@@ -385,51 +389,64 @@ fun EpisodeRowCard(episode: Episode, modifier: Modifier = Modifier) {
.background(AppColors.SurfaceElevated)
.padding(16.dp)
) {
- Row(horizontalArrangement = Arrangement.spacedBy(14.dp), verticalAlignment = Alignment.CenterVertically) {
- Box(
- modifier = Modifier
- .width(previewWidth)
- .aspectRatio(16f / 9f)
- .clip(RoundedCornerShape(12.dp))
- .background(AppColors.SurfaceEmphasis),
- contentAlignment = Alignment.Center
- ) {
- // Fallback label always visible; covered by AsyncImage on successful load
- Text(
- text = stringResource(R.string.label_episode, episode.episodeNumber),
- style = MaterialTheme.typography.titleMedium,
- color = AppColors.TextSecondary
- )
- if (!episode.coverUrl.isNullOrBlank()) {
- AsyncImage(
- model = episode.coverUrl,
- contentDescription = episode.title,
- modifier = Modifier.fillMaxSize(),
- contentScale = ContentScale.Crop
+ Column {
+ Row(horizontalArrangement = Arrangement.spacedBy(14.dp), verticalAlignment = Alignment.CenterVertically) {
+ Box(
+ modifier = Modifier
+ .width(previewWidth)
+ .aspectRatio(16f / 9f)
+ .clip(RoundedCornerShape(12.dp))
+ .background(AppColors.SurfaceEmphasis),
+ contentAlignment = Alignment.Center
+ ) {
+ // Fallback label always visible; covered by AsyncImage on successful load
+ Text(
+ text = stringResource(R.string.label_episode, episode.episodeNumber),
+ style = MaterialTheme.typography.titleMedium,
+ color = AppColors.TextSecondary
)
+ if (!episode.coverUrl.isNullOrBlank()) {
+ AsyncImage(
+ model = episode.coverUrl,
+ contentDescription = episode.title,
+ modifier = Modifier.fillMaxSize(),
+ contentScale = ContentScale.Crop
+ )
+ }
}
- }
- Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {
- Text(
- text = episode.title,
- style = MaterialTheme.typography.titleMedium,
- color = AppColors.TextPrimary,
- maxLines = 1,
- overflow = TextOverflow.Ellipsis
- )
- ContentMetadataStrip(
- values = listOf(stringResource(R.string.label_episode_full, episode.episodeNumber), episode.duration ?: "")
- )
- episode.plot?.takeIf { it.isNotBlank() }?.let { plot ->
+ Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {
Text(
- text = plot,
- style = MaterialTheme.typography.bodySmall,
- color = AppColors.TextSecondary,
- maxLines = 2,
+ text = episode.title,
+ style = MaterialTheme.typography.titleMedium,
+ color = AppColors.TextPrimary,
+ maxLines = 1,
overflow = TextOverflow.Ellipsis
)
+ ContentMetadataStrip(
+ values = listOf(stringResource(R.string.label_episode_full, episode.episodeNumber), episode.duration ?: "")
+ )
+ episode.plot?.takeIf { it.isNotBlank() }?.let { plot ->
+ Text(
+ text = plot,
+ style = MaterialTheme.typography.bodySmall,
+ color = AppColors.TextSecondary,
+ maxLines = 2,
+ overflow = TextOverflow.Ellipsis
+ )
+ }
}
}
+ if (showProgress) {
+ LinearProgressIndicator(
+ progress = { (episode.watchProgress.toFloat() / durationMs).coerceIn(0f, 1f) },
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(top = 8.dp)
+ .height(3.dp),
+ color = AppColors.Brand,
+ trackColor = AppColors.SurfaceEmphasis
+ )
+ }
}
}
}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt
index 2b20a896..dd075f4a 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt
@@ -1120,7 +1120,10 @@ fun HomeScreen(
showPinDialog = true
} else if (isProMode) {
if (uiState.previewChannelId == channel.id) {
- viewModel.clearPreview()
+ val handedOff = viewModel.beginPreviewHandoff(channel)
+ if (!handedOff) {
+ viewModel.clearPreview()
+ }
onChannelClick(
channel,
uiState.selectedCategory,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeViewModel.kt
index fe1da7dc..6d55b336 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeViewModel.kt
@@ -3,6 +3,7 @@ package com.streamvault.app.ui.screens.home
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.streamvault.app.di.AuxiliaryPlayerEngine
+import com.streamvault.app.player.LivePreviewHandoffManager
import com.streamvault.app.tvinput.TvInputChannelSyncManager
import com.streamvault.app.ui.screens.multiview.MultiViewManager
import com.streamvault.app.ui.model.applyProviderCategoryDisplayPreferences
@@ -78,6 +79,7 @@ class HomeViewModel @Inject constructor(
private val syncManager: SyncManager,
private val tvInputChannelSyncManager: TvInputChannelSyncManager,
private val multiViewManager: MultiViewManager,
+ private val livePreviewHandoffManager: LivePreviewHandoffManager,
@AuxiliaryPlayerEngine
private val playerEngineProvider: InjectProvider<PlayerEngine>
) : ViewModel() {
@@ -971,6 +973,11 @@ class HomeViewModel @Inject constructor(
engine.prepare(result.data)
engine.setVolume(1f)
engine.play()
+ livePreviewHandoffManager.registerPreviewSession(
+ channel = channel,
+ streamInfo = result.data,
+ engine = engine
+ )
}
is Result.Error -> {
if (!isActivePreviewSession(previewVersion, channel.id)) return@launch
@@ -986,12 +993,37 @@ class HomeViewModel @Inject constructor(
}
}
+ fun beginPreviewHandoff(channel: Channel): Boolean {
+ val engine = previewPlayerEngine ?: return false
+ if (_uiState.value.previewChannelId != channel.id) return false
+ if (!livePreviewHandoffManager.beginFullscreenHandoff(channel.id, engine)) return false
+
+ engine.clearRenderBinding()
+ previewSessionVersion++
+ previewPlaybackJob?.cancel()
+ previewErrorJob?.cancel()
+ previewPlaybackJob = null
+ previewErrorJob = null
+ previewPlayerEngine = null
+ _uiState.update {
+ it.copy(
+ previewChannelId = null,
+ previewPlayerEngine = null,
+ isPreviewLoading = false,
+ previewErrorMessage = null
+ )
+ }
+ return true
+ }
+
fun clearPreview() {
+ if (previewPlayerEngine == null) return
previewSessionVersion++
previewPlaybackJob?.cancel()
previewErrorJob?.cancel()
previewPlaybackJob = null
previewErrorJob = null
+ livePreviewHandoffManager.clear(previewPlayerEngine)
previewPlayerEngine?.stop()
previewPlayerEngine?.release()
previewPlayerEngine = null
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/movies/MovieDetailScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/movies/MovieDetailScreen.kt
index 3366b4dd..62e8181f 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/movies/MovieDetailScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/movies/MovieDetailScreen.kt
@@ -45,6 +45,7 @@ import coil3.compose.AsyncImage
import com.streamvault.app.R
import com.streamvault.app.device.rememberIsTelevisionDevice
import com.streamvault.app.ui.components.rememberCrossfadeImageModel
+import com.streamvault.app.util.formatPositionMs
import com.streamvault.app.ui.components.shell.ContentMetadataStrip
import com.streamvault.app.ui.components.shell.ExternalRatingsStrip
import com.streamvault.app.ui.components.shell.StatusPill
@@ -96,6 +97,7 @@ fun MovieDetailScreen(
MovieDetailContent(
movie = movie,
hasResume = uiState.hasResume,
+ resumePositionMs = uiState.resumePositionMs,
externalRatings = uiState.externalRatings,
isLoadingExternalRatings = uiState.isLoadingExternalRatings,
onPlay = { onPlay(movie) },
@@ -109,6 +111,7 @@ fun MovieDetailScreen(
private fun MovieDetailContent(
movie: Movie,
hasResume: Boolean,
+ resumePositionMs: Long,
externalRatings: ExternalRatings,
isLoadingExternalRatings: Boolean,
onPlay: () -> Unit,
@@ -191,13 +194,16 @@ private fun MovieDetailContent(
MovieDetailHeroText(
movie = movie,
hasResume = hasResume,
+ resumePositionMs = resumePositionMs,
externalRatings = externalRatings,
isLoadingExternalRatings = isLoadingExternalRatings,
onPlay = onPlay,
playButtonFocusRequester = playButtonFocusRequester,
onPlayTrailer = {
resolveTrailerUrl(movie.youtubeTrailer)?.let { trailerUrl ->
- context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(trailerUrl)))
+ runCatching {
+ context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(trailerUrl)))
+ }
}
}
)
@@ -211,13 +217,16 @@ private fun MovieDetailContent(
MovieDetailHeroText(
movie = movie,
hasResume = hasResume,
+ resumePositionMs = resumePositionMs,
externalRatings = externalRatings,
isLoadingExternalRatings = isLoadingExternalRatings,
onPlay = onPlay,
playButtonFocusRequester = playButtonFocusRequester,
onPlayTrailer = {
resolveTrailerUrl(movie.youtubeTrailer)?.let { trailerUrl ->
- context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(trailerUrl)))
+ runCatching {
+ context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(trailerUrl)))
+ }
}
},
modifier = Modifier.fillMaxWidth()
@@ -254,6 +263,7 @@ private fun MoviePoster(
private fun MovieDetailHeroText(
movie: Movie,
hasResume: Boolean,
+ resumePositionMs: Long,
externalRatings: ExternalRatings,
isLoadingExternalRatings: Boolean,
onPlay: () -> Unit,
@@ -313,9 +323,11 @@ private fun MovieDetailHeroText(
)
) {
Text(
- stringResource(
- if (hasResume) R.string.player_resume else R.string.movie_detail_play
- )
+ text = if (hasResume) {
+ stringResource(R.string.movie_detail_resume_from, formatPositionMs(resumePositionMs))
+ } else {
+ stringResource(R.string.movie_detail_play)
+ }
)
}
if (hasTrailer) {
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/movies/MovieDetailViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/movies/MovieDetailViewModel.kt
index 9b4bd12e..c71f3fce 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/movies/MovieDetailViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/movies/MovieDetailViewModel.kt
@@ -45,42 +45,48 @@ class MovieDetailViewModel @Inject constructor(
private fun loadMovieDetails() {
viewModelScope.launch {
- _uiState.update { it.copy(isLoading = true) }
+ try {
+ _uiState.update { it.copy(isLoading = true) }
- val provider = providerRepository.getActiveProvider().first()
- if (provider == null) {
- _uiState.update { it.copy(isLoading = false, error = "No active provider") }
- return@launch
- }
+ val provider = providerRepository.getActiveProvider().first()
+ if (provider == null) {
+ _uiState.update { it.copy(isLoading = false, error = "No active provider") }
+ return@launch
+ }
- val playbackHistory = playbackHistoryRepository.getPlaybackHistory(
- contentId = movieId,
- contentType = ContentType.MOVIE,
- providerId = provider.id
- )
+ val playbackHistory = playbackHistoryRepository.getPlaybackHistory(
+ contentId = movieId,
+ contentType = ContentType.MOVIE,
+ providerId = provider.id
+ )
- when (val result = movieRepository.getMovieDetails(provider.id, movieId)) {
- is Result.Success -> _uiState.update {
- val movie = result.data
- val movieDurationMs = movie.durationSeconds.takeIf { it > 0 }?.times(1000L) ?: 0L
- val resumePositionMs = playbackHistory?.resumePositionMs ?: movie.watchProgress
- val hasResume = resumePositionMs > 5000L && !isPlaybackComplete(
- progressMs = resumePositionMs,
- totalDurationMs = playbackHistory?.totalDurationMs?.takeIf { it > 0L } ?: movieDurationMs
- )
- it.copy(isLoading = false, movie = result.data, error = null)
- .copy(
- hasResume = hasResume,
- resumePositionMs = if (hasResume) resumePositionMs else 0L
+ when (val result = movieRepository.getMovieDetails(provider.id, movieId)) {
+ is Result.Success -> _uiState.update {
+ val movie = result.data
+ val movieDurationMs = movie.durationSeconds.takeIf { it > 0 }?.times(1000L) ?: 0L
+ val resumePositionMs = playbackHistory?.resumePositionMs ?: movie.watchProgress
+ val hasResume = resumePositionMs > 5000L && !isPlaybackComplete(
+ progressMs = resumePositionMs,
+ totalDurationMs = playbackHistory?.totalDurationMs?.takeIf { it > 0L } ?: movieDurationMs
)
- }.also {
- loadExternalRatings(result.data)
- }
- is Result.Error -> _uiState.update {
- it.copy(isLoading = false, error = result.message)
+ it.copy(isLoading = false, movie = result.data, error = null)
+ .copy(
+ hasResume = hasResume,
+ resumePositionMs = if (hasResume) resumePositionMs else 0L
+ )
+ }.also {
+ loadExternalRatings(result.data)
+ }
+ is Result.Error -> _uiState.update {
+ it.copy(isLoading = false, error = result.message)
+ }
+ is Result.Loading -> _uiState.update {
+ it.copy(isLoading = true)
+ }
}
- is Result.Loading -> _uiState.update {
- it.copy(isLoading = true)
+ } catch (e: Exception) {
+ _uiState.update {
+ it.copy(isLoading = false, error = e.message ?: "Failed to load movie details")
}
}
}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesViewModel.kt
index e355599f..1b65568e 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesViewModel.kt
@@ -177,7 +177,6 @@ class MoviesViewModel @Inject constructor(
}
}
.flatMapLatest { params ->
- _previewBatchSize.value = 8
_previewBatchSize.flatMapLatest { batchSize ->
if (params.query.isBlank()) {
val categoryIds = params.providerCategories.take(batchSize).map { it.id }
@@ -466,6 +465,7 @@ class MoviesViewModel @Inject constructor(
}
fun selectCategory(categoryName: String?) {
+ _previewBatchSize.value = 8
activeProviderId?.let { providerId ->
parentalControlManager.retainUnlockedCategory(
providerId = providerId,
@@ -510,6 +510,7 @@ class MoviesViewModel @Inject constructor(
}
fun setSearchQuery(query: String) {
+ _previewBatchSize.value = 8
setVodSearchQuery(query, _searchQuery, _uiState) { updatedQuery ->
copy(searchQuery = updatedQuery)
}
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.kt
index 2c56d92c..889c4889 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
@@ -149,8 +149,9 @@ fun PlayerScreen(
?.collectAsState(initial = mainActivity.isInPictureInPictureMode)
?.value
?: false
- val playbackState by viewModel.playerEngine.playbackState.collectAsStateWithLifecycle()
- val isPlaying by viewModel.playerEngine.isPlaying.collectAsStateWithLifecycle()
+ val playerEngine by viewModel.activePlayerEngine.collectAsStateWithLifecycle()
+ val playbackState by playerEngine.playbackState.collectAsStateWithLifecycle()
+ val isPlaying by playerEngine.isPlaying.collectAsStateWithLifecycle()
val showControls by viewModel.showControls.collectAsStateWithLifecycle()
val videoFormat by viewModel.videoFormat.collectAsStateWithLifecycle()
val playerError by viewModel.playerError.collectAsStateWithLifecycle()
@@ -768,7 +769,7 @@ fun PlayerScreen(
) {
// ExoPlayer Video Surface
PlayerRenderView(
- playerEngine = viewModel.playerEngine,
+ playerEngine = playerEngine,
resizeMode = aspectRatio.toPlayerSurfaceResizeMode(),
surfaceType = PlayerRenderSurfaceType.SURFACE_VIEW,
modifier = Modifier.fillMaxSize()
@@ -864,7 +865,7 @@ fun PlayerScreen(
}
PlayerControlsOverlayHost(
- playerEngine = viewModel.playerEngine,
+ playerEngine = playerEngine,
visible = showControls,
title = playbackTitle.ifBlank { title },
contentType = contentType,
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.kt
index 91f3df1f..b29d81fa 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
@@ -8,6 +8,7 @@ import com.streamvault.app.cast.CastManager
import com.streamvault.app.cast.CastMediaRequest
import com.streamvault.app.cast.CastStartResult
import com.streamvault.app.di.MainPlayerEngine
+import com.streamvault.app.player.LivePreviewHandoffManager
import com.streamvault.app.ui.model.orderedByRequestedRawIds
import com.streamvault.app.util.isPlaybackComplete
import com.streamvault.app.tv.LauncherRecommendationsManager
@@ -46,6 +47,7 @@ import com.streamvault.domain.repository.EpgRepository
import com.streamvault.domain.repository.MovieRepository
import com.streamvault.domain.repository.PlaybackHistoryRepository
import com.streamvault.domain.repository.SeriesRepository
+import com.streamvault.player.Media3PlayerEngine
import com.streamvault.player.PlaybackState
import com.streamvault.player.PlayerEngine
import com.streamvault.player.PlayerError
@@ -72,7 +74,7 @@ import okhttp3.Request
@OptIn(ExperimentalCoroutinesApi::class)
class PlayerViewModel @Inject constructor(
@param:MainPlayerEngine
- val playerEngine: PlayerEngine,
+ private val mainPlayerEngine: PlayerEngine,
private val epgRepository: EpgRepository,
internal val channelRepository: ChannelRepository,
internal val movieRepository: MovieRepository,
@@ -91,6 +93,7 @@ class PlayerViewModel @Inject constructor(
internal val castManager: CastManager,
private val xtreamStreamUrlResolver: XtreamStreamUrlResolver,
private val seekThumbnailProvider: SeekThumbnailProvider,
+ private val livePreviewHandoffManager: LivePreviewHandoffManager,
private val okHttpClient: OkHttpClient
) : ViewModel() {
companion object {
@@ -105,6 +108,11 @@ class PlayerViewModel @Inject constructor(
private const val LOW_BANDWIDTH_DURATION_SECONDS = 30
}
+ private val activePlayerEngineFlow = MutableStateFlow(mainPlayerEngine)
+ val activePlayerEngine: StateFlow<PlayerEngine> = activePlayerEngineFlow.asStateFlow()
+ val playerEngine: PlayerEngine
+ get() = activePlayerEngineFlow.value
+
internal val showControlsFlow = MutableStateFlow(false)
val showControls: StateFlow<Boolean> = showControlsFlow.asStateFlow()
@@ -294,6 +302,25 @@ class PlayerViewModel @Inject constructor(
val castConnectionState: StateFlow<CastConnectionState> = castManager.connectionState
+ private fun setActivePlayerEngine(engine: PlayerEngine) {
+ if (activePlayerEngineFlow.value === engine) return
+ activePlayerEngineFlow.value = engine
+ }
+
+ private fun <T> activeEngineState(
+ initialValue: T,
+ selector: (PlayerEngine) -> StateFlow<T>
+ ): StateFlow<T> = activePlayerEngineFlow
+ .flatMapLatest(selector)
+ .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), initialValue)
+
+ private fun <T> activeEngineFlowState(
+ initialValue: T,
+ selector: (PlayerEngine) -> Flow<T>
+ ): StateFlow<T> = activePlayerEngineFlow
+ .flatMapLatest(selector)
+ .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), initialValue)
+
internal fun logRepositoryFailure(operation: String, result: com.streamvault.domain.model.Result<Unit>) {
if (result is com.streamvault.domain.model.Result.Error) {
android.util.Log.w("PlayerVM", "$operation failed: ${result.message}", result.exception)
@@ -369,14 +396,14 @@ class PlayerViewModel @Inject constructor(
init {
viewModelScope.launch {
- playerEngine.error.collect { error ->
+ activePlayerEngineFlow.flatMapLatest { it.error }.collect { error ->
if (error != null) {
handlePlaybackError(error)
}
}
}
viewModelScope.launch {
- playerEngine.playbackState.collect { state ->
+ activePlayerEngineFlow.flatMapLatest { it.playbackState }.collect { state ->
_playerDiagnostics.update { it.copy(playbackStateLabel = state.name.replace('_', ' ')) }
if (state == PlaybackState.ENDED && lastObservedPlaybackState != PlaybackState.ENDED) {
handlePlaybackEnded()
@@ -401,13 +428,13 @@ class PlayerViewModel @Inject constructor(
}
}
viewModelScope.launch {
- playerEngine.retryStatus.collect { status ->
+ activePlayerEngineFlow.flatMapLatest { it.retryStatus }.collect { status ->
status ?: return@collect
showRetryNotice(status)
}
}
viewModelScope.launch {
- playerEngine.audioFocusDenied.collect {
+ activePlayerEngineFlow.flatMapLatest { it.audioFocusDenied }.collect {
showPlayerNotice(
message = "Waiting for audio \u2014 unmute device and press Play",
durationMs = 8_000L
@@ -432,7 +459,8 @@ class PlayerViewModel @Inject constructor(
foregroundColorArgb = textColor,
backgroundColorArgb = backgroundColor
)
- }.collect(playerEngine::setSubtitleStyle)
+ }.combine(activePlayerEngineFlow) { style, engine -> engine to style }
+ .collect { (engine, style) -> engine.setSubtitleStyle(style) }
}
viewModelScope.launch {
combine(
@@ -458,7 +486,9 @@ class PlayerViewModel @Inject constructor(
preferencesRepository.zapAutoRevert.collect { zapAutoRevertEnabled = it }
}
viewModelScope.launch {
- preferencesRepository.playerMediaSessionEnabled.collect(playerEngine::setMediaSessionEnabled)
+ preferencesRepository.playerMediaSessionEnabled
+ .combine(activePlayerEngineFlow) { enabled, engine -> engine to enabled }
+ .collect { (engine, enabled) -> engine.setMediaSessionEnabled(enabled) }
}
viewModelScope.launch {
combine(
@@ -478,21 +508,25 @@ class PlayerViewModel @Inject constructor(
}
}
viewModelScope.launch {
- playerEngine.timeshiftState.collect(::applyTimeshiftState)
+ activePlayerEngineFlow.flatMapLatest { it.timeshiftState }.collect(::applyTimeshiftState)
}
viewModelScope.launch {
- preferencesRepository.playerDecoderMode.collect { mode ->
- preferredDecoderMode = mode
- if (!hasRetriedWithSoftwareDecoder) {
- playerEngine.setDecoderMode(mode)
- updateDecoderMode(mode)
+ preferencesRepository.playerDecoderMode
+ .combine(activePlayerEngineFlow) { mode, engine -> engine to mode }
+ .collect { (engine, mode) ->
+ preferredDecoderMode = mode
+ if (!hasRetriedWithSoftwareDecoder) {
+ engine.setDecoderMode(mode)
+ if (engine === playerEngine) {
+ updateDecoderMode(mode)
+ }
+ }
}
- }
}
viewModelScope.launch {
var consecutiveLowBandwidthSeconds = 0
var noticeShown = false
- playerEngine.playerStats.collect { stats ->
+ activePlayerEngineFlow.flatMapLatest { it.playerStats }.collect { stats ->
if (!playerEngine.isPlaying.value || currentContentType != ContentType.LIVE) {
consecutiveLowBandwidthSeconds = 0
noticeShown = false
@@ -688,31 +722,25 @@ class PlayerViewModel @Inject constructor(
)
val playerError: StateFlow<PlayerError?> by lazy(LazyThreadSafetyMode.NONE) {
- playerEngine.error
- .stateIn(viewModelScope, kotlinx.coroutines.flow.SharingStarted.WhileSubscribed(5000), null)
+ activeEngineFlowState(initialValue = null) { it.error }
}
- val videoFormat: StateFlow<VideoFormat> = playerEngine.videoFormat
-
- val playerStats = playerEngine.playerStats
+ val videoFormat: StateFlow<VideoFormat> = activeEngineState(VideoFormat(0, 0)) { it.videoFormat }
+
+ val playerStats: StateFlow<com.streamvault.player.PlayerStats> =
+ activeEngineState(com.streamvault.player.PlayerStats()) { it.playerStats }
val availableAudioTracks: StateFlow<List<com.streamvault.player.PlayerTrack>> by lazy(LazyThreadSafetyMode.NONE) {
- playerEngine.availableAudioTracks
- .map { tracks -> tracks as? List<com.streamvault.player.PlayerTrack> ?: emptyList() }
- .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), emptyList())
+ activeEngineState(emptyList()) { it.availableAudioTracks }
}
val availableSubtitleTracks: StateFlow<List<com.streamvault.player.PlayerTrack>> by lazy(LazyThreadSafetyMode.NONE) {
- playerEngine.availableSubtitleTracks
- .map { tracks -> tracks as? List<com.streamvault.player.PlayerTrack> ?: emptyList() }
- .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), emptyList())
+ activeEngineState(emptyList()) { it.availableSubtitleTracks }
}
val availableVideoQualities: StateFlow<List<com.streamvault.player.PlayerTrack>> by lazy(LazyThreadSafetyMode.NONE) {
- playerEngine.availableVideoTracks
- .map { tracks -> tracks as? List<com.streamvault.player.PlayerTrack> ?: emptyList() }
- .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), emptyList())
+ activeEngineState(emptyList()) { it.availableVideoTracks }
}
- val isMuted: StateFlow<Boolean> = playerEngine.isMuted
- val mediaTitle: StateFlow<String?> = playerEngine.mediaTitle
- val playbackSpeed: StateFlow<Float> = playerEngine.playbackSpeed
+ val isMuted: StateFlow<Boolean> = activeEngineState(false) { it.isMuted }
+ val mediaTitle: StateFlow<String?> = activeEngineState<String?>(null) { it.mediaTitle }
+ val playbackSpeed: StateFlow<Float> = activeEngineState(1f) { it.playbackSpeed }
val preventStandbyDuringPlayback: StateFlow<Boolean> by lazy(LazyThreadSafetyMode.NONE) {
preferencesRepository.preventStandbyDuringPlayback
@@ -1088,6 +1116,73 @@ class PlayerViewModel @Inject constructor(
)
}
+ private suspend fun applyPlaybackPreferences() {
+ playerEngine.setMuted(preferencesRepository.playerMuted.first())
+ playerEngine.setPlaybackSpeed(
+ if (currentContentType == ContentType.LIVE) {
+ 1f
+ } else {
+ preferencesRepository.playerPlaybackSpeed.first()
+ }
+ )
+ playerEngine.setPreferredAudioLanguage(
+ resolvePreferredAudioLanguage(
+ preferredAudioLanguage = preferencesRepository.preferredAudioLanguage.first(),
+ appLanguage = preferencesRepository.appLanguage.first()
+ )
+ )
+ playerEngine.setNetworkQualityPreferences(
+ wifiMaxHeight = preferencesRepository.playerWifiMaxVideoHeight.first(),
+ ethernetMaxHeight = preferencesRepository.playerEthernetMaxVideoHeight.first()
+ )
+ }
+
+ private suspend fun tryAdoptPreviewHandoff(
+ requestVersion: Long,
+ internalChannelId: Long,
+ providerId: Long
+ ): Boolean {
+ if (currentContentType != ContentType.LIVE) return false
+
+ val session = livePreviewHandoffManager.consumeFullscreenHandoff(
+ channelId = internalChannelId,
+ providerId = providerId.takeIf { it > 0L }
+ ) ?: return false
+
+ val adoptedEngine = session.engine
+ return runCatching {
+ // Media3 requires a globally unique session ID. Release the main engine's
+ // session before the adopted live engine enables its own replacement.
+ mainPlayerEngine.setMediaSessionEnabled(false)
+ setActivePlayerEngine(adoptedEngine)
+ (adoptedEngine as? Media3PlayerEngine)?.let {
+ it.bypassAudioFocus = false
+ it.enableMediaSession = preferencesRepository.playerMediaSessionEnabled.first()
+ it.constrainResolutionForMultiView = false
+ }
+ applyPlaybackPreferences()
+ if (!isActivePlaybackSession(requestVersion)) {
+ setActivePlayerEngine(mainPlayerEngine)
+ adoptedEngine.release()
+ false
+ } else {
+ currentResolvedPlaybackUrl = session.streamInfo.url
+ probePassedPlaybackKeys.add(playbackProbeCacheKey(session.streamInfo.url))
+ playerEngine.play()
+ startTokenRenewalMonitoring(session.streamInfo.expirationTime)
+ maybeStartLiveTimeshift(session.streamInfo)
+ true
+ }
+ }.getOrElse {
+ livePreviewHandoffManager.clear(adoptedEngine)
+ if (playerEngine === adoptedEngine) {
+ setActivePlayerEngine(mainPlayerEngine)
+ }
+ adoptedEngine.release()
+ false
+ }
+ }
+
internal suspend fun preparePlayer(
streamInfo: com.streamvault.domain.model.StreamInfo,
requestVersion: Long
@@ -1121,24 +1216,7 @@ class PlayerViewModel @Inject constructor(
return false
}
probePassedPlaybackKeys.add(playbackProbeCacheKey(streamInfo.url))
- playerEngine.setMuted(preferencesRepository.playerMuted.first())
- playerEngine.setPlaybackSpeed(
- if (currentContentType == ContentType.LIVE) {
- 1f
- } else {
- preferencesRepository.playerPlaybackSpeed.first()
- }
- )
- playerEngine.setPreferredAudioLanguage(
- resolvePreferredAudioLanguage(
- preferredAudioLanguage = preferencesRepository.preferredAudioLanguage.first(),
- appLanguage = preferencesRepository.appLanguage.first()
- )
- )
- playerEngine.setNetworkQualityPreferences(
- wifiMaxHeight = preferencesRepository.playerWifiMaxVideoHeight.first(),
- ethernetMaxHeight = preferencesRepository.playerEthernetMaxVideoHeight.first()
- )
+ applyPlaybackPreferences()
if (!isActivePlaybackSession(requestVersion)) return false
currentResolvedPlaybackUrl = streamInfo.url
playerEngine.prepare(streamInfo)
@@ -1306,6 +1384,9 @@ class PlayerViewModel @Inject constructor(
if (!hasArchiveRequest) {
viewModelScope.launch {
+ if (tryAdoptPreviewHandoff(requestVersion, internalChannelId, providerId)) {
+ return@launch
+ }
val streamInfo = resolvePlaybackStreamInfo(streamUrl, internalChannelId, providerId, currentContentType)
if (!isActivePlaybackSession(requestVersion, streamUrl)) return@launch
if (streamInfo == null) {
@@ -1314,6 +1395,24 @@ class PlayerViewModel @Inject constructor(
return@launch
}
if (!preparePlayer(streamInfo, requestVersion)) return@launch
+
+ // Check for resume position after the player is fully prepared (VOD only).
+ // Doing this after preparePlayer ensures pause() acts on the live player instance,
+ // not a stale one that may have already been replaced by prepareInternal().
+ if (showResumePrompt && currentContentType != ContentType.LIVE && currentContentId != -1L && currentProviderId != -1L) {
+ val history = playbackHistoryRepository.getPlaybackHistory(currentContentId, currentContentType, currentProviderId)
+ if (isActivePlaybackSession(requestVersion, streamUrl)) {
+ if (history != null && history.resumePositionMs > 5000L && !isPlaybackComplete(history.resumePositionMs, history.totalDurationMs)) {
+ playerEngine.pause()
+ _resumePrompt.value = ResumePromptState(
+ show = true,
+ positionMs = history.resumePositionMs,
+ title = currentTitle
+ )
+ }
+ }
+ }
+
maybeStartLiveTimeshift(streamInfo)
}
}
@@ -1340,22 +1439,6 @@ class PlayerViewModel @Inject constructor(
_playerDiagnostics.update { it.copy(providerName = "", providerSourceLabel = "") }
}
- // 1. Check for Resume Position for VODs
- if (showResumePrompt && currentContentType != ContentType.LIVE && currentContentId != -1L && currentProviderId != -1L) {
- viewModelScope.launch {
- val history = playbackHistoryRepository.getPlaybackHistory(currentContentId, currentContentType, currentProviderId)
- if (!isActivePlaybackSession(requestVersion, streamUrl)) return@launch
- if (history != null && history.resumePositionMs > 5000L && !isPlaybackComplete(history.resumePositionMs, history.totalDurationMs)) {
- playerEngine.pause()
- _resumePrompt.value = ResumePromptState(
- show = true,
- positionMs = history.resumePositionMs,
- title = currentTitle
- )
- }
- }
- }
-
// Load playlist if context changed
if (shouldReloadPlaylist) {
currentCategoryId = categoryId
@@ -1537,7 +1620,10 @@ class PlayerViewModel @Inject constructor(
playerEngine.pause()
}
if (currentContentType != ContentType.LIVE) {
- viewModelScope.launch { persistPlaybackProgress() }
+ viewModelScope.launch {
+ persistPlaybackProgress()
+ playbackHistoryRepository.flushPendingProgress()
+ }
}
}
@@ -1552,7 +1638,10 @@ class PlayerViewModel @Inject constructor(
fun onPlayerScreenDisposed() {
if (currentContentType != ContentType.LIVE) {
- viewModelScope.launch { persistPlaybackProgress() }
+ viewModelScope.launch {
+ persistPlaybackProgress()
+ playbackHistoryRepository.flushPendingProgress()
+ }
}
playerEngine.stopLiveTimeshift()
}
@@ -1562,6 +1651,7 @@ class PlayerViewModel @Inject constructor(
viewModelScope.launch { persistPlaybackProgress() }
}
playerEngine.stopLiveTimeshift()
+ livePreviewHandoffManager.clear(playerEngine)
playerEngine.release()
}
@@ -2807,6 +2897,10 @@ class PlayerViewModel @Inject constructor(
recentChannelsJob?.cancel()
lastVisitedCategoryJob?.cancel()
seekThumbnailProvider.clearCache()
+ livePreviewHandoffManager.clear(playerEngine)
playerEngine.release()
+ if (mainPlayerEngine !== playerEngine) {
+ mainPlayerEngine.release()
+ }
}
}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupViewModel.kt
index 73edace9..ad4a7faf 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupViewModel.kt
@@ -414,14 +414,14 @@ data class ProviderSetupState(
val createdProviderName: String? = null,
val pendingCombinedAttachProfileId: Long? = null,
val pendingCombinedAttachProfileName: String? = null,
- val epgSyncMode: ProviderEpgSyncMode = ProviderEpgSyncMode.UPFRONT,
+ val epgSyncMode: ProviderEpgSyncMode = ProviderEpgSyncMode.BACKGROUND,
val hasCustomizedEpgSyncMode: Boolean = false,
val xtreamFastSyncEnabled: Boolean = true,
val m3uVodClassificationEnabled: Boolean = false
)
private fun defaultEpgSyncModeFor(sourceType: ProviderSetupViewModel.SetupSourceType): ProviderEpgSyncMode = when (sourceType) {
- ProviderSetupViewModel.SetupSourceType.STALKER -> ProviderEpgSyncMode.BACKGROUND
+ ProviderSetupViewModel.SetupSourceType.STALKER,
ProviderSetupViewModel.SetupSourceType.XTREAM,
- ProviderSetupViewModel.SetupSourceType.M3U -> ProviderEpgSyncMode.UPFRONT
+ ProviderSetupViewModel.SetupSourceType.M3U -> ProviderEpgSyncMode.BACKGROUND
}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailScreen.kt
index c763f658..35e94f1a 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailScreen.kt
@@ -21,9 +21,6 @@ import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.compose.runtime.Composable
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.compose.runtime.collectAsState
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@@ -48,6 +45,7 @@ import coil3.compose.AsyncImage
import com.streamvault.app.R
import com.streamvault.app.device.rememberIsTelevisionDevice
import com.streamvault.app.ui.components.rememberCrossfadeImageModel
+import com.streamvault.app.util.formatPositionMs
import com.streamvault.app.ui.components.shell.ContentMetadataStrip
import com.streamvault.app.ui.components.shell.EpisodeRowCard
import com.streamvault.app.ui.components.shell.ExternalRatingsStrip
@@ -65,6 +63,7 @@ import com.streamvault.app.ui.interaction.TvIconButton
@Composable
fun SeriesDetailScreen(
onEpisodeClick: (Episode) -> Unit,
+ onResumeClick: ((Episode) -> Unit)? = null,
onBack: () -> Unit,
viewModel: SeriesDetailViewModel = hiltViewModel()
) {
@@ -101,11 +100,13 @@ fun SeriesDetailScreen(
SeriesDetailContent(
series = series,
selectedSeason = uiState.selectedSeason,
+ resumeEpisode = uiState.resumeEpisode,
unwatchedEpisodeCount = uiState.unwatchedEpisodeCount,
externalRatings = uiState.externalRatings,
isLoadingExternalRatings = uiState.isLoadingExternalRatings,
onSeasonSelected = viewModel::selectSeason,
onEpisodeClick = onEpisodeClick,
+ onResumeClick = onResumeClick ?: onEpisodeClick,
onBack = onBack
)
}
@@ -114,11 +115,13 @@ fun SeriesDetailScreen(
private fun SeriesDetailContent(
series: Series,
selectedSeason: Season?,
+ resumeEpisode: Episode?,
unwatchedEpisodeCount: Int,
externalRatings: ExternalRatings,
isLoadingExternalRatings: Boolean,
onSeasonSelected: (Season) -> Unit,
onEpisodeClick: (Episode) -> Unit,
+ onResumeClick: (Episode) -> Unit,
onBack: () -> Unit
) {
val isTelevisionDevice = rememberIsTelevisionDevice()
@@ -248,6 +251,33 @@ private fun SeriesDetailContent(
maxLines = 5,
overflow = TextOverflow.Ellipsis
)
+ resumeEpisode?.let { ep ->
+ val hasProgress = ep.watchProgress > 5000L
+ TvButton(
+ onClick = { onResumeClick(ep) },
+ colors = ButtonDefaults.colors(
+ containerColor = AppColors.Brand,
+ contentColor = Color.White
+ )
+ ) {
+ Text(
+ text = if (hasProgress) {
+ stringResource(
+ R.string.series_detail_resume,
+ ep.seasonNumber,
+ ep.episodeNumber,
+ formatPositionMs(ep.watchProgress)
+ )
+ } else {
+ stringResource(
+ R.string.series_detail_play_episode,
+ ep.seasonNumber,
+ ep.episodeNumber
+ )
+ }
+ )
+ }
+ }
}
}
} else {
@@ -315,6 +345,33 @@ private fun SeriesDetailContent(
maxLines = 5,
overflow = TextOverflow.Ellipsis
)
+ resumeEpisode?.let { ep ->
+ val hasProgress = ep.watchProgress > 5000L
+ TvButton(
+ onClick = { onResumeClick(ep) },
+ colors = ButtonDefaults.colors(
+ containerColor = AppColors.Brand,
+ contentColor = Color.White
+ )
+ ) {
+ Text(
+ text = if (hasProgress) {
+ stringResource(
+ R.string.series_detail_resume,
+ ep.seasonNumber,
+ ep.episodeNumber,
+ formatPositionMs(ep.watchProgress)
+ )
+ } else {
+ stringResource(
+ R.string.series_detail_play_episode,
+ ep.seasonNumber,
+ ep.episodeNumber
+ )
+ }
+ )
+ }
+ }
}
}
}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailViewModel.kt
index 7c534b32..69953ea2 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailViewModel.kt
@@ -4,6 +4,7 @@ import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.streamvault.domain.model.ContentType
+import com.streamvault.domain.model.Episode
import com.streamvault.domain.model.ExternalRatings
import com.streamvault.domain.model.ExternalRatingsLookup
import com.streamvault.domain.model.Result
@@ -13,6 +14,7 @@ import com.streamvault.domain.repository.ExternalRatingsRepository
import com.streamvault.domain.repository.PlaybackHistoryRepository
import com.streamvault.domain.repository.SeriesRepository
import com.streamvault.domain.repository.ProviderRepository
+import com.streamvault.domain.util.isPlaybackComplete
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
@@ -64,6 +66,7 @@ class SeriesDetailViewModel @Inject constructor(
isLoading = false,
series = result.data,
selectedSeason = result.data.seasons.firstOrNull(),
+ resumeEpisode = findResumeEpisode(result.data),
error = null
)
}
@@ -126,12 +129,29 @@ class SeriesDetailViewModel @Inject constructor(
fun selectSeason(season: Season) {
_uiState.update { it.copy(selectedSeason = season) }
}
+
+ private fun findResumeEpisode(series: Series): Episode? {
+ val ordered = series.seasons
+ .sortedBy { it.seasonNumber }
+ .flatMap { season -> season.episodes.sortedBy { it.episodeNumber } }
+ // Prefer the most-recently-watched in-progress episode
+ val inProgress = ordered
+ .filter { ep ->
+ ep.watchProgress > 5000L &&
+ !isPlaybackComplete(ep.watchProgress, ep.durationSeconds.toLong() * 1000L)
+ }
+ .maxByOrNull { it.lastWatchedAt }
+ if (inProgress != null) return inProgress
+ // Fall back to the first episode that has never been started
+ return ordered.firstOrNull { ep -> ep.lastWatchedAt == 0L }
+ }
}
data class SeriesDetailUiState(
val isLoading: Boolean = false,
val series: Series? = null,
val selectedSeason: Season? = null,
+ val resumeEpisode: Episode? = null,
val unwatchedEpisodeCount: Int = 0,
val error: String? = null,
val isLoadingExternalRatings: Boolean = false,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesViewModel.kt
index 96e6010d..b66f14b1 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesViewModel.kt
@@ -175,7 +175,6 @@ class SeriesViewModel @Inject constructor(
}
}
.flatMapLatest { params ->
- _previewBatchSize.value = 8
_previewBatchSize.flatMapLatest { batchSize ->
if (params.query.isBlank()) {
val categoryIds = params.providerCategories.take(batchSize).map { it.id }
@@ -273,7 +272,7 @@ class SeriesViewModel @Inject constructor(
favoriteRepository.getAllFavorites(provider.id, ContentType.SERIES),
getCustomCategories(provider.id, ContentType.SERIES),
seriesRepository.getCategories(provider.id),
- playbackHistoryRepository.getRecentlyWatchedByProvider(provider.id, limit = 2_000),
+ playbackHistoryRepository.getRecentlyWatchedByProvider(provider.id, limit = 100),
preferencesRepository.getHiddenCategoryIds(provider.id, ContentType.SERIES),
preferencesRepository.getCategorySortMode(provider.id, ContentType.SERIES)
) { values ->
@@ -470,6 +469,7 @@ class SeriesViewModel @Inject constructor(
}
fun selectCategory(categoryName: String?) {
+ _previewBatchSize.value = 8
activeProviderId?.let { providerId ->
parentalControlManager.retainUnlockedCategory(
providerId = providerId,
@@ -514,6 +514,7 @@ class SeriesViewModel @Inject constructor(
}
fun setSearchQuery(query: String) {
+ _previewBatchSize.value = 8
setVodSearchQuery(query, _searchQuery, _uiState) { updatedQuery ->
copy(searchQuery = updatedQuery)
}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/vod/VodCatalogBuilders.kt b/app/src/main/java/com/streamvault/app/ui/screens/vod/VodCatalogBuilders.kt
index 9e2fd307..a740e8ea 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/vod/VodCatalogBuilders.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/vod/VodCatalogBuilders.kt
@@ -125,8 +125,9 @@ fun <Item> buildVodSearchCatalog(
.groupBy { itemCategoryName(it) ?: uncategorizedName }
.toMutableMap()
- grouped[VodBrowseDefaults.FAVORITES_CATEGORY] = enrichedItems.filter { item ->
- itemId(item) in globalFavoriteIds
+ val favoriteMatches = enrichedItems.filter { item -> itemId(item) in globalFavoriteIds }
+ if (favoriteMatches.isNotEmpty()) {
+ grouped[VodBrowseDefaults.FAVORITES_CATEGORY] = favoriteMatches
}
customCategories
diff --git a/app/src/main/java/com/streamvault/app/util/PlaybackCompletion.kt b/app/src/main/java/com/streamvault/app/util/PlaybackCompletion.kt
index 0178bf22..9b7d5b19 100644
--- a/app/src/main/java/com/streamvault/app/util/PlaybackCompletion.kt
+++ b/app/src/main/java/com/streamvault/app/util/PlaybackCompletion.kt
@@ -1,12 +1,9 @@
package com.streamvault.app.util
-private const val DEFAULT_PLAYBACK_COMPLETION_THRESHOLD = 0.95f
+import com.streamvault.domain.util.isPlaybackComplete as domainIsPlaybackComplete
fun isPlaybackComplete(
progressMs: Long,
totalDurationMs: Long,
- threshold: Float = DEFAULT_PLAYBACK_COMPLETION_THRESHOLD
-): Boolean {
- if (progressMs <= 0L || totalDurationMs <= 0L) return false
- return progressMs >= (totalDurationMs * threshold).toLong()
-}
+ threshold: Float = com.streamvault.domain.util.DEFAULT_PLAYBACK_COMPLETION_THRESHOLD
+): Boolean = domainIsPlaybackComplete(progressMs, totalDurationMs, threshold)
diff --git a/app/src/main/java/com/streamvault/app/util/TimeFormatter.kt b/app/src/main/java/com/streamvault/app/util/TimeFormatter.kt
new file mode 100644
index 00000000..ed173693
--- /dev/null
+++ b/app/src/main/java/com/streamvault/app/util/TimeFormatter.kt
@@ -0,0 +1,21 @@
+package com.streamvault.app.util
+
+/**
+ * Formats a playback position in milliseconds as a human-readable time string.
+ *
+ * Examples:
+ * 3_723_000 ms → "1:02:03"
+ * 143_000 ms → "2:23"
+ * 5_000 ms → "0:05"
+ */
+fun formatPositionMs(positionMs: Long): String {
+ val totalSeconds = (positionMs / 1000L).coerceAtLeast(0L)
+ val hours = totalSeconds / 3600
+ val minutes = (totalSeconds % 3600) / 60
+ val seconds = totalSeconds % 60
+ return if (hours > 0) {
+ "%d:%02d:%02d".format(hours, minutes, seconds)
+ } else {
+ "%d:%02d".format(minutes, seconds)
+ }
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 85a63d2a..b200c2d4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1192,6 +1192,8 @@
<string name="series_seasons">Seasons</string>
<string name="series_episodes">Episodes (%1$d)</string>
<string name="series_unwatched_badge">%1$d left to finish</string>
+ <string name="series_detail_resume">Resume · Season %1$d Ep %2$d · %3$s</string>
+ <string name="series_detail_play_episode">Play · Season %1$d Ep %2$d</string>
<string name="vod_external_ratings_heading">Ratings</string>
<string name="vod_rating_imdb">IMDb</string>
<string name="vod_rating_rotten_tomatoes">Rotten Tomatoes</string>
@@ -1201,6 +1203,7 @@
<string name="movie_not_found">Movie not found</string>
<string name="movie_detail_back">Back to library</string>
<string name="movie_detail_play">Play</string>
+ <string name="movie_detail_resume_from">Resume from %1$s</string>
<string name="movie_detail_trailer">Trailer</string>
<string name="movie_plot_fallback">No plot available</string>
<string name="movie_detail_director">Directed By:</string>
diff --git a/app/src/test/java/com/streamvault/app/player/LivePreviewHandoffManagerTest.kt b/app/src/test/java/com/streamvault/app/player/LivePreviewHandoffManagerTest.kt
new file mode 100644
index 00000000..a4e14dc4
--- /dev/null
+++ b/app/src/test/java/com/streamvault/app/player/LivePreviewHandoffManagerTest.kt
@@ -0,0 +1,78 @@
+package com.streamvault.app.player
+
+import com.google.common.truth.Truth.assertThat
+import com.streamvault.domain.model.Channel
+import com.streamvault.domain.model.StreamInfo
+import com.streamvault.player.PlayerEngine
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.advanceTimeBy
+import kotlinx.coroutines.test.runTest
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoInteractions
+import kotlinx.coroutines.test.setMain
+import kotlinx.coroutines.test.resetMain
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class LivePreviewHandoffManagerTest {
+ private val testDispatcher = StandardTestDispatcher()
+
+ @Before
+ fun setUp() {
+ Dispatchers.setMain(testDispatcher)
+ }
+
+ @After
+ fun tearDown() {
+ Dispatchers.resetMain()
+ }
+
+ @Test
+ fun `matching pending preview can be consumed by fullscreen`() = runTest(testDispatcher) {
+ val manager = LivePreviewHandoffManager()
+ val engine = mock<PlayerEngine>()
+ val channel = channel(id = 42L, providerId = 7L)
+ val streamInfo = StreamInfo(url = "https://example.com/live.m3u8", title = channel.name)
+
+ manager.registerPreviewSession(channel, streamInfo, engine)
+
+ assertThat(manager.beginFullscreenHandoff(channel.id, engine)).isTrue()
+
+ val session = manager.consumeFullscreenHandoff(channel.id, channel.providerId)
+
+ assertThat(session).isNotNull()
+ assertThat(session?.engine).isSameInstanceAs(engine)
+ assertThat(manager.consumeFullscreenHandoff(channel.id, channel.providerId)).isNull()
+ verifyNoInteractions(engine)
+ }
+
+ @Test
+ fun `pending preview is released when fullscreen never claims it`() = runTest(testDispatcher) {
+ val manager = LivePreviewHandoffManager()
+ val engine = mock<PlayerEngine>()
+ val channel = channel(id = 99L, providerId = 5L)
+ val streamInfo = StreamInfo(url = "https://example.com/preview.ts", title = channel.name)
+
+ manager.registerPreviewSession(channel, streamInfo, engine)
+ assertThat(manager.beginFullscreenHandoff(channel.id, engine)).isTrue()
+
+ advanceTimeBy(15_001L)
+ testDispatcher.scheduler.runCurrent()
+
+ assertThat(manager.consumeFullscreenHandoff(channel.id, channel.providerId)).isNull()
+ verify(engine).release()
+ }
+
+ private fun channel(id: Long, providerId: Long): Channel = Channel(
+ id = id,
+ name = "Preview $id",
+ streamUrl = "stream://$id",
+ categoryId = 1L,
+ providerId = providerId
+ )
+}
diff --git a/app/src/test/java/com/streamvault/app/ui/screens/home/HomeViewModelTest.kt b/app/src/test/java/com/streamvault/app/ui/screens/home/HomeViewModelTest.kt
index 2b7a2b3d..508672e0 100644
--- a/app/src/test/java/com/streamvault/app/ui/screens/home/HomeViewModelTest.kt
+++ b/app/src/test/java/com/streamvault/app/ui/screens/home/HomeViewModelTest.kt
@@ -2,6 +2,7 @@ package com.streamvault.app.ui.screens.home
import android.app.Application
import androidx.lifecycle.ViewModel
+import com.streamvault.app.player.LivePreviewHandoffManager
import com.streamvault.app.tvinput.TvInputChannelSyncManager
import com.streamvault.app.ui.screens.multiview.MultiViewManager
import com.streamvault.data.preferences.PreferencesRepository
@@ -51,6 +52,7 @@ class HomeViewModelTest {
private val syncManager: SyncManager = mock()
private val tvInputChannelSyncManager: TvInputChannelSyncManager = mock()
private val multiViewManager = MultiViewManager()
+ private val livePreviewHandoffManager: LivePreviewHandoffManager = mock()
private val playerEngine: PlayerEngine = mock()
private val playerEngineProvider: InjectProvider<PlayerEngine> = mock()
private val application: Application = mock()
@@ -126,6 +128,7 @@ class HomeViewModelTest {
syncManager = syncManager,
tvInputChannelSyncManager = tvInputChannelSyncManager,
multiViewManager = multiViewManager,
+ livePreviewHandoffManager = livePreviewHandoffManager,
playerEngineProvider = playerEngineProvider
).also(createdViewModels::add)
diff --git a/app/src/test/java/com/streamvault/app/ui/screens/provider/ProviderSetupViewModelTest.kt b/app/src/test/java/com/streamvault/app/ui/screens/provider/ProviderSetupViewModelTest.kt
index 33d4cc36..ef7da264 100644
--- a/app/src/test/java/com/streamvault/app/ui/screens/provider/ProviderSetupViewModelTest.kt
+++ b/app/src/test/java/com/streamvault/app/ui/screens/provider/ProviderSetupViewModelTest.kt
@@ -123,6 +123,36 @@ class ProviderSetupViewModelTest {
assertThat(viewModel.uiState.value.hasCustomizedEpgSyncMode).isFalse()
}
+ @Test
+ fun `xtream source defaults epg sync mode to background when user has not customized it`() = runTest {
+ val viewModel = ProviderSetupViewModel(
+ providerRepository = providerRepository,
+ combinedM3uRepository = combinedM3uRepository,
+ validateAndAddProvider = validateAndAddProvider
+ )
+
+ viewModel.applySourceDefaults(ProviderSetupViewModel.SetupSourceType.XTREAM)
+ advanceUntilIdle()
+
+ assertThat(viewModel.uiState.value.epgSyncMode).isEqualTo(ProviderEpgSyncMode.BACKGROUND)
+ assertThat(viewModel.uiState.value.hasCustomizedEpgSyncMode).isFalse()
+ }
+
+ @Test
+ fun `m3u source defaults epg sync mode to background when user has not customized it`() = runTest {
+ val viewModel = ProviderSetupViewModel(
+ providerRepository = providerRepository,
+ combinedM3uRepository = combinedM3uRepository,
+ validateAndAddProvider = validateAndAddProvider
+ )
+
+ viewModel.applySourceDefaults(ProviderSetupViewModel.SetupSourceType.M3U)
+ advanceUntilIdle()
+
+ assertThat(viewModel.uiState.value.epgSyncMode).isEqualTo(ProviderEpgSyncMode.BACKGROUND)
+ assertThat(viewModel.uiState.value.hasCustomizedEpgSyncMode).isFalse()
+ }
+
@Test
fun `source defaults do not override customized epg sync mode`() = runTest {
val viewModel = ProviderSetupViewModel(
diff --git a/data/src/main/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiService.kt b/data/src/main/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiService.kt
index 8232beb5..1f9f5c52 100644
--- a/data/src/main/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiService.kt
+++ b/data/src/main/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiService.kt
@@ -113,6 +113,13 @@ class OkHttpStalkerApiService @Inject constructor(
profile: StalkerDeviceProfile,
categoryId: String?
): Result<List<StalkerItemRecord>> = runApiCall("Failed to load live channels") {
+ if (categoryId.isNullOrBlank()) {
+ fetchAllLiveChannels(
+ session = session,
+ profile = profile
+ )?.let { return@runApiCall it }
+ }
+
fetchPagedItems(
session = session,
profile = profile,
@@ -305,6 +312,25 @@ class OkHttpStalkerApiService @Inject constructor(
).toProgramRecords(channelId)
}
+ override suspend fun getBulkEpg(
+ session: StalkerSession,
+ profile: StalkerDeviceProfile,
+ periodHours: Int
+ ): Result<List<StalkerProgramRecord>> = runApiCall("Failed to load bulk EPG") {
+ requestJson(
+ url = session.loadUrl,
+ profile = profile,
+ referer = session.portalReferer,
+ token = session.token,
+ query = mapOf(
+ "type" to "itv",
+ "action" to "get_epg_info",
+ "JsHttpRequest" to "1-xml",
+ "period" to periodHours.coerceAtLeast(1).toString()
+ )
+ ).toProgramRecords()
+ }
+
override suspend fun createLink(
session: StalkerSession,
profile: StalkerDeviceProfile,
@@ -366,6 +392,27 @@ class OkHttpStalkerApiService @Inject constructor(
return items
}
+ private suspend fun fetchAllLiveChannels(
+ session: StalkerSession,
+ profile: StalkerDeviceProfile
+ ): List<StalkerItemRecord>? {
+ return runCatching {
+ requestJson(
+ url = session.loadUrl,
+ profile = profile,
+ referer = session.portalReferer,
+ token = session.token,
+ query = mapOf(
+ "type" to "itv",
+ "action" to "get_all_channels",
+ "JsHttpRequest" to "1-xml"
+ )
+ ).toItemRecords()
+ }.onFailure { error ->
+ Log.w(TAG, "Stalker get_all_channels failed; falling back to paged live catalog", error)
+ }.getOrNull()?.takeIf { it.isNotEmpty() }
+ }
+
private suspend fun requestJson(
url: String,
profile: StalkerDeviceProfile,
@@ -656,8 +703,9 @@ class OkHttpStalkerApiService @Inject constructor(
)
}
- private fun JsonElement.toProgramRecords(channelId: String): List<StalkerProgramRecord> {
+ private fun JsonElement.toProgramRecords(channelId: String? = null): List<StalkerProgramRecord> {
return extractListElements().mapNotNull { entry ->
+ val resolvedChannelId = channelId ?: entry.findProgramChannelId() ?: return@mapNotNull null
val startMillis = entry.findString("start_timestamp")?.toLongOrNull()?.times(1000L)
?: entry.findString("time")?.let(::parseDateTime)
?: return@mapNotNull null
@@ -665,8 +713,8 @@ class OkHttpStalkerApiService @Inject constructor(
?: entry.findString("time_to")?.let(::parseDateTime)
?: startMillis + (entry.findString("duration")?.toLongOrNull()?.times(60_000L) ?: DEFAULT_PROGRAM_DURATION_MILLIS)
StalkerProgramRecord(
- id = entry.findString("id") ?: "$channelId:$startMillis",
- channelId = channelId,
+ id = entry.findString("id") ?: "$resolvedChannelId:$startMillis",
+ channelId = resolvedChannelId,
title = entry.findString("name")
?: entry.findString("title")
?: return@mapNotNull null,
@@ -681,6 +729,15 @@ class OkHttpStalkerApiService @Inject constructor(
}
}
+ private fun JsonElement.findProgramChannelId(): String? {
+ val payload = payloadObjectOrNull() ?: return null
+ return payload.findString("ch_id")
+ ?: payload.findString("channel_id")
+ ?: payload.findString("id_channel")
+ ?: payload.findString("xmltv_id")
+ ?: payload.findString("epg_id")
+ }
+
private fun JsonElement.extractListElements(): List<JsonElement> {
val jsValue = rootObjectOrNull()?.get("js") ?: this
return when {
diff --git a/data/src/main/java/com/streamvault/data/remote/stalker/StalkerApiService.kt b/data/src/main/java/com/streamvault/data/remote/stalker/StalkerApiService.kt
index c79d43a8..de917070 100644
--- a/data/src/main/java/com/streamvault/data/remote/stalker/StalkerApiService.kt
+++ b/data/src/main/java/com/streamvault/data/remote/stalker/StalkerApiService.kt
@@ -154,6 +154,12 @@ interface StalkerApiService {
channelId: String
): Result<List<StalkerProgramRecord>>
+ suspend fun getBulkEpg(
+ session: StalkerSession,
+ profile: StalkerDeviceProfile,
+ periodHours: Int = 6
+ ): Result<List<StalkerProgramRecord>>
+
suspend fun createLink(
session: StalkerSession,
profile: StalkerDeviceProfile,
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.kt
index c01a54fc..3e19847a 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
@@ -168,6 +168,21 @@ class StalkerProvider(
}
}
+ suspend fun getBulkEpg(periodHours: Int = 6): Result<List<Program>> {
+ return when (val authResult = ensureAuthenticated()) {
+ is Result.Success -> {
+ val (session, _) = authResult.data
+ when (val epgResult = api.getBulkEpg(session, currentDeviceProfile(), periodHours)) {
+ is Result.Success -> Result.success(epgResult.data.map { it.toProgram() })
+ is Result.Error -> Result.error(epgResult.message, epgResult.exception)
+ is Result.Loading -> Result.error("Unexpected loading state")
+ }
+ }
+ is Result.Error -> Result.error(authResult.message, authResult.exception)
+ is Result.Loading -> Result.error("Unexpected loading state")
+ }
+ }
+
override suspend fun getShortEpg(channelId: String, limit: Int): Result<List<Program>> {
return when (val authResult = ensureAuthenticated()) {
is Result.Success -> {
diff --git a/data/src/main/java/com/streamvault/data/repository/MovieRepositoryImpl.kt b/data/src/main/java/com/streamvault/data/repository/MovieRepositoryImpl.kt
index 9504a51d..67d77ddd 100644
--- a/data/src/main/java/com/streamvault/data/repository/MovieRepositoryImpl.kt
+++ b/data/src/main/java/com/streamvault/data/repository/MovieRepositoryImpl.kt
@@ -793,12 +793,16 @@ class MovieRepositoryImpl @Inject constructor(
when {
query.filterBy.type == LibraryFilterType.ALL &&
query.sortBy in setOf(LibrarySortBy.LIBRARY, LibrarySortBy.TITLE) -> {
- collectMoviePages<NameCursor>(query, parentalLevel, collected, favoriteIds) { limit, cursor ->
+ collectMoviePages<NameCursor>(query, parentalLevel, collected, favoriteIds,
+ extractCursor = { NameCursor(it.name, it.id) }
+ ) { limit, cursor ->
loadMovieNamePage(query, limit, cursor)
}
}
(query.sortBy == LibrarySortBy.RATING || query.filterBy.type == LibraryFilterType.TOP_RATED) -> {
- collectMoviePages<RatingCursor>(query, parentalLevel, collected, favoriteIds) { limit, cursor ->
+ collectMoviePages<RatingCursor>(query, parentalLevel, collected, favoriteIds,
+ extractCursor = { RatingCursor(it.rating, it.name, it.id) }
+ ) { limit, cursor ->
loadMovieRatingPage(query, limit, cursor)
}
}
@@ -807,7 +811,9 @@ class MovieRepositoryImpl @Inject constructor(
query.sortBy == LibrarySortBy.UPDATED ||
query.filterBy.type == LibraryFilterType.RECENTLY_UPDATED
) -> {
- collectMoviePages<FreshCursor>(query, parentalLevel, collected, favoriteIds) { limit, cursor ->
+ collectMoviePages<FreshCursor>(query, parentalLevel, collected, favoriteIds,
+ extractCursor = { FreshCursor(it.addedAt, it.releaseDate.orEmpty(), it.name, it.id) }
+ ) { limit, cursor ->
loadMovieFreshPage(query, limit, cursor)
}
}
@@ -821,6 +827,7 @@ class MovieRepositoryImpl @Inject constructor(
parentalLevel: Int,
collected: MutableList<Movie>,
favoriteIds: Set<Long>,
+ extractCursor: (MovieBrowseEntity) -> C,
loadPage: suspend (limit: Int, cursor: C?) -> List<MovieBrowseEntity>
) {
var cursor: C? = null
@@ -842,20 +849,10 @@ class MovieRepositoryImpl @Inject constructor(
if (batch.size < CURSOR_BATCH_SIZE) {
return
}
- @Suppress("UNCHECKED_CAST")
- cursor = cursorFromQuery(query, batch.last()) as C
+ cursor = extractCursor(batch.last())
}
}
- private fun cursorFromQuery(query: LibraryBrowseQuery, entity: MovieBrowseEntity): Any = when {
- query.filterBy.type == LibraryFilterType.ALL &&
- query.sortBy in setOf(LibrarySortBy.LIBRARY, LibrarySortBy.TITLE) -> NameCursor(entity.name, entity.id)
- query.sortBy == LibrarySortBy.RATING || query.filterBy.type == LibraryFilterType.TOP_RATED ->
- RatingCursor(entity.rating, entity.name, entity.id)
- else ->
- FreshCursor(entity.addedAt, entity.releaseDate.orEmpty(), entity.name, entity.id)
- }
-
private suspend fun loadMovieNamePage(query: LibraryBrowseQuery, limit: Int, cursor: NameCursor?): List<MovieBrowseEntity> {
val categoryId = query.categoryId
return if (categoryId == null) {
@@ -1160,25 +1157,27 @@ class MovieRepositoryImpl @Inject constructor(
provider.password,
enableBase64TextCompatibility.toString()
).joinToString("\u0000")
- return xtreamProviderCache.compute(providerId) { _, cached ->
- if (cached != null && cached.signature == signature) {
- cached
- } else {
- val decryptedPassword = credentialCrypto.decryptIfNeeded(provider.password)
- CachedXtreamProvider(
- signature = signature,
- provider = XtreamProvider(
- providerId = providerId,
- api = xtreamApiService,
- serverUrl = provider.serverUrl,
- username = provider.username,
- password = decryptedPassword,
- allowedOutputFormats = provider.toDomain().allowedOutputFormats,
- enableBase64TextCompatibility = enableBase64TextCompatibility
+ return requireNotNull(
+ xtreamProviderCache.compute(providerId) { _, cached ->
+ if (cached != null && cached.signature == signature) {
+ cached
+ } else {
+ val decryptedPassword = credentialCrypto.decryptIfNeeded(provider.password)
+ CachedXtreamProvider(
+ signature = signature,
+ provider = XtreamProvider(
+ providerId = providerId,
+ api = xtreamApiService,
+ serverUrl = provider.serverUrl,
+ username = provider.username,
+ password = decryptedPassword,
+ allowedOutputFormats = provider.toDomain().allowedOutputFormats,
+ enableBase64TextCompatibility = enableBase64TextCompatibility
+ )
)
- )
+ }
}
- }!!.provider
+ ) { "Provider cache compute returned null for providerId=$providerId" }.provider
}
private fun createStalkerProvider(providerId: Long, provider: ProviderEntity): StalkerProvider {
diff --git a/data/src/main/java/com/streamvault/data/repository/PlaybackHistoryRepositoryImpl.kt b/data/src/main/java/com/streamvault/data/repository/PlaybackHistoryRepositoryImpl.kt
index 1ce67f91..d14e9b2f 100644
--- a/data/src/main/java/com/streamvault/data/repository/PlaybackHistoryRepositoryImpl.kt
+++ b/data/src/main/java/com/streamvault/data/repository/PlaybackHistoryRepositoryImpl.kt
@@ -11,6 +11,8 @@ import com.streamvault.domain.model.PlaybackHistory
import com.streamvault.domain.model.PlaybackWatchedStatus
import com.streamvault.domain.model.Result
import com.streamvault.domain.repository.PlaybackHistoryRepository
+import com.streamvault.domain.util.DEFAULT_PLAYBACK_COMPLETION_THRESHOLD
+import com.streamvault.domain.util.isPlaybackComplete
import java.util.concurrent.ConcurrentHashMap
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
@@ -210,6 +212,13 @@ class PlaybackHistoryRepositoryImpl @Inject constructor(
Result.error("Failed to clear live playback history", e)
}
+ override suspend fun flushPendingProgress(): Result<Unit> = try {
+ flushPendingResumeUpdates()
+ Result.success(Unit)
+ } catch (e: Exception) {
+ Result.error("Failed to flush pending progress", e)
+ }
+
private suspend fun flushPendingResumeUpdates() {
val snapshot = pendingResumeUpdates.entries.toList()
snapshot.forEach { (key, history) ->
@@ -253,7 +262,6 @@ class PlaybackHistoryRepositoryImpl @Inject constructor(
}
}
-private const val DEFAULT_PLAYBACK_COMPLETION_THRESHOLD = 0.95f
private const val RESUME_POSITION_FLUSH_INTERVAL_MS = 30_000L
private data class PlaybackKey(
@@ -262,16 +270,5 @@ private data class PlaybackKey(
val providerId: Long
)
-private fun isPlaybackComplete(
- progressMs: Long,
- totalDurationMs: Long,
- threshold: Float = DEFAULT_PLAYBACK_COMPLETION_THRESHOLD
-): Boolean {
- if (progressMs <= 0L || totalDurationMs <= 0L) {
- return false
- }
- return progressMs >= (totalDurationMs * threshold).toLong()
-}
-
private fun PlaybackHistory.playbackKey(): PlaybackKey =
PlaybackKey(contentId = contentId, contentType = contentType, providerId = providerId)
diff --git a/data/src/main/java/com/streamvault/data/repository/SeriesRepositoryImpl.kt b/data/src/main/java/com/streamvault/data/repository/SeriesRepositoryImpl.kt
index 5cea31a8..2fd15cba 100644
--- a/data/src/main/java/com/streamvault/data/repository/SeriesRepositoryImpl.kt
+++ b/data/src/main/java/com/streamvault/data/repository/SeriesRepositoryImpl.kt
@@ -175,11 +175,11 @@ class SeriesRepositoryImpl @Inject constructor(
if (filteredCategories.isEmpty()) {
flowOf(emptyMap())
} else {
- filteredCategories.forEach { category ->
- val provider = providerDao.getById(providerId)
- if (provider != null &&
- (provider.type == ProviderType.XTREAM_CODES || provider.type == ProviderType.STALKER_PORTAL)
- ) {
+ val provider = providerDao.getById(providerId)
+ if (provider != null &&
+ (provider.type == ProviderType.XTREAM_CODES || provider.type == ProviderType.STALKER_PORTAL)
+ ) {
+ filteredCategories.forEach { category ->
triggerSeriesCategoryHydration(providerId, category.categoryId, provider)
}
}
@@ -720,19 +720,25 @@ class SeriesRepositoryImpl @Inject constructor(
when {
query.filterBy.type == LibraryFilterType.ALL &&
query.sortBy in setOf(LibrarySortBy.LIBRARY, LibrarySortBy.TITLE) -> {
- collectSeriesPages<NameCursor>(query, parentalLevel, collected, favoriteIds) { limit, cursor ->
+ collectSeriesPages<NameCursor>(query, parentalLevel, collected, favoriteIds,
+ extractCursor = { NameCursor(it.name, it.id) }
+ ) { limit, cursor ->
loadSeriesNamePage(query, limit, cursor)
}
}
(query.sortBy == LibrarySortBy.RATING || query.filterBy.type == LibraryFilterType.TOP_RATED) -> {
- collectSeriesPages<RatingCursor>(query, parentalLevel, collected, favoriteIds) { limit, cursor ->
+ collectSeriesPages<RatingCursor>(query, parentalLevel, collected, favoriteIds,
+ extractCursor = { RatingCursor(it.rating, it.name, it.id) }
+ ) { limit, cursor ->
loadSeriesRatingPage(query, limit, cursor)
}
}
query.sortBy == LibrarySortBy.RELEASE ||
query.sortBy == LibrarySortBy.UPDATED ||
query.filterBy.type == LibraryFilterType.RECENTLY_UPDATED -> {
- collectSeriesPages<FreshCursor>(query, parentalLevel, collected, favoriteIds) { limit, cursor ->
+ collectSeriesPages<FreshCursor>(query, parentalLevel, collected, favoriteIds,
+ extractCursor = { FreshCursor(it.lastModified, it.name, it.id) }
+ ) { limit, cursor ->
loadSeriesFreshPage(query, limit, cursor)
}
}
@@ -746,6 +752,7 @@ class SeriesRepositoryImpl @Inject constructor(
parentalLevel: Int,
collected: MutableList<Series>,
favoriteIds: Set<Long>,
+ extractCursor: (SeriesBrowseEntity) -> C,
loadPage: suspend (limit: Int, cursor: C?) -> List<SeriesBrowseEntity>
) {
var cursor: C? = null
@@ -767,19 +774,10 @@ class SeriesRepositoryImpl @Inject constructor(
if (batch.size < CURSOR_BATCH_SIZE) {
return
}
- @Suppress("UNCHECKED_CAST")
- cursor = cursorFromQuery(query, batch.last()) as C
+ cursor = extractCursor(batch.last())
}
}
- private fun cursorFromQuery(query: LibraryBrowseQuery, entity: SeriesBrowseEntity): Any = when {
- query.filterBy.type == LibraryFilterType.ALL &&
- query.sortBy in setOf(LibrarySortBy.LIBRARY, LibrarySortBy.TITLE) -> NameCursor(entity.name, entity.id)
- query.sortBy == LibrarySortBy.RATING || query.filterBy.type == LibraryFilterType.TOP_RATED ->
- RatingCursor(entity.rating, entity.name, entity.id)
- else -> FreshCursor(entity.lastModified, entity.name, entity.id)
- }
-
private suspend fun loadSeriesNamePage(query: LibraryBrowseQuery, limit: Int, cursor: NameCursor?): List<SeriesBrowseEntity> {
val categoryId = query.categoryId
return if (categoryId == null) {
@@ -1044,25 +1042,27 @@ class SeriesRepositoryImpl @Inject constructor(
provider.password,
enableBase64TextCompatibility.toString()
).joinToString("\u0000")
- return xtreamProviderCache.compute(providerId) { _, cached ->
- if (cached != null && cached.signature == signature) {
- cached
- } else {
- val decryptedPassword = credentialCrypto.decryptIfNeeded(provider.password)
- CachedXtreamProvider(
- signature = signature,
- provider = XtreamProvider(
- providerId = providerId,
- api = xtreamApiService,
- serverUrl = provider.serverUrl,
- username = provider.username,
- password = decryptedPassword,
- allowedOutputFormats = provider.toDomain().allowedOutputFormats,
- enableBase64TextCompatibility = enableBase64TextCompatibility
+ return requireNotNull(
+ xtreamProviderCache.compute(providerId) { _, cached ->
+ if (cached != null && cached.signature == signature) {
+ cached
+ } else {
+ val decryptedPassword = credentialCrypto.decryptIfNeeded(provider.password)
+ CachedXtreamProvider(
+ signature = signature,
+ provider = XtreamProvider(
+ providerId = providerId,
+ api = xtreamApiService,
+ serverUrl = provider.serverUrl,
+ username = provider.username,
+ password = decryptedPassword,
+ allowedOutputFormats = provider.toDomain().allowedOutputFormats,
+ enableBase64TextCompatibility = enableBase64TextCompatibility
+ )
)
- )
+ }
}
- }!!.provider
+ ) { "Provider cache compute returned null for providerId=$providerId" }.provider
}
private fun createStalkerProvider(providerId: Long, provider: ProviderEntity): StalkerProvider {
diff --git a/data/src/main/java/com/streamvault/data/sync/SyncManager.kt b/data/src/main/java/com/streamvault/data/sync/SyncManager.kt
index 469462e7..70287eb3 100644
--- a/data/src/main/java/com/streamvault/data/sync/SyncManager.kt
+++ b/data/src/main/java/com/streamvault/data/sync/SyncManager.kt
@@ -13,6 +13,7 @@ import com.streamvault.data.local.dao.SeriesDao
import com.streamvault.data.local.dao.TmdbIdentityDao
import com.streamvault.data.local.entity.CategoryEntity
import com.streamvault.data.local.entity.ChannelEntity
+import com.streamvault.data.local.entity.ChannelGuideSyncEntity
import com.streamvault.data.local.entity.MovieEntity
import com.streamvault.data.local.entity.SeriesEntity
import com.streamvault.data.mapper.toDomain
@@ -1175,10 +1176,23 @@ class SyncManager @Inject constructor(
return emptyList()
}
+ val guideRequests = channels
+ .mapNotNull(::toStalkerGuideRequest)
+ .distinctBy(StalkerGuideRequest::channelKey)
+ if (guideRequests.isEmpty()) {
+ return listOf("Stalker portal guide sync skipped because no valid guide channel IDs were available.")
+ }
+
val api = createStalkerSyncProvider(provider)
+ val aliasToChannelKey = buildMap {
+ guideRequests.forEach { request ->
+ request.aliases.forEach { alias -> putIfAbsent(alias, request.channelKey) }
+ }
+ }
val failedChannels = mutableListOf<String>()
val insertBuffer = ArrayList<com.streamvault.data.local.entity.ProgramEntity>(STALKER_GUIDE_PROGRAM_BATCH_SIZE)
var replacedExistingGuide = false
+ val bulkCoveredChannelKeys = linkedSetOf<String>()
suspend fun flushPrograms() {
if (insertBuffer.isEmpty()) return
@@ -1193,14 +1207,40 @@ class SyncManager @Inject constructor(
}
}
- channels.forEachIndexed { index, channel ->
- val channelKey = channel.epgChannelId?.takeIf { it.isNotBlank() } ?: channel.streamId.toString()
- val channelName = channel.name.ifBlank { channelKey }
- progress(provider.id, onProgress, "Downloading portal EPG... ${index + 1} of ${channels.size}")
+ runCatching {
+ requireResult(
+ api.getBulkEpg(),
+ "Failed to load bulk Stalker guide"
+ )
+ }.onSuccess { programs ->
+ programs
+ .asSequence()
+ .mapNotNull { program ->
+ val resolvedChannelKey = aliasToChannelKey[program.channelId] ?: return@mapNotNull null
+ bulkCoveredChannelKeys += resolvedChannelKey
+ program.copy(
+ providerId = provider.id,
+ channelId = resolvedChannelKey
+ ).toEntity()
+ }
+ .forEach { entity ->
+ insertBuffer += entity
+ if (insertBuffer.size >= STALKER_GUIDE_PROGRAM_BATCH_SIZE) {
+ flushPrograms()
+ }
+ }
+ }.onFailure { error ->
+ Log.d(TAG, "Bulk Stalker portal EPG fetch unavailable for provider ${provider.id}", error)
+ }
+
+ val fallbackGuideRequests = guideRequests.filterNot { request -> request.channelKey in bulkCoveredChannelKeys }
+
+ fallbackGuideRequests.forEachIndexed { index, request ->
+ progress(provider.id, onProgress, "Downloading portal EPG... ${index + 1} of ${fallbackGuideRequests.size}")
runCatching {
requireResult(
- api.getEpg(channelKey),
- "Failed to load Stalker guide for $channelName"
+ api.getEpg(request.channelKey),
+ "Failed to load Stalker guide for ${request.channelName}"
)
}.onSuccess { programs ->
programs
@@ -1209,17 +1249,17 @@ class SyncManager @Inject constructor(
.forEach { program ->
insertBuffer += program.copy(
providerId = provider.id,
- channelId = channelKey
+ channelId = request.channelKey
).toEntity()
if (insertBuffer.size >= STALKER_GUIDE_PROGRAM_BATCH_SIZE) {
flushPrograms()
}
}
}.onFailure { error ->
- failedChannels += channelName
+ failedChannels += request.channelName
Log.w(
TAG,
- "Stalker portal EPG fetch failed for provider ${provider.id} channel $channelKey",
+ "Stalker portal EPG fetch failed for provider ${provider.id} channel ${request.channelKey}",
error
)
}
@@ -1260,6 +1300,41 @@ class SyncManager @Inject constructor(
return warnings
}
+ private data class StalkerGuideRequest(
+ val channelKey: String,
+ val channelName: String,
+ val aliases: Set<String>
+ )
+
+ private fun toStalkerGuideRequest(channel: ChannelGuideSyncEntity): StalkerGuideRequest? {
+ val normalizedEpgKey = channel.epgChannelId
+ ?.trim()
+ ?.takeIf { it.isNotEmpty() }
+ ?.takeUnless(::isLikelyPlaceholderStalkerGuideKey)
+ val streamKey = channel.streamId.takeIf { it > 0L }?.toString()
+ val channelKey = normalizedEpgKey ?: streamKey ?: return null
+ val aliases = linkedSetOf<String>().apply {
+ normalizedEpgKey?.let(::add)
+ streamKey?.let(::add)
+ }
+ return StalkerGuideRequest(
+ channelKey = channelKey,
+ channelName = channel.name.ifBlank { channelKey },
+ aliases = aliases
+ )
+ }
+
+ private fun isLikelyPlaceholderStalkerGuideKey(value: String): Boolean {
+ return when (value.trim().lowercase()) {
+ "no details available",
+ "n/a",
+ "null",
+ "none",
+ "unknown" -> true
+ else -> false
+ }
+ }
+
private fun summarizeChannelNames(channelNames: List<String>): String {
val distinctNames = channelNames.distinct()
if (distinctNames.isEmpty()) {
diff --git a/data/src/test/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiServiceTest.kt b/data/src/test/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiServiceTest.kt
index c89c9e59..6a9160e7 100644
--- a/data/src/test/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiServiceTest.kt
+++ b/data/src/test/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiServiceTest.kt
@@ -175,6 +175,152 @@ class OkHttpStalkerApiServiceTest {
)
}
+ @Test
+ fun getLiveStreams_prefers_get_all_channels_for_bulk_live_loads() = runTest {
+ val requestedActions = mutableListOf<String>()
+ val service = OkHttpStalkerApiService(
+ okHttpClient = OkHttpClient.Builder()
+ .addInterceptor { chain ->
+ val request = chain.request()
+ val action = request.url.queryParameter("action").orEmpty()
+ requestedActions += action
+ val body = when (action) {
+ "get_all_channels" -> """
+ {"js":{"data":[{"id":"100","name":"News","tv_genre_id":"10","cmd":"ffmpeg http://example.com/live.ts"}]}}
+ """.trimIndent()
+ else -> error("Unexpected action '$action'")
+ }
+ Response.Builder()
+ .request(request)
+ .protocol(Protocol.HTTP_1_1)
+ .code(200)
+ .message("OK")
+ .body(body.toResponseBody("application/json".toMediaType()))
+ .build()
+ }
+ .build(),
+ json = Json { ignoreUnknownKeys = true }
+ )
+
+ val result = service.getLiveStreams(
+ session = StalkerSession(
+ loadUrl = "https://portal.example.com/server/load.php",
+ portalReferer = "https://portal.example.com/c/",
+ token = "token-123"
+ ),
+ profile = buildStalkerDeviceProfile(
+ portalUrl = "https://portal.example.com/c",
+ macAddress = "00:1A:79:12:34:56",
+ deviceProfile = "MAG250",
+ timezone = "UTC",
+ locale = "en"
+ ),
+ categoryId = null
+ )
+
+ assertThat(result).isInstanceOf(Result.Success::class.java)
+ val success = result as Result.Success
+ assertThat(success.data.map { it.name }).containsExactly("News")
+ assertThat(requestedActions).containsExactly("get_all_channels")
+ }
+
+ @Test
+ fun getLiveStreams_falls_back_to_paged_get_ordered_list_when_all_channels_is_unavailable() = runTest {
+ val requestedUrls = mutableListOf<String>()
+ val service = OkHttpStalkerApiService(
+ okHttpClient = OkHttpClient.Builder()
+ .addInterceptor { chain ->
+ val request = chain.request()
+ requestedUrls += request.url.toString()
+ val action = request.url.queryParameter("action").orEmpty()
+ val response = when (action) {
+ "get_all_channels" -> Response.Builder()
+ .request(request)
+ .protocol(Protocol.HTTP_1_1)
+ .code(200)
+ .message("OK")
+ .body("".toResponseBody("application/json".toMediaType()))
+ .build()
+ "get_ordered_list" -> Response.Builder()
+ .request(request)
+ .protocol(Protocol.HTTP_1_1)
+ .code(200)
+ .message("OK")
+ .body(
+ """
+ {"js":{"total_items":"1","max_page_items":"50","data":[{"id":"100","name":"News","tv_genre_id":"10","cmd":"ffmpeg http://example.com/live.ts"}]}}
+ """.trimIndent().toResponseBody("application/json".toMediaType())
+ )
+ .build()
+ else -> error("Unexpected action '$action'")
+ }
+ response
+ }
+ .build(),
+ json = Json { ignoreUnknownKeys = true }
+ )
+
+ val result = service.getLiveStreams(
+ session = StalkerSession(
+ loadUrl = "https://portal.example.com/server/load.php",
+ portalReferer = "https://portal.example.com/c/",
+ token = "token-123"
+ ),
+ profile = buildStalkerDeviceProfile(
+ portalUrl = "https://portal.example.com/c",
+ macAddress = "00:1A:79:12:34:56",
+ deviceProfile = "MAG250",
+ timezone = "UTC",
+ locale = "en"
+ ),
+ categoryId = null
+ )
+
+ assertThat(result).isInstanceOf(Result.Success::class.java)
+ val success = result as Result.Success
+ assertThat(success.data.map { it.name }).containsExactly("News")
+ assertThat(requestedUrls).containsAtLeast(
+ "https://portal.example.com/server/load.php?type=itv&action=get_all_channels&JsHttpRequest=1-xml",
+ "https://portal.example.com/server/load.php?type=itv&action=get_ordered_list&JsHttpRequest=1-xml&force_ch_link_check=0&fav=0&p=1"
+ )
+ }
+
+ @Test
+ fun getBulkEpg_parses_channel_ids_from_bulk_response_rows() = runTest {
+ val service = OkHttpStalkerApiService(
+ okHttpClient = fakeClient(
+ "get_epg_info" to """
+ {"js":[
+ {"id":"p1","ch_id":"100","name":"Morning News","descr":"Top stories","start_timestamp":"1700000000","stop_timestamp":"1700003600"},
+ {"id":"p2","channel_id":"sports-guide-id","name":"Live Sports","descr":"Match coverage","start_timestamp":"1700003600","stop_timestamp":"1700007200"}
+ ]}
+ """.trimIndent()
+ ),
+ json = Json { ignoreUnknownKeys = true }
+ )
+
+ val result = service.getBulkEpg(
+ session = StalkerSession(
+ loadUrl = "https://portal.example.com/server/load.php",
+ portalReferer = "https://portal.example.com/c/",
+ token = "token-123"
+ ),
+ profile = buildStalkerDeviceProfile(
+ portalUrl = "https://portal.example.com/c",
+ macAddress = "00:1A:79:12:34:56",
+ deviceProfile = "MAG250",
+ timezone = "UTC",
+ locale = "en"
+ ),
+ periodHours = 6
+ )
+
+ assertThat(result).isInstanceOf(Result.Success::class.java)
+ val success = result as Result.Success
+ assertThat(success.data.map { it.channelId }).containsExactly("100", "sports-guide-id")
+ assertThat(success.data.map { it.title }).containsExactly("Morning News", "Live Sports")
+ }
+
private fun fakeClient(vararg responses: Pair<String, String>): OkHttpClient {
val byAction = responses.toMap()
return OkHttpClient.Builder()
diff --git a/data/src/test/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolverTest.kt b/data/src/test/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolverTest.kt
index 467302be..6dbe84e1 100644
--- a/data/src/test/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolverTest.kt
+++ b/data/src/test/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolverTest.kt
@@ -404,6 +404,12 @@ class XtreamStreamUrlResolverTest {
channelId: String
): Result<List<StalkerProgramRecord>> = Result.success(emptyList())
+ override suspend fun getBulkEpg(
+ session: StalkerSession,
+ profile: StalkerDeviceProfile,
+ periodHours: Int
+ ): Result<List<StalkerProgramRecord>> = Result.success(emptyList())
+
override suspend fun createLink(
session: StalkerSession,
profile: StalkerDeviceProfile,
diff --git a/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.kt b/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.kt
index 484f6791..f0ed7105 100644
--- a/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.kt
+++ b/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.kt
@@ -848,6 +848,189 @@ class SyncManagerTest {
assertThat(metadata?.epgCount).isEqualTo(1)
}
+ @Test
+ fun retrySection_epg_stalker_dedupes_same_guide_key_within_one_run() = runTest {
+ val providerEntity = sampleProvider(ProviderType.STALKER_PORTAL).copy(
+ serverUrl = "http://example.com",
+ username = "",
+ password = "",
+ stalkerMacAddress = "00:11:22:33:44:55",
+ epgSyncMode = ProviderEpgSyncMode.BACKGROUND,
+ epgUrl = ""
+ )
+ val manager = buildManager(providerType = ProviderType.STALKER_PORTAL, providerEntity = providerEntity)
+
+ org.mockito.kotlin.whenever(stalkerApiService.authenticate(any())).thenReturn(
+ Result.success(
+ StalkerSession(
+ loadUrl = "http://example.com/stalker_portal/server/load.php",
+ portalReferer = "http://example.com/stalker_portal/c/",
+ token = "token"
+ ) to StalkerProviderProfile(accountName = "Stalker")
+ )
+ )
+ org.mockito.kotlin.whenever(channelDao.getGuideSyncEntriesByProvider(1L)).thenReturn(
+ listOf(
+ ChannelGuideSyncEntity(streamId = 100L, name = "News", epgChannelId = "shared-guide-id"),
+ ChannelGuideSyncEntity(streamId = 101L, name = "News HD", epgChannelId = "shared-guide-id"),
+ ChannelGuideSyncEntity(streamId = 102L, name = "Sports", epgChannelId = "sports-guide-id")
+ )
+ )
+ org.mockito.kotlin.whenever(stalkerApiService.getEpg(any(), any(), eq("shared-guide-id"))).thenReturn(
+ Result.success(
+ listOf(
+ StalkerProgramRecord(
+ id = "p1",
+ channelId = "shared-guide-id",
+ title = "Morning News",
+ description = "Top stories",
+ startTimeMillis = 1_700_000_000_000L,
+ endTimeMillis = 1_700_000_360_000L
+ )
+ )
+ )
+ )
+ org.mockito.kotlin.whenever(stalkerApiService.getEpg(any(), any(), eq("sports-guide-id"))).thenReturn(
+ Result.success(
+ listOf(
+ StalkerProgramRecord(
+ id = "p2",
+ channelId = "sports-guide-id",
+ title = "Live Sports",
+ description = "Match coverage",
+ startTimeMillis = 1_700_000_000_000L,
+ endTimeMillis = 1_700_000_360_000L
+ )
+ )
+ )
+ )
+ org.mockito.kotlin.whenever(programDao.countByProvider(1L)).thenReturn(2)
+
+ val result = manager.retrySection(providerId = 1L, section = SyncRepairSection.EPG)
+
+ assertThat(result).isInstanceOf(Result.Success::class.java)
+ verify(stalkerApiService, org.mockito.kotlin.times(1)).getEpg(any(), any(), eq("shared-guide-id"))
+ verify(stalkerApiService, org.mockito.kotlin.times(1)).getEpg(any(), any(), eq("sports-guide-id"))
+ }
+
+ @Test
+ fun retrySection_epg_stalker_uses_bulk_first_and_only_falls_back_for_uncovered_keys() = runTest {
+ val providerEntity = sampleProvider(ProviderType.STALKER_PORTAL).copy(
+ serverUrl = "http://example.com",
+ username = "",
+ password = "",
+ stalkerMacAddress = "00:11:22:33:44:55",
+ epgSyncMode = ProviderEpgSyncMode.BACKGROUND,
+ epgUrl = ""
+ )
+ val manager = buildManager(providerType = ProviderType.STALKER_PORTAL, providerEntity = providerEntity)
+
+ org.mockito.kotlin.whenever(stalkerApiService.authenticate(any())).thenReturn(
+ Result.success(
+ StalkerSession(
+ loadUrl = "http://example.com/stalker_portal/server/load.php",
+ portalReferer = "http://example.com/stalker_portal/c/",
+ token = "token"
+ ) to StalkerProviderProfile(accountName = "Stalker")
+ )
+ )
+ org.mockito.kotlin.whenever(channelDao.getGuideSyncEntriesByProvider(1L)).thenReturn(
+ listOf(
+ ChannelGuideSyncEntity(streamId = 100L, name = "News", epgChannelId = "shared-guide-id"),
+ ChannelGuideSyncEntity(streamId = 102L, name = "Sports", epgChannelId = "sports-guide-id")
+ )
+ )
+ org.mockito.kotlin.whenever(stalkerApiService.getBulkEpg(any(), any(), eq(6))).thenReturn(
+ Result.success(
+ listOf(
+ StalkerProgramRecord(
+ id = "p1",
+ channelId = "shared-guide-id",
+ title = "Morning News",
+ description = "Top stories",
+ startTimeMillis = 1_700_000_000_000L,
+ endTimeMillis = 1_700_000_360_000L
+ )
+ )
+ )
+ )
+ org.mockito.kotlin.whenever(stalkerApiService.getEpg(any(), any(), eq("sports-guide-id"))).thenReturn(
+ Result.success(
+ listOf(
+ StalkerProgramRecord(
+ id = "p2",
+ channelId = "sports-guide-id",
+ title = "Live Sports",
+ description = "Match coverage",
+ startTimeMillis = 1_700_000_000_000L,
+ endTimeMillis = 1_700_000_360_000L
+ )
+ )
+ )
+ )
+ org.mockito.kotlin.whenever(programDao.countByProvider(1L)).thenReturn(2)
+
+ val result = manager.retrySection(providerId = 1L, section = SyncRepairSection.EPG)
+
+ assertThat(result).isInstanceOf(Result.Success::class.java)
+ verify(stalkerApiService, org.mockito.kotlin.times(1)).getBulkEpg(any(), any(), eq(6))
+ verify(stalkerApiService, org.mockito.kotlin.times(0)).getEpg(any(), any(), eq("shared-guide-id"))
+ verify(stalkerApiService, org.mockito.kotlin.times(1)).getEpg(any(), any(), eq("sports-guide-id"))
+ }
+
+ @Test
+ fun retrySection_epg_stalker_falls_back_to_stream_id_for_placeholder_epg_key() = runTest {
+ val providerEntity = sampleProvider(ProviderType.STALKER_PORTAL).copy(
+ serverUrl = "http://example.com",
+ username = "",
+ password = "",
+ stalkerMacAddress = "00:11:22:33:44:55",
+ epgSyncMode = ProviderEpgSyncMode.BACKGROUND,
+ epgUrl = ""
+ )
+ val manager = buildManager(providerType = ProviderType.STALKER_PORTAL, providerEntity = providerEntity)
+
+ org.mockito.kotlin.whenever(stalkerApiService.authenticate(any())).thenReturn(
+ Result.success(
+ StalkerSession(
+ loadUrl = "http://example.com/stalker_portal/server/load.php",
+ portalReferer = "http://example.com/stalker_portal/c/",
+ token = "token"
+ ) to StalkerProviderProfile(accountName = "Stalker")
+ )
+ )
+ org.mockito.kotlin.whenever(channelDao.getGuideSyncEntriesByProvider(1L)).thenReturn(
+ listOf(
+ ChannelGuideSyncEntity(
+ streamId = 100L,
+ name = "News",
+ epgChannelId = "No details available"
+ )
+ )
+ )
+ org.mockito.kotlin.whenever(stalkerApiService.getEpg(any(), any(), eq("100"))).thenReturn(
+ Result.success(
+ listOf(
+ StalkerProgramRecord(
+ id = "p1",
+ channelId = "100",
+ title = "Morning News",
+ description = "Top stories",
+ startTimeMillis = 1_700_000_000_000L,
+ endTimeMillis = 1_700_000_360_000L
+ )
+ )
+ )
+ )
+ org.mockito.kotlin.whenever(programDao.countByProvider(1L)).thenReturn(1)
+
+ val result = manager.retrySection(providerId = 1L, section = SyncRepairSection.EPG)
+
+ assertThat(result).isInstanceOf(Result.Success::class.java)
+ verify(stalkerApiService, org.mockito.kotlin.times(1)).getEpg(any(), any(), eq("100"))
+ verify(stalkerApiService, org.mockito.kotlin.times(0)).getEpg(any(), any(), eq("No details available"))
+ }
+
@Test
fun `sync_xtream_movie_failure_does_not_block_series_sync`() = runTest {
val mgr = buildManager(providerType = ProviderType.XTREAM_CODES)
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 6a87d16a..1a06d469 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,16 +1,25 @@
# Changelog
All notable product changes are recorded in this document.
-## [1.0.8] - 2026-04-21
+## [1.0.8] - 2026-04-22
+
+### Added
+
+- Added resume action on movie and series detail screens — shows formatted position and episode context (e.g. "Resume · S2 E3 · 23:45").
### Fixed
-- Fixed Xtream Movies and Series sometimes showing categories but loading zero items after fast sync.
-- Fixed Xtream fast-sync category hydration treating temporary empty category responses as completed, which could leave VOD groups partially loaded until a later refresh.
-- Fixed slow Stalker provider adds by loading VOD and Series categories first and fetching their items only when needed.
-- Fixed Stalker streams failing on some portals by sending the required MAG/STB playback headers and user-agent on the final media request.
-- Fixed malformed Stalker stream links on some portals when the server already returned a direct playback URL.
-- Fixed Stalker EPG sync options so upfront, background, and manual refresh can use the portal guide with XMLTV fallback.
+- Fixed Pro-mode Live TV preview to fullscreen handoff so live playback can continue more smoothly without media-session crashes.
+- Fixed Stalker live sync over-requesting channels on provider add.
+- Fixed Stalker EPG sync making redundant requests for duplicate or placeholder guide keys.
+- Fixed Stalker background EPG sync skipping the bulk portal request and going straight to per-channel fetches.
+- Fixed new Stalker providers defaulting to upfront EPG sync instead of background sync.
+- Fixed Stalker playback on portals requiring MAG-style headers or fresh direct-URL resolution.
+- Fixed Stalker probe failures and HTTP `456` errors being reported too generically.
+- Fixed Xtream fast sync leaving movie and series categories temporarily empty.
+- Fixed VOD browse pagination skipping items or leaving groups incomplete.
+- Fixed VOD resume position, episode progress, and continue-watching state not updating reliably.
+- Fixed silent audio when a stream's codec (e.g. EAC3, AC3) is unsupported — player now surfaces a clear error.
---
@@ -22,7 +31,6 @@ All notable product changes are recorded in this document.
### Fixed
-- Fixed TV Guide startup loading full large categories before first render.
- Fixed startup crashes on some Android 9 devices when secure preference storage fails to initialize.
- Fixed Picture-in-Picture setup on devices that report invalid or unsupported video aspect ratios.
- Fixed launch crashes for some upgrades from 1.0.4 or earlier caused by orphaned provider content left behind by older deletes.
diff --git a/domain/src/main/java/com/streamvault/domain/repository/PlaybackHistoryRepository.kt b/domain/src/main/java/com/streamvault/domain/repository/PlaybackHistoryRepository.kt
index b7e42b4c..b5bc8e8c 100644
--- a/domain/src/main/java/com/streamvault/domain/repository/PlaybackHistoryRepository.kt
+++ b/domain/src/main/java/com/streamvault/domain/repository/PlaybackHistoryRepository.kt
@@ -14,6 +14,7 @@ interface PlaybackHistoryRepository {
suspend fun markAsWatched(history: PlaybackHistory): Result<Unit>
suspend fun recordPlayback(history: PlaybackHistory): Result<Unit>
suspend fun updateResumePosition(history: PlaybackHistory): Result<Unit>
+ suspend fun flushPendingProgress(): Result<Unit>
suspend fun removeFromHistory(contentId: Long, contentType: ContentType, providerId: Long): Result<Unit>
suspend fun clearAllHistory(): Result<Unit>
suspend fun clearHistoryForProvider(providerId: Long): Result<Unit>
diff --git a/domain/src/main/java/com/streamvault/domain/usecase/GetContinueWatching.kt b/domain/src/main/java/com/streamvault/domain/usecase/GetContinueWatching.kt
index d9d29f4f..9a752f9b 100644
--- a/domain/src/main/java/com/streamvault/domain/usecase/GetContinueWatching.kt
+++ b/domain/src/main/java/com/streamvault/domain/usecase/GetContinueWatching.kt
@@ -58,7 +58,7 @@ class GetContinueWatching @Inject constructor(
private fun continueWatchingKey(entry: PlaybackHistory): String = when (entry.contentType) {
ContentType.MOVIE -> "movie:${entry.contentId}"
ContentType.SERIES,
- ContentType.SERIES_EPISODE -> "series:${entry.seriesId ?: entry.contentId}"
+ ContentType.SERIES_EPISODE -> "series:${entry.seriesId?.takeIf { it > 0L } ?: entry.contentId}"
ContentType.LIVE -> "live:${entry.contentId}"
}
diff --git a/domain/src/main/java/com/streamvault/domain/usecase/ValidateAndAddProvider.kt b/domain/src/main/java/com/streamvault/domain/usecase/ValidateAndAddProvider.kt
index a728f04f..bd250950 100644
--- a/domain/src/main/java/com/streamvault/domain/usecase/ValidateAndAddProvider.kt
+++ b/domain/src/main/java/com/streamvault/domain/usecase/ValidateAndAddProvider.kt
@@ -16,14 +16,14 @@ data class XtreamProviderSetupCommand(
val password: String,
val name: String,
val xtreamFastSyncEnabled: Boolean = true,
- val epgSyncMode: ProviderEpgSyncMode = ProviderEpgSyncMode.UPFRONT,
+ val epgSyncMode: ProviderEpgSyncMode = ProviderEpgSyncMode.BACKGROUND,
val existingProviderId: Long? = null
)
data class M3uProviderSetupCommand(
val url: String,
val name: String,
- val epgSyncMode: ProviderEpgSyncMode = ProviderEpgSyncMode.UPFRONT,
+ val epgSyncMode: ProviderEpgSyncMode = ProviderEpgSyncMode.BACKGROUND,
val m3uVodClassificationEnabled: Boolean = false,
val existingProviderId: Long? = null
)
diff --git a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
index 6a3cc623..be719629 100644
--- a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
+++ b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
@@ -130,6 +130,7 @@ class Media3PlayerEngine @Inject constructor(
private var retryJob: Job? = null
private var retryGeneration = 0L
private var currentBufferIsLive: Boolean? = null
+ private var audioCodecUnsupportedReported = false
private val _playbackState = MutableStateFlow(PlaybackState.IDLE)
override val playbackState: StateFlow<PlaybackState> = _playbackState.asStateFlow()
@@ -483,6 +484,10 @@ class Media3PlayerEngine @Inject constructor(
viewBinder.bind(renderView, getOrCreatePlayer(), resizeMode)
}
+ override fun clearRenderBinding() {
+ viewBinder.attachPlayer(null)
+ }
+
override fun releaseRenderView(renderView: android.view.View) {
viewBinder.release(renderView)
}
@@ -548,6 +553,7 @@ class Media3PlayerEngine @Inject constructor(
lastMediaId = mediaId
playbackStarted = false
prepareStartMs = System.currentTimeMillis()
+ audioCodecUnsupportedReported = false
_error.tryEmit(null)
_mediaTitle.value = null
trackController.resetSelections()
@@ -615,17 +621,13 @@ class Media3PlayerEngine @Inject constructor(
}
private fun recreatePlayer() {
- val existing = exoPlayer
- if (existing != null) {
- val currentViewPosition = existing.currentPosition
- val playWhenReady = existing.playWhenReady
- mediaSession?.release()
- mediaSession = null
- exoPlayer?.release()
- exoPlayer = null
- viewBinder.attachPlayer(null)
- lastStreamInfo?.let { prepareInternal(it, preserveRetryState = true, seekPositionMs = currentViewPosition, autoPlay = playWhenReady) }
- }
+ val existing = exoPlayer ?: return
+ mediaSession?.release()
+ mediaSession = null
+ existing.release()
+ exoPlayer = null
+ viewBinder.attachPlayer(null)
+ // The caller (prepareInternal) will create a fresh player and set it up fully.
}
private fun getOrCreatePlayer(): ExoPlayer {
@@ -874,6 +876,30 @@ class Media3PlayerEngine @Inject constructor(
override fun onTracksChanged(tracks: androidx.media3.common.Tracks) {
trackController.onTracksChanged(tracks)
+ // Detect the silent failure: the stream contains audio groups but no track
+ // is decodable on this device (e.g. EAC3/AC3 without passthrough or a
+ // software decoder). ExoPlayer simply skips the audio renderer without
+ // throwing an error, resulting in mute playback with no user feedback.
+ if (!audioCodecUnsupportedReported) {
+ val hasAudioGroups = tracks.groups.any {
+ it.mediaTrackGroup.type == C.TRACK_TYPE_AUDIO && it.length > 0
+ }
+ if (hasAudioGroups && trackController.availableAudioTracks.value.isEmpty()) {
+ audioCodecUnsupportedReported = true
+ val mimeTypes = tracks.groups
+ .filter { it.mediaTrackGroup.type == C.TRACK_TYPE_AUDIO }
+ .flatMap { g -> (0 until g.length).mapNotNull { g.mediaTrackGroup.getFormat(it).sampleMimeType } }
+ .distinct()
+ .joinToString()
+ Log.w(TAG, "audio-codec-unsupported mimeTypes=$mimeTypes target=${PlaybackLogSanitizer.sanitizeUrl(lastStreamInfo?.url.orEmpty())}")
+ _error.tryEmit(
+ PlayerError.DecoderError(
+ "No compatible audio decoder for this stream ($mimeTypes). " +
+ "The audio codec is not supported on this device."
+ )
+ )
+ }
+ }
}
}
}
diff --git a/player/src/main/java/com/streamvault/player/PlayerEngine.kt b/player/src/main/java/com/streamvault/player/PlayerEngine.kt
index 62fc5398..1aab2bc5 100644
--- a/player/src/main/java/com/streamvault/player/PlayerEngine.kt
+++ b/player/src/main/java/com/streamvault/player/PlayerEngine.kt
@@ -103,6 +103,7 @@ interface PlayerEngine {
surfaceType: PlayerRenderSurfaceType = PlayerRenderSurfaceType.AUTO
): View
fun bindRenderView(renderView: View, resizeMode: PlayerSurfaceResizeMode)
+ fun clearRenderBinding()
fun releaseRenderView(renderView: View)
}