StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
Improve Stalker sync defaults and playback handling
David Nashash5e396c277e7c
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerViewModel.ktindex fab7cbf9..91f3df1f 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@@ -209,7 +209,7 @@ class PlayerViewModel @Inject constructor(private val failedStreamsThisSession = mutableMapOf<String, Int>()private var hasRetriedWithSoftwareDecoder = falseprivate var hasRetriedXtreamAuthRefresh = false- private val probePassedProviderIds = mutableSetOf<Long>()+ private val probePassedPlaybackKeys = mutableSetOf<String>()private val notifiedRecordingFailureIds = mutableSetOf<String>()internal var lastRecordedLivePlaybackKey: Pair<Long, Long>? = nullprivate var currentStreamClassLabel: String = "Primary"@@ -765,7 +765,7 @@ class PlayerViewModel @Inject constructor(logicalGroupId = updatedChannel.logicalGroupId,rawChannelId = rawChannelId)- val resolvedUrl = resolvePlaybackUrl(+ val streamInfo = resolvePlaybackStreamInfo(logicalUrl = updatedChannel.streamUrl,internalContentId = updatedChannel.id,providerId = updatedChannel.providerId,@@ -781,12 +781,7 @@ class PlayerViewModel @Inject constructor(internalChannelId = updatedChannel.id)}- val streamInfo = StreamInfo(- url = resolvedUrl,- title = currentTitle,- streamType = com.streamvault.domain.model.StreamType.UNKNOWN- )- if (!preparePlayer(streamInfo, requestVersion)) return@launch+ if (!preparePlayer(streamInfo.copy(title = streamInfo.title ?: currentTitle), requestVersion)) return@launchplayerEngine.play()}}@@ -1115,7 +1110,7 @@ class PlayerViewModel @Inject constructor(return false}- probePlaybackUrl(streamInfo.url)?.let { failure ->+ probePlaybackUrl(streamInfo)?.let { failure ->if (!isActivePlaybackSession(requestVersion)) return falsesetLastFailureReason(failure.message)showPlayerNotice(@@ -1125,7 +1120,7 @@ class PlayerViewModel @Inject constructor()return false}- currentProviderId.takeIf { it > 0L }?.let { probePassedProviderIds.add(it) }+ probePassedPlaybackKeys.add(playbackProbeCacheKey(streamInfo.url))playerEngine.setMuted(preferencesRepository.playerMuted.first())playerEngine.setPlaybackSpeed(if (currentContentType == ContentType.LIVE) {@@ -1151,7 +1146,8 @@ class PlayerViewModel @Inject constructor(return true}- private suspend fun probePlaybackUrl(url: String): PlaybackProbeFailure? {+ private suspend fun probePlaybackUrl(streamInfo: com.streamvault.domain.model.StreamInfo): PlaybackProbeFailure? {+ val url = streamInfo.urlif (!shouldProbePlaybackUrl(url)) return nullreturn runCatching {@@ -1160,6 +1156,12 @@ class PlayerViewModel @Inject constructor(.url(url).get().header("Range", "bytes=0-0")+ .apply {+ streamInfo.userAgent?.takeIf { it.isNotBlank() }?.let { header("User-Agent", it) }+ streamInfo.headers.forEach { (name, value) ->+ header(name, value)+ }+ }.build()okHttpClient.newCall(request).execute().use { response ->when (response.code) {@@ -1167,6 +1169,10 @@ class PlayerViewModel @Inject constructor(message = "This provider stream was rejected (${response.code} Unauthorized/Forbidden).",recoveryType = PlayerRecoveryType.SOURCE)+ 456 -> PlaybackProbeFailure(+ message = "This provider rejected playback for this channel (HTTP 456). The MAC or subscription may not have access to this stream.",+ recoveryType = PlayerRecoveryType.SOURCE+ )404 -> PlaybackProbeFailure(message = "This provider stream is unavailable right now (404).",recoveryType = PlayerRecoveryType.SOURCE@@ -1185,8 +1191,11 @@ class PlayerViewModel @Inject constructor(private suspend fun shouldProbePlaybackUrl(url: String): Boolean {if (!url.startsWith("http://") && !url.startsWith("https://")) return falseval providerId = currentProviderId.takeIf { it > 0L } ?: return false- if (providerId in probePassedProviderIds) return falseval provider = providerRepository.getProvider(providerId) ?: return false+ val cacheKey = playbackProbeCacheKey(url)+ if (provider.type != com.streamvault.domain.model.ProviderType.STALKER_PORTAL && cacheKey in probePassedPlaybackKeys) {+ return false+ }return (provider.type == com.streamvault.domain.model.ProviderType.XTREAM_CODES ||provider.type == com.streamvault.domain.model.ProviderType.STALKER_PORTAL@@ -1194,6 +1203,9 @@ class PlayerViewModel @Inject constructor((xtreamStreamUrlResolver.isInternalStreamUrl(currentStreamUrl) || xtreamStreamUrlResolver.isInternalStreamUrl(url))}+ private fun playbackProbeCacheKey(url: String): String =+ currentStreamUrl.takeIf { it.isNotBlank() } ?: url+fun prepare(streamUrl: String,epgChannelId: String?,@@ -2017,6 +2029,11 @@ class PlayerViewModel @Inject constructor(is PlayerError.NetworkError -> {if (error.message.contains("timeout", ignoreCase = true)) {PlayerRecoveryType.BUFFER_TIMEOUT+ } else if (+ error.message.contains("HTTP 456", ignoreCase = true) ||+ error.message.contains("access denied", ignoreCase = true)+ ) {+ PlayerRecoveryType.SOURCE} else {PlayerRecoveryType.NETWORK}@@ -2035,7 +2052,12 @@ class PlayerViewModel @Inject constructor(private fun resolvePlaybackErrorMessage(error: PlayerError): String = when (classifyPlaybackError(error)) {PlayerRecoveryType.NETWORK -> "This stream is not responding right now. You can retry or try another source."- PlayerRecoveryType.SOURCE -> "We couldn't start this stream on the available paths."+ PlayerRecoveryType.SOURCE -> when {+ error.message.contains("HTTP 456", ignoreCase = true) ||+ error.message.contains("access denied", ignoreCase = true) ->+ "This provider rejected playback for this channel. The MAC or subscription may not have access to this stream."+ else -> "We couldn't start this stream on the available paths."+ }PlayerRecoveryType.DECODER -> "This stream could not play in the current decoder mode."PlayerRecoveryType.DRM -> "Playback requires valid DRM credentials or a supported device security level."PlayerRecoveryType.BUFFER_TIMEOUT -> "Playback stayed stuck buffering for too long on this stream."@@ -2121,7 +2143,7 @@ class PlayerViewModel @Inject constructor(if (!isActivePlaybackSession(requestVersion, playbackUrl)) return falsehasRetriedXtreamAuthRefresh = true- probePassedProviderIds.remove(currentProviderId)+ probePassedPlaybackKeys.remove(playbackProbeCacheKey(playbackUrl))setLastFailureReason(error.message)appendRecoveryAction("Refreshed provider playback URL after auth failure")showPlayerNotice(@@ -2228,8 +2250,12 @@ class PlayerViewModel @Inject constructor(logicalGroupId = updatedChannel.logicalGroupId,rawChannelId = nextVariant.rawChannelId)- val resolvedUrl = resolvePlaybackUrl(nextVariant.streamUrl, updatedChannel.id, updatedChannel.providerId, ContentType.LIVE)- ?: return@launch+ val streamInfo = resolvePlaybackStreamInfo(+ logicalUrl = nextVariant.streamUrl,+ internalContentId = updatedChannel.id,+ providerId = updatedChannel.providerId,+ contentType = ContentType.LIVE+ ) ?: return@launchif (!isActivePlaybackSession(requestVersion, nextVariant.streamUrl)) return@launchrecordLivePlayback(updatedChannel)requestEpg(@@ -2238,12 +2264,7 @@ class PlayerViewModel @Inject constructor(streamId = updatedChannel.streamId,internalChannelId = updatedChannel.id)- val streamInfo = com.streamvault.domain.model.StreamInfo(- url = resolvedUrl,- title = currentTitle,- streamType = com.streamvault.domain.model.StreamType.UNKNOWN- )- if (!preparePlayer(streamInfo, requestVersion)) return@launch+ if (!preparePlayer(streamInfo.copy(title = streamInfo.title ?: currentTitle), requestVersion)) return@launchplayerEngine.play()}return true@@ -2262,15 +2283,10 @@ class PlayerViewModel @Inject constructor(currentStreamUrl = nextStreamupdateStreamClass("Alternate")viewModelScope.launch {- val resolvedUrl = resolvePlaybackUrl(nextStream, channel.id, channel.providerId, ContentType.LIVE)+ val streamInfo = resolvePlaybackStreamInfo(nextStream, channel.id, channel.providerId, ContentType.LIVE)?: return@launchif (!isActivePlaybackSession(requestVersion, nextStream)) return@launch- val streamInfo = com.streamvault.domain.model.StreamInfo(- url = resolvedUrl,- title = currentTitle,- streamType = com.streamvault.domain.model.StreamType.UNKNOWN- )- if (!preparePlayer(streamInfo, requestVersion)) return@launch+ if (!preparePlayer(streamInfo.copy(title = streamInfo.title ?: currentTitle), requestVersion)) return@launchplayerEngine.play()}return true@@ -2311,15 +2327,10 @@ class PlayerViewModel @Inject constructor(currentStreamUrl = nextStreamupdateStreamClass("Catch-up")viewModelScope.launch {- val resolvedUrl = resolvePlaybackUrl(nextStream, currentContentId, currentProviderId, ContentType.LIVE)+ val streamInfo = resolvePlaybackStreamInfo(nextStream, currentContentId, currentProviderId, ContentType.LIVE)?: return@launchif (!isActivePlaybackSession(requestVersion, nextStream)) return@launch- val streamInfo = com.streamvault.domain.model.StreamInfo(- url = resolvedUrl,- title = currentTitle,- streamType = com.streamvault.domain.model.StreamType.UNKNOWN- )- if (!preparePlayer(streamInfo, requestVersion)) return@launch+ if (!preparePlayer(streamInfo.copy(title = streamInfo.title ?: currentTitle), requestVersion)) return@launchplayerEngine.play()}return true@@ -2643,15 +2654,10 @@ class PlayerViewModel @Inject constructor(if (isCatchUpPlayback()) {val requestVersion = beginPlaybackSession()viewModelScope.launch {- val resolvedUrl = resolvePlaybackUrl(streamUrl, currentContentId, currentProviderId, currentContentType)+ val streamInfo = resolvePlaybackStreamInfo(streamUrl, currentContentId, currentProviderId, currentContentType)?: return@launchif (!isActivePlaybackSession(requestVersion, streamUrl)) return@launch- val streamInfo = com.streamvault.domain.model.StreamInfo(- url = resolvedUrl,- title = currentTitle,- streamType = com.streamvault.domain.model.StreamType.UNKNOWN- )- if (!preparePlayer(streamInfo, requestVersion)) return@launch+ if (!preparePlayer(streamInfo.copy(title = streamInfo.title ?: currentTitle), requestVersion)) return@launchplayerEngine.play()}return@@ -2685,6 +2691,7 @@ class PlayerViewModel @Inject constructor(ContentType.LIVE -> {channelRepository.getChannel(internalContentId)?.let { channel ->fallbackStreamId = channel.streamId.takeIf { it > 0L }+ ?: channel.epgChannelId?.toLongOrNull()channelRepository.getStreamInfo(channel).getOrNull()?.let { resolved ->return resolved.copy(title = resolved.title ?: currentTitle)}@@ -2735,6 +2742,8 @@ class PlayerViewModel @Inject constructor(return com.streamvault.domain.model.StreamInfo(url = resolved.url,title = currentTitle,+ headers = resolved.headers,+ userAgent = resolved.userAgent,streamType = com.streamvault.domain.model.StreamType.fromContainerExtension(ext),containerExtension = ext,expirationTime = resolved.expirationTimediff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.ktindex 3e1083e6..4b371b61 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt@@ -244,10 +244,24 @@ fun ProviderSetupScreen(fun onSourceTypeSelected(type: SourceType) {if (uiState.isEditing) returnwhen (type) {- SourceType.XTREAM -> { selectedTab = 0 }- SourceType.STALKER -> { selectedTab = 1 }- SourceType.M3U_URL -> { selectedTab = 2; viewModel.updateM3uTab(0) }- SourceType.M3U_FILE-> { selectedTab = 2; viewModel.updateM3uTab(1) }+ SourceType.XTREAM -> {+ selectedTab = 0+ viewModel.applySourceDefaults(ProviderSetupViewModel.SetupSourceType.XTREAM)+ }+ SourceType.STALKER -> {+ selectedTab = 1+ viewModel.applySourceDefaults(ProviderSetupViewModel.SetupSourceType.STALKER)+ }+ SourceType.M3U_URL -> {+ selectedTab = 2+ viewModel.updateM3uTab(0)+ viewModel.applySourceDefaults(ProviderSetupViewModel.SetupSourceType.M3U)+ }+ SourceType.M3U_FILE-> {+ selectedTab = 2+ viewModel.updateM3uTab(1)+ viewModel.applySourceDefaults(ProviderSetupViewModel.SetupSourceType.M3U)+ }}}@@ -629,9 +643,15 @@ private fun AdvancedProviderOptionsSection(onStalkerDeviceLocaleChange: (String) -> Unit) {var showAdvancedOptions by rememberSaveable(sourceType) { mutableStateOf(false) }+ val defaultEpgSyncMode = when (sourceType) {+ SourceType.STALKER -> ProviderEpgSyncMode.BACKGROUND+ SourceType.XTREAM,+ SourceType.M3U_URL,+ SourceType.M3U_FILE -> ProviderEpgSyncMode.UPFRONT+ }LaunchedEffect(uiState.isEditing, uiState.epgSyncMode, uiState.xtreamFastSyncEnabled, sourceType) {- val hasNonDefaultSelection = ((sourceType == SourceType.XTREAM || sourceType == SourceType.STALKER) && uiState.epgSyncMode != ProviderEpgSyncMode.UPFRONT) ||+ val hasNonDefaultSelection = ((sourceType == SourceType.XTREAM || sourceType == SourceType.STALKER) && uiState.epgSyncMode != defaultEpgSyncMode) ||(sourceType == SourceType.XTREAM && !uiState.xtreamFastSyncEnabled) ||((sourceType == SourceType.M3U_URL || sourceType == SourceType.M3U_FILE) && !uiState.m3uVodClassificationEnabled) ||(sourceType == SourceType.STALKER && (stalkerDeviceProfile.isNotBlank() || stalkerDeviceTimezone.isNotBlank() || stalkerDeviceLocale.isNotBlank()))@@ -805,13 +825,20 @@ private fun AdvancedProviderOptionsSection(color = TextPrimary)Text(- text = androidx.compose.ui.res.stringResource(R.string.setup_epg_sync_mode_helper),+ text = androidx.compose.ui.res.stringResource(+ if (sourceType == SourceType.STALKER) {+ R.string.setup_stalker_epg_sync_mode_helper+ } else {+ R.string.setup_epg_sync_mode_helper+ }+ ),style = MaterialTheme.typography.bodySmall,color = OnSurfaceDim)ProviderEpgSyncMode.entries.forEach { mode ->EpgSyncModeOptionRow(mode = mode,+ sourceType = sourceType,selected = uiState.epgSyncMode == mode,onSelect = { onSelectEpgSyncMode(mode) })@@ -844,6 +871,7 @@ private fun AdvancedProviderOptionsSection(@Composableprivate fun EpgSyncModeOptionRow(mode: ProviderEpgSyncMode,+ sourceType: SourceType,selected: Boolean,onSelect: () -> Unit) {@@ -853,9 +881,21 @@ private fun EpgSyncModeOptionRow(ProviderEpgSyncMode.SKIP -> R.string.setup_epg_sync_mode_skip_title}val descriptionRes = when (mode) {- ProviderEpgSyncMode.UPFRONT -> R.string.setup_epg_sync_mode_upfront_description- ProviderEpgSyncMode.BACKGROUND -> R.string.setup_epg_sync_mode_background_description- ProviderEpgSyncMode.SKIP -> R.string.setup_epg_sync_mode_skip_description+ ProviderEpgSyncMode.UPFRONT -> if (sourceType == SourceType.STALKER) {+ R.string.setup_stalker_epg_sync_mode_upfront_description+ } else {+ R.string.setup_epg_sync_mode_upfront_description+ }+ ProviderEpgSyncMode.BACKGROUND -> if (sourceType == SourceType.STALKER) {+ R.string.setup_stalker_epg_sync_mode_background_description+ } else {+ R.string.setup_epg_sync_mode_background_description+ }+ ProviderEpgSyncMode.SKIP -> if (sourceType == SourceType.STALKER) {+ R.string.setup_stalker_epg_sync_mode_skip_description+ } else {+ R.string.setup_epg_sync_mode_skip_description+ }}Surface(onClick = onSelect,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.ktindex d82e2e6d..73edace9 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@@ -42,6 +42,12 @@ class ProviderSetupViewModel @Inject constructor(private val validateAndAddProvider: ValidateAndAddProvider) : ViewModel() {+ enum class SetupSourceType {+ XTREAM,+ STALKER,+ M3U+ }+private val _uiState = MutableStateFlow(ProviderSetupState())val uiState: StateFlow<ProviderSetupState> = _uiState.asStateFlow()private val _knownLocalM3uUrls = MutableStateFlow<Set<String>>(emptySet())@@ -84,6 +90,7 @@ class ProviderSetupViewModel @Inject constructor(stalkerDeviceTimezone = provider.stalkerDeviceTimezone,stalkerDeviceLocale = provider.stalkerDeviceLocale,epgSyncMode = provider.epgSyncMode,+ hasCustomizedEpgSyncMode = true,xtreamFastSyncEnabled = provider.xtreamFastSyncEnabled,m3uVodClassificationEnabled = provider.m3uVodClassificationEnabled,selectedTab = when (provider.type) {@@ -111,7 +118,19 @@ class ProviderSetupViewModel @Inject constructor(}fun updateEpgSyncMode(mode: ProviderEpgSyncMode) {- _uiState.update { it.copy(epgSyncMode = mode) }+ _uiState.update { it.copy(epgSyncMode = mode, hasCustomizedEpgSyncMode = true) }+ }++ fun applySourceDefaults(sourceType: SetupSourceType) {+ _uiState.update { current ->+ if (current.isEditing || current.hasCustomizedEpgSyncMode) {+ current+ } else {+ current.copy(+ epgSyncMode = defaultEpgSyncModeFor(sourceType)+ )+ }+ }}fun loginStalker(@@ -396,6 +415,13 @@ data class ProviderSetupState(val pendingCombinedAttachProfileId: Long? = null,val pendingCombinedAttachProfileName: String? = null,val epgSyncMode: ProviderEpgSyncMode = ProviderEpgSyncMode.UPFRONT,+ 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.XTREAM,+ ProviderSetupViewModel.SetupSourceType.M3U -> ProviderEpgSyncMode.UPFRONT+}diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xmlindex 5ac1eb29..0bc7b846 100644--- a/app/src/main/res/values-ar/strings.xml+++ b/app/src/main/res/values-ar/strings.xml@@ -740,6 +740,10 @@<string name="setup_epg_sync_mode_background_description">أكمل الإعداد أولًا، ثم اجلب بيانات الدليل تلقائيًا في الخلفية.</string><string name="setup_epg_sync_mode_skip_title">تخطي EPG الآن</string><string name="setup_epg_sync_mode_skip_description">لا تجلب بيانات الدليل تلقائيًا. يمكنك تحديث EPG لاحقًا من الإعدادات.</string>+ <string name="setup_stalker_epg_sync_mode_helper">يمكن لـ Stalker استخدام دليل البوابة الأصلي عندما يكون XMLTV مفقودًا أو غير متاح. يقوم خيار «الفوري» باستيراده أثناء الإعداد، ويؤجل خيار «الخلفية» ذلك، بينما يترك خيار «التخطي» تحميل الدليل عند الطلب.</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">نزّل القنوات المباشرة واستورد دليل بوابة Stalker أثناء الإعداد. إذا كان XMLTV مُعدًا ويعمل، فسيتم استخدامه أولًا.</string>+ <string name="setup_stalker_epg_sync_mode_background_description">أكمل الإعداد أولًا، ثم استورد دليل بوابة Stalker في الخلفية. إذا كان XMLTV مُعدًا ويعمل، فسيتم استخدامه أولًا.</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">لا تستورد بيانات الدليل المجمعة تلقائيًا. لا يزال بإمكان بيانات دليل البث المباشر التحميل عند الطلب أثناء تصفح القنوات.</string><string name="setup_m3u_hint">رابط M3U</string><string name="setup_tab_url">الرابط</string><string name="setup_tab_file">ملف</string>diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xmlindex 5496cb66..d8af9b96 100644--- a/app/src/main/res/values-cs/strings.xml+++ b/app/src/main/res/values-cs/strings.xml@@ -740,6 +740,10 @@<string name="setup_epg_sync_mode_background_description">Nejprve dokončit nastavení a poté automaticky stáhnout data průvodce na pozadí.</string><string name="setup_epg_sync_mode_skip_title">EPG zatím přeskočit</string><string name="setup_epg_sync_mode_skip_description">Nesynchronizovat data průvodce automaticky. EPG můžete později obnovit v Nastavení.</string>+ <string name="setup_stalker_epg_sync_mode_helper">Stalker může použít nativní průvodce portálu, když XMLTV chybí nebo není dostupné. Volba načíst hned jej importuje během nastavení, načtení na pozadí to odloží a přeskočit ponechá načítání průvodce na vyžádání.</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">Během nastavení stáhnout živé kanály a importovat průvodce portálu Stalker. Pokud je XMLTV nakonfigurováno a funguje, použije se nejdříve.</string>+ <string name="setup_stalker_epg_sync_mode_background_description">Nejprve dokončete nastavení a potom na pozadí importujte průvodce portálu Stalker. Pokud je XMLTV nakonfigurováno a funguje, použije se nejdříve.</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">Neimportujte automaticky hromadná data průvodce. Data živého průvodce lze při procházení kanálů stále načítat na vyžádání.</string><string name="setup_m3u_hint">URL M3U</string><string name="setup_tab_url">URL</string><string name="setup_tab_file">Soubor</string>diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xmlindex e09046b5..f7d14482 100644--- a/app/src/main/res/values-da/strings.xml+++ b/app/src/main/res/values-da/strings.xml@@ -740,6 +740,10 @@<string name="setup_epg_sync_mode_background_description">Afslut opsætningen først, og hent derefter guide-data automatisk i baggrunden.</string><string name="setup_epg_sync_mode_skip_title">Spring EPG over nu</string><string name="setup_epg_sync_mode_skip_description">Hent ikke guide-data automatisk. Du kan opdatere EPG senere fra Indstillinger.</string>+ <string name="setup_stalker_epg_sync_mode_helper">Stalker kan bruge portalens indbyggede guide, når XMLTV mangler eller ikke er tilgængelig. Hent nu importerer den under opsætningen, baggrund udsætter det, og spring over lader guiden blive indlæst efter behov.</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">Hent livekanaler og importer Stalker-portalens guide under opsætningen. Hvis XMLTV er konfigureret og virker, bruges det først.</string>+ <string name="setup_stalker_epg_sync_mode_background_description">Afslut opsætningen først, og importer derefter Stalker-portalens guide i baggrunden. Hvis XMLTV er konfigureret og virker, bruges det først.</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">Importér ikke guide-data i bulk automatisk. Live-guide-data kan stadig indlæses efter behov, mens du gennemser kanaler.</string><string name="setup_m3u_hint">M3U-URL</string><string name="setup_tab_url">URL</string><string name="setup_tab_file">Fil</string>diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xmlindex 5e60e6dc..8e07f0ea 100644--- a/app/src/main/res/values-de/strings.xml+++ b/app/src/main/res/values-de/strings.xml@@ -740,6 +740,10 @@<string name="setup_epg_sync_mode_background_description">Schließe zuerst die Einrichtung ab und lade die Guide-Daten dann automatisch im Hintergrund.</string><string name="setup_epg_sync_mode_skip_title">EPG vorerst überspringen</string><string name="setup_epg_sync_mode_skip_description">Guide-Daten nicht automatisch abrufen. Sie können EPG später in den Einstellungen aktualisieren.</string>+ <string name="setup_stalker_epg_sync_mode_helper">Stalker kann den nativen Portal-Guide verwenden, wenn XMLTV fehlt oder nicht verfügbar ist. Sofort importiert ihn während der Einrichtung, im Hintergrund verschiebt ihn, und Überspringen lädt Guide-Daten nur bei Bedarf.</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">Lade Live-Kanäle herunter und importiere den Stalker-Portal-Guide während der Einrichtung. Wenn XMLTV konfiguriert ist und funktioniert, wird es zuerst verwendet.</string>+ <string name="setup_stalker_epg_sync_mode_background_description">Schließe die Einrichtung zuerst ab und importiere den Stalker-Portal-Guide dann im Hintergrund. Wenn XMLTV konfiguriert ist und funktioniert, wird es zuerst verwendet.</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">Importiere Guide-Daten nicht automatisch als Bulk. Live-Guide-Daten können beim Durchsuchen der Kanäle weiterhin bei Bedarf geladen werden.</string><string name="setup_m3u_hint">M3U-URL</string><string name="setup_tab_url">URL</string><string name="setup_tab_file">Datei</string>diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xmlindex 333c8f21..76742d8b 100644--- a/app/src/main/res/values-el/strings.xml+++ b/app/src/main/res/values-el/strings.xml@@ -740,6 +740,10 @@<string name="setup_epg_sync_mode_background_description">Ολοκληρώστε πρώτα τη ρύθμιση και μετά ανακτήστε αυτόματα τα δεδομένα οδηγού στο παρασκήνιο.</string><string name="setup_epg_sync_mode_skip_title">Παράλειψη EPG προς το παρόν</string><string name="setup_epg_sync_mode_skip_description">Μην ανακτάτε αυτόματα δεδομένα οδηγού. Μπορείτε να ανανεώσετε το EPG αργότερα από τις Ρυθμίσεις.</string>+ <string name="setup_stalker_epg_sync_mode_helper">Το Stalker μπορεί να χρησιμοποιήσει τον εγγενή οδηγό της πύλης όταν το XMLTV λείπει ή δεν είναι διαθέσιμο. Η επιλογή άμεσης φόρτωσης τον εισάγει κατά τη ρύθμιση, η φόρτωση στο παρασκήνιο τον αναβάλλει και η παράλειψη αφήνει τη φόρτωση οδηγού κατά απαίτηση.</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">Κατεβάστε τα ζωντανά κανάλια και εισαγάγετε τον οδηγό πύλης του Stalker κατά τη ρύθμιση. Αν το XMLTV είναι ρυθμισμένο και λειτουργεί, χρησιμοποιείται πρώτα.</string>+ <string name="setup_stalker_epg_sync_mode_background_description">Ολοκληρώστε πρώτα τη ρύθμιση και έπειτα εισαγάγετε τον οδηγό πύλης του Stalker στο παρασκήνιο. Αν το XMLTV είναι ρυθμισμένο και λειτουργεί, χρησιμοποιείται πρώτα.</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">Μην εισάγετε μαζικά τα δεδομένα οδηγού αυτόματα. Τα δεδομένα ζωντανού οδηγού μπορούν ακόμη να φορτωθούν κατά απαίτηση όταν περιηγείστε στα κανάλια.</string><string name="setup_m3u_hint">URL M3U</string><string name="setup_tab_url">URL</string><string name="setup_tab_file">Αρχείο</string>diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xmlindex 9875b77b..34803d7f 100644--- a/app/src/main/res/values-es/strings.xml+++ b/app/src/main/res/values-es/strings.xml@@ -740,6 +740,10 @@<string name="setup_epg_sync_mode_background_description">Termina la configuración primero y luego obtiene los datos de la guía automáticamente en segundo plano.</string><string name="setup_epg_sync_mode_skip_title">Omitir EPG por ahora</string><string name="setup_epg_sync_mode_skip_description">No obtener datos de la guía automáticamente. Puedes actualizar la EPG más tarde desde Ajustes.</string>+ <string name="setup_stalker_epg_sync_mode_helper">Stalker puede usar la guía nativa del portal cuando XMLTV falta o no está disponible. La carga inmediata la importa durante la configuración, la carga en segundo plano la pospone y omitir deja la guía para cargarse bajo demanda.</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">Descarga los canales en vivo e importa la guía del portal de Stalker durante la configuración. Si XMLTV está configurado y funciona, se usa primero.</string>+ <string name="setup_stalker_epg_sync_mode_background_description">Termina primero la configuración y luego importa la guía del portal de Stalker en segundo plano. Si XMLTV está configurado y funciona, se usa primero.</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">No importes automáticamente los datos de la guía en bloque. Los datos de la guía en vivo aún pueden cargarse bajo demanda mientras navegas por los canales.</string><string name="setup_m3u_hint">URL M3U</string><string name="setup_tab_url">URL</string><string name="setup_tab_file">Archivo</string>diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xmlindex 86de30ea..4c72ba4f 100644--- a/app/src/main/res/values-fi/strings.xml+++ b/app/src/main/res/values-fi/strings.xml@@ -740,6 +740,10 @@<string name="setup_epg_sync_mode_background_description">Viimeistele asetukset ensin, sitten hae opastiedot automaattisesti taustalla.</string><string name="setup_epg_sync_mode_skip_title">Ohita EPG toistaiseksi</string><string name="setup_epg_sync_mode_skip_description">Älä hae opastietoja automaattisesti. Voit päivittää EPG:n myöhemmin asetuksista.</string>+ <string name="setup_stalker_epg_sync_mode_helper">Stalker voi käyttää portaalin omaa ohjelmaopasta, kun XMLTV puuttuu tai ei ole käytettävissä. Lataa heti tuo sen asetuksen aikana, taustalataus lykkää sitä ja ohitus jättää oppaan latauksen pyynnöstä tehtäväksi.</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">Lataa live-kanavat ja tuo Stalker-portaalin opas asetuksen aikana. Jos XMLTV on määritetty ja toimii, sitä käytetään ensin.</string>+ <string name="setup_stalker_epg_sync_mode_background_description">Viimeistele asetus ensin ja tuo sitten Stalker-portaalin opas taustalla. Jos XMLTV on määritetty ja toimii, sitä käytetään ensin.</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">Älä tuo opastietoja automaattisesti massana. Live-oppaan tiedot voidaan silti ladata pyynnöstä, kun selaat kanavia.</string><string name="setup_m3u_hint">M3U-URL</string><string name="setup_tab_url">URL-osoite</string><string name="setup_tab_file">Tiedosto</string>diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xmlindex 98dad694..34009524 100644--- a/app/src/main/res/values-fr/strings.xml+++ b/app/src/main/res/values-fr/strings.xml@@ -740,6 +740,10 @@<string name="setup_epg_sync_mode_background_description">Terminez d’abord la configuration, puis récupérez automatiquement les données du guide en arrière-plan.</string><string name="setup_epg_sync_mode_skip_title">Ignorer l’EPG pour l’instant</string><string name="setup_epg_sync_mode_skip_description">Ne pas récupérer automatiquement les données du guide. Vous pourrez actualiser l’EPG plus tard dans les Paramètres.</string>+ <string name="setup_stalker_epg_sync_mode_helper">Stalker peut utiliser le guide natif du portail lorsque XMLTV est absent ou indisponible. Le chargement immédiat l’importe pendant la configuration, le chargement en arrière-plan le reporte et l’option d’ignorer laisse le guide se charger à la demande.</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">Téléchargez les chaînes en direct et importez le guide du portail Stalker pendant la configuration. Si XMLTV est configuré et fonctionne, il est utilisé en priorité.</string>+ <string name="setup_stalker_epg_sync_mode_background_description">Terminez d’abord la configuration, puis importez le guide du portail Stalker en arrière-plan. Si XMLTV est configuré et fonctionne, il est utilisé en priorité.</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">N’importez pas automatiquement les données du guide en bloc. Les données du guide en direct peuvent toujours se charger à la demande lorsque vous parcourez les chaînes.</string><string name="setup_m3u_hint">URL M3U</string><string name="setup_tab_url">URL</string><string name="setup_tab_file">Fichier</string>diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xmlindex d80e9649..81813ee0 100644--- a/app/src/main/res/values-hu/strings.xml+++ b/app/src/main/res/values-hu/strings.xml@@ -740,6 +740,10 @@<string name="setup_epg_sync_mode_background_description">Előbb fejezze be a beállítást, majd az útmutatóadatok automatikusan letöltődnek a háttérben.</string><string name="setup_epg_sync_mode_skip_title">EPG kihagyása most</string><string name="setup_epg_sync_mode_skip_description">Ne töltse le automatikusan az útmutatóadatokat. Az EPG-t később a Beállításokban frissítheti.</string>+ <string name="setup_stalker_epg_sync_mode_helper">A Stalker használhatja a portál natív műsorújságját, ha az XMLTV hiányzik vagy nem érhető el. Az azonnali betöltés a beállítás közben importálja, a háttérben betöltés elhalasztja, a kihagyás pedig igény szerinti betöltésre hagyja.</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">Töltse le az élő csatornákat, és importálja a Stalker portál műsorújságját a beállítás során. Ha az XMLTV be van állítva és működik, azt használja először.</string>+ <string name="setup_stalker_epg_sync_mode_background_description">Először fejezze be a beállítást, majd importálja a Stalker portál műsorújságját a háttérben. Ha az XMLTV be van állítva és működik, azt használja először.</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">Ne importálja automatikusan tömegesen a műsorújság adatait. Az élő műsorújság adatai böngészés közben továbbra is igény szerint betölthetők.</string><string name="setup_m3u_hint">M3U URL</string><string name="setup_tab_url">URL</string><string name="setup_tab_file">Fájl</string>diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xmlindex e5740544..8fdb6859 100644--- a/app/src/main/res/values-in/strings.xml+++ b/app/src/main/res/values-in/strings.xml@@ -740,6 +740,10 @@<string name="setup_epg_sync_mode_background_description">Selesaikan penyiapan dulu, lalu ambil data panduan otomatis di latar belakang.</string><string name="setup_epg_sync_mode_skip_title">Lewati EPG untuk sekarang</string><string name="setup_epg_sync_mode_skip_description">Jangan ambil data panduan otomatis. Anda bisa menyegarkan EPG nanti dari Setelan.</string>+ <string name="setup_stalker_epg_sync_mode_helper">Stalker dapat menggunakan panduan bawaan portal saat XMLTV tidak ada atau tidak tersedia. Muat sekarang mengimpornya saat penyiapan, muat di latar belakang menundanya, dan lewati membiarkan panduan dimuat sesuai permintaan.</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">Unduh saluran live dan impor panduan portal Stalker saat penyiapan. Jika XMLTV dikonfigurasi dan berfungsi, itu digunakan lebih dulu.</string>+ <string name="setup_stalker_epg_sync_mode_background_description">Selesaikan penyiapan terlebih dahulu, lalu impor panduan portal Stalker di latar belakang. Jika XMLTV dikonfigurasi dan berfungsi, itu digunakan lebih dulu.</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">Jangan impor data panduan secara massal otomatis. Data panduan live masih bisa dimuat sesuai permintaan saat Anda menelusuri saluran.</string><string name="setup_m3u_hint">URL M3U</string><string name="setup_tab_url">URL</string><string name="setup_tab_file">Mengajukan</string>diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xmlindex 98d01cbb..06191a40 100644--- a/app/src/main/res/values-it/strings.xml+++ b/app/src/main/res/values-it/strings.xml@@ -740,6 +740,10 @@<string name="setup_epg_sync_mode_background_description">Completa prima la configurazione, poi recupera automaticamente i dati della guida in background.</string><string name="setup_epg_sync_mode_skip_title">Salta EPG per ora</string><string name="setup_epg_sync_mode_skip_description">Non recuperare automaticamente i dati della guida. Puoi aggiornare l\'EPG in seguito da Impostazioni.</string>+ <string name="setup_stalker_epg_sync_mode_helper">Stalker può usare la guida nativa del portale quando XMLTV manca o non è disponibile. Il caricamento immediato la importa durante la configurazione, il caricamento in background la rimanda e salta lascia il caricamento della guida su richiesta.</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">Scarica i canali live e importa la guida del portale Stalker durante la configurazione. Se XMLTV è configurato e funziona, viene usato per primo.</string>+ <string name="setup_stalker_epg_sync_mode_background_description">Completa prima la configurazione, poi importa la guida del portale Stalker in background. Se XMLTV è configurato e funziona, viene usato per primo.</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">Non importare automaticamente i dati della guida in blocco. I dati della guida live possono comunque caricarsi su richiesta mentre navighi tra i canali.</string><string name="setup_m3u_hint">URL M3U</string><string name="setup_tab_url">URL</string><string name="setup_tab_file">Archivio</string>diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xmlindex ed094558..3964fd7e 100644--- a/app/src/main/res/values-iw/strings.xml+++ b/app/src/main/res/values-iw/strings.xml@@ -740,6 +740,10 @@<string name="setup_epg_sync_mode_background_description">סיים קודם את ההגדרה, ואז הבא נתוני מדריך אוטומטית ברקע.</string><string name="setup_epg_sync_mode_skip_title">דלג על EPG לעכשיו</string><string name="setup_epg_sync_mode_skip_description">אל תביא נתוני מדריך אוטומטית. אפשר לרענן את EPG מאוחר יותר מההגדרות.</string>+ <string name="setup_stalker_epg_sync_mode_helper">Stalker יכול להשתמש במדריך המקורי של הפורטל כאשר XMLTV חסר או לא זמין. טעינה מיידית מייבאת אותו במהלך ההגדרה, טעינה ברקע דוחה אותו, ודילוג משאיר את טעינת המדריך לפי דרישה.</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">הורד את הערוצים החיים וייבא את מדריך הפורטל של Stalker במהלך ההגדרה. אם XMLTV מוגדר ופועל, הוא ישמש ראשון.</string>+ <string name="setup_stalker_epg_sync_mode_background_description">סיים תחילה את ההגדרה ולאחר מכן ייבא את מדריך הפורטל של Stalker ברקע. אם XMLTV מוגדר ופועל, הוא ישמש ראשון.</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">אל תייבא באופן אוטומטי נתוני מדריך בכמות גדולה. נתוני המדריך החי עדיין יכולים להיטען לפי דרישה בזמן גלישה בין ערוצים.</string><string name="setup_m3u_hint">כתובת URL של M3U</string><string name="setup_tab_url">כתובת אתר</string><string name="setup_tab_file">קובץ</string>diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xmlindex 4123d14c..6451c8f3 100644--- a/app/src/main/res/values-ja/strings.xml+++ b/app/src/main/res/values-ja/strings.xml@@ -740,6 +740,10 @@<string name="setup_epg_sync_mode_background_description">先にセットアップを完了し、その後番組表データを自動でバックグラウンド取得します。</string><string name="setup_epg_sync_mode_skip_title">EPGを今はスキップ</string><string name="setup_epg_sync_mode_skip_description">番組表データを自動取得しません。EPGは後で設定から更新できます。</string>+ <string name="setup_stalker_epg_sync_mode_helper">Stalker は、XMLTV が未設定または利用できない場合に、ポータルのネイティブ番組表を使用できます。今すぐ読み込みはセットアップ中にそれを取り込み、バックグラウンド読み込みは後回しにし、スキップは必要時のみ番組表を読み込みます。</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">セットアップ中にライブチャンネルを取得し、Stalker ポータルの番組表を取り込みます。XMLTV が設定され正常に動作する場合は、そちらを優先して使用します。</string>+ <string name="setup_stalker_epg_sync_mode_background_description">まずセットアップを完了し、その後バックグラウンドで Stalker ポータルの番組表を取り込みます。XMLTV が設定され正常に動作する場合は、そちらを優先して使用します。</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">番組表データを自動で一括取り込みしません。チャンネルを閲覧中でも、ライブ番組表データは必要に応じて読み込めます。</string><string name="setup_m3u_hint">M3U URL</string><string name="setup_tab_url">URL</string><string name="setup_tab_file">ファイル</string>diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xmlindex 4736d2c3..a001612c 100644--- a/app/src/main/res/values-ko/strings.xml+++ b/app/src/main/res/values-ko/strings.xml@@ -740,6 +740,10 @@<string name="setup_epg_sync_mode_background_description">먼저 설정을 완료한 다음, 가이드 데이터를 백그라운드에서 자동으로 가져옵니다.</string><string name="setup_epg_sync_mode_skip_title">지금은 EPG 건너뛰기</string><string name="setup_epg_sync_mode_skip_description">가이드 데이터를 자동으로 가져오지 않습니다. 나중에 설정에서 EPG를 새로고침할 수 있습니다.</string>+ <string name="setup_stalker_epg_sync_mode_helper">Stalker는 XMLTV가 없거나 사용할 수 없을 때 포털의 기본 EPG를 사용할 수 있습니다. 지금 불러오기는 설정 중에 이를 가져오고, 백그라운드 불러오기는 이를 나중으로 미루며, 건너뛰기는 필요할 때만 가이드를 로드합니다.</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">설정 중에 실시간 채널을 다운로드하고 Stalker 포털 가이드를 가져옵니다. XMLTV가 설정되어 있고 정상적으로 동작하면 먼저 그것을 사용합니다.</string>+ <string name="setup_stalker_epg_sync_mode_background_description">먼저 설정을 완료한 다음 백그라운드에서 Stalker 포털 가이드를 가져옵니다. XMLTV가 설정되어 있고 정상적으로 동작하면 먼저 그것을 사용합니다.</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">가이드 데이터를 자동으로 일괄 가져오지 않습니다. 채널을 탐색할 때도 실시간 가이드 데이터는 필요 시 로드할 수 있습니다.</string><string name="setup_m3u_hint">M3U URL</string><string name="setup_tab_url">URL</string><string name="setup_tab_file">파일</string>diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xmlindex 282847ba..7eec6856 100644--- a/app/src/main/res/values-nb/strings.xml+++ b/app/src/main/res/values-nb/strings.xml@@ -740,6 +740,10 @@<string name="setup_epg_sync_mode_background_description">Fullfør oppsettet først, og hent deretter guide-data automatisk i bakgrunnen.</string><string name="setup_epg_sync_mode_skip_title">Hopp over EPG for nå</string><string name="setup_epg_sync_mode_skip_description">Ikke hent guide-data automatisk. Du kan oppdatere EPG senere fra Innstillinger.</string>+ <string name="setup_stalker_epg_sync_mode_helper">Stalker kan bruke portalens innebygde guide når XMLTV mangler eller ikke er tilgjengelig. Last inn nå importerer den under oppsettet, last inn i bakgrunnen utsetter det, og hopp over lar guideinnlasting skje ved behov.</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">Last ned direktekanaler og importer Stalker-portalens guide under oppsettet. Hvis XMLTV er konfigurert og fungerer, brukes det først.</string>+ <string name="setup_stalker_epg_sync_mode_background_description">Fullfør oppsettet først, og importer deretter Stalker-portalens guide i bakgrunnen. Hvis XMLTV er konfigurert og fungerer, brukes det først.</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">Ikke importer guide-data i bulk automatisk. Data for direkteguiden kan fortsatt lastes ved behov mens du blar i kanaler.</string><string name="setup_m3u_hint">M3U-URL</string><string name="setup_tab_url">URL</string><string name="setup_tab_file">Fil</string>diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xmlindex 69453554..cf42d5f1 100644--- a/app/src/main/res/values-nl/strings.xml+++ b/app/src/main/res/values-nl/strings.xml@@ -740,6 +740,10 @@<string name="setup_epg_sync_mode_background_description">Voltooi eerst de installatie en haal daarna automatisch gidsgegevens op op de achtergrond.</string><string name="setup_epg_sync_mode_skip_title">EPG nu overslaan</string><string name="setup_epg_sync_mode_skip_description">Haal geen gidsgegevens automatisch op. Je kunt EPG later verversen via Instellingen.</string>+ <string name="setup_stalker_epg_sync_mode_helper">Stalker kan de ingebouwde gids van het portaal gebruiken wanneer XMLTV ontbreekt of niet beschikbaar is. Meteen laden importeert die tijdens de installatie, laden op de achtergrond stelt dit uit en overslaan laat de gids op aanvraag laden.</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">Download livekanalen en importeer de Stalker-portaalgids tijdens de installatie. Als XMLTV is geconfigureerd en werkt, wordt dat eerst gebruikt.</string>+ <string name="setup_stalker_epg_sync_mode_background_description">Voltooi eerst de installatie en importeer daarna de Stalker-portaalgids op de achtergrond. Als XMLTV is geconfigureerd en werkt, wordt dat eerst gebruikt.</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">Importeer gidsgegevens niet automatisch in bulk. Live-gidsgegevens kunnen nog steeds op aanvraag worden geladen terwijl je door kanalen bladert.</string><string name="setup_m3u_hint">M3U-URL</string><string name="setup_tab_url">URL</string><string name="setup_tab_file">Bestand</string>diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xmlindex d7ba6c85..59b65e38 100644--- a/app/src/main/res/values-pl/strings.xml+++ b/app/src/main/res/values-pl/strings.xml@@ -740,6 +740,10 @@<string name="setup_epg_sync_mode_background_description">Najpierw dokończ konfigurację, a potem pobierz dane programu automatycznie w tle.</string><string name="setup_epg_sync_mode_skip_title">Pomiń EPG na razie</string><string name="setup_epg_sync_mode_skip_description">Nie pobieraj automatycznie danych programu. EPG możesz odświeżyć później w Ustawieniach.</string>+ <string name="setup_stalker_epg_sync_mode_helper">Stalker może używać natywnego przewodnika portalu, gdy XMLTV jest niedostępne lub nie zostało skonfigurowane. Wczytaj teraz importuje go podczas konfiguracji, w tle odkłada to na później, a pomiń pozostawia ładowanie przewodnika na żądanie.</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">Pobierz kanały na żywo i zaimportuj przewodnik portalu Stalker podczas konfiguracji. Jeśli XMLTV jest skonfigurowane i działa, zostanie użyte najpierw.</string>+ <string name="setup_stalker_epg_sync_mode_background_description">Najpierw dokończ konfigurację, a następnie zaimportuj przewodnik portalu Stalker w tle. Jeśli XMLTV jest skonfigurowane i działa, zostanie użyte najpierw.</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">Nie importuj automatycznie zbiorczo danych przewodnika. Dane przewodnika na żywo nadal mogą być ładowane na żądanie podczas przeglądania kanałów.</string><string name="setup_m3u_hint">Adres URL M3U</string><string name="setup_tab_url">Adres URL</string><string name="setup_tab_file">Plik</string>diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xmlindex 5fb2825c..8b2149b7 100644--- a/app/src/main/res/values-pt/strings.xml+++ b/app/src/main/res/values-pt/strings.xml@@ -740,6 +740,10 @@<string name="setup_epg_sync_mode_background_description">Conclua a configuração primeiro e depois busque os dados do guia automaticamente em segundo plano.</string><string name="setup_epg_sync_mode_skip_title">Pular EPG por enquanto</string><string name="setup_epg_sync_mode_skip_description">Não buscar dados do guia automaticamente. Você pode atualizar o EPG depois em Configurações.</string>+ <string name="setup_stalker_epg_sync_mode_helper">O Stalker pode usar o guia nativo do portal quando o XMLTV estiver ausente ou indisponível. Carregar agora o importa durante a configuração, carregar em segundo plano o adia, e pular deixa o carregamento do guia sob demanda.</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">Baixe os canais ao vivo e importe o guia do portal Stalker durante a configuração. Se o XMLTV estiver configurado e funcionar, ele será usado primeiro.</string>+ <string name="setup_stalker_epg_sync_mode_background_description">Conclua a configuração primeiro e depois importe o guia do portal Stalker em segundo plano. Se o XMLTV estiver configurado e funcionar, ele será usado primeiro.</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">Não importe automaticamente os dados do guia em lote. Os dados do guia ao vivo ainda podem ser carregados sob demanda enquanto você navega pelos canais.</string><string name="setup_m3u_hint">URL M3U</string><string name="setup_tab_url">URL</string><string name="setup_tab_file">Arquivo</string>diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xmlindex b9c8e63f..78df6107 100644--- a/app/src/main/res/values-ro/strings.xml+++ b/app/src/main/res/values-ro/strings.xml@@ -740,6 +740,10 @@<string name="setup_epg_sync_mode_background_description">Finalizați mai întâi configurarea, apoi preluați automat datele ghidului în fundal.</string><string name="setup_epg_sync_mode_skip_title">Omite EPG acum</string><string name="setup_epg_sync_mode_skip_description">Nu preluați automat datele ghidului. Puteți actualiza EPG mai târziu din Setări.</string>+ <string name="setup_stalker_epg_sync_mode_helper">Stalker poate folosi ghidul nativ al portalului atunci când XMLTV lipsește sau nu este disponibil. Încărcarea imediată îl importă în timpul configurării, încărcarea în fundal îl amână, iar omiterea lasă încărcarea ghidului la cerere.</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">Descărcați canalele live și importați ghidul portalului Stalker în timpul configurării. Dacă XMLTV este configurat și funcționează, este folosit mai întâi.</string>+ <string name="setup_stalker_epg_sync_mode_background_description">Finalizați mai întâi configurarea, apoi importați ghidul portalului Stalker în fundal. Dacă XMLTV este configurat și funcționează, este folosit mai întâi.</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">Nu importați automat în bloc datele ghidului. Datele ghidului live se pot încărca în continuare la cerere în timp ce navigați printre canale.</string><string name="setup_m3u_hint">URL M3U</string><string name="setup_tab_url">URL</string><string name="setup_tab_file">Fișier</string>diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xmlindex a5ccd9f2..4eb8fa43 100644--- a/app/src/main/res/values-ru/strings.xml+++ b/app/src/main/res/values-ru/strings.xml@@ -740,6 +740,10 @@<string name="setup_epg_sync_mode_background_description">Сначала завершить настройку, затем автоматически получить данные программы в фоне.</string><string name="setup_epg_sync_mode_skip_title">Пока пропустить EPG</string><string name="setup_epg_sync_mode_skip_description">Не загружать данные программы автоматически. Обновить EPG можно позже в Настройках.</string>+ <string name="setup_stalker_epg_sync_mode_helper">Stalker может использовать встроенный гид портала, если XMLTV отсутствует или недоступен. Загрузить сейчас импортирует его во время настройки, загрузка в фоне откладывает импорт, а пропуск оставляет загрузку программы по запросу.</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">Загрузите live-каналы и импортируйте гид портала Stalker во время настройки. Если XMLTV настроен и работает, сначала будет использован он.</string>+ <string name="setup_stalker_epg_sync_mode_background_description">Сначала завершите настройку, затем импортируйте гид портала Stalker в фоне. Если XMLTV настроен и работает, сначала будет использован он.</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">Не импортируйте данные программы автоматически целиком. Данные live-гида по-прежнему могут загружаться по запросу при просмотре каналов.</string><string name="setup_m3u_hint">URL M3U</string><string name="setup_tab_url">URL</string><string name="setup_tab_file">Файл</string>diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xmlindex afd9ff3f..96d02285 100644--- a/app/src/main/res/values-sv/strings.xml+++ b/app/src/main/res/values-sv/strings.xml@@ -740,6 +740,10 @@<string name="setup_epg_sync_mode_background_description">Slutför installationen först och hämta sedan guide-data automatiskt i bakgrunden.</string><string name="setup_epg_sync_mode_skip_title">Hoppa över EPG nu</string><string name="setup_epg_sync_mode_skip_description">Hämta inte guide-data automatiskt. Du kan uppdatera EPG senare i Inställningar.</string>+ <string name="setup_stalker_epg_sync_mode_helper">Stalker kan använda portalens inbyggda guide när XMLTV saknas eller inte är tillgängligt. Ladda nu importerar den under installationen, ladda i bakgrunden skjuter upp det, och hoppa över låter guiden laddas vid behov.</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">Ladda ner livekanaler och importera Stalker-portalens guide under installationen. Om XMLTV är konfigurerat och fungerar används det först.</string>+ <string name="setup_stalker_epg_sync_mode_background_description">Slutför installationen först och importera sedan Stalker-portalens guide i bakgrunden. Om XMLTV är konfigurerat och fungerar används det först.</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">Importera inte guide-data automatiskt i bulk. Data för liveguiden kan fortfarande laddas vid behov när du bläddrar bland kanaler.</string><string name="setup_m3u_hint">M3U-URL</string><string name="setup_tab_url">URL</string><string name="setup_tab_file">Arkiv</string>diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xmlindex afd36523..758137cf 100644--- a/app/src/main/res/values-tr/strings.xml+++ b/app/src/main/res/values-tr/strings.xml@@ -740,6 +740,10 @@<string name="setup_epg_sync_mode_background_description">Önce kurulumu bitir, ardından rehber verilerini arka planda otomatik olarak getir.</string><string name="setup_epg_sync_mode_skip_title">EPG’yi şimdilik atla</string><string name="setup_epg_sync_mode_skip_description">Rehber verilerini otomatik olarak getirme. EPG’yi daha sonra Ayarlar’dan yenileyebilirsin.</string>+ <string name="setup_stalker_epg_sync_mode_helper">Stalker, XMLTV eksik olduğunda veya kullanılamadığında portalın yerel rehberini kullanabilir. Şimdi yükle bunu kurulum sırasında içe aktarır, arka planda yükle erteler, atla ise rehberin isteğe bağlı yüklenmesini bırakır.</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">Kurulum sırasında canlı kanalları indir ve Stalker portal rehberini içe aktar. XMLTV yapılandırılmış ve çalışıyorsa önce o kullanılır.</string>+ <string name="setup_stalker_epg_sync_mode_background_description">Önce kurulumu tamamla, ardından Stalker portal rehberini arka planda içe aktar. XMLTV yapılandırılmış ve çalışıyorsa önce o kullanılır.</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">Rehber verilerini otomatik olarak toplu içe aktarma. Kanallara göz atarken canlı rehber verileri yine isteğe bağlı olarak yüklenebilir.</string><string name="setup_m3u_hint">M3U URL\'si</string><string name="setup_tab_url">URL\'si</string><string name="setup_tab_file">Dosya</string>diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xmlindex 9dc6be2c..0add0b32 100644--- a/app/src/main/res/values-uk/strings.xml+++ b/app/src/main/res/values-uk/strings.xml@@ -740,6 +740,10 @@<string name="setup_epg_sync_mode_background_description">Спершу завершити налаштування, а потім автоматично завантажити дані телегіда у фоновому режимі.</string><string name="setup_epg_sync_mode_skip_title">Пропустити EPG наразі</string><string name="setup_epg_sync_mode_skip_description">Не завантажувати дані телегіда автоматично. Ви зможете оновити EPG пізніше в Налаштуваннях.</string>+ <string name="setup_stalker_epg_sync_mode_helper">Stalker може використовувати рідний телегід порталу, коли XMLTV відсутній або недоступний. Завантажити зараз імпортує його під час налаштування, завантаження у фоновому режимі відкладає імпорт, а пропуск залишає завантаження телегіда на вимогу.</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">Завантажте live-канали та імпортуйте телегід порталу Stalker під час налаштування. Якщо XMLTV налаштовано й він працює, спочатку буде використано його.</string>+ <string name="setup_stalker_epg_sync_mode_background_description">Спершу завершіть налаштування, а потім імпортуйте телегід порталу Stalker у фоновому режимі. Якщо XMLTV налаштовано й він працює, спочатку буде використано його.</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">Не імпортуйте дані телегіда автоматично масово. Дані live-телегіда все одно можуть завантажуватися на вимогу під час перегляду каналів.</string><string name="setup_m3u_hint">URL M3U</string><string name="setup_tab_url">URL</string><string name="setup_tab_file">Файл</string>diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xmlindex 58edcda3..c59141cf 100644--- a/app/src/main/res/values-vi/strings.xml+++ b/app/src/main/res/values-vi/strings.xml@@ -740,6 +740,10 @@<string name="setup_epg_sync_mode_background_description">Hoàn tất thiết lập trước, rồi tự động tải dữ liệu hướng dẫn trong nền.</string><string name="setup_epg_sync_mode_skip_title">Tạm bỏ qua EPG</string><string name="setup_epg_sync_mode_skip_description">Không tự động tải dữ liệu hướng dẫn. Bạn có thể làm mới EPG sau trong Cài đặt.</string>+ <string name="setup_stalker_epg_sync_mode_helper">Stalker có thể dùng hướng dẫn gốc của cổng khi XMLTV bị thiếu hoặc không khả dụng. Tải ngay sẽ nhập nó trong lúc thiết lập, tải nền trì hoãn việc đó, còn bỏ qua sẽ để hướng dẫn tải theo yêu cầu.</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">Tải các kênh trực tiếp và nhập hướng dẫn cổng Stalker trong lúc thiết lập. Nếu XMLTV đã được cấu hình và hoạt động, nó sẽ được dùng trước.</string>+ <string name="setup_stalker_epg_sync_mode_background_description">Hoàn tất thiết lập trước, sau đó nhập hướng dẫn cổng Stalker ở chế độ nền. Nếu XMLTV đã được cấu hình và hoạt động, nó sẽ được dùng trước.</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">Không tự động nhập hàng loạt dữ liệu hướng dẫn. Dữ liệu hướng dẫn trực tiếp vẫn có thể tải theo yêu cầu khi bạn duyệt kênh.</string><string name="setup_m3u_hint">URL M3U</string><string name="setup_tab_url">URL</string><string name="setup_tab_file">tập tin</string>diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xmlindex 45678f1a..9a96b656 100644--- a/app/src/main/res/values-zh/strings.xml+++ b/app/src/main/res/values-zh/strings.xml@@ -740,6 +740,10 @@<string name="setup_epg_sync_mode_background_description">先完成设置,然后在后台自动获取节目指南数据。</string><string name="setup_epg_sync_mode_skip_title">暂时跳过 EPG</string><string name="setup_epg_sync_mode_skip_description">不自动获取节目指南数据。您之后可在设置中刷新 EPG。</string>+ <string name="setup_stalker_epg_sync_mode_helper">当 XMLTV 缺失或不可用时,Stalker 可以使用门户自带的节目单。立即模式会在设置过程中导入它,后台模式会将其延后,而跳过则保留为按需加载。</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">在设置过程中下载直播频道并导入 Stalker 门户节目单。如果已配置 XMLTV 且可正常使用,则会优先使用 XMLTV。</string>+ <string name="setup_stalker_epg_sync_mode_background_description">先完成设置,然后在后台导入 Stalker 门户节目单。如果已配置 XMLTV 且可正常使用,则会优先使用 XMLTV。</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">不要自动批量导入节目单数据。浏览频道时,直播节目单数据仍可按需加载。</string><string name="setup_m3u_hint">M3U URL</string><string name="setup_tab_url">URL</string><string name="setup_tab_file">文件</string>diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex 4dbc0c89..85a63d2a 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -864,6 +864,10 @@<string name="setup_epg_sync_mode_background_description">Finish setup first, then fetch guide data automatically in the background.</string><string name="setup_epg_sync_mode_skip_title">Skip EPG for now</string><string name="setup_epg_sync_mode_skip_description">Do not fetch guide data automatically. You can refresh EPG later from Settings.</string>+ <string name="setup_stalker_epg_sync_mode_helper">Stalker can use the portal’s native guide when XMLTV is missing or unavailable. Upfront imports it during setup, Background defers it, and Skip leaves guide loading on demand.</string>+ <string name="setup_stalker_epg_sync_mode_upfront_description">Download live channels and import the Stalker portal guide during setup. If XMLTV is configured and works, it is used first.</string>+ <string name="setup_stalker_epg_sync_mode_background_description">Finish setup first, then import the Stalker portal guide in the background. If XMLTV is configured and works, it is used first.</string>+ <string name="setup_stalker_epg_sync_mode_skip_description">Do not bulk import guide data automatically. Live guide data can still load on demand when you browse channels.</string><string name="setup_m3u_hint">M3U URL</string><string name="setup_tab_url">URL</string><string name="setup_tab_file">File</string>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.ktindex 21b840ca..33d4cc36 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@@ -4,6 +4,7 @@ import com.google.common.truth.Truth.assertThatimport com.streamvault.domain.model.ActiveLiveSourceimport com.streamvault.domain.model.CombinedM3uProfileimport com.streamvault.domain.model.Provider+import com.streamvault.domain.model.ProviderEpgSyncModeimport com.streamvault.domain.model.ProviderTypeimport com.streamvault.domain.repository.CombinedM3uRepositoryimport com.streamvault.domain.repository.ProviderRepository@@ -106,4 +107,35 @@ class ProviderSetupViewModelTest {assertThat(viewModel.uiState.value.loginSuccess).isTrue()assertThat(viewModel.uiState.value.pendingCombinedAttachProfileId).isNull()}++ @Test+ fun `stalker 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.STALKER)+ 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(+ providerRepository = providerRepository,+ combinedM3uRepository = combinedM3uRepository,+ validateAndAddProvider = validateAndAddProvider+ )++ viewModel.updateEpgSyncMode(ProviderEpgSyncMode.SKIP)+ viewModel.applySourceDefaults(ProviderSetupViewModel.SetupSourceType.STALKER)+ advanceUntilIdle()++ assertThat(viewModel.uiState.value.epgSyncMode).isEqualTo(ProviderEpgSyncMode.SKIP)+ assertThat(viewModel.uiState.value.hasCustomizedEpgSyncMode).isTrue()+ }}diff --git a/data/src/main/java/com/streamvault/data/local/dao/Daos.kt b/data/src/main/java/com/streamvault/data/local/dao/Daos.ktindex fc1a1194..8f700061 100644--- a/data/src/main/java/com/streamvault/data/local/dao/Daos.kt+++ b/data/src/main/java/com/streamvault/data/local/dao/Daos.kt@@ -221,6 +221,16 @@ abstract class ChannelDao {)abstract suspend fun getGuideLookupsByIds(ids: List<Long>): List<ChannelGuideLookupEntity>+ @Query(+ """+ SELECT name, stream_id, epg_channel_id+ FROM channels+ WHERE provider_id = :providerId+ ORDER BY number ASC, id ASC+ """+ )+ abstract suspend fun getGuideSyncEntriesByProvider(providerId: Long): List<ChannelGuideSyncEntity>+@Query("SELECT * FROM channels WHERE provider_id = :providerId")abstract suspend fun getByProviderSync(providerId: Long): List<ChannelEntity>diff --git a/data/src/main/java/com/streamvault/data/local/entity/Entities.kt b/data/src/main/java/com/streamvault/data/local/entity/Entities.ktindex 17208d0f..2e2b13e4 100644--- a/data/src/main/java/com/streamvault/data/local/entity/Entities.kt+++ b/data/src/main/java/com/streamvault/data/local/entity/Entities.kt@@ -109,6 +109,12 @@ data class ChannelGuideLookupEntity(@ColumnInfo(name = "epg_channel_id") val epgChannelId: String? = null)+data class ChannelGuideSyncEntity(+ val name: String,+ @ColumnInfo(name = "stream_id") val streamId: Long = 0,+ @ColumnInfo(name = "epg_channel_id") val epgChannelId: String? = null+)+@Entity(tableName = "channel_preferences",foreignKeys = [ForeignKey(diff --git a/data/src/main/java/com/streamvault/data/manager/recording/RecordingSourceResolver.kt b/data/src/main/java/com/streamvault/data/manager/recording/RecordingSourceResolver.ktindex 41e80692..b0c21246 100644--- a/data/src/main/java/com/streamvault/data/manager/recording/RecordingSourceResolver.kt+++ b/data/src/main/java/com/streamvault/data/manager/recording/RecordingSourceResolver.kt@@ -59,6 +59,8 @@ class RecordingSourceResolver @Inject constructor(return ResolvedRecordingSource(url = resolved.url,sourceType = inferred,+ headers = resolved.headers,+ userAgent = resolved.userAgent,expirationTime = resolved.expirationTime,providerLabel = providerLabel)@@ -81,14 +83,14 @@ class RecordingSourceResolver @Inject constructor(url.contains(".mpd") || url.contains("ext=mpd") -> RecordingSourceType.DASHurl.endsWith(".ts") || url.contains(".ts?") || url.contains("ext=ts") -> RecordingSourceType.TSurl.endsWith(".m3u8") || url.contains(".m3u8?") || url.contains("ext=m3u8") -> RecordingSourceType.HLS- else -> probeAdaptiveType(resolved.url)+ else -> probeAdaptiveType(resolved)}}- private fun probeAdaptiveType(url: String): RecordingSourceType {+ private fun probeAdaptiveType(resolved: ResolvedStreamUrl): RecordingSourceType {// Try HEAD first — lighter and avoids Range-header rejections.val headResult = runCatching {- val headRequest = Request.Builder().url(url).head().build()+ val headRequest = buildRequest(resolved, isHead = true)okHttpClient.newCall(headRequest).execute().use { response ->if (!response.isSuccessful) return@use nullval contentType = response.header("Content-Type").orEmpty().lowercase(Locale.ROOT)@@ -103,10 +105,7 @@ class RecordingSourceResolver @Inject constructor(if (headResult != null) return headResult// Fall back to a small GET to inspect the body prefix.- val request = Request.Builder()- .url(url)- .get()- .build()+ val request = buildRequest(resolved, isHead = false)val bodyPrefix = runCatching {okHttpClient.newCall(request).execute().use { response ->@@ -127,4 +126,21 @@ class RecordingSourceResolver @Inject constructor(else -> RecordingSourceType.TS}}++ private fun buildRequest(resolved: ResolvedStreamUrl, isHead: Boolean): Request {+ return Request.Builder()+ .url(resolved.url)+ .apply {+ resolved.userAgent?.takeIf { it.isNotBlank() }?.let { header("User-Agent", it) }+ resolved.headers.forEach { (name, value) ->+ header(name, value)+ }+ if (isHead) {+ head()+ } else {+ get()+ }+ }+ .build()+ }}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.ktindex cdca047c..8232beb5 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@@ -1,5 +1,6 @@package com.streamvault.data.remote.stalker+import android.util.Logimport com.streamvault.domain.model.Resultimport java.io.IOExceptionimport java.net.URI@@ -372,6 +373,8 @@ class OkHttpStalkerApiService @Inject constructor(query: Map<String, String>,token: String? = null): JsonElement = withContext(Dispatchers.IO) {+ val action = query["action"]+ val canRetryAlternateEndpoint = !token.isNullOrBlank()val request = Request.Builder().url(buildUrl(url, query)).header("User-Agent", profile.userAgent)@@ -385,21 +388,76 @@ class OkHttpStalkerApiService @Inject constructor(.get().build()- okHttpClient.newCall(request).execute().use { response ->+ runCatching {+ executeJsonRequest(request, action)+ }.recoverCatching { error ->+ if (!canRetryAlternateEndpoint) throw error+ val alternateUrl = siblingLoadUrl(url)+ ?.takeIf { it != url }+ ?: throw error+ Log.w(+ TAG,+ "Retrying Stalker ${action.orEmpty()} via alternate endpoint $alternateUrl after ${error.message}"+ )+ val alternateRequest = request.newBuilder()+ .url(buildUrl(alternateUrl, query))+ .header("Referer", StalkerUrlFactory.portalReferer(alternateUrl))+ .build()+ executeJsonRequest(alternateRequest, action)+ }.getOrElse { throw it }+ }++ private fun executeJsonRequest(request: Request, action: String?): JsonElement {+ return okHttpClient.newCall(request).execute().use { response ->val body = response.body?.string().orEmpty()if (!response.isSuccessful) {throw IOException("Portal request failed with HTTP ${response.code}.")}if (body.isBlank()) {- throw IOException("Portal returned an empty response.")+ throw IOException("Portal returned an empty response${actionSuffix(action)}.")}- val parsed = runCatching { json.parseToJsonElement(body) }- .getOrElse { throw IOException("Portal returned unreadable JSON.", it) }+ val parsed = parsePortalJson(body, action)parsed.ensureNoPortalError()parsed}}+ private fun siblingLoadUrl(url: String): String? {+ val normalized = StalkerUrlFactory.normalizePortalUrl(url)+ val lower = normalized.lowercase(Locale.ROOT)+ return when {+ lower.endsWith("/server/load.php") -> normalized.removeSuffix("/server/load.php") + "/portal.php"+ lower.endsWith("/portal.php") -> normalized.removeSuffix("/portal.php") + "/server/load.php"+ else -> null+ }+ }++ private fun parsePortalJson(body: String, action: String?): JsonElement {+ val normalized = sanitizePortalResponseBody(body)+ runCatching { json.parseToJsonElement(normalized) }+ .getOrNull()+ ?.let { return it }++ if (looksLikeHtml(normalized)) {+ val lower = normalized.lowercase(Locale.ROOT)+ if (lower.contains("access denied") || lower.contains("forbidden")) {+ throw IOException("Portal denied the request${actionSuffix(action)}.")+ }+ }++ extractEmbeddedJson(normalized)?.let { candidate ->+ runCatching { json.parseToJsonElement(candidate) }+ .getOrNull()+ ?.let { return it }+ }++ throw runCatching { json.parseToJsonElement(normalized) }+ .fold(+ onSuccess = { IOException("Portal returned unreadable JSON${actionSuffix(action)}.") },+ onFailure = { error -> IOException("Portal returned unreadable JSON${actionSuffix(action)}.", error) }+ )+ }+private fun JsonElement.ensureNoPortalError() {val error = rootObjectOrNull()?.findString("error")?: findString("error")@@ -465,6 +523,7 @@ class OkHttpStalkerApiService @Inject constructor(private fun JsonElement.toProviderProfile(): StalkerProviderProfile {val payload = payloadObjectOrNull()return StalkerProviderProfile(+ accountId = payload?.findString("id"),accountName = payload?.findString("name")?: payload?.findString("account")?: payload?.findString("login"),@@ -474,7 +533,8 @@ class OkHttpStalkerApiService @Inject constructor(expirationDate = payload?.findString("expire_billing_date")?.let(::parseExpirationDate)?: payload?.findString("end_date")?.let(::parseExpirationDate),- statusLabel = payload?.findString("status")+ statusLabel = payload?.findString("status"),+ authAccess = payload?.findBoolean("auth_access"))}@@ -679,6 +739,52 @@ class OkHttpStalkerApiService @Inject constructor(private fun sanitizeUrl(value: String?): String? =value?.trim()?.takeIf { it.isNotBlank() && !it.equals("null", ignoreCase = true) }+ private fun sanitizePortalResponseBody(body: String): String {+ val withoutBom = body.trimStart('\uFEFF')+ val sanitizedControls = withoutBom.filter { char ->+ char == '\n' || char == '\r' || char == '\t' || char.code >= 0x20+ }+ return sanitizedControls.trim()+ }++ private fun looksLikeHtml(body: String): Boolean {+ val trimmed = body.trimStart()+ return trimmed.startsWith("<!DOCTYPE", ignoreCase = true) ||+ trimmed.startsWith("<html", ignoreCase = true) ||+ trimmed.startsWith("<body", ignoreCase = true)+ }++ private fun extractEmbeddedJson(body: String): String? {+ val trimmed = body.trim()+ if (trimmed.isEmpty()) return null++ val callbackStart = trimmed.indexOf('(')+ val callbackEnd = trimmed.lastIndexOf(')')+ if (callbackStart in 1 until callbackEnd) {+ val callbackPayload = trimmed.substring(callbackStart + 1, callbackEnd).trim()+ if (callbackPayload.startsWith('{') || callbackPayload.startsWith('[')) {+ return callbackPayload+ }+ }++ val objectStart = trimmed.indexOf('{')+ val objectEnd = trimmed.lastIndexOf('}')+ if (objectStart >= 0 && objectEnd > objectStart) {+ return trimmed.substring(objectStart, objectEnd + 1)+ }++ val arrayStart = trimmed.indexOf('[')+ val arrayEnd = trimmed.lastIndexOf(']')+ if (arrayStart >= 0 && arrayEnd > arrayStart) {+ return trimmed.substring(arrayStart, arrayEnd + 1)+ }++ return null+ }++ private fun actionSuffix(action: String?): String =+ action?.takeIf { it.isNotBlank() }?.let { " for $it" }.orEmpty()+private fun extractContainerExtension(cmd: String?, fallback: String?): String? {fallback?.trim()?.removePrefix(".")?.takeIf { it.isNotBlank() }?.let { return it.lowercase(Locale.ROOT) }val path = runCatching { URI(cmd).path }.getOrNull() ?: cmd@@ -693,6 +799,7 @@ class OkHttpStalkerApiService @Inject constructor(URLEncoder.encode(value, Charsets.UTF_8.name()).replace("+", "%20")companion object {+ private const val TAG = "OkHttpStalkerApi"private const val MAX_PAGE_COUNT = 200private const val DEFAULT_PROGRAM_DURATION_MILLIS = 30 * 60_000Lprivate const val DEFAULT_VERSION_STRING =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.ktindex b1a5cff1..c79d43a8 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@@ -23,10 +23,12 @@ data class StalkerSession()data class StalkerProviderProfile(+ val accountId: String? = null,val accountName: String? = null,val maxConnections: Int? = null,val expirationDate: Long? = null,- val statusLabel: String? = null+ val statusLabel: String? = null,+ val authAccess: Boolean? = null)data class StalkerCategoryRecord(diff --git a/data/src/main/java/com/streamvault/data/remote/stalker/StalkerProvider.kt b/data/src/main/java/com/streamvault/data/remote/stalker/StalkerProvider.ktindex 8f7a648b..c01a54fc 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@@ -16,10 +16,17 @@ import com.streamvault.domain.model.Seasonimport com.streamvault.domain.model.Seriesimport com.streamvault.domain.provider.IptvProviderimport com.streamvault.domain.util.ChannelNormalizer+import java.net.URIimport java.util.Localeimport kotlinx.coroutines.sync.Muteximport kotlinx.coroutines.sync.withLock+data class StalkerPlaybackInfo(+ val url: String,+ val headers: Map<String, String> = emptyMap(),+ val userAgent: String? = null+)+class StalkerProvider(override val providerId: Long,private val api: StalkerApiService,@@ -46,7 +53,7 @@ class StalkerProvider(is Result.Success -> {val profile = authResult.data.secondval hostLabel = portalUrl.substringAfter("://").substringBefore('/').ifBlank { "portal" }- val providerName = profile.accountName?.takeIf { it.isNotBlank() }+ val providerName = profile.accountName?.takeUnless { it.isBlank() || it == "0" }?: "${normalizedMacAddress().takeLast(8)}@$hostLabel"Result.success(Provider(@@ -75,6 +82,14 @@ class StalkerProvider(}}+ suspend fun getAccountProfile(): Result<StalkerProviderProfile> {+ return when (val authResult = ensureAuthenticated()) {+ is Result.Success -> Result.success(authResult.data.second)+ is Result.Error -> Result.error(authResult.message, authResult.exception)+ is Result.Loading -> Result.error("Unexpected loading state")+ }+ }+override suspend fun getLiveCategories(): Result<List<Category>> =mapCategories(ContentType.LIVE) { session, profile ->api.getLiveCategories(session, profile)@@ -168,12 +183,31 @@ class StalkerProvider(}}- suspend fun resolvePlaybackUrl(kind: StalkerStreamKind, cmd: String): Result<String> {+ suspend fun resolvePlaybackInfo(kind: StalkerStreamKind, cmd: String): Result<StalkerPlaybackInfo> {return when (val authResult = ensureAuthenticated()) {is Result.Success -> {val (session, _) = authResult.data- when (val linkResult = api.createLink(session, currentDeviceProfile(), kind, cmd)) {- is Result.Success -> Result.success(linkResult.data)+ val profile = currentDeviceProfile()+ val directUrl = extractDirectPlaybackUrl(cmd)+ directUrl+ ?.takeIf { candidate -> shouldBypassCreateLink(kind, candidate) }+ ?.let { candidate ->+ return Result.success(+ StalkerPlaybackInfo(+ url = candidate,+ headers = buildPlaybackHeaders(session, profile),+ userAgent = profile.userAgent+ )+ )+ }+ when (val linkResult = api.createLink(session, profile, kind, cmd)) {+ is Result.Success -> Result.success(+ StalkerPlaybackInfo(+ url = repairCreateLinkUrl(kind, linkResult.data, directUrl),+ headers = buildPlaybackHeaders(session, profile),+ userAgent = profile.userAgent+ )+ )is Result.Error -> Result.error(linkResult.message, linkResult.exception)is Result.Loading -> Result.error("Unexpected loading state")}@@ -183,6 +217,9 @@ class StalkerProvider(}}+ suspend fun resolvePlaybackUrl(kind: StalkerStreamKind, cmd: String): Result<String> =+ resolvePlaybackInfo(kind, cmd).mapData(StalkerPlaybackInfo::url)+override suspend fun buildStreamUrl(streamId: Long, containerExtension: String?): String {throw UnsupportedOperationException("Stalker stream URLs require a command token context.")}@@ -279,6 +316,117 @@ class StalkerProvider()}+ private fun buildPlaybackHeaders(+ session: StalkerSession,+ profile: StalkerDeviceProfile+ ): Map<String, String> = buildMap {+ put("Referer", session.portalReferer)+ put("Accept", "*/*")+ put(+ "Cookie",+ listOf(+ "mac=${profile.macAddress}",+ "stb_lang=${profile.locale}",+ "timezone=${profile.timezone}",+ "sn=${profile.serialNumber}",+ "device_id=${profile.deviceId}",+ "device_id2=${profile.deviceId2}",+ "signature=${profile.signature}"+ ).joinToString("; ")+ )+ put("X-User-Agent", profile.xUserAgent)+ session.token.takeIf { it.isNotBlank() }?.let { token ->+ put("Authorization", "Bearer $token")+ }+ }++ private fun extractDirectPlaybackUrl(cmd: String): String? {+ return cmd+ .substringAfter(' ', missingDelimiterValue = cmd)+ .trim()+ .takeIf(UrlSecurityPolicy::isAllowedStreamEntryUrl)+ }++ private fun shouldBypassCreateLink(kind: StalkerStreamKind, directUrl: String): Boolean {+ val parsed = runCatching { URI(directUrl) }.getOrNull() ?: return false+ val host = parsed.host?.trim()?.lowercase(Locale.ROOT).orEmpty()+ if (host.isBlank()) return false+ if (host == "localhost" || host == "127.0.0.1" || host == "0.0.0.0") return false+ if (kind == StalkerStreamKind.LIVE && !hasUsableLiveStreamTarget(parsed)) return false++ return true+ }++ private fun repairCreateLinkUrl(+ kind: StalkerStreamKind,+ resolvedUrl: String,+ sourceDirectUrl: String?+ ): String {+ if (kind != StalkerStreamKind.LIVE || sourceDirectUrl.isNullOrBlank()) {+ return resolvedUrl+ }++ val resolvedUri = runCatching { URI(resolvedUrl) }.getOrNull() ?: return resolvedUrl+ val sourceUri = runCatching { URI(sourceDirectUrl) }.getOrNull() ?: return resolvedUrl+ if (!isSameLivePlayPath(resolvedUri, sourceUri)) {+ return resolvedUrl+ }+ if (hasUsableLiveStreamTarget(resolvedUri)) {+ return resolvedUrl+ }++ val sourceStreamId = sourceUri.queryParameter("stream")?.takeIf { it.isNotBlank() } ?: return resolvedUrl+ return replaceQueryParameter(resolvedUri, "stream", sourceStreamId) ?: resolvedUrl+ }++ private fun hasUsableLiveStreamTarget(uri: URI): Boolean {+ val path = uri.path?.lowercase(Locale.ROOT).orEmpty()+ if (!path.endsWith("/play/live.php")) {+ return true+ }+ return !uri.queryParameter("stream").isNullOrBlank()+ }++ private fun isSameLivePlayPath(first: URI, second: URI): Boolean {+ val firstHost = first.host?.trim()?.lowercase(Locale.ROOT).orEmpty()+ val secondHost = second.host?.trim()?.lowercase(Locale.ROOT).orEmpty()+ val firstPath = first.path?.trim()?.lowercase(Locale.ROOT).orEmpty()+ val secondPath = second.path?.trim()?.lowercase(Locale.ROOT).orEmpty()+ return firstHost.isNotBlank() &&+ firstHost == secondHost &&+ firstPath == secondPath &&+ firstPath.endsWith("/play/live.php")+ }++ private fun URI.queryParameter(name: String): String? {+ val rawQuery = rawQuery ?: return null+ return rawQuery.split('&')+ .asSequence()+ .map { part ->+ val key = part.substringBefore('=', missingDelimiterValue = "")+ val value = part.substringAfter('=', missingDelimiterValue = "")+ key to value+ }+ .firstOrNull { (key, _) -> key.equals(name, ignoreCase = true) }+ ?.second+ }++ private fun replaceQueryParameter(uri: URI, name: String, value: String): String? {+ val rawQuery = uri.rawQuery ?: return null+ val updated = rawQuery.split('&')+ .filter { it.isNotBlank() }+ .map { part ->+ val key = part.substringBefore('=', missingDelimiterValue = "")+ if (key.equals(name, ignoreCase = true)) {+ "$key=$value"+ } else {+ part+ }+ }+ .joinToString("&")+ return URI(uri.scheme, uri.authority, uri.path, updated, uri.fragment).toString()+ }+private suspend fun resolveRawCategoryId(type: ContentType, categoryId: Long?): String? {val normalizedType = when (type) {ContentType.SERIES_EPISODE -> ContentType.SERIESdiff --git a/data/src/main/java/com/streamvault/data/remote/xtream/XtreamProvider.kt b/data/src/main/java/com/streamvault/data/remote/xtream/XtreamProvider.ktindex 44ef8126..36a88337 100644--- a/data/src/main/java/com/streamvault/data/remote/xtream/XtreamProvider.kt+++ b/data/src/main/java/com/streamvault/data/remote/xtream/XtreamProvider.kt@@ -459,7 +459,11 @@ class XtreamProvider(}suspend fun mapVodStreamsResponse(streams: List<XtreamStream>): List<Movie> =- mapVodStreamsSequence(streams.asSequence()).toList()+ mapVodStreamsSequence(streams.asSequence()).toList().also { mapped ->+ if (streams.isNotEmpty() && mapped.isEmpty()) {+ Log.w(TAG, "Xtream VOD mapping rejected all ${streams.size} raw items for provider $providerId.")+ }+ }suspend fun mapVodStreamsSequence(streams: Sequence<XtreamStream>): Sequence<Movie> {val adultCategoryIds = loadAdultCategoryIds(ContentType.MOVIE)@@ -482,7 +486,11 @@ class XtreamProvider(}suspend fun mapSeriesListResponse(items: List<XtreamSeriesItem>): List<Series> =- mapSeriesListSequence(items.asSequence()).toList()+ mapSeriesListSequence(items.asSequence()).toList().also { mapped ->+ if (items.isNotEmpty() && mapped.isEmpty()) {+ Log.w(TAG, "Xtream series mapping rejected all ${items.size} raw items for provider $providerId.")+ }+ }suspend fun mapSeriesListSequence(items: Sequence<XtreamSeriesItem>): Sequence<Series> {val adultCategoryIds = loadAdultCategoryIds(ContentType.SERIES)diff --git a/data/src/main/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolver.kt b/data/src/main/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolver.ktindex e2ae47e8..ae53f6f1 100644--- a/data/src/main/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolver.kt+++ b/data/src/main/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolver.kt@@ -18,7 +18,9 @@ import javax.inject.Singletondata class ResolvedStreamUrl(val url: String,val expirationTime: Long? = null,- val containerExtension: String? = null+ val containerExtension: String? = null,+ val headers: Map<String, String> = emptyMap(),+ val userAgent: String? = null)@Singleton@@ -70,28 +72,40 @@ class XtreamStreamUrlResolver @Inject constructor(fallbackContainerExtension: String? = null,preferStableUrl: Boolean = false): ResolvedStreamUrl? {+ val xtreamToken = XtreamUrlFactory.parseInternalStreamUrl(url)+ val stalkerToken = StalkerUrlFactory.parseInternalStreamUrl(url)+ val providerId = xtreamToken?.providerId ?: stalkerToken?.providerId ?: fallbackProviderId?.takeIf { it > 0 }+ val provider = providerId?.let { id -> providerDao.getById(id) }+if (url.isNotBlank() && !XtreamUrlFactory.isInternalStreamUrl(url) && !StalkerUrlFactory.isInternalStreamUrl(url)) {+ if (provider?.type == ProviderType.STALKER_PORTAL) {+ resolveDirectStalkerUrl(+ provider = provider,+ url = url,+ fallbackStreamId = fallbackStreamId,+ fallbackContentType = fallbackContentType,+ fallbackContainerExtension = fallbackContainerExtension+ )?.let { return it }+ }return ResolvedStreamUrl(url = url,expirationTime = extractStreamExpirationTime(url))}- val xtreamToken = XtreamUrlFactory.parseInternalStreamUrl(url)- val stalkerToken = StalkerUrlFactory.parseInternalStreamUrl(url)- val providerId = xtreamToken?.providerId ?: stalkerToken?.providerId ?: fallbackProviderId?.takeIf { it > 0 } ?: return null- val provider = providerDao.getById(providerId) ?: return null- return when (provider.type) {+ val resolvedProviderId = providerId ?: return null+ val resolvedProvider = provider ?: return null+ return when (resolvedProvider.type) {ProviderType.XTREAM_CODES -> {val kind = xtreamToken?.kind ?: fallbackContentType?.let(XtreamUrlFactory::kindForContentType) ?: return nullval streamId = xtreamToken?.streamId ?: fallbackStreamId?.takeIf { it > 0 } ?: return nullval ext = xtreamToken?.containerExtension ?: fallbackContainerExtensionval directSource = xtreamToken?.directSource?.takeIf(UrlSecurityPolicy::isAllowedStreamEntryUrl)- val decryptedPassword = credentialCrypto.decryptIfNeeded(provider.password)+ val decryptedPassword = credentialCrypto.decryptIfNeeded(resolvedProvider.password)val fallbackResolvedUrl = XtreamUrlFactory.buildPlaybackUrl(- serverUrl = provider.serverUrl,- username = provider.username,+ serverUrl = resolvedProvider.serverUrl,+ username = resolvedProvider.username,password = decryptedPassword,kind = kind,streamId = streamId,@@ -112,16 +126,18 @@ class XtreamStreamUrlResolver @Inject constructor(expirationTime = extractStreamExpirationTime(passthroughUrl))}- val resolvedUrl = when (- val resolvedResult = getOrCreateStalkerProvider(provider).resolvePlaybackUrl(token.kind, token.cmd)+ val playbackInfo = when (+ val resolvedResult = getOrCreateStalkerProvider(resolvedProvider).resolvePlaybackInfo(token.kind, token.cmd)) {is com.streamvault.domain.model.Result.Success -> resolvedResult.dataelse -> return null}ResolvedStreamUrl(- url = resolvedUrl,- expirationTime = extractStreamExpirationTime(resolvedUrl),- containerExtension = token.containerExtension ?: fallbackContainerExtension+ url = playbackInfo.url,+ expirationTime = extractStreamExpirationTime(playbackInfo.url),+ containerExtension = token.containerExtension ?: fallbackContainerExtension,+ headers = playbackInfo.headers,+ userAgent = playbackInfo.userAgent)}ProviderType.M3U -> url.takeIf { it.isNotBlank() }?.let { passthroughUrl ->@@ -133,6 +149,90 @@ class XtreamStreamUrlResolver @Inject constructor(}}+ private suspend fun resolveDirectStalkerUrl(+ provider: ProviderEntity,+ url: String,+ fallbackStreamId: Long?,+ fallbackContentType: ContentType?,+ fallbackContainerExtension: String?+ ): ResolvedStreamUrl? {+ val kind = when (fallbackContentType) {+ ContentType.LIVE -> StalkerStreamKind.LIVE+ ContentType.MOVIE -> StalkerStreamKind.MOVIE+ ContentType.SERIES_EPISODE -> StalkerStreamKind.EPISODE+ else -> return null+ }+ val repairedUrl = repairDirectStalkerUrl(url, kind, fallbackStreamId)+ if (!UrlSecurityPolicy.isAllowedStreamEntryUrl(repairedUrl)) {+ return null+ }+ val playbackInfo = when (val resolvedResult = getOrCreateStalkerProvider(provider).resolvePlaybackInfo(kind, repairedUrl)) {+ is com.streamvault.domain.model.Result.Success -> resolvedResult.data+ else -> return null+ }+ return ResolvedStreamUrl(+ url = playbackInfo.url,+ expirationTime = extractStreamExpirationTime(playbackInfo.url),+ containerExtension = fallbackContainerExtension,+ headers = playbackInfo.headers,+ userAgent = playbackInfo.userAgent+ )+ }++ private fun repairDirectStalkerUrl(+ url: String,+ kind: StalkerStreamKind,+ fallbackStreamId: Long?+ ): String {+ if (kind != StalkerStreamKind.LIVE || fallbackStreamId == null || fallbackStreamId <= 0L) {+ return url+ }+ val uri = runCatching { URI(url) }.getOrNull() ?: return url+ val path = uri.path?.lowercase() ?: return url+ if (!path.endsWith("/play/live.php")) {+ return url+ }++ val rawQuery = uri.rawQuery ?: return url+ val parts = rawQuery.split('&').filter { it.isNotBlank() }+ if (parts.isEmpty()) {+ return url+ }++ var hasStream = false+ var changed = false+ val repairedParts = parts.map { part ->+ val key = part.substringBefore('=', missingDelimiterValue = "").lowercase()+ if (key != "stream") {+ return@map part+ }+ hasStream = true+ val value = part.substringAfter('=', missingDelimiterValue = "")+ if (value.isNotBlank()) {+ return@map part+ }+ changed = true+ "stream=$fallbackStreamId"+ }.toMutableList()++ if (!hasStream && rawQuery.contains("play_token=")) {+ repairedParts += "stream=$fallbackStreamId"+ changed = true+ }++ if (!changed) {+ return url+ }++ return URI(+ uri.scheme,+ uri.authority,+ uri.path,+ repairedParts.joinToString("&"),+ uri.fragment+ ).toString()+ }+private fun getOrCreateStalkerProvider(provider: ProviderEntity): StalkerProvider {val providerId = provider.idval cached = stalkerProviders[providerId]diff --git a/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt b/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.ktindex 566f238d..2a3d6d47 100644--- a/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt+++ b/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt@@ -195,7 +195,9 @@ class ChannelRepositoryImpl @Inject constructor(xtreamStreamUrlResolver.resolveWithMetadata(url = channel.streamUrl,fallbackProviderId = channel.providerId,- fallbackStreamId = channel.streamId,+ fallbackStreamId = channel.streamId.takeIf { it > 0L }+ ?: channel.epgChannelId?.toLongOrNull()+ ?: channel.id.takeIf { it > 0L },fallbackContentType = ContentType.LIVE,preferStableUrl = preferStableUrl)?.let { resolvedStream ->@@ -203,6 +205,8 @@ class ChannelRepositoryImpl @Inject constructor(StreamInfo(url = resolvedStream.url,title = channel.name,+ headers = resolvedStream.headers,+ userAgent = resolvedStream.userAgent,streamType = StreamType.fromContainerExtension(resolvedStream.containerExtension),containerExtension = resolvedStream.containerExtension,expirationTime = resolvedStream.expirationTimediff --git a/data/src/main/java/com/streamvault/data/repository/MovieRepositoryImpl.kt b/data/src/main/java/com/streamvault/data/repository/MovieRepositoryImpl.ktindex 1fe5e456..9504a51d 100644--- a/data/src/main/java/com/streamvault/data/repository/MovieRepositoryImpl.kt+++ b/data/src/main/java/com/streamvault/data/repository/MovieRepositoryImpl.kt@@ -82,6 +82,8 @@ class MovieRepositoryImpl @Inject constructor(const val MIN_SEARCH_QUERY_LENGTH = 2const val BROWSE_WINDOW_BUFFER = 80const val XTREAM_MOVIE_HYDRATION_TIMEOUT_MILLIS = 60_000L+ const val XTREAM_CATEGORY_HYDRATION_CONCURRENCY = 2+ const val XTREAM_EMPTY_CATEGORY_RETRY_COOLDOWN_MILLIS = 30_000Lconst val CURSOR_BATCH_SIZE = 40}@@ -112,7 +114,9 @@ class MovieRepositoryImpl @Inject constructor(private val xtreamCategoryLoadLocks = ConcurrentHashMap<String, Mutex>()private val freshXtreamCategories = ConcurrentHashMap.newKeySet<String>()private val backgroundRefreshes = ConcurrentHashMap.newKeySet<String>()- private val repositoryScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)+ private val repositoryScope = CoroutineScope(+ SupervisorJob() + Dispatchers.IO.limitedParallelism(XTREAM_CATEGORY_HYDRATION_CONCURRENCY)+ )override fun getMovies(providerId: Long): Flow<List<Movie>> =preferencesRepository.parentalControlLevel.flatMapLatest { level ->@@ -342,7 +346,7 @@ class MovieRepositoryImpl @Inject constructor(val remoteMovieResult = try {when (provider.type) {ProviderType.XTREAM_CODES -> getOrCreateXtreamProvider(providerId, provider).getVodInfo(movieEntity.streamId)- ProviderType.STALKER_PORTAL -> createStalkerProvider(providerId, provider).getVodInfo(movieEntity.streamId)+ ProviderType.STALKER_PORTAL -> return Result.success(movieEntity.toDomain())ProviderType.M3U -> return Result.success(movieEntity.toDomain())}} catch (e: Exception) {@@ -391,6 +395,8 @@ class MovieRepositoryImpl @Inject constructor(StreamInfo(url = resolvedStream.url,title = movie.name,+ headers = resolvedStream.headers,+ userAgent = resolvedStream.userAgent,streamType = StreamType.fromContainerExtension(ext),containerExtension = ext,expirationTime = resolvedStream.expirationTime@@ -972,7 +978,7 @@ class MovieRepositoryImpl @Inject constructor() {val key = "$providerId:$categoryId"val provider = providerDao.getById(providerId) ?: return- if (provider.type != ProviderType.XTREAM_CODES) return+ if (provider.type != ProviderType.XTREAM_CODES && provider.type != ProviderType.STALKER_PORTAL) returnval localCount = movieDao.getCountByCategory(providerId, categoryId).first()val hydration = movieCategoryHydrationDao.get(providerId, categoryId)@@ -1023,13 +1029,21 @@ class MovieRepositoryImpl @Inject constructor(repositoryScope.launch {try {val provider = providerDao.getById(providerId) ?: return@launch- if (provider.type != ProviderType.XTREAM_CODES) return@launch+ if (provider.type != ProviderType.XTREAM_CODES && provider.type != ProviderType.STALKER_PORTAL) {+ return@launch+ }val localCount = movieDao.getCountByCategory(providerId, categoryId).first()val hydration = movieCategoryHydrationDao.get(providerId, categoryId)if (hydration?.isFresh() == true && (localCount > 0 || hydration.itemCount == 0)) return@launch+ if (localCount == 0 && hydration?.isEmptyRetryCoolingDown() == true) return@launchif (localCount == 0 && !fetchIfMissing) return@launchif (localCount > 0 && !refreshStaleInBackground && !fetchIfMissing) return@launch- if (!shouldUsePersistedCategoryHydration(provider, providerId) && localCount > 0) return@launch+ if (!shouldUsePersistedCategoryHydration(provider, providerId) &&+ provider.type != ProviderType.STALKER_PORTAL &&+ localCount > 0+ ) {+ return@launch+ }hydrateXtreamCategory(providerId, categoryId, provider, forceRefresh = localCount > 0)} finally {backgroundRefreshes.remove(key)@@ -1054,26 +1068,46 @@ class MovieRepositoryImpl @Inject constructor(}runCatching {- val xtreamProvider = getOrCreateXtreamProvider(providerId, provider)- when (val result = withTimeout(XTREAM_MOVIE_HYDRATION_TIMEOUT_MILLIS) {- xtreamProvider.getVodStreams(categoryId)- }) {+ val result = withTimeout(XTREAM_MOVIE_HYDRATION_TIMEOUT_MILLIS) {+ when (provider.type) {+ ProviderType.XTREAM_CODES -> getOrCreateXtreamProvider(providerId, provider).getVodStreams(categoryId)+ ProviderType.STALKER_PORTAL -> createStalkerProvider(providerId, provider).getVodStreams(categoryId)+ ProviderType.M3U -> return@withTimeout Success(emptyList())+ }+ }+ when (result) {is Success -> {val entities = result.data.map { movie -> movie.toEntity() }- transactionRunner.inTransaction {- movieDao.replaceCategory(providerId, categoryId, entities)+ val lazyXtreamHydration = provider.type == ProviderType.XTREAM_CODES &&+ shouldUsePersistedCategoryHydration(provider, providerId)+ if (lazyXtreamHydration && entities.isEmpty()) {movieCategoryHydrationDao.upsert(MovieCategoryHydrationEntity(providerId = providerId,categoryId = categoryId,lastHydratedAt = System.currentTimeMillis(),- itemCount = entities.size,- lastStatus = "SUCCESS",- lastError = null+ itemCount = localCount,+ lastStatus = "EMPTY_RETRY",+ lastError = "Xtream category returned an empty result; retry pending."))+ freshXtreamCategories.remove(key)+ } else {+ transactionRunner.inTransaction {+ movieDao.replaceCategory(providerId, categoryId, entities)+ movieCategoryHydrationDao.upsert(+ MovieCategoryHydrationEntity(+ providerId = providerId,+ categoryId = categoryId,+ lastHydratedAt = System.currentTimeMillis(),+ itemCount = entities.size,+ lastStatus = "SUCCESS",+ lastError = null+ )+ )+ }+ freshXtreamCategories.add(key)}- freshXtreamCategories.add(key)}else -> Unit}@@ -1101,6 +1135,11 @@ class MovieRepositoryImpl @Inject constructor(return !ContentCachePolicy.shouldRefresh(lastHydratedAt, ContentCachePolicy.CATALOG_TTL_MILLIS, now)}+ private fun MovieCategoryHydrationEntity.isEmptyRetryCoolingDown(now: Long = System.currentTimeMillis()): Boolean {+ if (lastStatus != "EMPTY_RETRY") return false+ return !ContentCachePolicy.shouldRefresh(lastHydratedAt, XTREAM_EMPTY_CATEGORY_RETRY_COOLDOWN_MILLIS, now)+ }+private fun movieIsInProgress(movie: Movie): Boolean {if (movie.watchProgress <= 0L) return falseval totalDurationMs = movie.durationSeconds.takeIf { it > 0 }?.times(1000L) ?: 0Ldiff --git a/data/src/main/java/com/streamvault/data/repository/SeriesRepositoryImpl.kt b/data/src/main/java/com/streamvault/data/repository/SeriesRepositoryImpl.ktindex 057c71d7..5cea31a8 100644--- a/data/src/main/java/com/streamvault/data/repository/SeriesRepositoryImpl.kt+++ b/data/src/main/java/com/streamvault/data/repository/SeriesRepositoryImpl.kt@@ -61,6 +61,8 @@ class SeriesRepositoryImpl @Inject constructor(const val MIN_SEARCH_QUERY_LENGTH = 2const val BROWSE_WINDOW_BUFFER = 80const val XTREAM_SERIES_CATEGORY_TIMEOUT_MILLIS = 60_000L+ const val XTREAM_CATEGORY_HYDRATION_CONCURRENCY = 2+ const val XTREAM_EMPTY_CATEGORY_RETRY_COOLDOWN_MILLIS = 30_000Lconst val CURSOR_BATCH_SIZE = 40}@@ -90,7 +92,9 @@ class SeriesRepositoryImpl @Inject constructor(private val xtreamCategoryLoadLocks = ConcurrentHashMap<String, Mutex>()private val loadedXtreamCategories = ConcurrentHashMap.newKeySet<String>()private val backgroundRefreshes = ConcurrentHashMap.newKeySet<String>()- private val repositoryScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)+ private val repositoryScope = CoroutineScope(+ SupervisorJob() + Dispatchers.IO.limitedParallelism(XTREAM_CATEGORY_HYDRATION_CONCURRENCY)+ )override fun getSeries(providerId: Long): Flow<List<Series>> =combine(@@ -172,12 +176,11 @@ class SeriesRepositoryImpl @Inject constructor(flowOf(emptyMap())} else {filteredCategories.forEach { category ->- val key = "${providerId}:${category.categoryId}"- if (!loadedXtreamCategories.contains(key)) {- val provider = providerDao.getById(providerId)- if (provider != null && provider.type == com.streamvault.domain.model.ProviderType.XTREAM_CODES) {- triggerSeriesCategoryHydration(providerId, category.categoryId, provider)- }+ val provider = providerDao.getById(providerId)+ if (provider != null &&+ (provider.type == ProviderType.XTREAM_CODES || provider.type == ProviderType.STALKER_PORTAL)+ ) {+ triggerSeriesCategoryHydration(providerId, category.categoryId, provider)}}val categoryGroupFlows: List<Flow<Pair<Long?, List<Series>>>> = filteredCategories.map { cat ->@@ -403,6 +406,8 @@ class SeriesRepositoryImpl @Inject constructor(StreamInfo(url = resolvedStream.url,title = episode.title,+ headers = resolvedStream.headers,+ userAgent = resolvedStream.userAgent,streamType = StreamType.fromContainerExtension(ext),containerExtension = ext,expirationTime = resolvedStream.expirationTime@@ -880,10 +885,8 @@ class SeriesRepositoryImpl @Inject constructor(private suspend fun ensureXtreamCategoryLoaded(providerId: Long, categoryId: Long) {val key = "$providerId:$categoryId"- if (loadedXtreamCategories.contains(key)) return-val provider = providerDao.getById(providerId) ?: return- if (provider.type != ProviderType.XTREAM_CODES) return+ if (provider.type != ProviderType.XTREAM_CODES && provider.type != ProviderType.STALKER_PORTAL) returnval localCount = seriesDao.getCountByCategory(providerId, categoryId).first()val hydration = seriesCategoryHydrationDao.get(providerId, categoryId)@@ -914,6 +917,9 @@ class SeriesRepositoryImpl @Inject constructor(if (!backgroundRefreshes.add(key)) returnrepositoryScope.launch {try {+ val localCount = seriesDao.getCountByCategory(providerId, categoryId).first()+ val hydration = seriesCategoryHydrationDao.get(providerId, categoryId)+ if (localCount == 0 && hydration?.isEmptyRetryCoolingDown() == true) return@launchhydrateSeriesCategory(providerId, categoryId, provider)} finally {backgroundRefreshes.remove(key)@@ -937,25 +943,44 @@ class SeriesRepositoryImpl @Inject constructor(}runCatching {- val xtreamProvider = getOrCreateXtreamProvider(providerId, provider)- when (val result = withXtreamSeriesCategoryTimeout(categoryId) {- xtreamProvider.getSeriesList(categoryId)- }) {+ val result = withXtreamSeriesCategoryTimeout(categoryId) {+ when (provider.type) {+ ProviderType.XTREAM_CODES -> getOrCreateXtreamProvider(providerId, provider).getSeriesList(categoryId)+ ProviderType.STALKER_PORTAL -> createStalkerProvider(providerId, provider).getSeriesList(categoryId)+ ProviderType.M3U -> return@withXtreamSeriesCategoryTimeout Success(emptyList())+ }+ }+ when (result) {is Success -> {val entities = result.data.map { item -> item.toEntity() }- seriesDao.replaceCategory(providerId, categoryId, entities)- episodeDao.deleteOrphans()- seriesCategoryHydrationDao.upsert(- SeriesCategoryHydrationEntity(- providerId = providerId,- categoryId = categoryId,- lastHydratedAt = System.currentTimeMillis(),- itemCount = entities.size,- lastStatus = "SUCCESS",- lastError = null+ val lazyXtreamHydration = shouldUsePersistedCategoryHydration(provider)+ if (lazyXtreamHydration && entities.isEmpty()) {+ seriesCategoryHydrationDao.upsert(+ SeriesCategoryHydrationEntity(+ providerId = providerId,+ categoryId = categoryId,+ lastHydratedAt = System.currentTimeMillis(),+ itemCount = localCount,+ lastStatus = "EMPTY_RETRY",+ lastError = "Xtream category returned an empty result; retry pending."+ ))- )- loadedXtreamCategories.add(key)+ loadedXtreamCategories.remove(key)+ } else {+ seriesDao.replaceCategory(providerId, categoryId, entities)+ episodeDao.deleteOrphans()+ seriesCategoryHydrationDao.upsert(+ SeriesCategoryHydrationEntity(+ providerId = providerId,+ categoryId = categoryId,+ lastHydratedAt = System.currentTimeMillis(),+ itemCount = entities.size,+ lastStatus = "SUCCESS",+ lastError = null+ )+ )+ loadedXtreamCategories.add(key)+ }}else -> Unit}@@ -980,6 +1005,15 @@ class SeriesRepositoryImpl @Inject constructor(return !ContentCachePolicy.shouldRefresh(lastHydratedAt, ContentCachePolicy.SERIES_CATEGORY_TTL_MILLIS, now)}+ private fun SeriesCategoryHydrationEntity.isEmptyRetryCoolingDown(now: Long = System.currentTimeMillis()): Boolean {+ if (lastStatus != "EMPTY_RETRY") return false+ return !ContentCachePolicy.shouldRefresh(lastHydratedAt, XTREAM_EMPTY_CATEGORY_RETRY_COOLDOWN_MILLIS, now)+ }++ private fun shouldUsePersistedCategoryHydration(provider: ProviderEntity): Boolean {+ return provider.type == ProviderType.XTREAM_CODES && provider.xtreamFastSyncEnabled+ }+private suspend fun <T> withXtreamSeriesCategoryTimeout(categoryId: Long,block: suspend () -> Tdiff --git a/data/src/main/java/com/streamvault/data/sync/SyncErrorSanitizer.kt b/data/src/main/java/com/streamvault/data/sync/SyncErrorSanitizer.ktindex 25b1e0a6..e7368484 100644--- a/data/src/main/java/com/streamvault/data/sync/SyncErrorSanitizer.kt+++ b/data/src/main/java/com/streamvault/data/sync/SyncErrorSanitizer.kt@@ -74,6 +74,8 @@ internal class SyncErrorSanitizer {private fun classifyIllegalState(message: String?, fallback: String): String {val normalized = message.orEmpty().lowercase()return when {+ normalized.contains("no accessible catalog data") ->+ "Provider authenticated, but the account has no accessible catalog data. Check that the MAC is activated and assigned a package on the provider side."normalized.contains("empty") && normalized.contains("catalog") -> "Provider returned an empty catalog."normalized.contains("playlist") && normalized.contains("http") -> "Playlist download failed."normalized.contains("epg") -> "Guide download failed."diff --git a/data/src/main/java/com/streamvault/data/sync/SyncManager.kt b/data/src/main/java/com/streamvault/data/sync/SyncManager.ktindex 5304855b..469462e7 100644--- a/data/src/main/java/com/streamvault/data/sync/SyncManager.kt+++ b/data/src/main/java/com/streamvault/data/sync/SyncManager.kt@@ -20,6 +20,7 @@ import com.streamvault.data.mapper.toEntityimport com.streamvault.data.parser.M3uParserimport com.streamvault.data.remote.stalker.StalkerApiServiceimport com.streamvault.data.remote.stalker.StalkerProvider+import com.streamvault.data.remote.stalker.StalkerProviderProfileimport com.streamvault.data.remote.dto.XtreamCategoryimport com.streamvault.data.remote.dto.XtreamSeriesItemimport com.streamvault.data.remote.dto.XtreamStream@@ -95,6 +96,7 @@ private const val XTREAM_RECOVERY_ABORT_WARNING_SUFFIX =private const val XTREAM_AVOID_FULL_CATALOG_COOLDOWN_MILLIS = 6 * 60 * 60 * 1000Lprivate const val XTREAM_MOVIE_REQUEST_TIMEOUT_MILLIS = 60_000Lprivate const val XTREAM_SERIES_REQUEST_TIMEOUT_MILLIS = 60_000L+private const val STALKER_GUIDE_PROGRAM_BATCH_SIZE = 500enum class SyncRepairSection {LIVE,@@ -863,21 +865,11 @@ class SyncManager @Inject constructor(if (force || ContentCachePolicy.shouldRefresh(metadata.lastLiveSuccess, ContentCachePolicy.CATALOG_TTL_MILLIS, now)) {progress(provider.id, onProgress, "Downloading Live TV...")val hiddenLiveCategoryIds = preferencesRepository.getHiddenCategoryIds(provider.id, ContentType.LIVE).first()- val categories = requireResult(api.getLiveCategories(), "Failed to load live categories")- val channels = loadStalkerChannelsByCategory(api, categories, onProgress)+ val liveCatalogResult = loadStalkerLiveCatalog(api, provider, onProgress)val liveCatalog = mergeVisibleLiveSyncWithHiddenStoredContent(providerId = provider.id,- visibleCategories = categories.map { category ->- CategoryEntity(- providerId = provider.id,- categoryId = category.id,- name = category.name,- parentId = category.parentId,- type = ContentType.LIVE,- isAdult = category.isAdult- )- },- visibleChannels = channels.map { it.toEntity() },+ visibleCategories = liveCatalogResult.categories,+ visibleChannels = liveCatalogResult.channels.map { it.toEntity() },hiddenLiveCategoryIds = hiddenLiveCategoryIds)val acceptedCount = syncCatalogStore.replaceLiveCatalog(@@ -891,13 +883,13 @@ class SyncManager @Inject constructor(liveCount = acceptedCount)syncMetadataRepository.updateMetadata(metadata)+ warnings += liveCatalogResult.warnings}if (force || ContentCachePolicy.shouldRefresh(metadata.lastMovieSuccess, ContentCachePolicy.CATALOG_TTL_MILLIS, now)) {progress(provider.id, onProgress, "Downloading Movies...")val categories = requireResult(api.getVodCategories(), "Failed to load movie categories")- val movies = loadStalkerMoviesByCategory(api, categories, onProgress)- val acceptedCount = syncCatalogStore.replaceMovieCatalog(+ syncCatalogStore.replaceMovieCatalog(providerId = provider.id,categories = categories.map { category ->CategoryEntity(@@ -909,16 +901,16 @@ class SyncManager @Inject constructor(isAdult = category.isAdult)},- movies = movies.asSequence().map { it.toEntity() }+ movies = emptySequence())metadata = metadata.copy(lastMovieSync = now,lastMovieAttempt = now,lastMovieSuccess = now,- movieCount = acceptedCount,- movieSyncMode = VodSyncMode.FULL,+ movieCount = 0,+ movieSyncMode = VodSyncMode.LAZY_BY_CATEGORY,movieWarningsCount = 0,- movieCatalogStale = false+ movieCatalogStale = true)syncMetadataRepository.updateMetadata(metadata)}@@ -926,8 +918,7 @@ class SyncManager @Inject constructor(if (force || ContentCachePolicy.shouldRefresh(metadata.lastSeriesSuccess, ContentCachePolicy.CATALOG_TTL_MILLIS, now)) {progress(provider.id, onProgress, "Downloading Series...")val categories = requireResult(api.getSeriesCategories(), "Failed to load series categories")- val series = loadStalkerSeriesByCategory(api, categories, onProgress)- val acceptedCount = syncCatalogStore.replaceSeriesCatalog(+ syncCatalogStore.replaceSeriesCatalog(providerId = provider.id,categories = categories.map { category ->CategoryEntity(@@ -939,12 +930,12 @@ class SyncManager @Inject constructor(isAdult = category.isAdult)},- series = series.asSequence().map { it.toEntity() }+ series = emptySequence())metadata = metadata.copy(lastSeriesSync = now,lastSeriesSuccess = now,- seriesCount = acceptedCount+ seriesCount = 0)syncMetadataRepository.updateMetadata(metadata)}@@ -1032,30 +1023,13 @@ class SyncManager @Inject constructor(}ProviderType.STALKER_PORTAL -> {- val currentEpgUrl = providerDao.getById(provider.id)?.epgUrl ?: provider.epgUrl- if (!currentEpgUrl.isNullOrBlank() && (force || ContentCachePolicy.shouldRefresh(updatedMetadata.lastEpgSuccess, ContentCachePolicy.EPG_TTL_MILLIS, now))) {- val epgValidationError = UrlSecurityPolicy.validateOptionalEpgUrl(currentEpgUrl)- if (epgValidationError != null) {- warnings.add(epgValidationError)- } else {- try {- progress(provider.id, onProgress, "Downloading EPG...")- retryTransient { epgRepository.refreshEpg(provider.id, currentEpgUrl) }- updatedMetadata = updatedMetadata.copy(- lastEpgSync = now,- lastEpgSuccess = now,- epgCount = programDao.countByProvider(provider.id)- )- syncMetadataRepository.updateMetadata(updatedMetadata)- } catch (e: CancellationException) {- throw e- } catch (e: Exception) {- Log.e(TAG, "EPG sync failed (non-fatal): ${sanitizeThrowableMessage(e)}")- warnings.add("Portal XMLTV sync failed; live guide will fall back to on-demand Stalker data.")- }- }- } else {- warnings.add("No XMLTV URL configured; live guide will use on-demand portal data when available.")+ if (force || ContentCachePolicy.shouldRefresh(updatedMetadata.lastEpgSuccess, ContentCachePolicy.EPG_TTL_MILLIS, now)) {+ warnings += syncStalkerPreferredEpg(+ provider = provider,+ now = now,+ onProgress = onProgress+ )+ updatedMetadata = syncMetadataRepository.getMetadata(provider.id) ?: updatedMetadata}}}@@ -1081,6 +1055,18 @@ class SyncManager @Inject constructor() {progress(provider.id, onProgress, "Retrying EPG...")val hiddenLiveCategoryIds = preferencesRepository.getHiddenCategoryIds(provider.id, ContentType.LIVE).first()+ if (provider.type == ProviderType.STALKER_PORTAL) {+ syncStalkerPreferredEpg(+ provider = provider,+ now = System.currentTimeMillis(),+ onProgress = onProgress+ )+ progress(provider.id, onProgress, "Refreshing external EPG sources...")+ epgSourceRepository.refreshAllForProvider(provider.id)+ progress(provider.id, onProgress, "Resolving EPG mappings...")+ epgSourceRepository.resolveForProvider(provider.id, hiddenLiveCategoryIds)+ return+ }val epgUrl = when (provider.type) {ProviderType.XTREAM_CODES -> {val base = provider.serverUrl.trimEnd('/')@@ -1126,6 +1112,168 @@ class SyncManager @Inject constructor(epgSourceRepository.resolveForProvider(provider.id, hiddenLiveCategoryIds)}+ private suspend fun syncStalkerPreferredEpg(+ provider: Provider,+ now: Long,+ onProgress: ((String) -> Unit)?+ ): List<String> {+ val warnings = mutableListOf<String>()+ val currentEpgUrl = providerDao.getById(provider.id)?.epgUrl ?: provider.epgUrl+ var shouldUseNativeGuide = currentEpgUrl.isBlank()++ if (currentEpgUrl.isNotBlank()) {+ val epgValidationError = UrlSecurityPolicy.validateOptionalEpgUrl(currentEpgUrl)+ if (epgValidationError != null) {+ Log.w(TAG, "Portal XMLTV URL invalid for provider ${provider.id}: $epgValidationError")+ warnings.add("Portal XMLTV URL is invalid; using the Stalker portal guide instead.")+ shouldUseNativeGuide = true+ } else {+ try {+ progress(provider.id, onProgress, "Downloading EPG...")+ retryTransient { epgRepository.refreshEpg(provider.id, currentEpgUrl) }+ val epgCount = programDao.countByProvider(provider.id)+ if (epgCount > 0) {+ syncMetadataRepository.updateMetadata(+ (syncMetadataRepository.getMetadata(provider.id) ?: SyncMetadata(provider.id)).copy(+ lastEpgSync = now,+ lastEpgSuccess = now,+ epgCount = epgCount+ )+ )+ } else {+ warnings.add("Portal XMLTV imported zero programs; using the Stalker portal guide instead.")+ shouldUseNativeGuide = true+ }+ } catch (e: CancellationException) {+ throw e+ } catch (e: Exception) {+ Log.e(TAG, "Portal XMLTV sync failed for provider ${provider.id}: ${sanitizeThrowableMessage(e)}")+ warnings.add("Portal XMLTV sync failed; using the Stalker portal guide instead.")+ shouldUseNativeGuide = true+ }+ }+ }++ if (shouldUseNativeGuide) {+ warnings += syncStalkerPortalEpg(+ provider = provider,+ now = now,+ onProgress = onProgress+ )+ }++ return warnings+ }++ private suspend fun syncStalkerPortalEpg(+ provider: Provider,+ now: Long,+ onProgress: ((String) -> Unit)?+ ): List<String> {+ val channels = channelDao.getGuideSyncEntriesByProvider(provider.id)+ if (channels.isEmpty()) {+ return emptyList()+ }++ val api = createStalkerSyncProvider(provider)+ val failedChannels = mutableListOf<String>()+ val insertBuffer = ArrayList<com.streamvault.data.local.entity.ProgramEntity>(STALKER_GUIDE_PROGRAM_BATCH_SIZE)+ var replacedExistingGuide = false++ suspend fun flushPrograms() {+ if (insertBuffer.isEmpty()) return+ val chunk = insertBuffer.toList()+ insertBuffer.clear()+ transactionRunner.inTransaction {+ if (!replacedExistingGuide) {+ programDao.deleteByProvider(provider.id)+ replacedExistingGuide = true+ }+ programDao.insertAll(chunk)+ }+ }++ 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.getEpg(channelKey),+ "Failed to load Stalker guide for $channelName"+ )+ }.onSuccess { programs ->+ programs+ .asSequence()+ .filter { program -> program.endTime > program.startTime }+ .forEach { program ->+ insertBuffer += program.copy(+ providerId = provider.id,+ channelId = channelKey+ ).toEntity()+ if (insertBuffer.size >= STALKER_GUIDE_PROGRAM_BATCH_SIZE) {+ flushPrograms()+ }+ }+ }.onFailure { error ->+ failedChannels += channelName+ Log.w(+ TAG,+ "Stalker portal EPG fetch failed for provider ${provider.id} channel $channelKey",+ error+ )+ }+ }++ flushPrograms()++ if (!replacedExistingGuide && failedChannels.isNotEmpty()) {+ return listOf(+ "Stalker portal guide sync failed for all ${failedChannels.size} channels; keeping existing guide data."+ )+ }++ if (!replacedExistingGuide) {+ transactionRunner.inTransaction {+ programDao.deleteByProvider(provider.id)+ }+ }++ val epgCount = programDao.countByProvider(provider.id)+ syncMetadataRepository.updateMetadata(+ (syncMetadataRepository.getMetadata(provider.id) ?: SyncMetadata(provider.id)).copy(+ lastEpgSync = now,+ lastEpgSuccess = now,+ epgCount = epgCount+ )+ )++ val warnings = mutableListOf<String>()+ if (epgCount == 0) {+ warnings.add("Stalker portal guide import returned zero programs.")+ }+ if (failedChannels.isNotEmpty()) {+ warnings.add(+ "Stalker portal guide imported $epgCount programs, but ${failedChannels.size} channels failed (${summarizeChannelNames(failedChannels)})."+ )+ }+ return warnings+ }++ private fun summarizeChannelNames(channelNames: List<String>): String {+ val distinctNames = channelNames.distinct()+ if (distinctNames.isEmpty()) {+ return "unknown channels"+ }+ val preview = distinctNames.take(3).joinToString()+ val remaining = distinctNames.size - 3+ return if (remaining > 0) {+ "$preview, and $remaining more"+ } else {+ preview+ }+ }+private suspend fun syncLiveOnly(provider: Provider,onProgress: ((String) -> Unit)?@@ -1256,21 +1404,11 @@ class SyncManager @Inject constructor(progress(provider.id, onProgress, "Retrying Live TV...")val api = createStalkerSyncProvider(provider)val hiddenLiveCategoryIds = preferencesRepository.getHiddenCategoryIds(provider.id, ContentType.LIVE).first()- val categories = requireResult(api.getLiveCategories(), "Failed to load live categories")- val channels = loadStalkerChannelsByCategory(api, categories, onProgress)+ val liveCatalogResult = loadStalkerLiveCatalog(api, provider, onProgress)val liveCatalog = mergeVisibleLiveSyncWithHiddenStoredContent(providerId = provider.id,- visibleCategories = categories.map { category ->- CategoryEntity(- providerId = provider.id,- categoryId = category.id,- name = category.name,- parentId = category.parentId,- type = ContentType.LIVE,- isAdult = category.isAdult- )- },- visibleChannels = channels.map { it.toEntity() },+ visibleCategories = liveCatalogResult.categories,+ visibleChannels = liveCatalogResult.channels.map { it.toEntity() },hiddenLiveCategoryIds = hiddenLiveCategoryIds)val acceptedCount = syncCatalogStore.replaceLiveCatalog(provider.id, liveCatalog.categories, liveCatalog.channels)@@ -1989,15 +2127,138 @@ class SyncManager @Inject constructor(categories: List<com.streamvault.domain.model.Category>,onProgress: ((String) -> Unit)?): List<Channel> {+ progress(api.providerId, onProgress, "Loading live channels...")+ val bulkChannels = requireResult(api.getLiveStreams(null), "Failed to load live channels")if (categories.isEmpty()) {- return requireResult(api.getLiveStreams(null), "Failed to load live channels")+ return bulkChannels}++ val hasResolvedCategories = bulkChannels.any { channel -> channel.categoryId != null }+ if (bulkChannels.isNotEmpty() && hasResolvedCategories) {+ return bulkChannels.distinctBy { it.streamId }+ }+return categories.flatMap { category ->progress(api.providerId, onProgress, "Loading ${category.name}...")requireResult(api.getLiveStreams(category.id), "Failed to load live channels for ${category.name}")}.distinctBy { it.streamId }}+ private data class StalkerLiveCatalogResult(+ val categories: List<CategoryEntity>,+ val channels: List<Channel>,+ val warnings: List<String> = emptyList()+ )++ private suspend fun loadStalkerLiveCatalog(+ api: StalkerProvider,+ provider: Provider,+ onProgress: ((String) -> Unit)?+ ): StalkerLiveCatalogResult {+ return when (val categoriesResult = api.getLiveCategories()) {+ is com.streamvault.domain.model.Result.Success -> {+ val channels = loadStalkerChannelsByCategory(api, categoriesResult.data, onProgress)+ StalkerLiveCatalogResult(+ categories = categoriesResult.data.map { it.toEntity(provider.id) },+ channels = channels+ )+ }+ is com.streamvault.domain.model.Result.Error -> {+ Log.w(+ TAG,+ "Stalker live categories failed for provider ${provider.id}; trying bulk live fallback: ${categoriesResult.message}",+ categoriesResult.exception+ )+ when (val bulkResult = api.getLiveStreams(null)) {+ is com.streamvault.domain.model.Result.Success -> {+ val channels = bulkResult.data.distinctBy { it.streamId }+ if (channels.isEmpty()) {+ throw IllegalStateException(+ "${categoriesResult.message.ifBlank { "Failed to load live categories" }} Bulk live fallback returned no channels.",+ categoriesResult.exception+ )+ }+ StalkerLiveCatalogResult(+ categories = synthesizeStalkerLiveCategories(provider.id, channels),+ channels = channels,+ warnings = listOf("Live categories failed; recovered using bulk live channels.")+ )+ }+ is com.streamvault.domain.model.Result.Error -> {+ val profileDiagnostic = stalkerCatalogAccessDiagnostic(+ api = api,+ primaryMessage = categoriesResult.message,+ fallbackMessage = bulkResult.message+ )+ throw IllegalStateException(+ buildString {+ append(categoriesResult.message.ifBlank { "Failed to load live categories" })+ bulkResult.message.takeIf { it.isNotBlank() }?.let {+ append(" Bulk live fallback also failed: ")+ append(it)+ }+ profileDiagnostic?.let {+ append(' ')+ append(it)+ }+ },+ bulkResult.exception ?: categoriesResult.exception+ )+ }+ is com.streamvault.domain.model.Result.Loading -> throw IllegalStateException("Unexpected loading state")+ }+ }+ is com.streamvault.domain.model.Result.Loading -> throw IllegalStateException("Unexpected loading state")+ }+ }++ private suspend fun stalkerCatalogAccessDiagnostic(+ api: StalkerProvider,+ primaryMessage: String,+ fallbackMessage: String?+ ): String? {+ if (!isStalkerEmptyResponse(primaryMessage) || !isStalkerEmptyResponse(fallbackMessage)) {+ return null+ }+ val profile = when (val profileResult = api.getAccountProfile()) {+ is com.streamvault.domain.model.Result.Success -> profileResult.data+ else -> return null+ }+ if (!profile.hasLikelyMissingCatalogAccess()) {+ return null+ }+ return "Portal authenticated, but the returned Stalker profile indicates this account has no accessible catalog data. Check that the MAC is activated and assigned a live/VOD package on the provider side."+ }++ private fun isStalkerEmptyResponse(message: String?): Boolean =+ !message.isNullOrBlank() && message.contains("empty response", ignoreCase = true)++ private fun StalkerProviderProfile.hasLikelyMissingCatalogAccess(): Boolean {+ val normalizedAccountId = accountId?.trim().orEmpty()+ val normalizedAccountName = accountName?.trim().orEmpty()+ return authAccess == false &&+ (normalizedAccountId.isBlank() || normalizedAccountId == "0") &&+ (normalizedAccountName.isBlank() || normalizedAccountName == "0")+ }++ private fun synthesizeStalkerLiveCategories(+ providerId: Long,+ channels: List<Channel>+ ): List<CategoryEntity> {+ return channels+ .mapNotNull { channel ->+ val categoryId = channel.categoryId ?: return@mapNotNull null+ CategoryEntity(+ providerId = providerId,+ categoryId = categoryId,+ name = channel.categoryName?.takeIf { it.isNotBlank() } ?: "Category $categoryId",+ type = ContentType.LIVE,+ isAdult = channel.isAdult+ )+ }+ .distinctBy { it.categoryId }+ }+private suspend fun loadStalkerMoviesByCategory(api: StalkerProvider,categories: List<com.streamvault.domain.model.Category>,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.ktindex 4c4e0b9d..c89c9e59 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@@ -4,6 +4,7 @@ import com.google.common.truth.Truth.assertThatimport com.streamvault.domain.model.Resultimport kotlinx.coroutines.test.runTestimport kotlinx.serialization.json.Json+import okhttp3.Interceptorimport okhttp3.MediaType.Companion.toMediaTypeimport okhttp3.OkHttpClientimport okhttp3.Protocol@@ -71,6 +72,109 @@ class OkHttpStalkerApiServiceTest {assertThat(success.data).isEqualTo("http://cdn.example.com/live/stream.ts")}+ @Test+ fun authenticate_reads_json_from_callback_wrapper_and_control_char_noise() = runTest {+ val service = OkHttpStalkerApiService(+ okHttpClient = fakeClient(+ "handshake" to "\u0000callback({\"js\":{\"token\":\"token-123\"}});",+ "get_profile" to "\u0000callback({\"js\":{\"name\":\"Living Room\",\"status\":\"1\"}});"+ ),+ json = Json { ignoreUnknownKeys = true }+ )++ val result = service.authenticate(+ buildStalkerDeviceProfile(+ portalUrl = "https://portal.example.com/c",+ macAddress = "00:1A:79:12:34:56",+ deviceProfile = "MAG250",+ timezone = "UTC",+ locale = "en"+ )+ )++ assertThat(result).isInstanceOf(Result.Success::class.java)+ val success = result as Result.Success+ assertThat(success.data.first.token).isEqualTo("token-123")+ assertThat(success.data.second.accountName).isEqualTo("Living Room")+ }++ @Test+ fun authenticate_reports_access_denied_html_clearly() = runTest {+ val service = OkHttpStalkerApiService(+ okHttpClient = fakeClient(+ "handshake" to """<!DOCTYPE html><html><body>Access Denied.</body></html>"""+ ),+ json = Json { ignoreUnknownKeys = true }+ )++ val result = service.authenticate(+ buildStalkerDeviceProfile(+ portalUrl = "https://portal.example.com/c",+ macAddress = "00:1A:79:12:34:56",+ deviceProfile = "MAG250",+ timezone = "UTC",+ locale = "en"+ )+ )++ assertThat(result).isInstanceOf(Result.Error::class.java)+ val error = result as Result.Error+ assertThat(error.message).isEqualTo("Portal denied the request for handshake.")+ }++ @Test+ fun getLiveCategories_retries_alternate_endpoint_for_authenticated_requests() = runTest {+ val requestedUrls = mutableListOf<String>()+ val service = OkHttpStalkerApiService(+ okHttpClient = OkHttpClient.Builder()+ .addInterceptor(Interceptor { chain ->+ val request = chain.request()+ requestedUrls += request.url.toString()+ val body = when (request.url.encodedPath) {+ "/server/load.php" -> if (request.url.queryParameter("action") == "get_genres") {+ throw java.io.IOException("\\n not found: limit=1 content=0d…")+ } else {+ """{"js":{"token":"token-123"}}"""+ }+ "/portal.php" -> """{"js":[{"id":"10","title":"News"}]}"""+ else -> error("Unexpected path ${request.url.encodedPath}")+ }+ 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.getLiveCategories(+ 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"+ )+ )++ 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_genres&JsHttpRequest=1-xml",+ "https://portal.example.com/portal.php?type=itv&action=get_genres&JsHttpRequest=1-xml"+ )+ }+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.ktindex 069a9434..467302be 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@@ -15,6 +15,7 @@ import com.streamvault.data.remote.stalker.StalkerSeriesDetailsimport com.streamvault.data.remote.stalker.StalkerSessionimport com.streamvault.data.remote.stalker.StalkerStreamKindimport com.streamvault.data.remote.stalker.StalkerUrlFactory+import com.streamvault.domain.model.ContentTypeimport com.streamvault.data.security.CredentialCryptoimport com.streamvault.domain.model.Resultimport com.streamvault.domain.model.ProviderType@@ -176,11 +177,139 @@ class XtreamStreamUrlResolverTest {val firstResolved = resolver.resolveWithMetadata(internalUrl)val secondResolved = resolver.resolveWithMetadata(internalUrl)- assertThat(firstResolved?.url).isEqualTo("http://edge.example.com/live/77.m3u8?exp=1774017000")- assertThat(firstResolved?.expirationTime).isEqualTo(1_774_017_000_000L)- assertThat(secondResolved?.url).isEqualTo("http://edge.example.com/live/77.m3u8?exp=1774017000")+ assertThat(firstResolved?.url).isEqualTo("http://edge.example.com/live/77.m3u8")+ assertThat(firstResolved?.expirationTime).isNull()+ assertThat(firstResolved?.headers?.get("Referer")).isEqualTo("https://portal.example.com/c/")+ assertThat(firstResolved?.headers?.get("Cookie")).contains("mac=00:1A:79:12:34:56")+ assertThat(firstResolved?.headers?.get("Cookie")).contains("stb_lang=en")+ assertThat(firstResolved?.headers?.get("Cookie")).contains("timezone=UTC")+ assertThat(firstResolved?.headers?.get("Cookie")).contains("sn=0001A79123456")+ assertThat(firstResolved?.headers?.get("Cookie")).contains("device_id=")+ assertThat(firstResolved?.headers?.get("Cookie")).contains("device_id2=")+ assertThat(firstResolved?.headers?.get("Cookie")).contains("signature=")+ assertThat(firstResolved?.headers?.get("Authorization")).isEqualTo("Bearer token")+ assertThat(firstResolved?.headers?.get("X-User-Agent")).isEqualTo("Model: MAG250; Link: Ethernet")+ assertThat(firstResolved?.userAgent).contains("MAG250 stbapp")+ assertThat(secondResolved?.url).isEqualTo("http://edge.example.com/live/77.m3u8")assertThat(fakeStalkerApiService.authenticateCalls).isEqualTo(1)- assertThat(fakeStalkerApiService.createLinkCalls).isEqualTo(2)+ assertThat(fakeStalkerApiService.createLinkCalls).isEqualTo(0)+ }++ @Test+ fun resolveWithMetadata_uses_direct_stalker_absolute_cmd_without_create_link() = runBlocking {+ val fakeStalkerApiService = FakeStalkerApiService()+ val resolver = XtreamStreamUrlResolver(+ providerDao = FakeProviderDao(+ ProviderEntity(+ id = 14,+ name = "Stalker",+ type = ProviderType.STALKER_PORTAL,+ serverUrl = "https://portal.example.com",+ stalkerMacAddress = "00:1A:79:12:34:56",+ stalkerDeviceProfile = "MAG250",+ stalkerDeviceTimezone = "UTC",+ stalkerDeviceLocale = "en"+ )+ ),+ credentialCrypto = credentialCrypto,+ stalkerApiService = fakeStalkerApiService+ )+ val directCmd = "http://0connect.top:8080/9UTXtQcxuxkk/9fa4ed5x07/443?play_token=iwdgLK23Yl"+ val internalUrl = StalkerUrlFactory.buildInternalStreamUrl(+ providerId = 14,+ kind = StalkerStreamKind.LIVE,+ itemId = 77,+ cmd = directCmd,+ containerExtension = "ts"+ )++ val resolved = resolver.resolveWithMetadata(internalUrl)++ assertThat(resolved?.url).isEqualTo(directCmd)+ assertThat(resolved?.headers?.get("Referer")).isEqualTo("https://portal.example.com/c/")+ assertThat(resolved?.headers?.get("Authorization")).isEqualTo("Bearer token")+ assertThat(resolved?.userAgent).contains("MAG250 stbapp")+ assertThat(fakeStalkerApiService.authenticateCalls).isEqualTo(1)+ assertThat(fakeStalkerApiService.createLinkCalls).isEqualTo(0)+ }++ @Test+ fun resolveWithMetadata_uses_wrapped_direct_stalker_live_cmd_without_create_link() = runBlocking {+ val fakeStalkerApiService = FakeStalkerApiService().apply {+ createLinkResponse = "http://line.trxdnscloud.ru/play/live.php?mac=00:1A:79:40:8B:D7&stream=&extension=ts&play_token=broken"+ }+ val resolver = XtreamStreamUrlResolver(+ providerDao = FakeProviderDao(+ ProviderEntity(+ id = 14,+ name = "Stalker",+ type = ProviderType.STALKER_PORTAL,+ serverUrl = "http://line.trxdnscloud.ru/c/",+ stalkerMacAddress = "00:1A:79:40:8B:D7",+ stalkerDeviceProfile = "MAG250",+ stalkerDeviceTimezone = "UTC",+ stalkerDeviceLocale = "en"+ )+ ),+ credentialCrypto = credentialCrypto,+ stalkerApiService = fakeStalkerApiService+ )+ val internalUrl = StalkerUrlFactory.buildInternalStreamUrl(+ providerId = 14,+ kind = StalkerStreamKind.LIVE,+ itemId = 978715,+ cmd = "ffmpeg http://line.trxdnscloud.ru/play/live.php?mac=00:1A:79:40:8B:D7&stream=978715&extension=ts&play_token=R7KbxtDJj3",+ containerExtension = "ts"+ )++ val resolved = resolver.resolveWithMetadata(internalUrl)++ assertThat(resolved?.url).isEqualTo(+ "http://line.trxdnscloud.ru/play/live.php?mac=00:1A:79:40:8B:D7&stream=978715&extension=ts&play_token=R7KbxtDJj3"+ )+ assertThat(resolved?.headers?.get("Referer")).isEqualTo("https://portal.example.com/c/")+ assertThat(resolved?.headers?.get("Authorization")).isEqualTo("Bearer token")+ assertThat(resolved?.userAgent).contains("MAG250 stbapp")+ assertThat(fakeStalkerApiService.authenticateCalls).isEqualTo(1)+ assertThat(fakeStalkerApiService.createLinkCalls).isEqualTo(0)+ }++ @Test+ fun resolveWithMetadata_repairs_stale_direct_stalker_live_url_and_applies_headers() = runBlocking {+ val fakeStalkerApiService = FakeStalkerApiService()+ val resolver = XtreamStreamUrlResolver(+ providerDao = FakeProviderDao(+ ProviderEntity(+ id = 14,+ name = "Stalker",+ type = ProviderType.STALKER_PORTAL,+ serverUrl = "https://portal.example.com",+ stalkerMacAddress = "00:1A:79:12:34:56",+ stalkerDeviceProfile = "MAG250",+ stalkerDeviceTimezone = "UTC",+ stalkerDeviceLocale = "en"+ )+ ),+ credentialCrypto = credentialCrypto,+ stalkerApiService = fakeStalkerApiService+ )++ val resolved = resolver.resolveWithMetadata(+ url = "http://portal.example.com/play/live.php?mac=00:1A:79:12:34:56&stream=&extension=ts&play_token=abc123",+ fallbackProviderId = 14,+ fallbackStreamId = 978715,+ fallbackContentType = ContentType.LIVE,+ fallbackContainerExtension = "ts"+ )++ assertThat(resolved?.url).isEqualTo(+ "http://portal.example.com/play/live.php?mac=00:1A:79:12:34:56&stream=978715&extension=ts&play_token=abc123"+ )+ assertThat(resolved?.headers?.get("Referer")).isEqualTo("https://portal.example.com/c/")+ assertThat(resolved?.headers?.get("Authorization")).isEqualTo("Bearer token")+ assertThat(resolved?.userAgent).contains("MAG250 stbapp")+ assertThat(fakeStalkerApiService.authenticateCalls).isEqualTo(1)+ assertThat(fakeStalkerApiService.createLinkCalls).isEqualTo(0)}private class FakeProviderDao(@@ -205,6 +334,7 @@ class XtreamStreamUrlResolverTest {private class FakeStalkerApiService : StalkerApiService {var authenticateCalls: Int = 0var createLinkCalls: Int = 0+ var createLinkResponse: String = "http://edge.example.com/live/77.m3u8?exp=1774017000"override suspend fun authenticate(profile: StalkerDeviceProfile): Result<Pair<StalkerSession, StalkerProviderProfile>> {authenticateCalls += 1@@ -281,7 +411,7 @@ class XtreamStreamUrlResolverTest {cmd: String): Result<String> {createLinkCalls += 1- return Result.success("http://edge.example.com/live/77.m3u8?exp=1774017000")+ return Result.success(createLinkResponse)}}}diff --git a/data/src/test/java/com/streamvault/data/repository/MovieRepositoryImplTest.kt b/data/src/test/java/com/streamvault/data/repository/MovieRepositoryImplTest.ktindex 706e2553..781217d8 100644--- a/data/src/test/java/com/streamvault/data/repository/MovieRepositoryImplTest.kt+++ b/data/src/test/java/com/streamvault/data/repository/MovieRepositoryImplTest.kt@@ -15,6 +15,11 @@ import com.streamvault.data.local.entity.MovieEntityimport com.streamvault.data.local.entity.PlaybackHistoryLiteEntityimport com.streamvault.data.local.entity.ProviderEntityimport com.streamvault.data.preferences.PreferencesRepository+import com.streamvault.data.remote.stalker.StalkerDeviceProfile+import com.streamvault.data.remote.stalker.StalkerProviderProfile+import com.streamvault.data.remote.stalker.StalkerSession+import com.streamvault.data.remote.stalker.StalkerCategoryRecord+import com.streamvault.data.remote.stalker.StalkerItemRecordimport com.streamvault.data.remote.dto.XtreamCategoryimport com.streamvault.data.remote.dto.XtreamStreamimport com.streamvault.data.remote.stalker.StalkerApiService@@ -24,6 +29,9 @@ import com.streamvault.data.security.CredentialCryptoimport com.streamvault.domain.model.ContentTypeimport com.streamvault.domain.model.ProviderStatusimport com.streamvault.domain.model.ProviderType+import com.streamvault.domain.model.Result+import com.streamvault.domain.model.SyncMetadata+import com.streamvault.domain.model.VodSyncModeimport com.streamvault.domain.repository.SyncMetadataRepositoryimport kotlinx.coroutines.flow.firstimport kotlinx.coroutines.flow.flow@@ -31,8 +39,11 @@ import kotlinx.coroutines.flow.flowOfimport kotlinx.coroutines.test.runTestimport org.junit.Testimport org.mockito.kotlin.any+import org.mockito.kotlin.anyOrNull+import org.mockito.kotlin.argumentCaptorimport org.mockito.kotlin.eqimport org.mockito.kotlin.mock+import org.mockito.kotlin.neverimport org.mockito.kotlin.verifyimport org.mockito.kotlin.whenever@@ -195,6 +206,123 @@ class MovieRepositoryImplTest {verify(movieDao).replaceCategory(eq(7L), eq(42L), any())}+ @Test+ fun `getMoviesByCategory marks empty xtream fast sync hydration for retry`() = runTest {+ whenever(preferencesRepository.parentalControlLevel).thenReturn(flowOf(0))+ whenever(preferencesRepository.xtreamBase64TextCompatibility).thenReturn(flowOf(false))+ whenever(movieDao.getCountByCategory(7L, 42L)).thenReturn(flowOf(0))+ whenever(movieDao.getByCategory(7L, 42L)).thenReturn(flowOf(emptyList()))+ whenever(movieCategoryHydrationDao.get(7L, 42L)).thenReturn(null)+ whenever(syncMetadataRepository.getMetadata(7L)).thenReturn(+ SyncMetadata(providerId = 7L, movieSyncMode = VodSyncMode.LAZY_BY_CATEGORY)+ )+ whenever(providerDao.getById(7L)).thenReturn(+ ProviderEntity(+ id = 7L,+ name = "Xtream",+ type = ProviderType.XTREAM_CODES,+ serverUrl = "http://example.com",+ username = "user",+ password = "pass",+ status = ProviderStatus.ACTIVE+ )+ )+ whenever(xtreamApiService.getVodCategories(any())).thenReturn(+ listOf(XtreamCategory(categoryId = "42", categoryName = "Action"))+ )+ whenever(xtreamApiService.getVodStreams(any())).thenReturn(emptyList())++ val repository = createRepository()++ repository.getMoviesByCategory(7L, 42L).first()++ verify(movieDao, never()).replaceCategory(eq(7L), eq(42L), any())+ val hydrationCaptor = argumentCaptor<com.streamvault.data.local.entity.MovieCategoryHydrationEntity>()+ verify(movieCategoryHydrationDao).upsert(hydrationCaptor.capture())+ assertThat(hydrationCaptor.firstValue.lastStatus).isEqualTo("EMPTY_RETRY")+ assertThat(hydrationCaptor.firstValue.itemCount).isEqualTo(0)+ }++ @Test+ fun `getMoviesByCategory lazily hydrates stalker category when local cache is empty`() = runTest {+ whenever(preferencesRepository.parentalControlLevel).thenReturn(flowOf(0))+ whenever(movieDao.getCountByCategory(7L, 42L)).thenReturn(flowOf(0))+ whenever(movieDao.getByCategory(7L, 42L)).thenReturn(flowOf(emptyList()))+ whenever(movieCategoryHydrationDao.get(7L, 42L)).thenReturn(null)+ whenever(providerDao.getById(7L)).thenReturn(+ ProviderEntity(+ id = 7L,+ name = "Stalker",+ type = ProviderType.STALKER_PORTAL,+ serverUrl = "http://example.com",+ stalkerMacAddress = "00:11:22:33:44:55",+ status = ProviderStatus.ACTIVE+ )+ )+ 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")+ )+ )+ whenever(stalkerApiService.getVodCategories(any(), any())).thenReturn(+ Result.success(listOf(StalkerCategoryRecord(id = "42", name = "Action")))+ )+ whenever(stalkerApiService.getVodStreams(any(), any(), anyOrNull())).thenReturn(+ Result.success(+ listOf(+ StalkerItemRecord(+ id = "101",+ name = "Movie",+ categoryId = "42",+ cmd = "ffmpeg http://example.com/movie.mp4",+ containerExtension = "mp4"+ )+ )+ )+ )++ val repository = createRepository()++ repository.getMoviesByCategory(7L, 42L).first()++ verify(movieDao).replaceCategory(eq(7L), eq(42L), any())+ }++ @Test+ fun `getMovieDetails returns local data for stalker without full remote fetch`() = runTest {+ whenever(movieDao.getById(101L)).thenReturn(+ movieRecord(+ id = 101L,+ name = "Stored Movie",+ genre = "Action",+ categoryId = 42L,+ rating = 8.5f+ )+ )+ whenever(providerDao.getById(7L)).thenReturn(+ ProviderEntity(+ id = 7L,+ name = "Stalker",+ type = ProviderType.STALKER_PORTAL,+ serverUrl = "http://example.com",+ stalkerMacAddress = "00:11:22:33:44:55",+ status = ProviderStatus.ACTIVE+ )+ )++ val repository = createRepository()++ val result = repository.getMovieDetails(7L, 101L)++ assertThat(result).isInstanceOf(Result.Success::class.java)+ assertThat((result as Result.Success).data.name).isEqualTo("Stored Movie")+ verify(stalkerApiService, never()).authenticate(any())+ }+@Testfun `searchMovies returns empty list when sqlite throws for malformed fts query`() = runTest {whenever(preferencesRepository.parentalControlLevel).thenReturn(flowOf(0))diff --git a/data/src/test/java/com/streamvault/data/repository/SeriesRepositoryImplTest.kt b/data/src/test/java/com/streamvault/data/repository/SeriesRepositoryImplTest.ktindex c9032d5a..4c51c18b 100644--- a/data/src/test/java/com/streamvault/data/repository/SeriesRepositoryImplTest.kt+++ b/data/src/test/java/com/streamvault/data/repository/SeriesRepositoryImplTest.kt@@ -12,6 +12,10 @@ import com.streamvault.data.local.dao.SeriesCategoryHydrationDaoimport com.streamvault.data.local.entity.SeriesEntityimport com.streamvault.data.local.entity.ProviderEntityimport com.streamvault.data.preferences.PreferencesRepository+import com.streamvault.data.remote.stalker.StalkerCategoryRecord+import com.streamvault.data.remote.stalker.StalkerItemRecord+import com.streamvault.data.remote.stalker.StalkerProviderProfile+import com.streamvault.data.remote.stalker.StalkerSessionimport com.streamvault.data.remote.dto.XtreamCategoryimport com.streamvault.data.remote.dto.XtreamSeriesItemimport com.streamvault.data.remote.stalker.StalkerApiService@@ -22,14 +26,18 @@ import com.streamvault.data.security.CredentialCryptoimport com.streamvault.domain.model.ContentTypeimport com.streamvault.domain.model.ProviderStatusimport com.streamvault.domain.model.ProviderType+import com.streamvault.domain.model.Resultimport kotlinx.coroutines.flow.firstimport kotlinx.coroutines.flow.flowimport kotlinx.coroutines.flow.flowOfimport kotlinx.coroutines.test.runTestimport org.junit.Testimport org.mockito.kotlin.any+import org.mockito.kotlin.anyOrNull+import org.mockito.kotlin.argumentCaptorimport org.mockito.kotlin.eqimport org.mockito.kotlin.mock+import org.mockito.kotlin.neverimport org.mockito.kotlin.verifyimport org.mockito.kotlin.whenever@@ -93,6 +101,92 @@ class SeriesRepositoryImplTest {verify(episodeDao).deleteOrphans()}+ @Test+ fun `getSeriesByCategory lazily hydrates stalker category when local cache is empty`() = runTest {+ whenever(preferencesRepository.parentalControlLevel).thenReturn(flowOf(0))+ whenever(seriesDao.getCountByCategory(7L, 77L)).thenReturn(flowOf(0))+ whenever(seriesDao.getByCategory(7L, 77L)).thenReturn(flowOf(emptyList()))+ whenever(providerDao.getById(7L)).thenReturn(+ ProviderEntity(+ id = 7L,+ name = "Stalker",+ type = ProviderType.STALKER_PORTAL,+ serverUrl = "http://example.com",+ stalkerMacAddress = "00:11:22:33:44:55",+ status = ProviderStatus.ACTIVE+ )+ )+ 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")+ )+ )+ whenever(stalkerApiService.getSeriesCategories(any(), any())).thenReturn(+ Result.success(listOf(StalkerCategoryRecord(id = "77", name = "Drama")))+ )+ whenever(stalkerApiService.getSeries(any(), any(), anyOrNull())).thenReturn(+ Result.success(+ listOf(+ StalkerItemRecord(+ id = "301",+ name = "Series",+ categoryId = "77",+ isSeries = true+ )+ )+ )+ )+ whenever(seriesCategoryHydrationDao.get(7L, 77L)).thenReturn(null)+ whenever(episodeDao.deleteOrphans()).thenReturn(0)++ val repository = createRepository()++ val result = repository.getSeriesByCategory(7L, 77L).first()++ assertThat(result).isEmpty()+ verify(seriesDao).replaceCategory(eq(7L), eq(77L), any())+ verify(episodeDao).deleteOrphans()+ }++ @Test+ fun `getSeriesByCategory marks empty xtream fast sync hydration for retry`() = runTest {+ whenever(preferencesRepository.parentalControlLevel).thenReturn(flowOf(0))+ whenever(preferencesRepository.xtreamBase64TextCompatibility).thenReturn(flowOf(false))+ whenever(seriesDao.getCountByCategory(7L, 77L)).thenReturn(flowOf(0))+ whenever(seriesDao.getByCategory(7L, 77L)).thenReturn(flowOf(emptyList()))+ whenever(seriesCategoryHydrationDao.get(7L, 77L)).thenReturn(null)+ whenever(providerDao.getById(7L)).thenReturn(+ ProviderEntity(+ id = 7L,+ name = "Xtream",+ type = ProviderType.XTREAM_CODES,+ serverUrl = "http://example.com",+ username = "user",+ password = "pass",+ xtreamFastSyncEnabled = true,+ status = ProviderStatus.ACTIVE+ )+ )+ whenever(xtreamApiService.getSeriesCategories(any())).thenReturn(+ listOf(XtreamCategory(categoryId = "77", categoryName = "Drama"))+ )+ whenever(xtreamApiService.getSeriesList(any())).thenReturn(emptyList())++ val repository = createRepository()++ repository.getSeriesByCategory(7L, 77L).first()++ verify(seriesDao, never()).replaceCategory(eq(7L), eq(77L), any())+ val hydrationCaptor = argumentCaptor<com.streamvault.data.local.entity.SeriesCategoryHydrationEntity>()+ verify(seriesCategoryHydrationDao).upsert(hydrationCaptor.capture())+ assertThat(hydrationCaptor.firstValue.lastStatus).isEqualTo("EMPTY_RETRY")+ assertThat(hydrationCaptor.firstValue.itemCount).isEqualTo(0)+ }+@Testfun `getSeriesDetails falls back to remote series id lookup`() = runTest {whenever(preferencesRepository.xtreamBase64TextCompatibility).thenReturn(flowOf(false))diff --git a/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.kt b/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.ktindex 148a1a18..484f6791 100644--- a/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.kt+++ b/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.kt@@ -11,15 +11,23 @@ import com.streamvault.data.local.dao.ProgramDaoimport com.streamvault.data.local.dao.ProviderDaoimport com.streamvault.data.local.dao.SeriesDaoimport com.streamvault.data.local.dao.TmdbIdentityDao+import com.streamvault.data.local.entity.ChannelEntity+import com.streamvault.data.local.entity.ChannelGuideSyncEntityimport com.streamvault.data.local.entity.ProviderEntityimport com.streamvault.data.parser.M3uParserimport com.streamvault.data.security.CredentialCryptoimport com.streamvault.domain.model.SyncStateimport com.streamvault.domain.model.Result+import com.streamvault.domain.model.ProviderEpgSyncModeimport com.streamvault.domain.model.ProviderTypeimport com.streamvault.domain.model.SyncMetadataimport com.streamvault.domain.repository.EpgRepositoryimport com.streamvault.domain.repository.EpgSourceRepository+import com.streamvault.data.remote.stalker.StalkerCategoryRecord+import com.streamvault.data.remote.stalker.StalkerItemRecord+import com.streamvault.data.remote.stalker.StalkerProgramRecord+import com.streamvault.data.remote.stalker.StalkerProviderProfile+import com.streamvault.data.remote.stalker.StalkerSessionimport com.streamvault.data.remote.stalker.StalkerApiServiceimport com.streamvault.data.preferences.PreferencesRepositoryimport kotlinx.coroutines.CompletableDeferred@@ -42,6 +50,7 @@ import org.junit.Ruleimport org.junit.Testimport org.junit.rules.TemporaryFolderimport org.mockito.kotlin.any+import org.mockito.kotlin.anyOrNullimport org.mockito.kotlin.atLeastimport org.mockito.kotlin.atLeastOnceimport org.mockito.kotlin.argumentCaptor@@ -204,7 +213,8 @@ class SyncManagerTest {tmdbIdentityDao,epgRepo,epgSourceRepo,- preferencesRepo+ preferencesRepo,+ stalkerApiService)org.mockito.kotlin.whenever(preferencesRepo.useXtreamTextClassification).thenReturn(flowOf(false))org.mockito.kotlin.whenever(preferencesRepo.xtreamBase64TextCompatibility).thenReturn(flowOf(false))@@ -488,6 +498,356 @@ class SyncManagerTest {assertThat(xtreamBackend.requestedActions).doesNotContain("get_vod_streams")}+ @Test+ fun sync_stalker_persists_only_vod_and_series_categories_during_initial_sync() = runTest {+ val providerEntity = sampleProvider(ProviderType.STALKER_PORTAL).copy(+ serverUrl = "http://example.com",+ username = "",+ password = "",+ stalkerMacAddress = "00:11:22:33:44:55",+ epgSyncMode = ProviderEpgSyncMode.SKIP+ )+ 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(stalkerApiService.getLiveCategories(any(), any())).thenReturn(+ Result.success(listOf(StalkerCategoryRecord(id = "10", name = "News")))+ )+ org.mockito.kotlin.whenever(stalkerApiService.getLiveStreams(any(), any(), anyOrNull())).thenReturn(+ Result.success(+ listOf(+ StalkerItemRecord(+ id = "100",+ name = "News",+ categoryId = "10",+ cmd = "ffmpeg http://example.com/live.ts"+ )+ )+ )+ )+ org.mockito.kotlin.whenever(stalkerApiService.getVodCategories(any(), any())).thenReturn(+ Result.success(listOf(StalkerCategoryRecord(id = "42", name = "Action")))+ )+ org.mockito.kotlin.whenever(stalkerApiService.getSeriesCategories(any(), any())).thenReturn(+ Result.success(listOf(StalkerCategoryRecord(id = "77", name = "Drama")))+ )++ val result = manager.sync(providerId = 1L, force = false)++ assertThat(result).isInstanceOf(Result.Success::class.java)+ val metadata = syncMetadataRepo.getMetadata(1L)+ assertThat(metadata?.movieSyncMode).isEqualTo(com.streamvault.domain.model.VodSyncMode.LAZY_BY_CATEGORY)+ assertThat(metadata?.movieCount).isEqualTo(0)+ assertThat(metadata?.seriesCount).isEqualTo(0)+ verify(stalkerApiService).getVodCategories(any(), any())+ verify(stalkerApiService).getSeriesCategories(any(), any())+ verify(stalkerApiService).getLiveStreams(any(), any(), anyOrNull())+ verify(stalkerApiService, org.mockito.kotlin.times(0)).getLiveStreams(any(), any(), eq("10"))+ verify(stalkerApiService, org.mockito.kotlin.times(0)).getEpg(any(), any(), any())+ verify(stalkerApiService, org.mockito.kotlin.times(0)).getVodStreams(any(), any(), anyOrNull())+ verify(stalkerApiService, org.mockito.kotlin.times(0)).getSeries(any(), any(), anyOrNull())+ }++ @Test+ fun sync_stalker_recovers_when_live_categories_fail_but_bulk_channels_work() = runTest {+ val providerEntity = sampleProvider(ProviderType.STALKER_PORTAL).copy(+ serverUrl = "http://example.com",+ username = "",+ password = "",+ stalkerMacAddress = "00:11:22:33:44:55",+ epgSyncMode = ProviderEpgSyncMode.SKIP+ )+ 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(stalkerApiService.getLiveCategories(any(), any())).thenReturn(+ Result.error("Portal returned an empty response for get_genres.")+ )+ org.mockito.kotlin.whenever(stalkerApiService.getLiveStreams(any(), any(), anyOrNull())).thenReturn(+ Result.success(+ listOf(+ StalkerItemRecord(+ id = "100",+ name = "News",+ categoryId = "10",+ categoryName = "News",+ cmd = "ffmpeg http://example.com/live.ts"+ )+ )+ )+ )+ org.mockito.kotlin.whenever(stalkerApiService.getVodCategories(any(), any())).thenReturn(Result.success(emptyList()))+ org.mockito.kotlin.whenever(stalkerApiService.getSeriesCategories(any(), any())).thenReturn(Result.success(emptyList()))++ val result = manager.sync(providerId = 1L, force = false)++ assertThat(result).isInstanceOf(Result.Success::class.java)+ val categoryStagesCaptor = argumentCaptor<List<com.streamvault.data.local.entity.CategoryImportStageEntity>>()+ verify(catalogSyncDao, atLeastOnce()).insertCategoryStages(categoryStagesCaptor.capture())+ assertThat(categoryStagesCaptor.allValues.flatten().any { it.type == com.streamvault.domain.model.ContentType.LIVE && it.name == "News" }).isTrue()+ verify(stalkerApiService).getLiveCategories(any(), any())+ verify(stalkerApiService).getLiveStreams(any(), any(), anyOrNull())+ }++ @Test+ fun sync_stalker_surfaces_profile_hint_when_catalog_access_is_missing() = runTest {+ val providerEntity = sampleProvider(ProviderType.STALKER_PORTAL).copy(+ serverUrl = "http://example.com",+ username = "",+ password = "",+ stalkerMacAddress = "00:11:22:33:44:55",+ epgSyncMode = ProviderEpgSyncMode.SKIP+ )+ 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(+ accountId = "0",+ accountName = "0",+ authAccess = false+ )+ )+ )+ org.mockito.kotlin.whenever(stalkerApiService.getLiveCategories(any(), any())).thenReturn(+ Result.error("Portal returned an empty response for get_genres.")+ )+ org.mockito.kotlin.whenever(stalkerApiService.getLiveStreams(any(), any(), anyOrNull())).thenReturn(+ Result.error("Portal returned an empty response for get_ordered_list.")+ )++ val result = manager.sync(providerId = 1L, force = false)++ assertThat(result).isInstanceOf(Result.Error::class.java)+ val error = result as Result.Error+ assertThat(error.message).contains("no accessible catalog data")+ assertThat(error.message).contains("MAC is activated")+ }++ @Test+ fun sync_stalker_upfront_epg_without_xmltv_imports_native_portal_guide() = runTest {+ val providerEntity = sampleProvider(ProviderType.STALKER_PORTAL).copy(+ serverUrl = "http://example.com",+ username = "",+ password = "",+ stalkerMacAddress = "00:11:22:33:44:55",+ epgSyncMode = ProviderEpgSyncMode.UPFRONT,+ 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(stalkerApiService.getLiveCategories(any(), any())).thenReturn(+ Result.success(listOf(StalkerCategoryRecord(id = "10", name = "News")))+ )+ org.mockito.kotlin.whenever(stalkerApiService.getLiveStreams(any(), any(), anyOrNull())).thenReturn(+ Result.success(+ listOf(+ StalkerItemRecord(+ id = "100",+ name = "News",+ categoryId = "10",+ cmd = "ffmpeg http://example.com/live.ts"+ )+ )+ )+ )+ org.mockito.kotlin.whenever(stalkerApiService.getVodCategories(any(), any())).thenReturn(Result.success(emptyList()))+ org.mockito.kotlin.whenever(stalkerApiService.getSeriesCategories(any(), any())).thenReturn(Result.success(emptyList()))+ org.mockito.kotlin.whenever(channelDao.getGuideSyncEntriesByProvider(1L)).thenReturn(+ listOf(+ ChannelGuideSyncEntity(+ streamId = 100L,+ name = "News",+ epgChannelId = "100"+ )+ )+ )+ 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.sync(providerId = 1L, force = true)++ assertThat(result).isInstanceOf(Result.Success::class.java)+ val insertedProgramsCaptor = argumentCaptor<List<com.streamvault.data.local.entity.ProgramEntity>>()+ verify(programDao).insertAll(insertedProgramsCaptor.capture())+ assertThat(insertedProgramsCaptor.firstValue).hasSize(1)+ assertThat(insertedProgramsCaptor.firstValue.first().channelId).isEqualTo("100")+ assertThat(insertedProgramsCaptor.firstValue.first().providerId).isEqualTo(1L)+ val metadata = syncMetadataRepo.getMetadata(1L)+ assertThat(metadata?.epgCount).isEqualTo(1)+ verify(stalkerApiService).getLiveStreams(any(), any(), anyOrNull())+ verify(stalkerApiService, org.mockito.kotlin.times(0)).getLiveStreams(any(), any(), eq("10"))+ verify(stalkerApiService).getEpg(any(), any(), eq("100"))+ }++ @Test+ fun sync_stalker_upfront_epg_batches_native_portal_guide_writes() = runTest {+ val providerEntity = sampleProvider(ProviderType.STALKER_PORTAL).copy(+ serverUrl = "http://example.com",+ username = "",+ password = "",+ stalkerMacAddress = "00:11:22:33:44:55",+ epgSyncMode = ProviderEpgSyncMode.UPFRONT,+ 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(stalkerApiService.getLiveCategories(any(), any())).thenReturn(+ Result.success(listOf(StalkerCategoryRecord(id = "10", name = "News")))+ )+ org.mockito.kotlin.whenever(stalkerApiService.getLiveStreams(any(), any(), anyOrNull())).thenReturn(+ Result.success(+ listOf(+ StalkerItemRecord(+ id = "100",+ name = "News",+ categoryId = "10",+ cmd = "ffmpeg http://example.com/live.ts"+ )+ )+ )+ )+ org.mockito.kotlin.whenever(stalkerApiService.getVodCategories(any(), any())).thenReturn(Result.success(emptyList()))+ org.mockito.kotlin.whenever(stalkerApiService.getSeriesCategories(any(), any())).thenReturn(Result.success(emptyList()))+ org.mockito.kotlin.whenever(channelDao.getGuideSyncEntriesByProvider(1L)).thenReturn(+ listOf(+ ChannelGuideSyncEntity(+ streamId = 100L,+ name = "News",+ epgChannelId = "100"+ )+ )+ )+ org.mockito.kotlin.whenever(stalkerApiService.getEpg(any(), any(), eq("100"))).thenReturn(+ Result.success(+ (1..505).map { index ->+ StalkerProgramRecord(+ id = "p$index",+ channelId = "100",+ title = "Program $index",+ description = "Desc $index",+ startTimeMillis = 1_700_000_000_000L + index * 60_000L,+ endTimeMillis = 1_700_000_030_000L + index * 60_000L+ )+ }+ )+ )+ org.mockito.kotlin.whenever(programDao.countByProvider(1L)).thenReturn(505)++ val result = manager.sync(providerId = 1L, force = true)++ assertThat(result).isInstanceOf(Result.Success::class.java)+ val insertedProgramsCaptor = argumentCaptor<List<com.streamvault.data.local.entity.ProgramEntity>>()+ verify(programDao, atLeast(2)).insertAll(insertedProgramsCaptor.capture())+ assertThat(insertedProgramsCaptor.allValues.flatten()).hasSize(505)+ }++ @Test+ fun retrySection_epg_stalker_without_xmltv_imports_native_portal_guide() = 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 = "100"+ )+ )+ )+ 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).getEpg(any(), any(), eq("100"))+ verify(programDao).insertAll(any())+ val metadata = syncMetadataRepo.getMetadata(1L)+ assertThat(metadata?.epgCount).isEqualTo(1)+ }+@Testfun `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.mdindex b44fb15a..6a87d16a 100644--- a/docs/CHANGELOG.md+++ b/docs/CHANGELOG.md@@ -1,6 +1,19 @@# ChangelogAll notable product changes are recorded in this document.+## [1.0.8] - 2026-04-21++### 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.++---+## [1.0.7] - 2026-04-20### Addeddiff --git a/domain/src/main/java/com/streamvault/domain/usecase/ValidateAndAddProvider.kt b/domain/src/main/java/com/streamvault/domain/usecase/ValidateAndAddProvider.ktindex 81c8378c..a728f04f 100644--- a/domain/src/main/java/com/streamvault/domain/usecase/ValidateAndAddProvider.kt+++ b/domain/src/main/java/com/streamvault/domain/usecase/ValidateAndAddProvider.kt@@ -35,7 +35,7 @@ data class StalkerProviderSetupCommand(val deviceProfile: String = "",val timezone: String = "",val locale: String = "",- val epgSyncMode: ProviderEpgSyncMode = ProviderEpgSyncMode.UPFRONT,+ val epgSyncMode: ProviderEpgSyncMode = ProviderEpgSyncMode.BACKGROUND,val existingProviderId: Long? = null)diff --git a/player/src/main/java/com/streamvault/player/playback/PlayerDataSourceFactoryProvider.kt b/player/src/main/java/com/streamvault/player/playback/PlayerDataSourceFactoryProvider.ktindex a7af3be8..d1b046d1 100644--- a/player/src/main/java/com/streamvault/player/playback/PlayerDataSourceFactoryProvider.kt+++ b/player/src/main/java/com/streamvault/player/playback/PlayerDataSourceFactoryProvider.kt@@ -21,10 +21,7 @@ class PlayerDataSourceFactoryProvider(preload: Boolean = false): Pair<PlayerTimeoutProfile, DataSource.Factory> {val profile = PlayerTimeoutProfile.resolve(streamInfo, resolvedStreamType, preload)- val headers = buildMap {- putAll(streamInfo.headers)- streamInfo.userAgent?.takeIf { it.isNotBlank() }?.let { put("User-Agent", it) }- }+ val headers = streamInfo.headersval client = clientsByProfile.computeIfAbsent(profile) {baseClient.newBuilder().connectTimeout(profile.connectTimeoutMs, TimeUnit.MILLISECONDS)@@ -33,6 +30,7 @@ class PlayerDataSourceFactoryProvider(.build()}val upstreamFactory = OkHttpDataSource.Factory(client).apply {+ streamInfo.userAgent?.takeIf { it.isNotBlank() }?.let(::setUserAgent)if (headers.isNotEmpty()) {setDefaultRequestProperties(headers)}diff --git a/player/src/main/java/com/streamvault/player/playback/PlayerErrorClassifier.kt b/player/src/main/java/com/streamvault/player/playback/PlayerErrorClassifier.ktindex 1f902240..94d6a8ef 100644--- a/player/src/main/java/com/streamvault/player/playback/PlayerErrorClassifier.kt+++ b/player/src/main/java/com/streamvault/player/playback/PlayerErrorClassifier.kt@@ -43,7 +43,7 @@ object PlayerErrorClassifier {chain.any { it is BehindLiveWindowException } ||playbackException?.errorCode == PlaybackException.ERROR_CODE_BEHIND_LIVE_WINDOW ->PlaybackErrorCategory.LIVE_WINDOW- httpCode == 401 || httpCode == 403 -> PlaybackErrorCategory.HTTP_AUTH+ httpCode == 401 || httpCode == 403 || httpCode == 456 -> PlaybackErrorCategory.HTTP_AUTHhttpCode in setOf(408, 429, 500, 502, 503, 504) -> PlaybackErrorCategory.HTTP_SERVERchain.any { it is SSLHandshakeException || it is SSLException } ||chain.any { it.message?.contains("certificate", ignoreCase = true) == true } ->@@ -75,7 +75,7 @@ object PlayerErrorClassifier {}private fun parseHttpStatus(message: String?): Int? {- return Regex("""\b(401|403|408|429|500|502|503|504)\b""").find(message.orEmpty())+ return Regex("""\b(401|403|408|429|456|500|502|503|504)\b""").find(message.orEmpty())?.groupValues?.getOrNull(1)?.toIntOrNull()diff --git a/player/src/test/java/com/streamvault/player/playback/PlayerErrorClassifierTest.kt b/player/src/test/java/com/streamvault/player/playback/PlayerErrorClassifierTest.ktindex 4a8e4ceb..e17c16f0 100644--- a/player/src/test/java/com/streamvault/player/playback/PlayerErrorClassifierTest.kt+++ b/player/src/test/java/com/streamvault/player/playback/PlayerErrorClassifierTest.kt@@ -20,6 +20,12 @@ class PlayerErrorClassifierTest {.isEqualTo(PlaybackErrorCategory.HTTP_SERVER)}+ @Test+ fun `456 maps to auth`() {+ assertThat(PlayerErrorClassifier.classify(IOException("HTTP 456")))+ .isEqualTo(PlaybackErrorCategory.HTTP_AUTH)+ }+@Testfun `ssl exception maps to ssl`() {assertThat(PlayerErrorClassifier.classify(SSLHandshakeException("certificate verify failed")))