StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
feat: enhance database startup coordination with explicit startup request handling
David Nashashac35ebe65428
diff --git a/app/src/main/java/com/streamvault/app/DatabaseStartupGate.kt b/app/src/main/java/com/streamvault/app/DatabaseStartupGate.ktindex a624c38f..bc4bb4a2 100644--- a/app/src/main/java/com/streamvault/app/DatabaseStartupGate.kt+++ b/app/src/main/java/com/streamvault/app/DatabaseStartupGate.kt@@ -6,7 +6,10 @@ import com.streamvault.data.local.StreamVaultDatabaseimport dagger.Lazyimport dagger.hilt.android.qualifiers.ApplicationContextimport kotlinx.coroutines.CancellationException+import kotlinx.coroutines.CoroutineScopeimport kotlinx.coroutines.Dispatchers+import kotlinx.coroutines.Job+import kotlinx.coroutines.SupervisorJobimport kotlinx.coroutines.flow.MutableStateFlowimport kotlinx.coroutines.flow.StateFlowimport kotlinx.coroutines.flow.asStateFlow@@ -35,6 +38,8 @@ internal class DatabaseStartupGate(private val mutableState = MutableStateFlow<DatabaseStartupState>(DatabaseStartupState.Opening)val state: StateFlow<DatabaseStartupState> = mutableState.asStateFlow()+ fun start(scope: CoroutineScope): Job = scope.launch { open() }+suspend fun open() {mutex.withLock {if (mutableState.value == DatabaseStartupState.Ready) return@@ -59,6 +64,7 @@ class DatabaseStartupCoordinator @Inject constructor(database: Lazy<StreamVaultDatabase>,@ApplicationContext context: Context) {+ private val startupScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)private val gate = DatabaseStartupGate(openDatabase = {withContext(Dispatchers.IO) {@@ -72,6 +78,8 @@ class DatabaseStartupCoordinator @Inject constructor(val state: StateFlow<DatabaseStartupState> = gate.state+ fun start(): Job = gate.start(startupScope)+suspend fun open() = gate.open()}diff --git a/app/src/main/java/com/streamvault/app/MainActivity.kt b/app/src/main/java/com/streamvault/app/MainActivity.ktindex a7c7c5e9..27ab952d 100644--- a/app/src/main/java/com/streamvault/app/MainActivity.kt+++ b/app/src/main/java/com/streamvault/app/MainActivity.kt@@ -220,6 +220,11 @@ class MainActivity : ComponentActivity() {}}}++ // Start Room only after the application/test process has finished its lightweight setup.+ // Compatibility instrumentation does not create this activity, so it cannot be blocked+ // by a full schema open while Android is still starting the instrumented process.+ databaseStartupCoordinator.start()}override fun onResume() {diff --git a/app/src/main/java/com/streamvault/app/StreamVaultApp.kt b/app/src/main/java/com/streamvault/app/StreamVaultApp.ktindex 9c4127cf..2df33c6d 100644--- a/app/src/main/java/com/streamvault/app/StreamVaultApp.kt+++ b/app/src/main/java/com/streamvault/app/StreamVaultApp.kt@@ -87,9 +87,6 @@ class StreamVaultApp : Application(), SingletonImageLoader.Factory {.first()runDatabaseReadyStartupTasks()}- applicationScope.launch {- databaseStartupCoordinator.open()- }}private suspend fun runDatabaseReadyStartupTasks() {diff --git a/app/src/test/java/com/streamvault/app/DatabaseStartupGateTest.kt b/app/src/test/java/com/streamvault/app/DatabaseStartupGateTest.ktindex 44823827..116fc6a9 100644--- a/app/src/test/java/com/streamvault/app/DatabaseStartupGateTest.kt+++ b/app/src/test/java/com/streamvault/app/DatabaseStartupGateTest.kt@@ -2,9 +2,12 @@ package com.streamvault.appimport com.google.common.truth.Truth.assertThatimport kotlinx.coroutines.async+import kotlinx.coroutines.ExperimentalCoroutinesApi+import kotlinx.coroutines.test.advanceUntilIdleimport kotlinx.coroutines.test.runTestimport org.junit.Test+@OptIn(ExperimentalCoroutinesApi::class)class DatabaseStartupGateTest {@Testfun `successful open transitions to ready`() = runTest {@@ -15,6 +18,20 @@ class DatabaseStartupGateTest {assertThat(gate.state.value).isEqualTo(DatabaseStartupState.Ready)}+ @Test+ fun `database open is deferred until an explicit startup request`() = runTest {+ var attempts = 0+ val gate = DatabaseStartupGate { attempts++ }++ assertThat(attempts).isEqualTo(0)++ gate.start(this)+ advanceUntilIdle()++ assertThat(attempts).isEqualTo(1)+ assertThat(gate.state.value).isEqualTo(DatabaseStartupState.Ready)+ }+@Testfun `failed open is contained and retry can recover`() = runTest {var attempts = 0