Skip to content

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

Fix TV crash report scrolling and release test coverage

David Nashash4addc20fd7bc
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 0be719df..ec5749dc 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -57,8 +57,8 @@ android {
applicationId = "com.streamvault.app"
minSdk = 27
targetSdk = 36
- versionCode = 13
- versionName = "1.0.12"
+ versionCode = 14
+ versionName = "1.0.13"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
buildConfigField("String", "OFFICIAL_APPLICATION_ID", "\"com.streamvault.app\"")
buildConfigField("String", "OFFICIAL_SIGNING_CERT_SHA256", "\"$officialSigningCertSha256\"")
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenDialogs.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenDialogs.kt
index 25c80755..09878a94 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenDialogs.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenDialogs.kt
@@ -1,6 +1,9 @@
package com.streamvault.app.ui.screens.settings
+import androidx.compose.foundation.focusable
import android.content.Context
+import android.view.KeyEvent
+import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
@@ -12,7 +15,15 @@ import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.input.key.onPreviewKeyEvent
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.tv.material3.ClickableSurfaceDefaults
@@ -29,6 +40,7 @@ import com.streamvault.app.ui.theme.SurfaceElevated
import com.streamvault.app.ui.theme.TextSecondary
import com.streamvault.domain.model.ExternalPlaybackMode
import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
@Composable
internal fun SettingsScreenDialogs(
@@ -272,17 +284,65 @@ internal fun SettingsScreenDialogs(
}
uiState.viewedCrashReport?.let { report ->
+ val scrollState = rememberScrollState()
+ val focusRequester = remember { FocusRequester() }
+ val coroutineScope = rememberCoroutineScope()
+ val canScrollUp by remember { derivedStateOf { scrollState.value > 0 } }
+ val canScrollDown by remember { derivedStateOf { scrollState.value < scrollState.maxValue } }
+
+ LaunchedEffect(report.fileName, report.timestamp) {
+ focusRequester.requestFocus()
+ }
+
AlertDialog(
onDismissRequest = viewModel::dismissCrashReport,
title = { Text(text = stringResource(R.string.settings_crash_report_view_title)) },
text = {
- Text(
- text = report.content,
- color = OnSurface,
+ Box(
modifier = Modifier
.heightIn(max = 420.dp)
- .verticalScroll(rememberScrollState())
- )
+ .fillMaxWidth()
+ ) {
+ Text(
+ text = report.content,
+ color = OnSurface,
+ modifier = Modifier
+ .fillMaxWidth()
+ .focusRequester(focusRequester)
+ .focusable()
+ .onPreviewKeyEvent { event ->
+ if (event.nativeKeyEvent.action != KeyEvent.ACTION_DOWN) {
+ return@onPreviewKeyEvent false
+ }
+ when (event.nativeKeyEvent.keyCode) {
+ KeyEvent.KEYCODE_DPAD_UP ->
+ if (canScrollUp) {
+ coroutineScope.launch {
+ scrollState.animateScrollTo(
+ (scrollState.value - 120).coerceAtLeast(0)
+ )
+ }
+ true
+ } else {
+ false
+ }
+ KeyEvent.KEYCODE_DPAD_DOWN ->
+ if (canScrollDown) {
+ coroutineScope.launch {
+ scrollState.animateScrollTo(
+ (scrollState.value + 120).coerceAtMost(scrollState.maxValue)
+ )
+ }
+ true
+ } else {
+ false
+ }
+ else -> false
+ }
+ }
+ .verticalScroll(scrollState)
+ )
+ }
},
confirmButton = {
TextButton(onClick = viewModel::dismissCrashReport) {
diff --git a/app/src/test/java/com/streamvault/app/ui/screens/provider/ProviderSetupViewModelTest.kt b/app/src/test/java/com/streamvault/app/ui/screens/provider/ProviderSetupViewModelTest.kt
index c1b7a635..86e0a892 100644
--- a/app/src/test/java/com/streamvault/app/ui/screens/provider/ProviderSetupViewModelTest.kt
+++ b/app/src/test/java/com/streamvault/app/ui/screens/provider/ProviderSetupViewModelTest.kt
@@ -1,6 +1,8 @@
package com.streamvault.app.ui.screens.provider
import com.google.common.truth.Truth.assertThat
+import com.streamvault.app.pairing.ProviderQrPairingManager
+import com.streamvault.app.pairing.ProviderQrPairingState
import com.streamvault.domain.model.ActiveLiveSource
import com.streamvault.domain.model.CombinedM3uProfile
import com.streamvault.domain.model.Provider
@@ -19,6 +21,7 @@ import com.streamvault.domain.usecase.ValidateAndAddProvider
import com.streamvault.domain.usecase.ValidateAndAddProviderResult
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.test.StandardTestDispatcher
import kotlinx.coroutines.test.advanceUntilIdle
@@ -42,6 +45,7 @@ class ProviderSetupViewModelTest {
private val validateAndAddProvider: ValidateAndAddProvider = mock()
private val importBackup: ImportBackup = mock()
private val driveBackupSyncManager: DriveBackupSyncManager = mock()
+ private val providerQrPairingManager: ProviderQrPairingManager = mock()
private val testDispatcher = StandardTestDispatcher()
@Before
@@ -51,6 +55,7 @@ class ProviderSetupViewModelTest {
whenever(providerRepository.getProviders()).thenReturn(flowOf(emptyList()))
whenever(combinedM3uRepository.getActiveLiveSource()).thenReturn(flowOf(null))
whenever(driveBackupSyncManager.authState).thenReturn(flowOf(DriveAuthState.SignedOut))
+ whenever(providerQrPairingManager.state).thenReturn(MutableStateFlow(ProviderQrPairingState()))
}
@After
@@ -83,6 +88,7 @@ class ProviderSetupViewModelTest {
validateAndAddProvider = validateAndAddProvider,
importBackup = importBackup,
driveBackupSyncManager = driveBackupSyncManager,
+ providerQrPairingManager = providerQrPairingManager,
)
viewModel.addM3u("https://example.com/list.m3u", "Playlist 7", "", "")
@@ -117,6 +123,7 @@ class ProviderSetupViewModelTest {
validateAndAddProvider = validateAndAddProvider,
importBackup = importBackup,
driveBackupSyncManager = driveBackupSyncManager,
+ providerQrPairingManager = providerQrPairingManager,
)
viewModel.loginXtream("https://example.com", "alice", "secret", "Premium", "", "")
@@ -149,6 +156,7 @@ class ProviderSetupViewModelTest {
validateAndAddProvider = validateAndAddProvider,
importBackup = importBackup,
driveBackupSyncManager = driveBackupSyncManager,
+ providerQrPairingManager = providerQrPairingManager,
)
val field = ProviderSetupViewModel::class.java.getDeclaredField("_uiState").apply { isAccessible = true }
@Suppress("UNCHECKED_CAST")
@@ -175,6 +183,7 @@ class ProviderSetupViewModelTest {
validateAndAddProvider = validateAndAddProvider,
importBackup = importBackup,
driveBackupSyncManager = driveBackupSyncManager,
+ providerQrPairingManager = providerQrPairingManager,
)
val seededState = viewModel.uiState.value.copy(
@@ -226,6 +235,7 @@ class ProviderSetupViewModelTest {
validateAndAddProvider = validateAndAddProvider,
importBackup = importBackup,
driveBackupSyncManager = driveBackupSyncManager,
+ providerQrPairingManager = providerQrPairingManager,
)
viewModel.addM3u("https://example.com/list.m3u", "Playlist 7", "", "")
@@ -247,6 +257,7 @@ class ProviderSetupViewModelTest {
validateAndAddProvider = validateAndAddProvider,
importBackup = importBackup,
driveBackupSyncManager = driveBackupSyncManager,
+ providerQrPairingManager = providerQrPairingManager,
)
viewModel.applySourceDefaults(ProviderSetupViewModel.SetupSourceType.STALKER)
@@ -264,6 +275,7 @@ class ProviderSetupViewModelTest {
validateAndAddProvider = validateAndAddProvider,
importBackup = importBackup,
driveBackupSyncManager = driveBackupSyncManager,
+ providerQrPairingManager = providerQrPairingManager,
)
viewModel.applySourceDefaults(ProviderSetupViewModel.SetupSourceType.XTREAM)
@@ -281,6 +293,7 @@ class ProviderSetupViewModelTest {
validateAndAddProvider = validateAndAddProvider,
importBackup = importBackup,
driveBackupSyncManager = driveBackupSyncManager,
+ providerQrPairingManager = providerQrPairingManager,
)
viewModel.applySourceDefaults(ProviderSetupViewModel.SetupSourceType.M3U)
@@ -298,6 +311,7 @@ class ProviderSetupViewModelTest {
validateAndAddProvider = validateAndAddProvider,
importBackup = importBackup,
driveBackupSyncManager = driveBackupSyncManager,
+ providerQrPairingManager = providerQrPairingManager,
)
viewModel.updateEpgSyncMode(ProviderEpgSyncMode.SKIP)
@@ -330,6 +344,7 @@ class ProviderSetupViewModelTest {
validateAndAddProvider = validateAndAddProvider,
importBackup = importBackup,
driveBackupSyncManager = driveBackupSyncManager,
+ providerQrPairingManager = providerQrPairingManager,
)
// Simulate being in edit mode for provider 7.
@@ -362,6 +377,7 @@ class ProviderSetupViewModelTest {
validateAndAddProvider = validateAndAddProvider,
importBackup = importBackup,
driveBackupSyncManager = driveBackupSyncManager,
+ providerQrPairingManager = providerQrPairingManager,
)
viewModel.addM3u("https://example.com/list.m3u", "Playlist", "", "")
@@ -386,6 +402,7 @@ class ProviderSetupViewModelTest {
validateAndAddProvider = validateAndAddProvider,
importBackup = importBackup,
driveBackupSyncManager = driveBackupSyncManager,
+ providerQrPairingManager = providerQrPairingManager,
)
viewModel.loginStalker(
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 3dc1a3f2..adfcd233 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -24,6 +24,7 @@ All notable product changes are recorded in this document.
### Fixed
- Attempted to fix Android TV backup export/import creating empty backup JSON or showing version `0` with `0` items on restore. Needs testing.
+- Fixed the Settings crash report viewer so the latest crash content can scroll with the TV D-pad.
- Fixed provider delete confirmation staying open when a follow-up TV integration refresh failed after the provider had already been deleted.
- Fixed the bundled FFmpeg Media3 artifact so MPEG Layer II audio (`audio/mpeg-L2`) maps to the bundled `mp2` decoder and release builds pass FFmpeg verification again.
- Fixed a broken player content-resolution merge that could leave the app failing to compile.