Skip to content

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

Fix external playback URL handoff

dev.salmontechde29b60b45ce
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8a384a88..fb440651 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -92,6 +92,8 @@ android {
buildTypes {
debug {
+ applicationIdSuffix = ".debug"
+ versionNameSuffix = "-debug"
buildConfigField("String", "XTREAM_DEV_SERVER", "\"${localProp("xtream.dev.server")}\"")
buildConfigField("String", "XTREAM_DEV_USERNAME", "\"${localProp("xtream.dev.username")}\"")
buildConfigField("String", "XTREAM_DEV_PASSWORD", "\"${localProp("xtream.dev.password")}\"")
diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml
new file mode 100644
index 00000000..ce97f7db
--- /dev/null
+++ b/app/src/debug/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="app_name">StreamVault Debug</string>
+</resources>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 69f7f4d5..9cee5257 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,7 +46,7 @@
android:banner="@drawable/app_banner"
android:icon="@mipmap/ic_launcher_vault"
android:roundIcon="@mipmap/ic_launcher_vault"
- android:label="StreamVault"
+ android:label="@string/app_name"
android:networkSecurityConfig="@xml/network_security_config"
android:usesCleartextTraffic="false"
android:supportsRtl="true"
diff --git a/app/src/main/java/com/streamvault/app/player/external/ExternalPlayerLauncher.kt b/app/src/main/java/com/streamvault/app/player/external/ExternalPlayerLauncher.kt
index f9b32427..8d629220 100644
--- a/app/src/main/java/com/streamvault/app/player/external/ExternalPlayerLauncher.kt
+++ b/app/src/main/java/com/streamvault/app/player/external/ExternalPlayerLauncher.kt
@@ -18,7 +18,7 @@ import java.lang.RuntimeException
*
* Validation rules:
* - Blank / empty URLs are rejected (returns `null`).
- * - Only `http` and `https` schemes are accepted (non-whitelisted schemes return `null`).
+ * - Only externally playable schemes are accepted (non-whitelisted schemes return `null`).
* - Valid URLs produce an [Intent] with:
* - action: `Intent.ACTION_VIEW`
* - data: the parsed [Uri]
@@ -26,6 +26,22 @@ import java.lang.RuntimeException
* - category: `Intent.CATEGORY_BROWSABLE`
*/
object ExternalPlayerLauncher {
+ private val allowedExternalPlayerSchemes = setOf(
+ "http",
+ "https",
+ "rtsp",
+ "rtmp",
+ "rtsps",
+ "mms",
+ "content",
+ "file",
+ )
+
+ fun isExternalPlayerLaunchUrl(url: String): Boolean {
+ val trimmed = url.trim()
+ if (trimmed.isBlank()) return false
+ return Uri.parse(trimmed).scheme?.lowercase() in allowedExternalPlayerSchemes
+ }
/**
* Build a view [Intent] for the given URL or return `null` when the URL is
@@ -42,15 +58,13 @@ object ExternalPlayerLauncher {
return null
}
- // Only allow http and https schemes
val parsed = Uri.parse(trimmed)
- if (parsed.scheme != "http" && parsed.scheme != "https") {
+ if (parsed.scheme?.lowercase() !in allowedExternalPlayerSchemes) {
return null
}
return Intent(Intent.ACTION_VIEW).apply {
- data = parsed
- type = inferExternalPlayerMimeType(trimmed)
+ setDataAndType(parsed, inferExternalPlayerMimeType(trimmed))
addCategory(Intent.CATEGORY_BROWSABLE)
}
}
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 fd36fd10..d9260e53 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
@@ -1,7 +1,10 @@
package com.streamvault.app.ui.screens.movies
import android.content.Intent
+import android.content.ClipData
+import android.content.ClipboardManager
import android.net.Uri
+import android.widget.Toast
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
@@ -26,6 +29,7 @@ import androidx.compose.material.icons.outlined.FavoriteBorder
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
@@ -63,6 +67,8 @@ import com.streamvault.domain.model.Movie
import com.streamvault.app.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.interaction.TvButton
import com.streamvault.app.ui.interaction.TvIconButton
+import com.streamvault.domain.model.Result
+import kotlinx.coroutines.launch
@Composable
fun MovieDetailScreen(
@@ -108,6 +114,13 @@ fun MovieDetailScreen(
isLoadingExternalRatings = uiState.isLoadingExternalRatings,
relatedContent = uiState.relatedContent,
onPlay = { onPlay(movie) },
+ onCopyUrl = {
+ when (val result = viewModel.resolveCopyStreamUrl()) {
+ is Result.Success -> result.data
+ is Result.Error -> null
+ Result.Loading -> null
+ }
+ },
onToggleFavorite = viewModel::toggleFavorite,
onRelatedClick = onPlay,
onBack = onBack
@@ -125,11 +138,13 @@ private fun MovieDetailContent(
isLoadingExternalRatings: Boolean,
relatedContent: List<Movie>,
onPlay: () -> Unit,
+ onCopyUrl: suspend () -> String?,
onToggleFavorite: () -> Unit,
onRelatedClick: (Movie) -> Unit,
onBack: () -> Unit
) {
val context = LocalContext.current
+ val coroutineScope = rememberCoroutineScope()
val isTelevisionDevice = rememberIsTelevisionDevice()
val playButtonFocusRequester = remember { FocusRequester() }
@@ -210,6 +225,11 @@ private fun MovieDetailContent(
externalRatings = externalRatings,
isLoadingExternalRatings = isLoadingExternalRatings,
onPlay = onPlay,
+ onCopyUrl = {
+ coroutineScope.launch {
+ copyStreamUrlToClipboard(context, onCopyUrl())
+ }
+ },
onToggleFavorite = onToggleFavorite,
playButtonFocusRequester = playButtonFocusRequester,
onPlayTrailer = {
@@ -234,6 +254,11 @@ private fun MovieDetailContent(
externalRatings = externalRatings,
isLoadingExternalRatings = isLoadingExternalRatings,
onPlay = onPlay,
+ onCopyUrl = {
+ coroutineScope.launch {
+ copyStreamUrlToClipboard(context, onCopyUrl())
+ }
+ },
onToggleFavorite = onToggleFavorite,
playButtonFocusRequester = playButtonFocusRequester,
onPlayTrailer = {
@@ -327,6 +352,7 @@ private fun MovieDetailHeroText(
externalRatings: ExternalRatings,
isLoadingExternalRatings: Boolean,
onPlay: () -> Unit,
+ onCopyUrl: () -> Unit,
onToggleFavorite: () -> Unit,
playButtonFocusRequester: FocusRequester,
onPlayTrailer: () -> Unit,
@@ -391,6 +417,15 @@ private fun MovieDetailHeroText(
}
)
}
+ TvButton(
+ onClick = onCopyUrl,
+ colors = ButtonDefaults.colors(
+ containerColor = AppColors.SurfaceEmphasis,
+ contentColor = AppColors.TextPrimary
+ )
+ ) {
+ Text(stringResource(R.string.stream_url_copy))
+ }
if (hasTrailer) {
TvButton(
onClick = onPlayTrailer,
@@ -429,6 +464,16 @@ private fun MovieDetailHeroText(
}
}
+private fun copyStreamUrlToClipboard(context: android.content.Context, url: String?) {
+ if (url.isNullOrBlank()) {
+ Toast.makeText(context, context.getString(R.string.stream_url_copy_failed), Toast.LENGTH_SHORT).show()
+ return
+ }
+ context.getSystemService(ClipboardManager::class.java)
+ ?.setPrimaryClip(ClipData.newPlainText(context.getString(R.string.stream_url_clip_label), url))
+ Toast.makeText(context, context.getString(R.string.stream_url_copied), Toast.LENGTH_SHORT).show()
+}
+
private fun resolveTrailerUrl(rawTrailer: String?): String? {
val trailer = rawTrailer?.trim().orEmpty()
if (trailer.isBlank()) return null
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 2d55f882..71f51600 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
@@ -3,6 +3,7 @@ package com.streamvault.app.ui.screens.movies
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
+import com.streamvault.app.plugins.StreamVaultPluginManager
import com.streamvault.app.util.isPlaybackComplete
import com.streamvault.domain.model.ContentType
import com.streamvault.domain.model.ExternalRatings
@@ -30,7 +31,8 @@ class MovieDetailViewModel @Inject constructor(
private val providerRepository: ProviderRepository,
private val playbackHistoryRepository: PlaybackHistoryRepository,
private val externalRatingsRepository: ExternalRatingsRepository,
- private val favoriteRepository: FavoriteRepository
+ private val favoriteRepository: FavoriteRepository,
+ private val pluginManager: StreamVaultPluginManager
) : ViewModel() {
private val movieId: Long = checkNotNull(
@@ -116,6 +118,22 @@ class MovieDetailViewModel @Inject constructor(
}
}
+ suspend fun resolveCopyStreamUrl(): Result<String> {
+ val movie = _uiState.value.movie ?: return Result.error("Could not resolve stream URL")
+ val streamInfo = when (val result = movieRepository.getStreamInfo(movie)) {
+ is Result.Success -> result.data
+ is Result.Error -> return Result.error(result.message, result.exception)
+ Result.Loading -> return Result.error("Could not resolve stream URL")
+ }
+ return when (val prepared = pluginManager.preparePlaybackStreamInfo(streamInfo)) {
+ is Result.Success -> prepared.data.url.trim().takeIf { it.isNotBlank() }
+ ?.let { Result.success(it) }
+ ?: Result.error("Could not resolve stream URL")
+ is Result.Error -> Result.error(prepared.message, prepared.exception)
+ Result.Loading -> Result.error("Could not resolve stream URL")
+ }
+ }
+
private fun loadExternalRatings(movie: Movie) {
viewModelScope.launch {
_uiState.update { it.copy(isLoadingExternalRatings = true) }
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 4a4772a2..462484d1 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
@@ -464,19 +464,28 @@ fun PlayerScreen(
}
// Auto-launch external player once per playback identity when mode is EXTERNAL_PLAYER.
- // The remembered key (streamUrl + prepareIdentity) prevents repeated launches
- // during recomposition and ensures a new identity triggers a new attempt.
+ // Wait for the resolved playable URL so logical provider URLs (xtream://, stalker://)
+ // are not handed to external apps before preparation finishes.
val externalPlaybackMode = playerPreferencesUiState.externalPlaybackMode
+ val externalPlaybackUrl by viewModel.externalPlaybackUrl.collectAsStateWithLifecycle()
val lastLaunchedExternalKey = rememberSaveable(streamUrl, prepareIdentity) {
mutableStateOf<String?>(null)
}
- LaunchedEffect(externalPlaybackMode, streamUrl, prepareIdentity) {
- if (externalPlaybackMode == ExternalPlaybackMode.EXTERNAL_PLAYER && streamUrl.isNotBlank()) {
+ LaunchedEffect(externalPlaybackMode, prepareIdentity, externalPlaybackUrl) {
+ if (externalPlaybackMode == ExternalPlaybackMode.EXTERNAL_PLAYER) {
+ val launchUrl = externalPlaybackUrl
+ if (launchUrl.isBlank()) return@LaunchedEffect
val launchKey = prepareIdentity.toString()
if (lastLaunchedExternalKey.value != launchKey) {
lastLaunchedExternalKey.value = launchKey
- val result = ExternalPlayerLauncher.launch(appContext, streamUrl)
+ if (!ExternalPlayerLauncher.isExternalPlayerLaunchUrl(launchUrl)) {
+ viewModel.showPlayerNotice(
+ message = "Cannot launch external player: Invalid or non-whitelisted URL scheme"
+ )
+ return@LaunchedEffect
+ }
+ val result = ExternalPlayerLauncher.launch(appContext, launchUrl)
when (result) {
is ExternalPlayerLaunchResult.Success -> {
Log.d("PlayerScreen", "External player launched successfully for: ${result.url}")
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 5a51f5c5..87fd8a61 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
@@ -227,6 +227,8 @@ class PlayerViewModel @Inject constructor(
val sleepTimerExitEvent: StateFlow<Int> = _sleepTimerExitEvent.asStateFlow()
private val _playerPreferencesUiState = MutableStateFlow(PlayerPreferencesUiState())
val playerPreferencesUiState: StateFlow<PlayerPreferencesUiState> = _playerPreferencesUiState.asStateFlow()
+ private val _externalPlaybackUrl = MutableStateFlow("")
+ val externalPlaybackUrl: StateFlow<String> = _externalPlaybackUrl.asStateFlow()
internal var channelInfoHideJob: Job? = null
internal var liveOverlayHideJob: Job? = null
@@ -251,6 +253,10 @@ class PlayerViewModel @Inject constructor(
internal var readySideEffectsRequestVersion: Long? = null
internal var currentArtworkUrl: String? = null
internal var currentResolvedPlaybackUrl: String = ""
+ set(value) {
+ field = value
+ _externalPlaybackUrl.value = value.trim()
+ }
internal var currentResolvedStreamInfo: StreamInfo? = null
internal var pendingCatchUpUrls: List<String> = emptyList()
internal var channelNumberingMode: ChannelNumberingMode = ChannelNumberingMode.GROUP
@@ -923,6 +929,8 @@ class PlayerViewModel @Inject constructor(
hasRetriedXtreamAuthRefresh = false
lastRecordedVariantObservationSignature = null
readySideEffectsRequestVersion = null
+ currentResolvedPlaybackUrl = ""
+ currentResolvedStreamInfo = null
playerEngine.setScrubbingMode(false)
return ++prepareRequestVersion
}
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 c55f7a17..2a36ce65 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
@@ -1,5 +1,8 @@
package com.streamvault.app.ui.screens.series
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.widget.Toast
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
@@ -27,6 +30,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@@ -35,6 +39,7 @@ import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
@@ -66,6 +71,8 @@ import com.streamvault.domain.model.Series
import com.streamvault.app.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.interaction.TvButton
import com.streamvault.app.ui.interaction.TvIconButton
+import com.streamvault.domain.model.Result
+import kotlinx.coroutines.launch
private const val EPISODE_DETAIL_PAGE_SIZE = 100
@@ -117,6 +124,13 @@ fun SeriesDetailScreen(
onSeasonSelected = viewModel::selectSeason,
onEpisodeClick = onEpisodeClick,
onResumeClick = onResumeClick ?: onEpisodeClick,
+ onCopyEpisodeUrl = { episode ->
+ when (val result = viewModel.resolveCopyStreamUrl(episode)) {
+ is Result.Success -> result.data
+ is Result.Error -> null
+ Result.Loading -> null
+ }
+ },
onBack = onBack
)
}
@@ -133,9 +147,17 @@ private fun SeriesDetailContent(
onSeasonSelected: (Season) -> Unit,
onEpisodeClick: (Episode) -> Unit,
onResumeClick: (Episode) -> Unit,
+ onCopyEpisodeUrl: suspend (Episode) -> String?,
onBack: () -> Unit
) {
val isTelevisionDevice = rememberIsTelevisionDevice()
+ val context = LocalContext.current
+ val coroutineScope = rememberCoroutineScope()
+ val copyEpisodeUrl: (Episode) -> Unit = { episode ->
+ coroutineScope.launch {
+ copyStreamUrlToClipboard(context, onCopyEpisodeUrl(episode))
+ }
+ }
BoxWithConstraints(
modifier = Modifier
.fillMaxSize()
@@ -271,10 +293,11 @@ private fun SeriesDetailContent(
SeriesDetailActions(
series = series,
resumeEpisode = ep,
- hasProgress = hasProgress,
- onResumeClick = onResumeClick,
- onToggleFavorite = onToggleFavorite
- )
+ hasProgress = hasProgress,
+ onResumeClick = onResumeClick,
+ onCopyUrl = { copyEpisodeUrl(ep) },
+ onToggleFavorite = onToggleFavorite
+ )
}
if (resumeEpisode == null) {
SeriesDetailFavoriteAction(series = series, onToggleFavorite = onToggleFavorite)
@@ -351,10 +374,11 @@ private fun SeriesDetailContent(
SeriesDetailActions(
series = series,
resumeEpisode = ep,
- hasProgress = hasProgress,
- onResumeClick = onResumeClick,
- onToggleFavorite = onToggleFavorite
- )
+ hasProgress = hasProgress,
+ onResumeClick = onResumeClick,
+ onCopyUrl = { copyEpisodeUrl(ep) },
+ onToggleFavorite = onToggleFavorite
+ )
}
if (resumeEpisode == null) {
SeriesDetailFavoriteAction(series = series, onToggleFavorite = onToggleFavorite)
@@ -404,7 +428,11 @@ private fun SeriesDetailContent(
}
}
items(visibleEpisodes, key = { it.id }) { episode ->
- EpisodeItem(episode = episode, onClick = { onEpisodeClick(episode) })
+ EpisodeItem(
+ episode = episode,
+ onClick = { onEpisodeClick(episode) },
+ onCopyUrl = { copyEpisodeUrl(episode) }
+ )
}
if (visibleEpisodes.size < season.episodes.size) {
item {
@@ -435,6 +463,7 @@ private fun SeriesDetailActions(
resumeEpisode: Episode,
hasProgress: Boolean,
onResumeClick: (Episode) -> Unit,
+ onCopyUrl: () -> Unit,
onToggleFavorite: () -> Unit
) {
Row(horizontalArrangement = Arrangement.spacedBy(12.dp), verticalAlignment = Alignment.CenterVertically) {
@@ -462,6 +491,15 @@ private fun SeriesDetailActions(
}
)
}
+ TvButton(
+ onClick = onCopyUrl,
+ colors = ButtonDefaults.colors(
+ containerColor = AppColors.SurfaceEmphasis,
+ contentColor = AppColors.TextPrimary
+ )
+ ) {
+ Text(stringResource(R.string.stream_url_copy))
+ }
SeriesDetailFavoriteAction(series = series, onToggleFavorite = onToggleFavorite)
}
}
@@ -524,20 +562,40 @@ fun SeasonChip(
@Composable
fun EpisodeItem(
episode: Episode,
- onClick: () -> Unit
+ onClick: () -> Unit,
+ onCopyUrl: () -> Unit
) {
- TvClickableSurface(
- onClick = onClick,
- shape = ClickableSurfaceDefaults.shape(shape = RoundedCornerShape(18.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = AppColors.SurfaceElevated,
- focusedContainerColor = AppColors.SurfaceEmphasis
- ),
- modifier = Modifier.fillMaxWidth()
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.spacedBy(12.dp),
+ verticalAlignment = Alignment.CenterVertically
) {
- EpisodeRowCard(
- episode = episode,
- modifier = Modifier.fillMaxWidth()
- )
+ TvClickableSurface(
+ onClick = onClick,
+ shape = ClickableSurfaceDefaults.shape(shape = RoundedCornerShape(18.dp)),
+ colors = ClickableSurfaceDefaults.colors(
+ containerColor = AppColors.SurfaceElevated,
+ focusedContainerColor = AppColors.SurfaceEmphasis
+ ),
+ modifier = Modifier.weight(1f)
+ ) {
+ EpisodeRowCard(
+ episode = episode,
+ modifier = Modifier.fillMaxWidth()
+ )
+ }
+ TvButton(onClick = onCopyUrl) {
+ Text(stringResource(R.string.stream_url_copy))
+ }
+ }
+}
+
+private fun copyStreamUrlToClipboard(context: android.content.Context, url: String?) {
+ if (url.isNullOrBlank()) {
+ Toast.makeText(context, context.getString(R.string.stream_url_copy_failed), Toast.LENGTH_SHORT).show()
+ return
}
+ context.getSystemService(ClipboardManager::class.java)
+ ?.setPrimaryClip(ClipData.newPlainText(context.getString(R.string.stream_url_clip_label), url))
+ Toast.makeText(context, context.getString(R.string.stream_url_copied), Toast.LENGTH_SHORT).show()
}
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 c06d665d..1b97a093 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
@@ -3,6 +3,7 @@ package com.streamvault.app.ui.screens.series
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
+import com.streamvault.app.plugins.StreamVaultPluginManager
import com.streamvault.domain.model.ContentType
import com.streamvault.domain.model.Episode
import com.streamvault.domain.model.ExternalRatings
@@ -34,7 +35,8 @@ class SeriesDetailViewModel @Inject constructor(
private val providerRepository: ProviderRepository,
private val playbackHistoryRepository: PlaybackHistoryRepository,
private val externalRatingsRepository: ExternalRatingsRepository,
- private val favoriteRepository: FavoriteRepository
+ private val favoriteRepository: FavoriteRepository,
+ private val pluginManager: StreamVaultPluginManager
) : ViewModel() {
private val seriesId: Long = checkNotNull(
@@ -129,6 +131,21 @@ class SeriesDetailViewModel @Inject constructor(
}
}
+ suspend fun resolveCopyStreamUrl(episode: Episode): Result<String> {
+ val streamInfo = when (val result = seriesRepository.getEpisodeStreamInfo(episode)) {
+ is Result.Success -> result.data
+ is Result.Error -> return Result.error(result.message, result.exception)
+ Result.Loading -> return Result.error("Could not resolve stream URL")
+ }
+ return when (val prepared = pluginManager.preparePlaybackStreamInfo(streamInfo)) {
+ is Result.Success -> prepared.data.url.trim().takeIf { it.isNotBlank() }
+ ?.let { Result.success(it) }
+ ?: Result.error("Could not resolve stream URL")
+ is Result.Error -> Result.error(prepared.message, prepared.exception)
+ Result.Loading -> Result.error("Could not resolve stream URL")
+ }
+ }
+
private fun loadExternalRatings(series: Series) {
viewModelScope.launch {
_uiState.update { it.copy(isLoadingExternalRatings = true) }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4137d710..361f2f03 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1338,6 +1338,10 @@
<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="stream_url_copy">Copy URL</string>
+ <string name="stream_url_copied">Stream URL copied</string>
+ <string name="stream_url_copy_failed">Could not resolve stream URL</string>
+ <string name="stream_url_clip_label">Stream URL</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>
diff --git a/app/src/test/java/com/streamvault/app/player/external/ExternalPlayerLauncherTest.kt b/app/src/test/java/com/streamvault/app/player/external/ExternalPlayerLauncherTest.kt
index 925873e5..6cba8b82 100644
--- a/app/src/test/java/com/streamvault/app/player/external/ExternalPlayerLauncherTest.kt
+++ b/app/src/test/java/com/streamvault/app/player/external/ExternalPlayerLauncherTest.kt
@@ -23,6 +23,28 @@ class ExternalPlayerLauncherTest {
).isNull()
}
+ @Test
+ fun `logical internal URLs return null`() {
+ assertThat(ExternalPlayerLauncher.buildExternalPlayerIntent("xtream://provider/movie/123")).isNull()
+ assertThat(ExternalPlayerLauncher.buildExternalPlayerIntent("stalker://provider/channel/456")).isNull()
+ }
+
+ @Test
+ fun `VLC compatible direct schemes return intents`() {
+ listOf(
+ "http://example.com/stream.ts",
+ "https://example.com/stream.m3u8",
+ "rtsp://example.com/live",
+ "rtmp://example.com/live",
+ "rtsps://example.com/live",
+ "mms://example.com/live",
+ "content://media/external/video/media/1",
+ "file:///sdcard/Movies/video.mp4",
+ ).forEach { url ->
+ assertThat(ExternalPlayerLauncher.buildExternalPlayerIntent(url)).isNotNull()
+ }
+ }
+
@Test
fun `https m3u8 URL returns ACTION_VIEW intent with HLS MIME type`() {
val intent = checkNotNull(ExternalPlayerLauncher.buildExternalPlayerIntent(
@@ -30,6 +52,7 @@ class ExternalPlayerLauncherTest {
))
assertThat(intent.action).isEqualTo(Intent.ACTION_VIEW)
+ assertThat(intent.data.toString()).isEqualTo("https://example.com/stream.m3u8")
assertThat(intent.type).isEqualTo("application/x-mpegURL")
assertThat(intent.categories).contains(Intent.CATEGORY_BROWSABLE)
}
diff --git a/docs/external-playback-copy-url-handoff.md b/docs/external-playback-copy-url-handoff.md
new file mode 100644
index 00000000..efb097ce
--- /dev/null
+++ b/docs/external-playback-copy-url-handoff.md
@@ -0,0 +1,48 @@
+# External Playback And Copy URL Validation
+
+## Completed State
+
+- Latest committed StreamVault work: `ae26790 Add external playback mode`.
+- Debug install conflict fix is applied:
+ - `app/build.gradle.kts` sets debug `applicationIdSuffix = ".debug"` and `versionNameSuffix = "-debug"`.
+ - `app/src/main/AndroidManifest.xml` uses `android:label="@string/app_name"`.
+ - `app/src/debug/res/values/strings.xml` defines `StreamVault Debug`.
+- Verified debug APK built with package `com.streamvault.app.debug` and label `StreamVault Debug`.
+- Copy URL works for movie and series playback URLs.
+- Direct VLC playback works after resolving provider URLs before external launch.
+
+## External Playback Fix
+
+- External launch happens in `app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt`.
+- `streamUrl` can be an internal/logical URL like `xtream://...` or `stalker://...`, not the resolved playable URL.
+- `ExternalPlayerLauncher` correctly rejects `xtream` and `stalker`.
+- `PlayerViewModel.prepare()` resolves playable URLs through `resolvePlaybackStreamInfo(...)` and stores:
+ - `currentResolvedPlaybackUrl = preparedStreamInfo.url`
+ - `currentResolvedStreamInfo = preparedStreamInfo`
+- `PlayerViewModel.externalPlaybackUrl` exposes the resolved playable URL to Compose.
+- `PlayerScreen` now waits for `externalPlaybackUrl` and does not fall back to raw logical provider URLs.
+- `beginPlaybackSession()` clears stale resolved URL/state before each prepare.
+
+## Copy URL Fix
+
+- `MovieDetailScreen.kt` has `Copy URL` next to movie `Play` and uses `MovieDetailViewModel.resolveCopyStreamUrl()`.
+- `SeriesDetailScreen.kt` has `Copy URL` for resume episode and episode rows, using `SeriesDetailViewModel.resolveCopyStreamUrl(episode)`.
+- Copied URLs resolve through repository/provider preparation before hitting clipboard.
+- Live channels do not currently have a separate detail page with a Play button; they launch directly from `HomeScreen`, so no live Copy URL button was added in this pass.
+
+## Verification
+
+- `gradlew.bat :app:compileDebugKotlin --no-daemon --console=plain` passed.
+- `gradlew.bat :app:testDebugUnitTest --tests com.streamvault.app.player.external.* --no-daemon --console=plain` passed.
+- `gradlew.bat :app:assembleDebug --no-daemon --console=plain` passed.
+- APK badging:
+ - package: `com.streamvault.app.debug`
+ - label: `StreamVault Debug`
+- User installed/ran debug app and confirmed:
+ - Copy URL works.
+ - Direct VLC playback works.
+
+## Follow-Up
+
+- External-player mode still prepares internal playback in the background after launching the chooser/player. Next fix should keep internal playback stopped unless no external app is chosen.
+- Remove `Ask every time` from Default playback app because external mode already falls back to internal playback when no external player is selected.