Skip to content

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

Fix stale player route without playable request

Ensar Basri Kahveci2b3de0d7cd57
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 1e110640..86f815a7 100644
--- a/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt
+++ b/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt
@@ -1,6 +1,7 @@
package com.streamvault.app.navigation
import android.net.Uri
+import android.util.Log
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.lifecycle.Lifecycle
@@ -37,6 +38,7 @@ import kotlinx.coroutines.suspendCancellableCoroutine
private const val PLAYER_REQUEST_KEY = "player_request"
+private const val TAG = "AppNavigation"
data class PlayerNavigationRequest(
val streamUrl: String,
@@ -210,6 +212,9 @@ private fun isStreamUrlSafe(url: String?): Boolean {
return scheme in setOf("http", "https", "rtsp", "rtmp", "rtsps", "mms", "xtream", "content", "file")
}
+internal fun safePlayerNavigationRequest(request: PlayerNavigationRequest?): PlayerNavigationRequest? =
+ request?.takeIf { isStreamUrlSafe(it.streamUrl) }
+
/** Navigate only when the current destination is fully resumed – prevents double-navigation during transitions. */
private fun NavHostController.navigateIfResumed(route: String, builder: NavOptionsBuilder.() -> Unit = {}): Boolean {
if (currentBackStackEntry?.lifecycle?.currentState?.isAtLeast(Lifecycle.State.RESUMED) != true) return false
@@ -629,50 +634,62 @@ fun AppNavigation(mainActivity: MainActivity) {
?: navController.previousBackStackEntry?.savedStateHandle?.get<PlayerNavigationRequest>(PLAYER_REQUEST_KEY)?.also {
backStackEntry.savedStateHandle[PLAYER_REQUEST_KEY] = it
}
- val streamUrl = if (isStreamUrlSafe(playerRequest?.streamUrl)) playerRequest?.streamUrl.orEmpty() else ""
- PlayerScreen(
- streamUrl = streamUrl,
- title = playerRequest?.title.orEmpty(),
- epgChannelId = playerRequest?.channelId,
- internalChannelId = playerRequest?.internalId ?: -1L,
- categoryId = playerRequest?.categoryId,
- providerId = playerRequest?.providerId,
- isVirtual = playerRequest?.isVirtual ?: false,
- combinedProfileId = playerRequest?.combinedProfileId,
- combinedSourceFilterProviderId = playerRequest?.combinedSourceFilterProviderId,
- contentType = playerRequest?.contentType ?: "LIVE",
- artworkUrl = playerRequest?.artworkUrl,
- archiveStartMs = playerRequest?.archiveStartMs,
- archiveEndMs = playerRequest?.archiveEndMs,
- archiveTitle = playerRequest?.archiveTitle,
- returnRoute = playerRequest?.returnRoute,
- seriesId = playerRequest?.seriesId,
- seasonNumber = playerRequest?.seasonNumber,
- episodeNumber = playerRequest?.episodeNumber,
- episodeId = playerRequest?.episodeId,
- onBack = {
- val route = playerRequest?.returnRoute
- if (!route.isNullOrBlank() && navController.popBackStack(route, false)) {
- Unit
- } else if (!route.isNullOrBlank()) {
- navController.navigate(route) {
+ val safePlayerRequest = safePlayerNavigationRequest(playerRequest)
+ if (safePlayerRequest == null) {
+ LaunchedEffect(playerRequest) {
+ Log.w(TAG, "Missing or invalid player request; returning to previous destination")
+ if (!navController.popBackStack()) {
+ navController.navigate(Routes.HOME) {
popUpTo(Routes.PLAYER) { inclusive = true }
launchSingleTop = true
- restoreState = true
}
- } else {
- navController.popBackStack()
}
- },
- onNavigate = { route ->
- navController.navigateIfResumed(route) {
- launchSingleTop = true
- if (route == Routes.MULTI_VIEW) {
- popUpTo(Routes.PLAYER) { inclusive = true }
+ }
+ } else {
+ PlayerScreen(
+ streamUrl = safePlayerRequest.streamUrl,
+ title = safePlayerRequest.title,
+ epgChannelId = safePlayerRequest.channelId,
+ internalChannelId = safePlayerRequest.internalId,
+ categoryId = safePlayerRequest.categoryId,
+ providerId = safePlayerRequest.providerId,
+ isVirtual = safePlayerRequest.isVirtual,
+ combinedProfileId = safePlayerRequest.combinedProfileId,
+ combinedSourceFilterProviderId = safePlayerRequest.combinedSourceFilterProviderId,
+ contentType = safePlayerRequest.contentType,
+ artworkUrl = safePlayerRequest.artworkUrl,
+ archiveStartMs = safePlayerRequest.archiveStartMs,
+ archiveEndMs = safePlayerRequest.archiveEndMs,
+ archiveTitle = safePlayerRequest.archiveTitle,
+ returnRoute = safePlayerRequest.returnRoute,
+ seriesId = safePlayerRequest.seriesId,
+ seasonNumber = safePlayerRequest.seasonNumber,
+ episodeNumber = safePlayerRequest.episodeNumber,
+ episodeId = safePlayerRequest.episodeId,
+ onBack = {
+ val route = safePlayerRequest.returnRoute
+ if (!route.isNullOrBlank() && navController.popBackStack(route, false)) {
+ Unit
+ } else if (!route.isNullOrBlank()) {
+ navController.navigate(route) {
+ popUpTo(Routes.PLAYER) { inclusive = true }
+ launchSingleTop = true
+ restoreState = true
+ }
+ } else {
+ navController.popBackStack()
+ }
+ },
+ onNavigate = { route ->
+ navController.navigateIfResumed(route) {
+ launchSingleTop = true
+ if (route == Routes.MULTI_VIEW) {
+ popUpTo(Routes.PLAYER) { inclusive = true }
+ }
}
}
- }
- )
+ )
+ }
}
composable(
diff --git a/app/src/test/java/com/streamvault/app/navigation/PlayerNavigationRequestTest.kt b/app/src/test/java/com/streamvault/app/navigation/PlayerNavigationRequestTest.kt
new file mode 100644
index 00000000..7edb1915
--- /dev/null
+++ b/app/src/test/java/com/streamvault/app/navigation/PlayerNavigationRequestTest.kt
@@ -0,0 +1,32 @@
+package com.streamvault.app.navigation
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class PlayerNavigationRequestTest {
+
+ @Test
+ fun `safePlayerNavigationRequest rejects missing request`() {
+ assertThat(safePlayerNavigationRequest(null)).isNull()
+ }
+
+ @Test
+ fun `safePlayerNavigationRequest rejects unsafe stream url`() {
+ val request = PlayerNavigationRequest(
+ streamUrl = "javascript:alert(1)",
+ title = "Unsafe"
+ )
+
+ assertThat(safePlayerNavigationRequest(request)).isNull()
+ }
+
+ @Test
+ fun `safePlayerNavigationRequest accepts app supported stream schemes`() {
+ val request = PlayerNavigationRequest(
+ streamUrl = "xtream://1/series/10?ext=mkv",
+ title = "Episode"
+ )
+
+ assertThat(safePlayerNavigationRequest(request)).isSameInstanceAs(request)
+ }
+}