Skip to content

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

Fix external subtitle restore during playback retries

David Nashash8a9bed569e1b
diff --git a/data/src/main/java/com/streamvault/data/preferences/VodTrackPreferenceCodec.kt b/data/src/main/java/com/streamvault/data/preferences/VodTrackPreferenceCodec.kt
index 8d828a6f..7d79c45d 100644
--- a/data/src/main/java/com/streamvault/data/preferences/VodTrackPreferenceCodec.kt
+++ b/data/src/main/java/com/streamvault/data/preferences/VodTrackPreferenceCodec.kt
@@ -48,19 +48,21 @@ private fun encodeVodTrackPreference(preference: VodTrackPreference?): String {
if (preference.disabled) "1" else "0",
encodeComponent(preference.trackId),
encodeComponent(preference.language),
- encodeComponent(preference.label)
+ encodeComponent(preference.label),
+ encodeComponent(preference.externalSubtitleDownloadId)
).joinToString("~")
}
private fun decodeVodTrackPreference(encoded: String): VodTrackPreference? {
if (encoded == "-") return null
val parts = encoded.split('~')
- if (parts.size != 4) return null
+ if (parts.size !in 4..5) return null
return VodTrackPreference(
trackId = decodeComponent(parts[1]),
language = decodeComponent(parts[2]),
label = decodeComponent(parts[3]),
- disabled = parts[0] == "1"
+ disabled = parts[0] == "1",
+ externalSubtitleDownloadId = parts.getOrNull(4)?.let(::decodeComponent)
)
}
diff --git a/data/src/main/java/com/streamvault/data/repository/OpenSubtitlesRepositoryImpl.kt b/data/src/main/java/com/streamvault/data/repository/OpenSubtitlesRepositoryImpl.kt
index 3e59b9d6..a1704000 100644
--- a/data/src/main/java/com/streamvault/data/repository/OpenSubtitlesRepositoryImpl.kt
+++ b/data/src/main/java/com/streamvault/data/repository/OpenSubtitlesRepositoryImpl.kt
@@ -21,11 +21,13 @@ import java.io.File
import javax.inject.Inject
import javax.inject.Singleton
import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
@Singleton
class OpenSubtitlesRepositoryImpl @Inject constructor(
@@ -134,8 +136,8 @@ class OpenSubtitlesRepositoryImpl @Inject constructor(
return try {
val fileId = subtitle.downloadId.toLongOrNull()?.takeIf { it > 0L }
?: return Result.error("This subtitle has no downloadable file.")
+ cachedSubtitleFile(subtitle.downloadId)?.let { return Result.success(it) }
val destination = subtitleCacheFile(fileId)
- if (destination.isFile && destination.length() > 0L) return Result.success(destination)
requestWithOptionalSession { session ->
if (session?.remainingDownloads == 0) {
@@ -164,6 +166,22 @@ class OpenSubtitlesRepositoryImpl @Inject constructor(
}
}
+ override suspend fun cachedSubtitleFile(downloadId: String): File? = withContext(Dispatchers.IO) {
+ val fileId = downloadId.toLongOrNull()?.takeIf { it > 0L } ?: return@withContext null
+ val destination = subtitleCacheFile(fileId)
+ if (destination.isFile && destination.length() > 0L) return@withContext destination
+
+ val legacyCacheFile = File(
+ context.cacheDir,
+ "subtitles/opensubtitles/$fileId.srt"
+ )
+ if (!legacyCacheFile.isFile || legacyCacheFile.length() <= 0L) return@withContext null
+
+ runCatching { legacyCacheFile.copyTo(destination, overwrite = true) }
+ .getOrNull()
+ ?.takeIf { it.isFile && it.length() > 0L }
+ }
+
private suspend fun <T> requestWithOptionalSession(
request: suspend (OpenSubtitlesSession?) -> Result<T>,
): Result<T> {
@@ -245,7 +263,7 @@ class OpenSubtitlesRepositoryImpl @Inject constructor(
}
private fun subtitleCacheFile(fileId: Long): File {
- val directory = File(context.cacheDir, "subtitles/opensubtitles").apply { mkdirs() }
+ val directory = File(context.filesDir, "subtitles/opensubtitles").apply { mkdirs() }
return File(directory, "$fileId.srt")
}
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index e9e5af8c..aee5e57f 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -18,6 +18,7 @@ All notable product changes are recorded in this document.
- VOD timelines can now be scrubbed with the D-pad in 10-second steps; holding a direction previews repeated seeks, and releasing applies the selected position.
### Fixed
+- Fixed external subtitles disappearing after playback retries or when replaying a movie: attached subtitles are restored with the rebuilt source, and downloaded OpenSubtitles files are kept in durable app storage and remembered for that movie.
- Fixed the player showing a generic recording error when Android alarm access is missing; it now explains how to enable access and retry.
- Fixed the temporary torrent cache clear action to confirm when the cache was cleared successfully.
- Fixed deleted downloads leaving partial files behind after earlier failed attempts.
diff --git a/domain/src/main/java/com/streamvault/domain/repository/ExternalSubtitleRepository.kt b/domain/src/main/java/com/streamvault/domain/repository/ExternalSubtitleRepository.kt
index f044c77f..1b9a32ab 100644
--- a/domain/src/main/java/com/streamvault/domain/repository/ExternalSubtitleRepository.kt
+++ b/domain/src/main/java/com/streamvault/domain/repository/ExternalSubtitleRepository.kt
@@ -22,4 +22,6 @@ interface ExternalSubtitleRepository {
suspend fun languages(): Result<List<ExternalSubtitleLanguage>>
suspend fun downloadToCache(subtitle: ExternalSubtitle): Result<File>
+
+ suspend fun cachedSubtitleFile(downloadId: String): File? = null
}
diff --git a/domain/src/main/java/com/streamvault/domain/settings/VodTrackPreferences.kt b/domain/src/main/java/com/streamvault/domain/settings/VodTrackPreferences.kt
index 0219f15c..59590ecc 100644
--- a/domain/src/main/java/com/streamvault/domain/settings/VodTrackPreferences.kt
+++ b/domain/src/main/java/com/streamvault/domain/settings/VodTrackPreferences.kt
@@ -9,7 +9,8 @@ data class VodTrackPreference(
val trackId: String? = null,
val language: String? = null,
val label: String? = null,
- val disabled: Boolean = false
+ val disabled: Boolean = false,
+ val externalSubtitleDownloadId: String? = null
)
data class VodTrackPreferences(
diff --git a/domain/src/main/java/com/streamvault/domain/usecase/DownloadExternalSubtitle.kt b/domain/src/main/java/com/streamvault/domain/usecase/DownloadExternalSubtitle.kt
index f0f726ae..a7ae085d 100644
--- a/domain/src/main/java/com/streamvault/domain/usecase/DownloadExternalSubtitle.kt
+++ b/domain/src/main/java/com/streamvault/domain/usecase/DownloadExternalSubtitle.kt
@@ -11,4 +11,7 @@ class DownloadExternalSubtitle @Inject constructor(
) {
suspend operator fun invoke(subtitle: ExternalSubtitle): Result<File> =
repository.downloadToCache(subtitle)
+
+ suspend fun cachedSubtitleFile(downloadId: String): File? =
+ repository.cachedSubtitleFile(downloadId)
}
diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerExternalSubtitleActions.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerExternalSubtitleActions.kt
index ae2d6e8d..b4275a2b 100644
--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerExternalSubtitleActions.kt
+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerExternalSubtitleActions.kt
@@ -5,7 +5,10 @@ import androidx.lifecycle.viewModelScope
import com.streamvault.domain.model.ContentType
import com.streamvault.domain.model.ExternalSubtitleLanguage
import com.streamvault.domain.model.Result
+import com.streamvault.domain.settings.VodTrackPreference
+import com.streamvault.domain.settings.VodTrackPreferences
import com.streamvault.domain.settings.SubtitleLanguageOrdering
+import com.streamvault.player.SubtitleTrackSource
import java.util.Locale
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.flow.first
@@ -182,6 +185,17 @@ internal fun PlayerViewModel.downloadExternalSubtitle(subtitleId: String) {
try {
when (val result = downloadExternalSubtitleUseCase(subtitle)) {
is Result.Success -> {
+ if (currentContentType == ContentType.MOVIE || currentContentType == ContentType.VOD) {
+ val updatedPreferences = (activeVodTrackPreferences ?: VodTrackPreferences()).copy(
+ subtitle = VodTrackPreference(
+ language = subtitle.language,
+ label = subtitle.displayLanguage,
+ externalSubtitleDownloadId = subtitle.downloadId
+ )
+ )
+ persistVodTrackPreferences(updatedPreferences, persistGlobal = false)
+ playerEngine.setVodTrackPreferences(updatedPreferences)
+ }
playerEngine.addExternalSubtitle(Uri.fromFile(result.data), subtitle.language)
externalSubtitleSearchStateFlow.update {
it.copy(downloadingSubtitleId = null, appliedSubtitleName = subtitle.displayLanguage)
@@ -201,6 +215,19 @@ internal fun PlayerViewModel.downloadExternalSubtitle(subtitleId: String) {
}
}
+internal suspend fun PlayerViewModel.restoreRememberedOpenSubtitle() {
+ if (currentContentType != ContentType.MOVIE && currentContentType != ContentType.VOD) return
+ val preference = activeVodTrackPreferences?.subtitle ?: return
+ val downloadId = preference.externalSubtitleDownloadId ?: return
+ val cachedFile = downloadExternalSubtitleUseCase.cachedSubtitleFile(downloadId) ?: return
+ playerEngine.addExternalSubtitle(
+ subtitleUri = Uri.fromFile(cachedFile),
+ language = preference.language?.takeIf { it.isNotBlank() } ?: "und",
+ label = preference.label,
+ subtitleSource = SubtitleTrackSource.ONLINE
+ )
+}
+
internal fun PlayerViewModel.cancelExternalSubtitleSearch() {
externalSubtitleSearchJob?.cancel()
externalSubtitleDownloadJob?.cancel()
diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerLocalSubtitleActions.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerLocalSubtitleActions.kt
index de168419..ebedbf6b 100644
--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerLocalSubtitleActions.kt
+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerLocalSubtitleActions.kt
@@ -26,6 +26,7 @@ internal fun PlayerViewModel.loadLocalSrtSubtitle(uri: Uri) {
try {
val subtitle = withContext(Dispatchers.IO) { copyLocalSrtSubtitle(uri) }
deactivateLiveTranslation()
+ clearRememberedOpenSubtitleForCurrentContent()
playerEngine.addExternalSubtitle(
subtitleUri = Uri.fromFile(subtitle.file),
language = "und",
diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPlaybackPreferenceActions.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPlaybackPreferenceActions.kt
index 88910329..b9335fb5 100644
--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPlaybackPreferenceActions.kt
+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerPlaybackPreferenceActions.kt
@@ -17,6 +17,7 @@ import com.streamvault.player.SUBTITLE_OFFSET_MAX_MS
import com.streamvault.player.SUBTITLE_OFFSET_MIN_MS
import com.streamvault.player.PlaybackState
import com.streamvault.player.PlayerError
+import com.streamvault.player.SubtitleTrackSource
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.update
@@ -44,10 +45,18 @@ fun PlayerViewModel.selectSubtitleTrack(trackId: String?) {
playerEngine.selectSubtitleTrack(trackId)
val current = activeVodTrackPreferences ?: VodTrackPreferences()
- val subtitlePreference = if (trackId == null) {
- VodTrackPreference(disabled = true)
- } else {
- selectedTrack?.toVodTrackPreference() ?: VodTrackPreference(trackId = trackId)
+ val rememberedDownloadId = current.subtitle
+ ?.externalSubtitleDownloadId
+ ?.takeIf { selectedTrack?.subtitleSource == SubtitleTrackSource.ONLINE }
+ val subtitlePreference = when {
+ trackId == null -> VodTrackPreference(disabled = true)
+ selectedTrack != null -> selectedTrack.toVodTrackPreference().copy(
+ externalSubtitleDownloadId = rememberedDownloadId
+ )
+ else -> VodTrackPreference(
+ trackId = trackId,
+ externalSubtitleDownloadId = rememberedDownloadId
+ )
}
persistVodTrackPreferences(
updated = current.copy(
@@ -62,8 +71,9 @@ private fun com.streamvault.player.PlayerTrack.toVodTrackPreference() = VodTrack
label = name
)
-private fun PlayerViewModel.persistVodTrackPreferences(
- updated: VodTrackPreferences
+internal fun PlayerViewModel.persistVodTrackPreferences(
+ updated: VodTrackPreferences,
+ persistGlobal: Boolean = true
) {
val scope = buildVodTrackPreferenceScope(
contentType = currentContentType,
@@ -75,11 +85,26 @@ private fun PlayerViewModel.persistVodTrackPreferences(
viewModelScope.launch {
vodTrackPreferenceSaveMutex.withLock {
playerPreferencesCoordinator.setVodTrackPreferences(scope, updated)
- playerPreferencesCoordinator.setGlobalVodTrackPreferences(updated)
+ if (persistGlobal) {
+ playerPreferencesCoordinator.setGlobalVodTrackPreferences(
+ updated.copy(
+ subtitle = updated.subtitle?.copy(externalSubtitleDownloadId = null)
+ )
+ )
+ }
}
}
}
+internal fun PlayerViewModel.clearRememberedOpenSubtitleForCurrentContent() {
+ val current = activeVodTrackPreferences ?: return
+ if (current.subtitle?.externalSubtitleDownloadId == null) return
+ persistVodTrackPreferences(
+ updated = current.copy(subtitle = null),
+ persistGlobal = false
+ )
+}
+
fun PlayerViewModel.selectVideoQuality(trackId: String): Boolean {
if (trackId == PLAYER_TRACK_AUTO_ID && temporaryPlaybackQualityPreferenceFlow.value != null) {
episodeSourceState.onVideoSelection()
diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerViewModel.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerViewModel.kt
index 048c2010..9df21dd3 100644
--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerViewModel.kt
+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerViewModel.kt
@@ -1413,6 +1413,7 @@ class PlayerViewModel @Inject constructor(
fun selectStremioSubtitle(option: StremioPlayerSubtitleOption) {
if (option !in _stremioSubtitlePickerState.value.options) return
val uri = option.url.trim().toHttpUrlOrNull()?.toString()?.let { Uri.parse(it) } ?: return
+ clearRememberedOpenSubtitleForCurrentContent()
playerEngine.addExternalSubtitle(uri, option.languageTag, option.label, SubtitleTrackSource.STREMIO)
}
@@ -1577,6 +1578,8 @@ class PlayerViewModel @Inject constructor(
val success = preparationResult as PlayerPreparationCoordinator.Result.Success
success.probeCacheKey?.let(probePassedPlaybackKeys::add)
if (!isCurrent()) return false
+ restoreRememberedOpenSubtitle()
+ if (!isCurrent()) return false
currentResolvedPlaybackUrl = success.streamInfo.url
currentResolvedStreamInfo = success.streamInfo
readySideEffectsRequestVersion = requestVersion
diff --git a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
index b0064ade..29326cd7 100644
--- a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
+++ b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
@@ -178,6 +178,15 @@ class Media3PlayerEngine @Inject constructor(
private val nextMediaSessionInstanceId = AtomicLong(1L)
}
+ private data class ActiveExternalSubtitle(
+ val uri: android.net.Uri,
+ val language: String,
+ val label: String?,
+ val source: SubtitleTrackSource,
+ val trackId: String,
+ val mediaId: String
+ )
+
var constrainResolutionForMultiView: Boolean = false
var bypassAudioFocus: Boolean = false
set(value) {
@@ -248,6 +257,7 @@ class Media3PlayerEngine @Inject constructor(
@Volatile
private var liveAudioTap: LiveAudioTap? = null
private var lastStreamInfo: StreamInfo? = null
+ private var activeExternalSubtitle: ActiveExternalSubtitle? = null
private var lastMediaId: String? = null
private var currentResolvedStreamType: ResolvedStreamType = ResolvedStreamType.UNKNOWN
private var currentTimeoutProfile: PlayerTimeoutProfile = PlayerTimeoutProfile.VOD
@@ -716,7 +726,14 @@ class Media3PlayerEngine @Inject constructor(
startupRefreshGate.clear()
liveMpegTsEndRecovery.reset(preserveAttempt = true)
- player.setMediaSource(withSubtitleOffset(mediaSource), /* resetPosition= */ false)
+ val mediaSourceWithExternalSubtitle = activeExternalSubtitle
+ ?.takeIf { it.mediaId == lastMediaId }
+ ?.let { activeSubtitle ->
+ trackController.requestExternalSubtitleAutoSelect(activeSubtitle.source)
+ mergeExternalSubtitleMediaSource(mediaSource, activeSubtitle)
+ }
+ ?: mediaSource
+ player.setMediaSource(withSubtitleOffset(mediaSourceWithExternalSubtitle), /* resetPosition= */ false)
player.prepare()
Log.i(
@@ -1183,6 +1200,9 @@ class Media3PlayerEngine @Inject constructor(
}
override fun selectSubtitleTrack(trackId: String?) {
+ if (activeExternalSubtitle?.trackId != trackId) {
+ activeExternalSubtitle = null
+ }
exoPlayer?.let { trackController.selectSubtitleTrack(it, trackId) }
}
@@ -1226,11 +1246,16 @@ class Media3PlayerEngine @Inject constructor(
label = label,
subtitleSource = resolvedSubtitleSource
)
- val subtitleSource = buildExternalSubtitleMediaSource(
- dataSourceFactory = androidx.media3.datasource.DefaultDataSource.Factory(context),
- configuration = subtitleConfig
+ val externalSubtitle = ActiveExternalSubtitle(
+ uri = subtitleUri,
+ language = language,
+ label = label,
+ source = resolvedSubtitleSource,
+ trackId = subtitleConfig.id ?: return,
+ mediaId = mediaSourceFactory.compatibilityMediaIdFor(streamInfo)
)
- val merged = androidx.media3.exoplayer.source.MergingMediaSource(mainMediaSource, subtitleSource)
+ activeExternalSubtitle = externalSubtitle
+ val merged = mergeExternalSubtitleMediaSource(mainMediaSource, externalSubtitle)
player.trackSelectionParameters = player.trackSelectionParameters.withExternalSubtitleEnabled()
trackController.requestExternalSubtitleAutoSelect(resolvedSubtitleSource)
@@ -1245,6 +1270,23 @@ class Media3PlayerEngine @Inject constructor(
)
}
+ private fun mergeExternalSubtitleMediaSource(
+ mainMediaSource: androidx.media3.exoplayer.source.MediaSource,
+ subtitle: ActiveExternalSubtitle
+ ): androidx.media3.exoplayer.source.MediaSource {
+ val subtitleConfiguration = buildExternalSubtitleConfiguration(
+ subtitleUri = subtitle.uri,
+ language = subtitle.language,
+ label = subtitle.label,
+ subtitleSource = subtitle.source
+ )
+ val subtitleMediaSource = buildExternalSubtitleMediaSource(
+ dataSourceFactory = androidx.media3.datasource.DefaultDataSource.Factory(context),
+ configuration = subtitleConfiguration
+ )
+ return androidx.media3.exoplayer.source.MergingMediaSource(mainMediaSource, subtitleMediaSource)
+ }
+
override fun toggleMute() {
audioFocusController.toggleMute()
}
@@ -1449,6 +1491,13 @@ class Media3PlayerEngine @Inject constructor(
lastStreamInfo = streamInfo
val mediaId = mediaSourceFactory.compatibilityMediaIdFor(streamInfo)
val mediaChanged = lastMediaId != mediaId
+ if (mediaChanged && activeExternalSubtitle?.mediaId != mediaId) {
+ activeExternalSubtitle = if (preserveRetryState) {
+ activeExternalSubtitle?.copy(mediaId = mediaId)
+ } else {
+ null
+ }
+ }
startupTimedOut = false
startupRefreshGate.clear()
liveMpegTsEndRecovery.reset(preserveAttempt = preserveRetryState && !mediaChanged)
@@ -1610,7 +1659,14 @@ class Media3PlayerEngine @Inject constructor(
if (managedSource != null) {
Log.i(TAG, "preload-source reused mediaId=$mediaId source=window")
}
- player.setMediaSource(withSubtitleOffset(mediaSource))
+ val mediaSourceWithExternalSubtitle = activeExternalSubtitle
+ ?.takeIf { it.mediaId == mediaId }
+ ?.let { activeSubtitle ->
+ trackController.requestExternalSubtitleAutoSelect(activeSubtitle.source)
+ mergeExternalSubtitleMediaSource(mediaSource, activeSubtitle)
+ }
+ ?: mediaSource
+ player.setMediaSource(withSubtitleOffset(mediaSourceWithExternalSubtitle))
player.prepare()
seekPositionMs?.takeIf { it > 0L }?.let(player::seekTo)
diff --git a/player/src/main/java/com/streamvault/player/tracks/PlayerTrackController.kt b/player/src/main/java/com/streamvault/player/tracks/PlayerTrackController.kt
index c5863d26..efc315e4 100644
--- a/player/src/main/java/com/streamvault/player/tracks/PlayerTrackController.kt
+++ b/player/src/main/java/com/streamvault/player/tracks/PlayerTrackController.kt
@@ -129,18 +129,25 @@ class PlayerTrackController(
}
preferences.subtitle?.let { preference ->
- val selected = resolvePreferredPlayerTrack(preference, _availableSubtitleTracks.value)
- builder.clearOverridesOfType(C.TRACK_TYPE_TEXT)
- if (preference.disabled || selected == null) {
- builder.setTrackTypeDisabled(C.TRACK_TYPE_TEXT, true)
+ if (preference.externalSubtitleDownloadId != null) {
+ builder
+ .setTrackTypeDisabled(C.TRACK_TYPE_TEXT, true)
+ .clearOverridesOfType(C.TRACK_TYPE_TEXT)
_availableSubtitleTracks.update { tracks -> tracks.map { it.copy(isSelected = false) } }
} else {
- findOverride(player.currentTracks, C.TRACK_TYPE_TEXT, selected.id)?.let { override ->
- builder
- .setTrackTypeDisabled(C.TRACK_TYPE_TEXT, false)
- .setOverrideForType(override)
- _availableSubtitleTracks.update { tracks ->
- tracks.map { track -> track.copy(isSelected = track.id == selected.id) }
+ val selected = resolvePreferredPlayerTrack(preference, _availableSubtitleTracks.value)
+ builder.clearOverridesOfType(C.TRACK_TYPE_TEXT)
+ if (preference.disabled || selected == null) {
+ builder.setTrackTypeDisabled(C.TRACK_TYPE_TEXT, true)
+ _availableSubtitleTracks.update { tracks -> tracks.map { it.copy(isSelected = false) } }
+ } else {
+ findOverride(player.currentTracks, C.TRACK_TYPE_TEXT, selected.id)?.let { override ->
+ builder
+ .setTrackTypeDisabled(C.TRACK_TYPE_TEXT, false)
+ .setOverrideForType(override)
+ _availableSubtitleTracks.update { tracks ->
+ tracks.map { track -> track.copy(isSelected = track.id == selected.id) }
+ }
}
}
}
@@ -532,14 +539,19 @@ class PlayerTrackController(
}
val override = findOverride(player.currentTracks, C.TRACK_TYPE_TEXT, trackId) ?: return
val selectedTrack = _availableSubtitleTracks.value.firstOrNull { it.id == trackId }
- vodTrackPreferences = (vodTrackPreferences ?: VodTrackPreferences()).copy(
+ val currentPreferences = vodTrackPreferences ?: VodTrackPreferences()
+ val preservedDownloadId = currentPreferences.subtitle
+ ?.externalSubtitleDownloadId
+ ?.takeIf { selectedTrack?.subtitleSource == SubtitleTrackSource.ONLINE }
+ vodTrackPreferences = currentPreferences.copy(
subtitle = selectedTrack?.let { track ->
VodTrackPreference(
trackId = track.id,
language = track.language,
- label = track.name
+ label = track.name,
+ externalSubtitleDownloadId = preservedDownloadId
)
- } ?: VodTrackPreference(trackId = trackId)
+ } ?: VodTrackPreference(trackId = trackId, externalSubtitleDownloadId = preservedDownloadId)
)
player.trackSelectionParameters = player.trackSelectionParameters
.buildUpon()
@@ -566,8 +578,17 @@ class PlayerTrackController(
_availableSubtitleTracks.update { tracks ->
tracks.map { existing -> existing.copy(isSelected = existing.id == track.id) }
}
- vodTrackPreferences = (vodTrackPreferences ?: VodTrackPreferences()).copy(
- subtitle = VodTrackPreference(trackId = track.id, language = track.language, label = track.name)
+ val currentPreferences = vodTrackPreferences ?: VodTrackPreferences()
+ val preservedDownloadId = currentPreferences.subtitle
+ ?.externalSubtitleDownloadId
+ ?.takeIf { source == SubtitleTrackSource.ONLINE }
+ vodTrackPreferences = currentPreferences.copy(
+ subtitle = VodTrackPreference(
+ trackId = track.id,
+ language = track.language,
+ label = track.name,
+ externalSubtitleDownloadId = preservedDownloadId
+ )
)
}