Skip to content

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

Batch 10: Backup integrity checksum, rememberSaveable, scope reuse, search limit, dashboard loading UI

Davidona2195ac06f06f
diff --git a/app/src/main/java/com/streamvault/app/ui/components/shell/VodChrome.kt b/app/src/main/java/com/streamvault/app/ui/components/shell/VodChrome.kt
index d0d2c068..19b79655 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/shell/VodChrome.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/shell/VodChrome.kt
@@ -17,6 +17,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@@ -224,7 +225,7 @@ fun VodCategoryPickerDialog(
categories: List<VodCategoryOption>,
onDismiss: () -> Unit
) {
- var query by remember { mutableStateOf("") }
+ var query by rememberSaveable { mutableStateOf("") }
val searchFocusRequester = remember { FocusRequester() }
val filteredCategories = remember(categories, query) {
val normalized = query.trim()
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt
index e852e69e..38cbd09d 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
@@ -100,10 +101,28 @@ fun DashboardScreen(
}
val orderedSections = rememberDashboardSections(uiState)
+ if (uiState.isLoading) {
+ Box(
+ modifier = Modifier.fillMaxSize(),
+ contentAlignment = Alignment.Center
+ ) {
+ CircularProgressIndicator(color = Primary)
+ }
+ return@AppScreenScaffold
+ }
+
androidx.compose.foundation.lazy.LazyColumn(
modifier = Modifier.fillMaxSize(),
contentPadding = PaddingValues(bottom = 28.dp)
) {
+ if (uiState.providerWarnings.isNotEmpty()) {
+ item(key = "provider_warnings") {
+ DashboardProviderWarningCard(
+ warnings = uiState.providerWarnings,
+ onOpenSettings = { onNavigate(Routes.SETTINGS) }
+ )
+ }
+ }
items(orderedSections, key = { it.name }) { section ->
when (section) {
DashboardHomeSection.LIVE_SHORTCUTS -> DashboardShortcutRow(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt
index a72ccca8..ab1d20ae 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt
@@ -118,11 +118,11 @@ fun HomeScreen(
// Split screen state
val splitSlots by multiViewViewModel.slotsFlow.collectAsState()
val hasSplitChannels = splitSlots.any { it != null }
- var showSplitManagerDialog by remember { mutableStateOf(false) }
+ var showSplitManagerDialog by rememberSaveable { mutableStateOf(false) }
// Parental Control State
- var showPinDialog by remember { mutableStateOf(false) }
- var pinError by remember { mutableStateOf<String?>(null) }
+ var showPinDialog by rememberSaveable { mutableStateOf(false) }
+ var pinError by rememberSaveable { mutableStateOf<String?>(null) }
var pendingUnlockCategory by remember { mutableStateOf<Category?>(null) }
var pendingUnlockChannel by remember { mutableStateOf<Channel?>(null) }
var pendingLockToggleCategory by remember { mutableStateOf<Category?>(null) }
diff --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.kt
index 16061355..fe0b2498 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
@@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.*
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.foundation.rememberScrollState
@@ -54,9 +55,9 @@ fun ProviderSetupScreen(
val context = LocalContext.current
val coroutineScope = rememberCoroutineScope()
- var name by remember { mutableStateOf("") }
- var m3uUrl by remember { mutableStateOf("") }
- var fileImportError by remember { mutableStateOf<String?>(null) }
+ var name by rememberSaveable { mutableStateOf("") }
+ var m3uUrl by rememberSaveable { mutableStateOf("") }
+ var fileImportError by rememberSaveable { mutableStateOf<String?>(null) }
val filePickerLauncher = rememberLauncherForActivityResult(
contract = ActivityResultContracts.OpenDocument()
@@ -147,10 +148,10 @@ fun ProviderSetupScreen(
// if (uiState.hasExistingProvider) onProviderAdded()
// }
- var selectedTab by remember { mutableStateOf(0) } // 0 = Xtream, 1 = M3U
- var serverUrl by remember { mutableStateOf("") }
- var username by remember { mutableStateOf("") }
- var password by remember { mutableStateOf("") }
+ var selectedTab by rememberSaveable { mutableStateOf(0) } // 0 = Xtream, 1 = M3U
+ var serverUrl by rememberSaveable { mutableStateOf("") }
+ var username by rememberSaveable { mutableStateOf("") }
+ var password by rememberSaveable { mutableStateOf("") }
val providerNameFocusRequester = remember { FocusRequester() }
val m3uUrlTabFocusRequester = remember { FocusRequester() }
val m3uFileTabFocusRequester = remember { FocusRequester() }
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt
index b7430878..3e0dbd60 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt
@@ -81,12 +81,12 @@ fun SettingsScreen(
}
// Parental Control State
- var showPinDialog by remember { mutableStateOf(false) }
- var showLevelDialog by remember { mutableStateOf(false) }
- var showLanguageDialog by remember { mutableStateOf(false) }
- var showLiveTvModeDialog by remember { mutableStateOf(false) }
- var showClearHistoryDialog by remember { mutableStateOf(false) }
- var pinError by remember { mutableStateOf<String?>(null) }
+ var showPinDialog by rememberSaveable { mutableStateOf(false) }
+ var showLevelDialog by rememberSaveable { mutableStateOf(false) }
+ var showLanguageDialog by rememberSaveable { mutableStateOf(false) }
+ var showLiveTvModeDialog by rememberSaveable { mutableStateOf(false) }
+ var showClearHistoryDialog by rememberSaveable { mutableStateOf(false) }
+ var pinError by rememberSaveable { mutableStateOf<String?>(null) }
var pendingAction by remember { mutableStateOf<ParentalAction?>(null) }
val createDocumentLauncher = rememberLauncherForActivityResult(
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.kt
index 824782ad..85e7924a 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
@@ -60,7 +60,7 @@ interface ChannelDao {
WHERE c.provider_id = :providerId
AND channels_fts MATCH :query
ORDER BY c.name ASC
- LIMIT 300
+ LIMIT 1000
"""
)
fun search(providerId: Long, query: String): Flow<List<ChannelEntity>>
@@ -73,7 +73,7 @@ interface ChannelDao {
AND c.category_id = :categoryId
AND channels_fts MATCH :query
ORDER BY c.name ASC
- LIMIT 300
+ LIMIT 1000
"""
)
fun searchByCategory(providerId: Long, categoryId: Long, query: String): Flow<List<ChannelEntity>>
@@ -152,7 +152,7 @@ interface MovieDao {
WHERE m.provider_id = :providerId
AND movies_fts MATCH :query
ORDER BY m.name ASC
- LIMIT 300
+ LIMIT 1000
"""
)
fun search(providerId: Long, query: String): Flow<List<MovieEntity>>
@@ -254,7 +254,7 @@ interface SeriesDao {
WHERE s.provider_id = :providerId
AND series_fts MATCH :query
ORDER BY s.name ASC
- LIMIT 300
+ LIMIT 1000
"""
)
fun search(providerId: Long, query: String): Flow<List<SeriesEntity>>
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 45ef2b81..4710626f 100644
--- a/data/src/main/java/com/streamvault/data/manager/BackupManagerImpl.kt
+++ b/data/src/main/java/com/streamvault/data/manager/BackupManagerImpl.kt
@@ -24,6 +24,7 @@ import kotlinx.coroutines.flow.first
import kotlinx.coroutines.withContext
import java.io.InputStreamReader
import java.io.OutputStreamWriter
+import java.util.zip.CRC32
import javax.inject.Inject
import javax.inject.Singleton
@@ -86,10 +87,16 @@ class BackupManagerImpl @Inject constructor(
multiViewPresets = multiViewPresets
)
+ // Compute checksum over the data without checksum field
+ val jsonWithoutChecksum = gson.toJson(backupData)
+ val crc = CRC32()
+ crc.update(jsonWithoutChecksum.toByteArray(Charsets.UTF_8))
+ val backupWithChecksum = backupData.copy(checksum = crc.value.toString(16))
+
// 2. Serialize and write to URI
context.contentResolver.openOutputStream(uri)?.use { outputStream ->
OutputStreamWriter(outputStream).use { writer ->
- gson.toJson(backupData, writer)
+ gson.toJson(backupWithChecksum, writer)
}
} ?: return@withContext com.streamvault.domain.model.Result.error("Failed to open output stream")
@@ -106,6 +113,9 @@ class BackupManagerImpl @Inject constructor(
if (backupData.version > 2) {
return@withContext Result.error("Unsupported backup version")
}
+ if (!verifyChecksum(backupData)) {
+ return@withContext Result.error("Backup file is corrupted (checksum mismatch)")
+ }
val existingProviders = providerDao.getAll().first()
val existingGroups = buildList {
@@ -172,6 +182,9 @@ class BackupManagerImpl @Inject constructor(
if (backupData.version > 2) {
return@withContext com.streamvault.domain.model.Result.error("Unsupported backup version")
}
+ if (!verifyChecksum(backupData)) {
+ return@withContext com.streamvault.domain.model.Result.error("Backup file is corrupted (checksum mismatch)")
+ }
val importedSections = mutableListOf<String>()
val skippedSections = mutableListOf<String>()
@@ -307,6 +320,15 @@ class BackupManagerImpl @Inject constructor(
}
}
+ private fun verifyChecksum(backupData: BackupData): Boolean {
+ val storedChecksum = backupData.checksum ?: return true // no checksum = legacy backup, skip verification
+ val dataWithoutChecksum = backupData.copy(checksum = null)
+ val json = gson.toJson(dataWithoutChecksum)
+ val crc = CRC32()
+ crc.update(json.toByteArray(Charsets.UTF_8))
+ return crc.value.toString(16) == storedChecksum
+ }
+
private fun readBackupData(uriString: String): BackupData? {
val uri = Uri.parse(uriString)
return context.contentResolver.openInputStream(uri)?.use { inputStream ->
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 89ecc7be..79236bf8 100644
--- a/domain/src/main/java/com/streamvault/domain/manager/BackupManager.kt
+++ b/domain/src/main/java/com/streamvault/domain/manager/BackupManager.kt
@@ -7,6 +7,7 @@ import com.streamvault.domain.model.Result
data class BackupData(
val version: Int = 2,
+ val checksum: String? = null,
val preferences: Map<String, String>? = null,
val providers: List<Provider>? = null,
val favorites: List<com.streamvault.domain.model.Favorite>? = null,
diff --git a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
index 8bb4ef27..56c72ac9 100644
--- a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
+++ b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
@@ -43,7 +43,8 @@ class Media3PlayerEngine @Inject constructor(
private val okHttpClient: OkHttpClient
) : PlayerEngine {
- private val scope = CoroutineScope(Dispatchers.Main + SupervisorJob())
+ private var supervisorJob = SupervisorJob()
+ private var scope = CoroutineScope(Dispatchers.Main + supervisorJob)
private var exoPlayer: ExoPlayer? = null
private var mediaSession: MediaSession? = null
private var currentDecoderMode: DecoderMode = DecoderMode.AUTO
@@ -449,7 +450,9 @@ class Media3PlayerEngine @Inject constructor(
exoPlayer?.release()
exoPlayer = null
lastStreamInfo = null
- scope.cancel()
+ supervisorJob.cancel()
+ supervisorJob = SupervisorJob()
+ scope = CoroutineScope(Dispatchers.Main + supervisorJob)
_playbackState.value = PlaybackState.IDLE
_isPlaying.value = false
}