StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
Merge local develop into compose refactor branch
David Nashash084061809438
diff --cc app/src/main/java/com/streamvault/app/MainActivity.ktindex 820fabbb,c9e8b183..98460ded--- a/app/src/main/java/com/streamvault/app/MainActivity.kt+++ b/app/src/main/java/com/streamvault/app/MainActivity.kt@@@ -49,6 -71,9 +65,9 @@@ import android.content.res.Resourceimport kotlinx.coroutines.flow.MutableStateFlowimport kotlinx.coroutines.flow.StateFlowimport kotlinx.coroutines.flow.asStateFlow++import androidx.lifecycle.lifecycleScope+ import kotlinx.coroutines.launch+ import com.streamvault.app.diagnostics.CrashReportStore@AndroidEntryPointclass MainActivity : ComponentActivity() {@@@ -82,10 -128,9 +104,12 @@@private val _pictureInPictureModeFlow = MutableStateFlow(false)val pictureInPictureModeFlow: StateFlow<Boolean> = _pictureInPictureModeFlow.asStateFlow()- private val _externalNavigationRequestFlow = MutableStateFlow<ExternalNavigationRequest?>(null)- val externalNavigationRequestFlow: StateFlow<ExternalNavigationRequest?> =- _externalNavigationRequestFlow.asStateFlow()+ private val appNavigationCoordinator: AppNavigationCoordinator by viewModels()+++ private val pendingExternalNavigationRequests = ArrayDeque<ExternalNavigationRequest>()+++ @Inject+ lateinit var externalNavigationRequestParser: ExternalNavigationRequestParserprivate var playerPictureInPictureState = PlayerPictureInPictureState()@@@ -153,19 -204,37 +178,35 @@@CompositionLocalProvider(LocalContext provides localizedContext,LocalLayoutDirection provides layoutDirection,- LocalAppTimeFormat provides appTimeFormat+ LocalAppTimeFormat provides appTimeFormat,+ LocalUiTimeFormat provides appTimeFormat.toUiTimeFormat()) {StreamVaultTheme {- AppNavigation(coordinator = appNavigationCoordinator)+ when (val state = databaseStartupState) {+ DatabaseStartupState.Opening -> DatabaseStartupScreen(state = state)+ is DatabaseStartupState.Failed -> DatabaseStartupScreen(+ state = state,+ onRetry = {+ lifecycleScope.launch { databaseStartupCoordinator.open() }+ },+ onShareReport = ::shareLatestFailureReport+ )+ DatabaseStartupState.Ready -> {++ AppNavigation(coordinator = appNavigationCoordinator)+ LaunchedEffect(Unit) {- if (isTelevisionDevice()) {- watchNextManager.refreshWatchNext()- launcherRecommendationsManager.refreshRecommendations()- tvInputChannelSyncManager.refreshTvInputCatalog()++ dispatchPendingExternalNavigationRequests()++ window.decorView.doOnPreDraw {++ window.decorView.post {++ appStartupCoordinator.onFirstUiFrameDrawn(isTelevisionDevice())++ }+ }+ }- AppNavigation(mainActivity = this@MainActivity)+ }+ }}}}- window.decorView.doOnPreDraw {- window.decorView.post {- appStartupCoordinator.onFirstUiFrameDrawn(isTelevisionDevice())- }- }-- // 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() {@@@ -319,7 -390,167 +360,73 @@@}private fun handleExternalIntent(intent: Intent?) {- intent?.let(externalNavigationRequestParser::parse)- ?.let(appNavigationCoordinator::submitExternalRequest)- val request = intent?.toExternalNavigationRequest() ?: return- _externalNavigationRequestFlow.value = request++ intent?.let(externalNavigationRequestParser::parse)?.let {++ pendingExternalNavigationRequests += it++ dispatchPendingExternalNavigationRequests()++ }++ }++++ private fun dispatchPendingExternalNavigationRequests() {++ if (databaseStartupCoordinator.state.value != DatabaseStartupState.Ready) return++ while (pendingExternalNavigationRequests.isNotEmpty()) {++ appNavigationCoordinator.submitExternalRequest(++ pendingExternalNavigationRequests.removeFirst()++ )++ }+ }++ private fun shareLatestFailureReport() {+ val file = CrashReportStore.latestReportFile(this)+ if (!file.isFile || file.length() <= 0L) return+ runCatching {+ val uri = CrashReportStore.providerUriForFile(this, file)+ startActivity(CrashReportStore.buildShareIntent(uri))+ }+ }-- private fun Intent.toExternalNavigationRequest(): ExternalNavigationRequest? {- readPlayerRequestExtra()?.let { return ExternalNavigationRequest.Player(it) }- readExternalDestinationExtra()?.let { return ExternalNavigationRequest.Destination(it) }- getStringExtra(EXTRA_EXTERNAL_ROUTE)- ?.let(ExternalDestination::fromLegacyRoute)- ?.let { return ExternalNavigationRequest.Destination(it) }- if (hasExtra(EXTRA_EXTERNAL_ROUTE)) {- return ExternalNavigationRequest.Destination(ExternalDestination.Home)- }- readImportedPlaylistUri()?.let { return ExternalNavigationRequest.ImportM3u(it) }- readImportedBackupUri()?.let { return ExternalNavigationRequest.ImportBackup(it) }-- val query = when (action) {- Intent.ACTION_SEARCH,- Intent.ACTION_ASSIST,- RecognizerIntent.ACTION_VOICE_SEARCH_HANDS_FREE -> {- getStringExtra(SearchManager.QUERY)- ?: getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)?.firstOrNull()- }-- else -> null- }?.trim().orEmpty()-- query.takeIf { it.isNotBlank() }?.let(ExternalNavigationRequest::Search)?.let { return it }-- return if (action == Intent.ACTION_VIEW) {- ExternalNavigationRequest.Destination(ExternalDestination.Home)- } else {- null- }- }-- private fun Intent.readImportedPlaylistUri(): String? {- if (action != Intent.ACTION_VIEW) return null- val targetUri = data ?: return null- val normalizedPath = targetUri.toString().substringBefore('?').lowercase(Locale.ROOT)- val mimeType = type?.lowercase(Locale.ROOT).orEmpty()- val isPlaylistMime = mimeType in setOf(- "audio/x-mpegurl",- "audio/mpegurl",- "application/x-mpegurl",- "application/vnd.apple.mpegurl",- "application/mpegurl"- )- val isPlaylistPath = normalizedPath.endsWith(".m3u") || normalizedPath.endsWith(".m3u8")- if (!isPlaylistMime && !isPlaylistPath) return null- return when (targetUri.scheme?.lowercase(Locale.ROOT)) {- "content", "file" -> targetUri.toString()- else -> null- }- }-- private fun Intent.readImportedBackupUri(): String? {- val targetUri = when (action) {- Intent.ACTION_VIEW -> data- Intent.ACTION_SEND -> readStreamUriExtra()- else -> null- } ?: return null- if (!isBackupJsonCandidate(targetUri)) return null- return BackupFileBridge.copyToImportInbox(this@MainActivity, targetUri)?.toString()- ?: targetUri.toString()- }-- @Suppress("DEPRECATION")- private fun Intent.readStreamUriExtra(): Uri? {- return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {- getParcelableExtra(Intent.EXTRA_STREAM, Uri::class.java)- } else {- getParcelableExtra(Intent.EXTRA_STREAM) as? Uri- } ?: clipData?.takeIf { it.itemCount > 0 }?.getItemAt(0)?.uri- }-- private fun Intent.isBackupJsonCandidate(uri: Uri): Boolean {- val normalizedPath = uri.toString().substringBefore('?').lowercase(Locale.ROOT)- val mimeType = type?.lowercase(Locale.ROOT).orEmpty()- val isJsonMime = mimeType in setOf(- "application/json",- "text/json",- "application/x-json",- "application/octet-stream",- "text/plain",- )- val isJsonPath = normalizedPath.endsWith(".json")- if (!isJsonMime && !isJsonPath) return false- return uri.scheme?.lowercase(Locale.ROOT) in setOf("content", "file")- }-- @Suppress("DEPRECATION")- private fun Intent.readPlayerRequestExtra(): PlayerNavigationRequest? {- return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {- getSerializableExtra(EXTRA_PLAYER_REQUEST, PlayerNavigationRequest::class.java)- } else {- getSerializableExtra(EXTRA_PLAYER_REQUEST) as? PlayerNavigationRequest- }- }-- @Suppress("DEPRECATION")- private fun Intent.readExternalDestinationExtra(): ExternalDestination? {- return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {- getSerializableExtra(EXTRA_EXTERNAL_DESTINATION, ExternalDestination::class.java)- } else {- getSerializableExtra(EXTRA_EXTERNAL_DESTINATION) as? ExternalDestination- }- }+ }++ @Composable+ private fun DatabaseStartupScreen(+ state: DatabaseStartupState,+ onRetry: () -> Unit = {},+ onShareReport: () -> Unit = {}+ ) {+ Surface(modifier = Modifier.fillMaxSize()) {+ Column(+ modifier = Modifier.fillMaxSize().padding(48.dp),+ verticalArrangement = Arrangement.Center,+ horizontalAlignment = Alignment.CenterHorizontally+ ) {+ when (state) {+ DatabaseStartupState.Opening -> {+ CircularProgressIndicator()+ Text(+ text = "Preparing your library…",+ modifier = Modifier.padding(top = 24.dp),+ style = MaterialTheme.typography.titleLarge+ )+ }+ is DatabaseStartupState.Failed -> {+ Text(+ text = "StreamVault couldn't open your library",+ style = MaterialTheme.typography.headlineSmall,+ textAlign = TextAlign.Center+ )+ Text(+ text = "${state.userMessage}\nError: ${state.errorType}",+ modifier = Modifier.padding(top = 16.dp),+ textAlign = TextAlign.Center+ )+ Row(+ modifier = Modifier.padding(top = 28.dp),+ horizontalArrangement = Arrangement.spacedBy(16.dp)+ ) {+ Button(onClick = onRetry) { Text("Retry") }+ Button(onClick = onShareReport) { Text("Share report") }+ }+ }+ DatabaseStartupState.Ready -> Unit+ }+ }}}diff --cc app/src/main/java/com/streamvault/app/StreamVaultApp.ktindex 4b35fd69,2df33c6d..e2deed03--- a/app/src/main/java/com/streamvault/app/StreamVaultApp.kt+++ b/app/src/main/java/com/streamvault/app/StreamVaultApp.kt@@@ -10,10 -11,18 +11,15 @@@ import coil3.network.okhttp.OkHttpNetwoimport coil3.request.crossfadeimport com.streamvault.app.diagnostics.CrashReportStoreimport com.streamvault.app.diagnostics.RuntimeDiagnosticsManager-import com.streamvault.app.plugins.StreamVaultPluginManager-import com.streamvault.app.ui.accessibility.isReducedMotionEnabled+import com.streamvault.core.ui.accessibility.isReducedMotionEnabledimport com.streamvault.data.remote.jellyfin.JellyfinImageAuthInterceptor-import com.streamvault.domain.repository.DownloadManager-import com.streamvault.domain.manager.ProgramReminderManagerimport dagger.hilt.android.HiltAndroidApp+ import kotlinx.coroutines.CoroutineScopeimport kotlinx.coroutines.Dispatchers+ import kotlinx.coroutines.SupervisorJob+ import kotlinx.coroutines.launch+ import kotlinx.coroutines.flow.filterIsInstance+ import kotlinx.coroutines.flow.firstimport okio.Path.Companion.toOkioPathimport androidx.work.Constraints@@@ -24,19 -42,38 +30,23 @@@ import okhttp3.OkHttpClien@HiltAndroidAppclass StreamVaultApp : Application(), SingletonImageLoader.Factory {private val runtimeDiagnosticsManager by lazy { RuntimeDiagnosticsManager(this) }+ private val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)@Inject- lateinit var okHttpClient: OkHttpClient+ lateinit var okHttpClient: Provider<OkHttpClient>@Inject- lateinit var jellyfinImageAuthInterceptor: JellyfinImageAuthInterceptor+ lateinit var jellyfinImageAuthInterceptor: Provider<JellyfinImageAuthInterceptor>@Inject- lateinit var providerSyncLifecycle: ProviderSyncLifecycle-- @Inject- lateinit var downloadManager: DownloadManager-- @Inject- lateinit var streamVaultPluginManager: StreamVaultPluginManager-- @Inject- lateinit var programReminderManager: ProgramReminderManager-- @Inject- lateinit var startupWorkRegistry: StartupWorkRegistry-- @Inject- lateinit var pendingBackupRestoreCoordinator: PendingBackupRestoreCoordinator+ internal lateinit var appStartupCoordinator: AppStartupCoordinator+ @Inject+ lateinit var databaseStartupCoordinator: DatabaseStartupCoordinator+private val imageOkHttpClient: OkHttpClient by lazy {- okHttpClient.newBuilder()- .addInterceptor(jellyfinImageAuthInterceptor)+ okHttpClient.get().newBuilder()+ .addInterceptor(jellyfinImageAuthInterceptor.get()).build()}@@@ -44,9 -81,46 +54,17 @@@super.onCreate()CrashReportStore.install(this)runtimeDiagnosticsManager.start()- appStartupCoordinator.startProcessMaintenance()++ // Open Room once the process has completed lightweight setup, then admit++ // database-backed maintenance through the Phase 5 startup coordinator.++ databaseStartupCoordinator.start()+ applicationScope.launch {+ databaseStartupCoordinator.state+ .filterIsInstance<DatabaseStartupState.Ready>()+ .first()- runDatabaseReadyStartupTasks()++ appStartupCoordinator.startProcessMaintenance()+ }}- private suspend fun runDatabaseReadyStartupTasks() {- runContainedStartupTasks(- tasks = listOf(- StartupTask("timeshift-cleanup") {- TimeshiftDiskManager(applicationContext)- .cleanupStaleDirectories(activeSessionDir = null)- },- StartupTask("download-recovery") {- downloadManager.recoverInterruptedDownloads()- },- StartupTask("plugin-reconcile") {- streamVaultPluginManager.reconcilePluginProviders()- },- StartupTask("reminder-restore") {- programReminderManager.restoreScheduledReminders()- },- StartupTask("stalker-work-reconcile") {- providerSyncLifecycle.reconcileStalkerIndexWorkAtStartup()- },- StartupTask("pending-backup-restore") {- pendingBackupRestoreCoordinator.applyAllAvailable()- },- StartupTask("work-registration") {- startupWorkRegistry.register()- }- ),- onFailure = { name, error ->- Log.e("StreamVaultStartup", "Startup task failed: $name", error)- }- )- }-override fun onTerminate() {runtimeDiagnosticsManager.stop()super.onTerminate()diff --cc app/src/main/java/com/streamvault/app/ui/screens/plugins/PluginsScreen.ktindex b77e3dd4,b17bdd36..aa84c43c--- a/app/src/main/java/com/streamvault/app/ui/screens/plugins/PluginsScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/plugins/PluginsScreen.kt@@@ -57,17 -57,18 +57,18 @@@ import com.streamvault.app.plugins.Plugimport com.streamvault.app.plugins.PluginConfigurationFieldimport com.streamvault.app.plugins.PluginConfigurationSectionimport com.streamvault.app.plugins.owner+ import com.streamvault.app.plugins.toBundleSafeKey-import com.streamvault.app.ui.components.dialogs.PremiumDialog-import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton+import com.streamvault.core.ui.components.dialogs.PremiumDialog+import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButtonimport com.streamvault.app.ui.components.shell.AppNavigationChromeimport com.streamvault.app.ui.components.shell.AppScreenScaffold-import com.streamvault.app.ui.components.shell.StatusPill-import com.streamvault.app.ui.design.AppColors-import com.streamvault.app.ui.design.FocusSpec-import com.streamvault.app.ui.interaction.TvButton-import com.streamvault.app.ui.theme.FocusBorder-import com.streamvault.app.ui.theme.OnSurface-import com.streamvault.app.ui.theme.Primary+import com.streamvault.core.ui.components.shell.StatusPill+import com.streamvault.core.ui.design.AppColors+import com.streamvault.core.ui.design.FocusSpec+import com.streamvault.core.ui.interaction.TvButton+import com.streamvault.core.ui.theme.FocusBorder+import com.streamvault.core.ui.theme.OnSurface+import com.streamvault.core.ui.theme.Primary@Composablefun PluginsScreen(