Skip to content

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

feat: Add global and per-title VOD audio and subtitle preferences to portable backups

David Nashash5684320f9c0a
diff --git a/data/src/main/java/com/streamvault/data/manager/BackupManagerImpl.kt b/data/src/main/java/com/streamvault/data/manager/BackupManagerImpl.kt
index ddafdfaa..787b7d18 100644
--- a/data/src/main/java/com/streamvault/data/manager/BackupManagerImpl.kt
+++ b/data/src/main/java/com/streamvault/data/manager/BackupManagerImpl.kt
@@ -95,6 +95,7 @@ import com.streamvault.domain.manager.PortableProtectedContentBackup
import com.streamvault.domain.manager.PortableHiddenContentBackup
import com.streamvault.domain.manager.PortableContentPreferenceBackup
import com.streamvault.domain.manager.PortableContentReference
+import com.streamvault.domain.manager.PortableVodTrackPreferenceBackup
import com.streamvault.domain.manager.PortableVariantChoiceBackup
import com.streamvault.domain.manager.PortableManualEpgMappingV14Backup
import com.streamvault.domain.manager.PortableMultiViewPresetV14Backup
@@ -119,6 +120,8 @@ import com.streamvault.domain.model.ProviderStatus
import com.streamvault.domain.model.ProviderType
import com.streamvault.domain.model.ProviderAccountRuntime
import com.streamvault.domain.model.PlayerBackButtonVisibility
+import com.streamvault.domain.settings.VodTrackPreferenceScope
+import com.streamvault.domain.settings.VodTrackPreferences
import com.streamvault.domain.model.LegacyProvider as Provider
import com.streamvault.domain.repository.ProviderSnapshotRepository
import com.streamvault.domain.model.StalkerBootstrapRecipe
@@ -256,6 +259,13 @@ class BackupManagerImpl @Inject constructor(
put("multiViewCenterTwoSlotLayout", preferencesRepository.multiViewCenterTwoSlotLayout.first().toString())
put("multiViewRespectProviderConnectionLimit", preferencesRepository.multiViewRespectProviderConnectionLimit.first().toString())
put("preferredAudioLanguage", preferencesRepository.preferredAudioLanguage.first() ?: "auto")
+ put(
+ "playerVodTrackPreferences",
+ gson.toJson(
+ (preferencesRepository.globalVodTrackPreferences ?: flowOf(null)).first()
+ ?: VodTrackPreferences()
+ )
+ )
put("playerSubtitleTextScale", preferencesRepository.playerSubtitleTextScale.first().toString())
put("playerSubtitleTextColor", preferencesRepository.playerSubtitleTextColor.first().toString())
put("playerSubtitleBackgroundColor", preferencesRepository.playerSubtitleBackgroundColor.first().toString())
@@ -907,35 +917,93 @@ class BackupManagerImpl @Inject constructor(
SavedHistoryConflictKey(
providerId = history.providerId,
contentType = history.contentType,
- remoteContentId = domainHistory.remoteContentId ?: "legacy:${history.contentId}"
+ remoteContentId = domainHistory.remoteContentId ?: "legacy:${history.contentId}",
+ parentRemoteContentId = domainHistory.remoteSeriesId
)
}.toHashSet()
+ fun hasHistoryConflict(incoming: SavedHistoryConflictKey): Boolean = historyKeys.any { existing ->
+ existing.providerId == incoming.providerId &&
+ existing.contentType == incoming.contentType &&
+ existing.remoteContentId == incoming.remoteContentId &&
+ (incoming.parentRemoteContentId == null ||
+ existing.parentRemoteContentId == null ||
+ existing.parentRemoteContentId == incoming.parentRemoteContentId)
+ }
val protectedCategoryKeys = existingProtectedCategories.mapTo(hashSetOf()) { (provider, name, type) ->
Triple(provider.id, name, type)
}
+ val portableFavoriteItems = buildList<Pair<PortableFavoriteBackup, String?>> {
+ backupData.portableFavorites.orEmpty().forEach { favorite ->
+ add(favorite to null)
+ }
+ backupData.portableCustomGroups.orEmpty().forEach { group ->
+ group.members.forEach { favorite ->
+ add(favorite to group.name.lowercase())
+ }
+ }
+ }
val providerConflicts = backupData.providers.orEmpty().count { it.backupIdentity() in providersByIdentity }
- val groupConflicts = backupData.virtualGroups.orEmpty().count { group ->
- val targetProviderId = backupProviderIdMap[group.providerId] ?: return@count false
- SavedGroupConflictKey(targetProviderId, group.name.lowercase(), group.contentType) in groupKeys
+ val groupConflicts = if (backupData.portableCustomGroups != null) {
+ backupData.portableCustomGroups.orEmpty().count { group ->
+ val targetProviderId = existingProviders.findUnambiguousPortableProvider(group.provider)?.id
+ ?: return@count false
+ SavedGroupConflictKey(targetProviderId, group.name.lowercase(), group.contentType) in groupKeys
+ }
+ } else {
+ backupData.virtualGroups.orEmpty().count { group ->
+ val targetProviderId = backupProviderIdMap[group.providerId] ?: return@count false
+ SavedGroupConflictKey(targetProviderId, group.name.lowercase(), group.contentType) in groupKeys
+ }
}
- val favoriteConflicts = backupData.favorites.orEmpty().count {
- val targetProviderId = backupProviderIdMap[it.providerId] ?: return@count false
- SavedFavoriteConflictKey(
- providerId = targetProviderId,
- contentType = it.contentType,
- remoteContentId = it.remoteContentId ?: "legacy:${it.contentId}",
- group = it.groupId?.let { groupId ->
- backupData.virtualGroups.orEmpty().firstOrNull { group -> group.id == groupId }?.name?.lowercase()
- }
- ) in favoriteKeys
+ val favoriteConflicts = if (
+ backupData.portableFavorites != null || backupData.portableCustomGroups != null
+ ) {
+ portableFavoriteItems.count { (favorite, groupName) ->
+ val targetProviderId = existingProviders
+ .findUnambiguousPortableProvider(favorite.content.provider)
+ ?.id ?: return@count false
+ SavedFavoriteConflictKey(
+ providerId = targetProviderId,
+ contentType = favorite.content.contentType,
+ remoteContentId = favorite.content.remoteContentId,
+ group = groupName
+ ) in favoriteKeys
+ }
+ } else {
+ backupData.favorites.orEmpty().count {
+ val targetProviderId = backupProviderIdMap[it.providerId] ?: return@count false
+ SavedFavoriteConflictKey(
+ providerId = targetProviderId,
+ contentType = it.contentType,
+ remoteContentId = it.remoteContentId ?: "legacy:${it.contentId}",
+ group = it.groupId?.let { groupId ->
+ backupData.virtualGroups.orEmpty().firstOrNull { group -> group.id == groupId }?.name?.lowercase()
+ }
+ ) in favoriteKeys
+ }
}
- val historyConflicts = backupData.playbackHistory.orEmpty().count {
- val targetProviderId = backupProviderIdMap[it.providerId] ?: return@count false
- SavedHistoryConflictKey(
- providerId = targetProviderId,
- contentType = it.contentType,
- remoteContentId = it.remoteContentId ?: "legacy:${it.contentId}"
- ) in historyKeys
+ val historyConflicts = if (backupData.portablePlaybackHistory != null) {
+ backupData.portablePlaybackHistory.orEmpty().count { history ->
+ val targetProviderId = existingProviders
+ .findUnambiguousPortableProvider(history.content.provider)
+ ?.id ?: return@count false
+ SavedHistoryConflictKey(
+ providerId = targetProviderId,
+ contentType = history.content.contentType,
+ remoteContentId = history.content.remoteContentId,
+ parentRemoteContentId = history.content.parentRemoteContentId
+ ).let(::hasHistoryConflict)
+ }
+ } else {
+ backupData.playbackHistory.orEmpty().count {
+ val targetProviderId = backupProviderIdMap[it.providerId] ?: return@count false
+ SavedHistoryConflictKey(
+ providerId = targetProviderId,
+ contentType = it.contentType,
+ remoteContentId = it.remoteContentId ?: "legacy:${it.contentId}",
+ parentRemoteContentId = it.remoteSeriesId
+ ).let(::hasHistoryConflict)
+ }
}
val protectedCategoryConflicts = backupData.protectedCategories.orEmpty().count { incoming ->
val provider = providersByIdentity[incoming.backupIdentity()] ?: return@count false
@@ -951,10 +1019,20 @@ class BackupManagerImpl @Inject constructor(
BackupPreview(
version = backupData.version,
providerCount = backupData.providers.orEmpty().size,
- favoriteCount = backupData.favorites.orEmpty().size,
- groupCount = backupData.virtualGroups.orEmpty().size,
- playbackHistoryCount = backupData.playbackHistory.orEmpty().size,
- multiViewPresetCount = backupData.multiViewPresets.orEmpty().count { it.value.isNotEmpty() },
+ favoriteCount = if (
+ backupData.portableFavorites != null || backupData.portableCustomGroups != null
+ ) {
+ portableFavoriteItems.size
+ } else {
+ backupData.favorites.orEmpty().size
+ },
+ groupCount = backupData.portableCustomGroups?.size
+ ?: backupData.virtualGroups.orEmpty().size,
+ playbackHistoryCount = backupData.portablePlaybackHistory?.size
+ ?: backupData.playbackHistory.orEmpty().size,
+ multiViewPresetCount = backupData.portableMultiViewPresetsV14?.count { it.channels.isNotEmpty() }
+ ?: backupData.portableMultiViewPresets?.count { it.value.isNotEmpty() }
+ ?: backupData.multiViewPresets.orEmpty().count { it.value.isNotEmpty() },
preferenceCount = backupData.preferences.orEmpty().size,
protectedCategoryCount = backupData.protectedCategories.orEmpty().size,
scheduledRecordingCount = backupData.scheduledRecordings.orEmpty().normalizedRecurringBackups().size,
@@ -2173,6 +2251,7 @@ class BackupManagerImpl @Inject constructor(
var homeDefaultCategory: PortableCategoryReference? = null
var homeDefaultVirtualCategoryId: Long? = null
var homeDefaultCategorySpecified = false
+ var vodTrackPreferences: List<PortableVodTrackPreferenceBackup>? = null
val seenFields = hashSetOf<String>()
reader.beginObject()
@@ -2280,6 +2359,12 @@ class BackupManagerImpl @Inject constructor(
readLegacyAwareValue(reader, PORTABLE_CATEGORY_REFERENCE_TYPE)
"homeDefaultVirtualCategoryId", "w" -> homeDefaultVirtualCategoryId = reader.nextNullableLong()
"homeDefaultCategorySpecified", "x" -> homeDefaultCategorySpecified = reader.nextBoolean()
+ "vodTrackPreferences" -> vodTrackPreferences = readLimitedArray(
+ reader,
+ PORTABLE_VOD_TRACK_PREFERENCE_TYPE,
+ MAX_SECTION_ITEMS,
+ "VOD track preferences"
+ )
"i" -> {
val element = gson.fromJson<JsonElement>(reader, JsonElement::class.java)
if (element?.isJsonArray == true && element.asJsonArray.any { it.isJsonObject }) {
@@ -2326,7 +2411,8 @@ class BackupManagerImpl @Inject constructor(
channelPreferencesSpecified = channelPreferencesSpecified,
homeDefaultCategory = homeDefaultCategory,
homeDefaultVirtualCategoryId = homeDefaultVirtualCategoryId,
- homeDefaultCategorySpecified = homeDefaultCategorySpecified
+ homeDefaultCategorySpecified = homeDefaultCategorySpecified,
+ vodTrackPreferences = vodTrackPreferences
)
}
@@ -2356,6 +2442,9 @@ class BackupManagerImpl @Inject constructor(
require(data.portableProviderPreferences?.channelPreferences.orEmpty().size <= MAX_SECTION_ITEMS) {
"Backup has too many channel preferences"
}
+ require(data.portableProviderPreferences?.vodTrackPreferences.orEmpty().size <= MAX_SECTION_ITEMS) {
+ "Backup has too many VOD track preferences"
+ }
require(data.epgSources.orEmpty().size <= MAX_EPG_SOURCES) { "Backup has too many EPG sources" }
require(data.providerEpgAssignments.orEmpty().size <= MAX_SECTION_ITEMS) {
"Backup has too many provider EPG assignments"
@@ -2681,6 +2770,8 @@ class BackupManagerImpl @Inject constructor(
backupData.portableSearchHistory.orEmpty().forEach { add(RESTORE_SECTION_SEARCH_HISTORY to it) }
backupData.portableContentPreferences.orEmpty().forEach { add(RESTORE_SECTION_CONTENT_PREFERENCES to it) }
backupData.portableVariantChoices.orEmpty().forEach { add(RESTORE_SECTION_VARIANT_CHOICES to it) }
+ backupData.portableProviderPreferences?.vodTrackPreferences.orEmpty()
+ .forEach { add(RESTORE_SECTION_VOD_TRACK_PREFERENCES to it) }
}
if (plan.importMultiViewPresets) {
backupData.portableMultiViewPresetsV14.orEmpty().forEach { add(RESTORE_SECTION_MULTIVIEW to it) }
@@ -2702,6 +2793,7 @@ class BackupManagerImpl @Inject constructor(
is PortableHiddenContentBackup -> add(payload.content.provider)
is PortableContentPreferenceBackup -> add(payload.content.provider)
is PortableVariantChoiceBackup -> add(payload.selectedContent.provider)
+ is PortableVodTrackPreferenceBackup -> add(payload.content.provider)
is PortableManualEpgMappingV14Backup -> add(payload.content.provider)
is PortableMultiViewPresetV14Backup -> addAll(payload.channels.map { it.provider })
is PortableCategoryReference -> add(payload.provider)
@@ -2745,13 +2837,28 @@ class BackupManagerImpl @Inject constructor(
if (plan.importMultiViewPresets) {
add(RESTORE_SECTION_REPLACE_SCOPE to ReplaceScopePayload(null, RESTORE_SECTION_MULTIVIEW))
}
+ val trackPreferencesBackup = backupData.portableProviderPreferences
+ ?.takeIf { it.vodTrackPreferences != null }
+ if (plan.importPreferences && trackPreferencesBackup != null) {
+ val trackProviders = trackPreferencesBackup.providers
+ .plus(trackPreferencesBackup.vodTrackPreferences.orEmpty().map { it.content.provider })
+ .distinct()
+ trackProviders.forEach { trackProvider ->
+ add(
+ RESTORE_SECTION_REPLACE_SCOPE to ReplaceScopePayload(
+ trackProvider,
+ RESTORE_SECTION_VOD_TRACK_PREFERENCES
+ )
+ )
+ }
+ }
}
} else emptyList()
val pendingPayloads = replacementMarkers + contentPayloads
if (pendingPayloads.isEmpty()) return null
val ledgerDao = backupRestoreLedgerDao ?: if (backupData.version < 14) {
// Compatibility for callers built against the pre-ledger constructor. Production
- // schema 77 always supplies the DAO; unresolved legacy references remain reported.
+ // schema 81 always supplies the DAO; unresolved legacy references remain reported.
return null
} else {
error("Durable backup restore storage is unavailable")
@@ -2766,6 +2873,7 @@ class BackupManagerImpl @Inject constructor(
is PortableHiddenContentBackup -> payload.content
is PortableContentPreferenceBackup -> payload.content
is PortableVariantChoiceBackup -> payload.selectedContent
+ is PortableVodTrackPreferenceBackup -> payload.content
is PortableManualEpgMappingV14Backup -> payload.content
is PortableMultiViewPresetV14Backup -> null
is PortableCategoryReference -> payload
@@ -2841,6 +2949,7 @@ class BackupManagerImpl @Inject constructor(
is PortableHiddenContentBackup -> add(payload.content.provider)
is PortableContentPreferenceBackup -> add(payload.content.provider)
is PortableVariantChoiceBackup -> add(payload.selectedContent.provider)
+ is PortableVodTrackPreferenceBackup -> add(payload.content.provider)
is PortableManualEpgMappingV14Backup -> add(payload.content.provider)
is PortableMultiViewPresetV14Backup -> addAll(payload.channels.map { it.provider })
is PortableCategoryReference -> add(payload.provider)
@@ -3041,6 +3150,22 @@ class BackupManagerImpl @Inject constructor(
)
}
}
+ val vodTrackPreferences = (preferencesRepository.vodTrackPreferencesByScope ?: flowOf(emptyMap()))
+ .first()
+ .mapNotNull { (scope, trackPreferences) ->
+ val providerReference = referencesById[scope.providerId]
+ ?: return@mapNotNull null
+ val contentReference = when (scope) {
+ is VodTrackPreferenceScope.Movie -> movieDao.getById(scope.contentId)
+ ?.takeIf { it.providerId == scope.providerId }
+ ?.toPortableContentReference(providerReference)
+ is VodTrackPreferenceScope.Series -> seriesDao.getById(scope.contentId)
+ ?.takeIf { it.providerId == scope.providerId }
+ ?.toPortableContentReference(providerReference)
+ } ?: return@mapNotNull null
+ PortableVodTrackPreferenceBackup(contentReference, trackPreferences)
+ }
+ .distinctBy { it.content.provider to it.content.contentType to it.content.remoteContentId }
return PortableProviderPreferencesBackup(
providers = referencesById.values.toList(),
activeProvider = activeProvider,
@@ -3065,7 +3190,8 @@ class BackupManagerImpl @Inject constructor(
channelPreferencesSpecified = channelPreferenceDao != null,
homeDefaultCategory = homeDefaultCategory,
homeDefaultVirtualCategoryId = homeDefaultId?.takeIf { it in PORTABLE_VIRTUAL_CATEGORY_IDS },
- homeDefaultCategorySpecified = homeDefaultId != null
+ homeDefaultCategorySpecified = homeDefaultId != null,
+ vodTrackPreferences = vodTrackPreferences
)
}
@@ -3199,6 +3325,13 @@ class BackupManagerImpl @Inject constructor(
put("multiViewCenterTwoSlotLayout", preferencesRepository.multiViewCenterTwoSlotLayout.first().toString())
put("multiViewRespectProviderConnectionLimit", preferencesRepository.multiViewRespectProviderConnectionLimit.first().toString())
put("preferredAudioLanguage", preferencesRepository.preferredAudioLanguage.first() ?: "auto")
+ put(
+ "playerVodTrackPreferences",
+ gson.toJson(
+ (preferencesRepository.globalVodTrackPreferences ?: flowOf(null)).first()
+ ?: VodTrackPreferences()
+ )
+ )
put("playerSubtitleTextScale", preferencesRepository.playerSubtitleTextScale.first().toString())
put("playerSubtitleTextColor", preferencesRepository.playerSubtitleTextColor.first().toString())
put("playerSubtitleBackgroundColor", preferencesRepository.playerSubtitleBackgroundColor.first().toString())
@@ -3288,7 +3421,9 @@ class BackupManagerImpl @Inject constructor(
)
}
}.also { snapshot ->
- PreferenceBackupRegistry.requirePortableCodecs(snapshot.keys)
+ PreferenceBackupRegistry.requirePortableCodecs(
+ snapshot.keys.filterNot { it.startsWith("__restore_snapshot_") }.toSet()
+ )
}
}
@@ -3803,6 +3938,11 @@ class BackupManagerImpl @Inject constructor(
prefs["multiViewRespectProviderConnectionLimit"]?.toBooleanStrictOrNull()
?.let { preferencesRepository.setMultiViewRespectProviderConnectionLimit(it) }
preferencesRepository.setPreferredAudioLanguage(prefs["preferredAudioLanguage"])
+ prefs["playerVodTrackPreferences"]?.let { encoded ->
+ runCatching { gson.fromJson(encoded, VodTrackPreferences::class.java) }
+ .getOrNull()
+ ?.let { preferencesRepository.setGlobalVodTrackPreferences(it) }
+ }
prefs["playerSubtitleTextScale"]?.toFloatOrNull()?.let { preferencesRepository.setPlayerSubtitleTextScale(it) }
prefs["playerSubtitleTextColor"]?.toIntOrNull()?.let { preferencesRepository.setPlayerSubtitleTextColor(it) }
prefs["playerSubtitleBackgroundColor"]?.toIntOrNull()?.let { preferencesRepository.setPlayerSubtitleBackgroundColor(it) }
@@ -5678,7 +5818,8 @@ private data class SavedFavoriteConflictKey(
private data class SavedHistoryConflictKey(
val providerId: Long,
val contentType: ContentType,
- val remoteContentId: String
+ val remoteContentId: String,
+ val parentRemoteContentId: String? = null
)
private fun com.streamvault.domain.model.LegacyProvider.toSecureEntityForBackup(
@@ -5741,7 +5882,7 @@ private const val RESTORE_SNAPSHOT_PRESET_1 = "__restore_snapshot_preset_1"
private const val RESTORE_SNAPSHOT_PRESET_2 = "__restore_snapshot_preset_2"
private const val RESTORE_SNAPSHOT_PRESET_3 = "__restore_snapshot_preset_3"
private const val RESTORE_SNAPSHOT_CHANNEL_PREFERENCES = "__restore_snapshot_channel_preferences"
-private const val CURRENT_BACKUP_VERSION = 14
+private const val CURRENT_BACKUP_VERSION = 15
private const val RESTORE_SECTION_FAVORITES = "FAVORITES"
private const val RESTORE_SECTION_CUSTOM_GROUPS = "CUSTOM_GROUPS"
private const val RESTORE_SECTION_PLAYBACK_HISTORY = "PLAYBACK_HISTORY"
@@ -5750,6 +5891,7 @@ private const val RESTORE_SECTION_HIDDEN_CONTENT = "HIDDEN_CONTENT"
private const val RESTORE_SECTION_HIDDEN_CATEGORIES = "HIDDEN_CATEGORIES"
private const val RESTORE_SECTION_CONTENT_PREFERENCES = "CONTENT_PREFERENCES"
private const val RESTORE_SECTION_VARIANT_CHOICES = "VARIANT_CHOICES"
+private const val RESTORE_SECTION_VOD_TRACK_PREFERENCES = "VOD_TRACK_PREFERENCES"
private const val RESTORE_SECTION_MANUAL_EPG = "MANUAL_EPG"
private const val RESTORE_SECTION_MULTIVIEW = "MULTIVIEW"
private const val RESTORE_SECTION_RECORDING_SCHEDULES = "RECORDING_SCHEDULES"
@@ -5779,6 +5921,7 @@ private val PORTABLE_CHANNEL_REFERENCE_TYPE: Type = PortableChannelReference::cl
private val PORTABLE_CHANNEL_PREFERENCE_REFERENCE_TYPE: Type = PortableChannelPreferenceReference::class.java
private val PORTABLE_EPG_TIME_SHIFT_REFERENCE_TYPE: Type = PortableEpgTimeShiftReference::class.java
private val PORTABLE_VARIANT_SELECTION_REFERENCE_TYPE: Type = PortableVariantSelectionReference::class.java
+private val PORTABLE_VOD_TRACK_PREFERENCE_TYPE: Type = PortableVodTrackPreferenceBackup::class.java
private val COMBINED_M3U_PROFILE_TYPE: Type = CombinedM3uProfileBackup::class.java
private val COMBINED_M3U_PROFILE_LIST_TYPE: Type = object : TypeToken<List<CombinedM3uProfileBackup>>() {}.type
private val ACTIVE_LIVE_SOURCE_BACKUP_TYPE: Type = ActiveLiveSourceBackup::class.java
diff --git a/data/src/main/java/com/streamvault/data/manager/PendingBackupRestoreCoordinator.kt b/data/src/main/java/com/streamvault/data/manager/PendingBackupRestoreCoordinator.kt
index 579b6ce0..9396e87a 100644
--- a/data/src/main/java/com/streamvault/data/manager/PendingBackupRestoreCoordinator.kt
+++ b/data/src/main/java/com/streamvault/data/manager/PendingBackupRestoreCoordinator.kt
@@ -32,6 +32,7 @@ import com.streamvault.domain.manager.PortableProtectedContentBackup
import com.streamvault.domain.manager.PortableHiddenContentBackup
import com.streamvault.domain.manager.PortableContentPreferenceBackup
import com.streamvault.domain.manager.PortableVariantChoiceBackup
+import com.streamvault.domain.manager.PortableVodTrackPreferenceBackup
import com.streamvault.domain.manager.PortableManualEpgMappingV14Backup
import com.streamvault.domain.manager.PortableMultiViewPresetV14Backup
import com.streamvault.domain.manager.BackupProviderReference
@@ -46,6 +47,7 @@ import com.streamvault.data.preferences.PreferencesRepository
import com.streamvault.domain.manager.PortableSearchHistoryBackup
import com.streamvault.domain.model.ContentType
import com.streamvault.domain.model.ProviderType
+import com.streamvault.domain.settings.VodTrackPreferenceScope
import java.util.Locale
import java.util.concurrent.ConcurrentHashMap
import javax.inject.Inject
@@ -61,7 +63,7 @@ data class RestoreResolutionSummary(
val failedCount: Int = 0
)
-/** Applies durable v14 restore intentions after provider catalog transactions commit. */
+/** Applies portable restore intentions after provider catalog transactions commit. */
@Singleton
class PendingBackupRestoreCoordinator @Inject constructor(
private val ledgerDao: BackupRestoreLedgerDao,
@@ -139,6 +141,9 @@ class PendingBackupRestoreCoordinator @Inject constructor(
SECTION_HIDDEN_CONTENT -> listOf(gson.fromJson(item.payloadJson, PortableHiddenContentBackup::class.java).content)
SECTION_CONTENT_PREFERENCES -> listOf(gson.fromJson(item.payloadJson, PortableContentPreferenceBackup::class.java).content)
SECTION_VARIANT_CHOICES -> listOf(gson.fromJson(item.payloadJson, PortableVariantChoiceBackup::class.java).selectedContent)
+ SECTION_VOD_TRACK_PREFERENCES -> listOf(
+ gson.fromJson(item.payloadJson, PortableVodTrackPreferenceBackup::class.java).content
+ )
SECTION_MANUAL_EPG -> listOf(gson.fromJson(item.payloadJson, PortableManualEpgMappingV14Backup::class.java).content)
SECTION_MULTIVIEW -> gson.fromJson(item.payloadJson, PortableMultiViewPresetV14Backup::class.java).channels
SECTION_RECORDING_SCHEDULES -> listOfNotNull(
@@ -216,6 +221,7 @@ class PendingBackupRestoreCoordinator @Inject constructor(
SECTION_HIDDEN_CATEGORIES -> applyHiddenCategory(item, providerId)
SECTION_CONTENT_PREFERENCES -> applyContentPreference(item, providerId)
SECTION_VARIANT_CHOICES -> applyVariantChoice(item, providerId)
+ SECTION_VOD_TRACK_PREFERENCES -> applyVodTrackPreference(item, providerId)
SECTION_MANUAL_EPG -> applyManualEpg(item, providerId)
SECTION_MULTIVIEW -> applyMultiView(item)
SECTION_RECORDING_SCHEDULES -> applyRecordingSchedule(item, providerId)
@@ -272,6 +278,11 @@ class PendingBackupRestoreCoordinator @Inject constructor(
) != null
SECTION_CONTENT_PREFERENCES -> resolveContent(providerId, gson.fromJson(item.payloadJson, PortableContentPreferenceBackup::class.java).content) != null
SECTION_VARIANT_CHOICES -> resolveContent(providerId, gson.fromJson(item.payloadJson, PortableVariantChoiceBackup::class.java).selectedContent) != null
+ SECTION_VOD_TRACK_PREFERENCES -> {
+ val reference = gson.fromJson(item.payloadJson, PortableVodTrackPreferenceBackup::class.java).content
+ reference.contentType in setOf(ContentType.MOVIE, ContentType.VOD, ContentType.SERIES) &&
+ resolveContent(providerId, reference) != null
+ }
SECTION_MANUAL_EPG -> {
val backup = gson.fromJson(item.payloadJson, PortableManualEpgMappingV14Backup::class.java)
val sourceUrl = backup.sourceUrl
@@ -308,6 +319,7 @@ class PendingBackupRestoreCoordinator @Inject constructor(
preferencesRepository.clearPreferredLiveVariants(providerId)
preferencesRepository.clearPreferredVodVariants(providerId)
}
+ SECTION_VOD_TRACK_PREFERENCES -> preferencesRepository.clearVodTrackPreferencesForProvider(providerId)
SECTION_MANUAL_EPG -> channelEpgMappingDao.deleteByProvider(providerId)
SECTION_SEARCH_HISTORY -> searchHistoryDao.deleteByProvider(providerId)
SECTION_MULTIVIEW -> repeat(3) { preferencesRepository.setMultiViewPreset(it, emptyList()) }
@@ -465,6 +477,18 @@ class PendingBackupRestoreCoordinator @Inject constructor(
return true
}
+ private suspend fun applyVodTrackPreference(item: BackupRestoreItemEntity, providerId: Long): Boolean {
+ val backup = gson.fromJson(item.payloadJson, PortableVodTrackPreferenceBackup::class.java)
+ val resolved = resolveContent(providerId, backup.content) ?: return false
+ val scope = when (backup.content.contentType) {
+ ContentType.MOVIE, ContentType.VOD -> VodTrackPreferenceScope.Movie(providerId, resolved.localId)
+ ContentType.SERIES -> VodTrackPreferenceScope.Series(providerId, resolved.localId)
+ ContentType.LIVE, ContentType.SERIES_EPISODE -> return false
+ }
+ preferencesRepository.setVodTrackPreferences(scope, backup.preferences)
+ return true
+ }
+
private suspend fun applyManualEpg(item: BackupRestoreItemEntity, providerId: Long): Boolean {
val backup = gson.fromJson(item.payloadJson, PortableManualEpgMappingV14Backup::class.java)
val resolved = resolveContent(providerId, backup.content) ?: return false
@@ -696,6 +720,7 @@ class PendingBackupRestoreCoordinator @Inject constructor(
const val SECTION_HIDDEN_CATEGORIES = "HIDDEN_CATEGORIES"
const val SECTION_CONTENT_PREFERENCES = "CONTENT_PREFERENCES"
const val SECTION_VARIANT_CHOICES = "VARIANT_CHOICES"
+ const val SECTION_VOD_TRACK_PREFERENCES = "VOD_TRACK_PREFERENCES"
const val SECTION_MANUAL_EPG = "MANUAL_EPG"
const val SECTION_MULTIVIEW = "MULTIVIEW"
const val SECTION_RECORDING_SCHEDULES = "RECORDING_SCHEDULES"
diff --git a/data/src/main/java/com/streamvault/data/manager/PreferenceBackupRegistry.kt b/data/src/main/java/com/streamvault/data/manager/PreferenceBackupRegistry.kt
index 8eadd142..58fe4e1b 100644
--- a/data/src/main/java/com/streamvault/data/manager/PreferenceBackupRegistry.kt
+++ b/data/src/main/java/com/streamvault/data/manager/PreferenceBackupRegistry.kt
@@ -104,7 +104,7 @@ internal object PreferenceBackupRegistry {
"playerSurfaceMode", "playerLiveStreamFormatMode", "playerVodHttpProtocolMode", "playerPlaybackSpeed",
"playerExternalPlaybackMode", "playerAudioVideoSyncEnabled", "playerAudioVideoOffsetMs", "playerMuted",
"multiViewPerformanceMode", "multiViewCenterTwoSlotLayout", "multiViewRespectProviderConnectionLimit",
- "preferredAudioLanguage", "playerSubtitleTextScale", "playerSubtitleTextColor",
+ "preferredAudioLanguage", "playerVodTrackPreferences", "playerSubtitleTextScale", "playerSubtitleTextColor",
"playerSubtitleBackgroundColor", "playerLiveTranslationEnabled", "playerLiveTranslationEndpoint",
"playerControlsTimeoutSeconds", "playerLiveOverlayTimeoutSeconds", "playerNoticeTimeoutSeconds",
"playerLiveClockEnabled", "playerLiveClockPosition", "playerLiveClockSize", "playerLiveClockFont",
diff --git a/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt b/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt
index c9ec99e4..9be5896a 100644
--- a/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt
+++ b/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt
@@ -574,6 +574,24 @@ class PreferencesRepository @Inject constructor(
decodeVodTrackPreferences(preferences[PreferencesKeys.PLAYER_VOD_TRACK_GLOBAL_PREFERENCES])
}
+ val vodTrackPreferencesByScope: Flow<Map<VodTrackPreferenceScope, VodTrackPreferences>> =
+ context.dataStore.data.map { preferences ->
+ decodeVodTrackPreferenceEntries(preferences[PreferencesKeys.PLAYER_VOD_TRACK_PREFERENCES])
+ .mapNotNull { (storageKey, trackPreferences) ->
+ val parts = storageKey.split('|', limit = 3)
+ if (parts.size != 3) return@mapNotNull null
+ val providerId = parts[0].toLongOrNull()?.takeIf { it > 0L } ?: return@mapNotNull null
+ val contentId = parts[2].toLongOrNull()?.takeIf { it > 0L } ?: return@mapNotNull null
+ val scope = when (parts[1]) {
+ "movie" -> VodTrackPreferenceScope.Movie(providerId, contentId)
+ "series" -> VodTrackPreferenceScope.Series(providerId, contentId)
+ else -> return@mapNotNull null
+ }
+ scope to trackPreferences
+ }
+ .toMap()
+ }
+
override fun getVodTrackPreferences(scope: VodTrackPreferenceScope): Flow<VodTrackPreferences?> =
context.dataStore.data.map { preferences ->
decodeVodTrackPreferenceEntries(preferences[PreferencesKeys.PLAYER_VOD_TRACK_PREFERENCES])[
@@ -1282,6 +1300,20 @@ class PreferencesRepository @Inject constructor(
}
}
+ suspend fun clearVodTrackPreferencesForProvider(providerId: Long) {
+ if (providerId <= 0L) return
+ context.dataStore.edit { values ->
+ val updated = decodeVodTrackPreferenceEntries(
+ values[PreferencesKeys.PLAYER_VOD_TRACK_PREFERENCES]
+ ).filterKeys { key -> key.substringBefore('|').toLongOrNull() != providerId }
+ if (updated.isEmpty()) {
+ values.remove(PreferencesKeys.PLAYER_VOD_TRACK_PREFERENCES)
+ } else {
+ values[PreferencesKeys.PLAYER_VOD_TRACK_PREFERENCES] = encodeVodTrackPreferenceEntries(updated)
+ }
+ }
+ }
+
override suspend fun setPlayerSubtitleTextScale(scale: Float) {
context.dataStore.edit { preferences ->
preferences[PreferencesKeys.PLAYER_SUBTITLE_TEXT_SCALE] = scale.coerceIn(0.75f, 1.75f).toString()
diff --git a/data/src/main/java/com/streamvault/data/provider/ProviderConfigurationCodec.kt b/data/src/main/java/com/streamvault/data/provider/ProviderConfigurationCodec.kt
index d272db28..710de389 100644
--- a/data/src/main/java/com/streamvault/data/provider/ProviderConfigurationCodec.kt
+++ b/data/src/main/java/com/streamvault/data/provider/ProviderConfigurationCodec.kt
@@ -25,6 +25,26 @@ class ProviderConfigurationCodec @Inject constructor(
fun decode(type: ProviderType, payload: String): ProviderConfiguration =
decodeProviderConfigurationCompat(gson, credentialCrypto, type, payload)
+ /**
+ * Decode provider metadata for public projections without asking Android Keystore to open
+ * credentials that the projection will immediately discard.
+ */
+ fun decodeForPublicProjection(type: ProviderType, payload: String): ProviderConfiguration {
+ val configuration = decodeProviderConfigurationCompat(
+ gson = gson,
+ credentialCrypto = credentialCrypto,
+ type = type,
+ payload = payload,
+ decryptCredentials = false
+ )
+ return when (configuration) {
+ is XtreamConfig -> configuration.copy(password = "")
+ is M3uConfig -> configuration
+ is StalkerConfig -> configuration.copy(password = "")
+ is JellyfinConfig -> configuration.copy(credential = "")
+ }
+ }
+
fun identityKey(configuration: ProviderConfiguration): String {
val canonical = when (configuration) {
is XtreamConfig -> listOf(configuration.type.name, normalizeOrigin(configuration.serverUrl), configuration.username.trim())
diff --git a/data/src/main/java/com/streamvault/data/provider/ProviderConfigurationMigrationCompat.kt b/data/src/main/java/com/streamvault/data/provider/ProviderConfigurationMigrationCompat.kt
index a5fbe1ed..a8e63d0d 100644
--- a/data/src/main/java/com/streamvault/data/provider/ProviderConfigurationMigrationCompat.kt
+++ b/data/src/main/java/com/streamvault/data/provider/ProviderConfigurationMigrationCompat.kt
@@ -27,7 +27,8 @@ internal fun decodeProviderConfigurationCompat(
gson: Gson,
credentialCrypto: CredentialCrypto,
type: ProviderType,
- payload: String
+ payload: String,
+ decryptCredentials: Boolean = true
): ProviderConfiguration {
val payloadHasType = gson.fromJson(payload, Map::class.java)?.containsKey("type") == true
val decoded = when (type) {
@@ -50,6 +51,8 @@ internal fun decodeProviderConfigurationCompat(
require(normalized.type == type) { "Configuration payload does not match stored provider type" }
+ if (!decryptCredentials) return normalized
+
return when (normalized) {
is XtreamConfig -> normalized.copy(password = credentialCrypto.decryptIfNeeded(normalized.password))
is M3uConfig -> normalized
diff --git a/data/src/main/java/com/streamvault/data/provider/ProviderPublicProjection.kt b/data/src/main/java/com/streamvault/data/provider/ProviderPublicProjection.kt
index 27ecec0c..cdf1a929 100644
--- a/data/src/main/java/com/streamvault/data/provider/ProviderPublicProjection.kt
+++ b/data/src/main/java/com/streamvault/data/provider/ProviderPublicProjection.kt
@@ -34,7 +34,7 @@ internal class DefaultProviderPublicProjection(
) : ProviderPublicProjection {
override fun decode(entity: ProviderConfigEntity): RedactedProviderConfigurationProjection {
- val configuration = codec.decode(entity.type, entity.encryptedConfigJson)
+ val configuration = codec.decodeForPublicProjection(entity.type, entity.encryptedConfigJson)
val templateIdentity = StableProvider(
id = entity.providerId,
name = PROJECTION_TEMPLATE_NAME,
diff --git a/data/src/main/java/com/streamvault/data/sync/CatalogSizeLimits.kt b/data/src/main/java/com/streamvault/data/sync/CatalogSizeLimits.kt
index 4fec36b8..e80c8dfc 100644
--- a/data/src/main/java/com/streamvault/data/sync/CatalogSizeLimits.kt
+++ b/data/src/main/java/com/streamvault/data/sync/CatalogSizeLimits.kt
@@ -1,12 +1,12 @@
package com.streamvault.data.sync
data class CatalogSizeLimits(
- val maxChannelsPerProvider: Int = 100_000,
- val maxMoviesPerProvider: Int = 200_000,
+ val maxChannelsPerProvider: Int = 400_000,
+ val maxMoviesPerProvider: Int = 400_000,
val maxSeriesPerProvider: Int = 100_000,
val maxM3uDecompressedBytes: Long = 100L * 1024L * 1024L,
val maxM3uLineBytes: Int = 16 * 1024,
- val maxM3uEntries: Int = 300_000,
+ val maxM3uEntries: Int = 500_000,
val maxM3uCategoriesPerType: Int = 10_000,
val maxM3uFieldLength: Int = 8_192,
val maxM3uInvalidEntryRatioPercent: Int = 50
diff --git a/data/src/test/java/com/streamvault/data/provider/ProviderPublicProjectionTest.kt b/data/src/test/java/com/streamvault/data/provider/ProviderPublicProjectionTest.kt
index 6915f8b1..f88bcfa2 100644
--- a/data/src/test/java/com/streamvault/data/provider/ProviderPublicProjectionTest.kt
+++ b/data/src/test/java/com/streamvault/data/provider/ProviderPublicProjectionTest.kt
@@ -51,7 +51,7 @@ class ProviderPublicProjectionTest {
assertThat(decoded.providerTemplate.serverUrl).isEqualTo("https://example.test")
assertThat(decoded.providerTemplate.username).isEqualTo("user")
assertThat(decoded.providerTemplate.password).isEmpty()
- assertThat(crypto.decryptCalls.get()).isEqualTo(1)
+ assertThat(crypto.decryptCalls.get()).isEqualTo(0)
}
@Test
@@ -229,7 +229,7 @@ class ProviderPublicProjectionTest {
override fun decryptIfNeeded(value: String): String {
decryptCalls.incrementAndGet()
- return value
+ error("Public provider projections must not decrypt credentials")
}
}
}
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 9eb84d2a..30618ff7 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -10,9 +10,11 @@ All notable product changes are recorded in this document.
- Added AVC/H.264 fallback for eligible HEVC episodes, preserving playback position, audio, subtitles, and episode history.
- Added durable retries for failed Stalker live categories, scoped to the current provider configuration and visible categories, with retry promotion and cleanup committed atomically (Room migration v80 to v81).
- Added Stalker provider setup from supported Stalker playback or export URLs in the URL tab by detecting the portal and MAC address.
+- Added global and per-title VOD audio and subtitle preferences to portable backups, while preserving compatibility with earlier backup files.
### Fixed
+- Fixed provider observation crashes on devices where saved credentials cannot be decrypted by skipping unnecessary credential decryption in public provider projections.
- Fixed successful new-provider setup staying on Add Provider; new providers now navigate to Home, while edits return to the previous screen.
- Fixed repeated stream restarts during network outages and unnecessary recovery from nonfatal audio errors.
- Fixed stalled live playback recovery to refresh the live window without interrupting active network retries.
@@ -31,9 +33,12 @@ All notable product changes are recorded in this document.
- Fixed M3U channels sharing a `tvg-id` but using different stream URLs or Acestream hashes from being incorrectly treated as the same channel (#231).
- Fixed background movie refresh crashes when saved provider credentials cannot be decrypted.
- Fixed cropped video during adaptive resolution changes on affected Android TV emulators.
+- Fixed backup imports rejecting internal restore checkpoints and episode conflict previews matching episodes without their parent-series identity.
+- Fixed backup export sharing to remove failed temporary files and share only completed exports.
### Changed
+- Raised M3U admission ceilings to 500,000 entries and 400,000 live channels or movies per provider.
- Reduced duplicate category requests and per-row identity database work during Stalker provider setup, preserving portal verification and stable catalog IDs.
- Added direct Stalker live-row decoding and bounded ingestion with isolated authorization retries; incomplete responses cannot promote a full catalog, and bootstrap prefixes do not certify bulk catalog fidelity.
- Overlapped Stalker live-category and bulk requests when provider admission allows it; category fallback now streams isolated attempts, preserves failed scopes, stops bootstrap after its accepted prefix, and leaves incomplete live coverage eligible for durable refresh.
@@ -48,6 +53,7 @@ All notable product changes are recorded in this document.
- Improved seek previews with request-header support and cancellation when seeking or leaving the player.
- Reduced audio output buffering for more responsive playback.
- Restored automatic live playback speed adjustments to stay near the live edge.
+- Clarified in Settings that backup files contain provider passwords in readable form.
## [1.0.19]
diff --git a/domain/src/main/java/com/streamvault/domain/manager/BackupManager.kt b/domain/src/main/java/com/streamvault/domain/manager/BackupManager.kt
index 5fedb1e3..3f56d63b 100644
--- a/domain/src/main/java/com/streamvault/domain/manager/BackupManager.kt
+++ b/domain/src/main/java/com/streamvault/domain/manager/BackupManager.kt
@@ -13,6 +13,7 @@ import com.streamvault.domain.model.XtreamConfig
import com.streamvault.domain.model.M3uConfig
import com.streamvault.domain.model.StalkerConfig
import com.streamvault.domain.model.JellyfinConfig
+import com.streamvault.domain.settings.VodTrackPreferences
data class BackupData(
val version: Int = 13,
@@ -104,7 +105,9 @@ data class PortableProviderPreferencesBackup(
/** The user's Home start category, resolved by provider/category identity on import. */
val homeDefaultCategory: PortableCategoryReference? = null,
val homeDefaultVirtualCategoryId: Long? = null,
- val homeDefaultCategorySpecified: Boolean = false
+ val homeDefaultCategorySpecified: Boolean = false,
+ /** Per-movie and per-series VOD track selections, stored without local catalog ids. */
+ val vodTrackPreferences: List<PortableVodTrackPreferenceBackup>? = null
)
data class BackupProviderReference(
@@ -182,6 +185,11 @@ data class PortableContentReference(
val urlFallback: String? = null
)
+data class PortableVodTrackPreferenceBackup(
+ val content: PortableContentReference,
+ val preferences: VodTrackPreferences
+)
+
data class PortableFavoriteBackup(
val content: PortableContentReference,
val position: Int = 0,
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsBackupAboutSections.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsBackupAboutSections.kt
index d834970d..238a9285 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsBackupAboutSections.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsBackupAboutSections.kt
@@ -70,6 +70,12 @@ public fun LazyListScope.settingsBackupSection(
)
)
}
+ Text(
+ text = stringResource(R.string.settings_backup_credentials_notice),
+ style = MaterialTheme.typography.bodySmall,
+ color = OnSurfaceDim,
+ modifier = Modifier.fillMaxWidth()
+ )
BackupActionCard(
icon = "\u2193",
title = stringResource(R.string.settings_restore_data),
@@ -232,6 +238,12 @@ public fun LazyListScope.settingsDriveBackupSection(
onSignOut = onSignOut,
actionModifier = if (targetItemId == "backup.drive_auth") targetFocusModifier else Modifier,
)
+ Text(
+ text = stringResource(R.string.settings_backup_credentials_notice),
+ style = MaterialTheme.typography.bodySmall,
+ color = OnSurfaceDim,
+ modifier = Modifier.fillMaxWidth()
+ )
Row(
horizontalArrangement = Arrangement.spacedBy(16.dp),
modifier = Modifier.fillMaxWidth()
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsScreen.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsScreen.kt
index ce7b51fb..803395b6 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsScreen.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsScreen.kt
@@ -151,6 +151,11 @@ public fun SettingsScreen(
viewModel.exportConfig(
uriString = it.toString(),
onSuccess = { platformHost.backupFiles.rememberManagedExport(it) },
+ onFinished = { success ->
+ if (!success) {
+ DocumentFile.fromSingleUri(context, it)?.delete()
+ }
+ },
)
}
}
@@ -207,6 +212,9 @@ public fun SettingsScreen(
viewModel.exportConfig(
uriString = newFile.uri.toString(),
onSuccess = { platformHost.backupFiles.rememberManagedExport(newFile.uri) },
+ onFinished = { success ->
+ if (!success) newFile.delete()
+ },
)
}
@@ -253,11 +261,17 @@ public fun SettingsScreen(
return
}
val uri = platformHost.backupFiles.providerUri(file)
- viewModel.exportConfig(uri.toString()) {
- if (platformHost.shareBackup(uri) is Result.Error) {
- viewModel.showUserMessage(shareFailedMessage)
- }
- }
+ viewModel.exportConfig(
+ uriString = uri.toString(),
+ onFinished = { exported ->
+ if (!exported) {
+ file.delete()
+ } else if (platformHost.shareBackup(uri) is Result.Error) {
+ file.delete()
+ viewModel.showUserMessage(shareFailedMessage)
+ }
+ },
+ )
}
fun exportBackupWithoutPicker() {
@@ -318,7 +332,21 @@ public fun SettingsScreen(
viewModel.showUserMessage(usbBackupFailedMessage)
return
}
- viewModel.exportConfig(Uri.fromFile(file).toString())
+ val candidate = SettingsBackupFileCandidate(
+ displayName = file.name,
+ uri = Uri.fromFile(file),
+ lastModifiedMs = file.lastModified(),
+ sizeBytes = file.length(),
+ )
+ viewModel.exportConfig(
+ uriString = candidate.uri.toString(),
+ onFinished = { success ->
+ if (!success) {
+ platformHost.backupFiles.delete(candidate)
+ }
+ refreshManagedLocalBackups()
+ }
+ )
}
fun restoreBackupFromUsb() {
diff --git a/feature/settings/src/main/res/values/strings.xml b/feature/settings/src/main/res/values/strings.xml
index 868ee14a..71344ed7 100644
--- a/feature/settings/src/main/res/values/strings.xml
+++ b/feature/settings/src/main/res/values/strings.xml
@@ -633,6 +633,7 @@
<string name="settings_recording_empty_subtitle">Start a manual recording from live playback or schedule one from the player.</string>
<string name="settings_recording_pattern_hint">Use tokens like ChannelName, ProgramTitle, yyyy-MM-dd_HH-mm</string>
<string name="settings_backup_subtitle">Export or import favorites, groups, and preferences.</string>
+ <string name="settings_backup_credentials_notice">Backup files include provider passwords in readable form so restored accounts can reconnect. Store and share them only with people you trust.</string>
<string name="settings_backup_data">Export Data</string>
<string name="settings_backup_share_data">Share Backup</string>
<string name="settings_backup_share_subtitle">Send a backup file to a TV file manager or another app.</string>