Skip to content

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

fix(live): clear recovered preview engine errors

David Nashashda94af620d40
diff --git a/feature/live/src/main/java/com/streamvault/feature/live/home/HomeViewModel.kt b/feature/live/src/main/java/com/streamvault/feature/live/home/HomeViewModel.kt
index 1581d8e6..4e71d057 100644
--- a/feature/live/src/main/java/com/streamvault/feature/live/home/HomeViewModel.kt
+++ b/feature/live/src/main/java/com/streamvault/feature/live/home/HomeViewModel.kt
@@ -1026,14 +1026,23 @@ class HomeViewModel @Inject constructor(
}
previewPlaybackJob = viewModelScope.launch {
+ var hasEnginePlaybackError = false
engine.playbackState.collectLatest { playbackState ->
if (!isActivePreviewSession(previewVersion, channel.id)) return@collectLatest
_previewUiState.update { state ->
state.copy(
isPreviewLoading = playbackState == PlaybackState.IDLE || playbackState == PlaybackState.BUFFERING,
previewErrorMessage = when {
- playbackState == PlaybackState.ERROR && state.previewErrorMessage.isNullOrBlank() ->
- appContext.getString(R.string.live_preview_failed)
+ playbackState == PlaybackState.ERROR -> {
+ hasEnginePlaybackError = true
+ state.previewErrorMessage
+ ?.takeIf(String::isNotBlank)
+ ?: appContext.getString(R.string.live_preview_failed)
+ }
+ hasEnginePlaybackError -> {
+ hasEnginePlaybackError = false
+ null
+ }
else -> state.previewErrorMessage
}
)
diff --git a/feature/live/src/test/java/com/streamvault/feature/live/home/HomeViewModelTest.kt b/feature/live/src/test/java/com/streamvault/feature/live/home/HomeViewModelTest.kt
index 74d827b5..caada322 100644
--- a/feature/live/src/test/java/com/streamvault/feature/live/home/HomeViewModelTest.kt
+++ b/feature/live/src/test/java/com/streamvault/feature/live/home/HomeViewModelTest.kt
@@ -301,6 +301,29 @@ class HomeViewModelTest {
verify(livePreviewHandoffManager, never()).registerPreviewSession(any<Channel>(), any(), any(), any())
}
+ @Test
+ fun `preview clears engine error when playback recovers`() = runTest {
+ configurePreviewDependencies()
+ val playbackState = MutableStateFlow(PlaybackState.IDLE)
+ whenever(playerEngine.playbackState).thenReturn(playbackState)
+ whenever(channelRepository.getStreamInfo(any(), any())).thenReturn(
+ Result.Success(StreamInfo(url = "https://example.com/live.m3u8"))
+ )
+ viewModel = createViewModel()
+ advanceUntilIdle()
+
+ viewModel.previewChannel(Channel(id = 103L, name = "Recovery Channel", providerId = 7L))
+ advanceUntilIdle()
+
+ playbackState.value = PlaybackState.ERROR
+ runCurrent()
+ assertThat(viewModel.previewUiState.value.previewErrorMessage).isEqualTo("test-message")
+
+ playbackState.value = PlaybackState.READY
+ runCurrent()
+ assertThat(viewModel.previewUiState.value.previewErrorMessage).isNull()
+ }
+
@Test
fun `fullscreen handoff delegates and clears local preview only on success`() = runTest {
configurePreviewDependencies()