Skip to content

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

Batch 15: Fix remaining pre-launch issues

Davidonae6ca49659359
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewScreen.kt
index cda26ec4..eafeb84f 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewScreen.kt
@@ -339,6 +339,19 @@ private fun PlayerCell(
}
}
+ // Buffering indicator for active streams
+ val playbackState = slot.playerEngine?.playbackState?.collectAsState()
+ if (playbackState?.value == com.streamvault.player.PlaybackState.BUFFERING) {
+ CircularProgressIndicator(
+ color = Color.White.copy(alpha = 0.7f),
+ modifier = Modifier
+ .size(20.dp)
+ .align(Alignment.TopStart)
+ .padding(6.dp),
+ strokeWidth = 2.dp
+ )
+ }
+
if (isFocused && !slot.isEmpty) {
Box(
modifier = Modifier
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt
index 21dc4cb3..81c31770 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt
@@ -443,7 +443,7 @@ fun PlayerScreen(
}
in KeyEvent.KEYCODE_0..KeyEvent.KEYCODE_9,
in KeyEvent.KEYCODE_NUMPAD_0..KeyEvent.KEYCODE_NUMPAD_9 -> {
- if (contentType == "LIVE" && !showChannelListOverlay && !showEpgOverlay && !showChannelInfoOverlay) {
+ if (contentType == "LIVE") {
val keyCode = event.nativeKeyEvent.keyCode
val digit = when (keyCode) {
in KeyEvent.KEYCODE_0..KeyEvent.KEYCODE_9 -> keyCode - KeyEvent.KEYCODE_0
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerViewModel.kt
index 2cca2a09..96a4b32f 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerViewModel.kt
@@ -1423,7 +1423,7 @@ class PlayerViewModel @Inject constructor(
message: String,
recoveryType: PlayerRecoveryType = PlayerRecoveryType.UNKNOWN,
actions: List<PlayerNoticeAction> = emptyList(),
- durationMs: Long = 3600L
+ durationMs: Long = if (actions.isNotEmpty()) 8000L else 3600L
) {
playerNoticeHideJob?.cancel()
_playerNotice.value = PlayerNoticeState(
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 259860c8..08c8b06e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -427,7 +427,7 @@
<string name="search_command_title">Command Search</string>
<string name="search_command_subtitle">Start with a title, keyword, channel name, or series. Results stay grouped for fast remote navigation.</string>
<string name="search_incorrect_pin">Incorrect PIN</string>
- <string name="search_type_to_search">Type to search...</string>
+ <string name="search_type_to_search">Type at least 2 characters to search</string>
<string name="search_no_results">No results found for \'%1$s\'</string>
<string name="search_no_results_title">No matches</string>
<string name="search_ready_title">Search the library</string>
diff --git a/data/src/main/java/com/streamvault/data/parser/M3uParser.kt b/data/src/main/java/com/streamvault/data/parser/M3uParser.kt
index dbd7f36c..eb31b4a2 100644
--- a/data/src/main/java/com/streamvault/data/parser/M3uParser.kt
+++ b/data/src/main/java/com/streamvault/data/parser/M3uParser.kt
@@ -348,7 +348,7 @@ class M3uParser {
val eqPos = content.indexOf('=', nextTokenStart)
if (eqPos > nextTokenStart) {
val candidateKey = content.substring(nextTokenStart, eqPos).trim().lowercase()
- if (candidateKey.isNotEmpty() && !candidateKey.any { it.isWhitespace() }) {
+ if (candidateKey.isNotEmpty() && !candidateKey.any { it.isWhitespace() } && candidateKey in knownAttributes) {
break
}
}
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 2fa42259..0d531dde 100644
--- a/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt
+++ b/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt
@@ -30,6 +30,7 @@ class PreferencesRepository @Inject constructor(
private const val PIN_SALT_BYTES = 16
private const val PIN_HASH_ITERATIONS = 120_000
private const val PIN_HASH_KEY_BITS = 256
+ private val secureRandom = SecureRandom()
}
private object PreferencesKeys {
@@ -96,7 +97,7 @@ class PreferencesRepository @Inject constructor(
}
suspend fun setParentalPin(pin: String) {
- val salt = ByteArray(PIN_SALT_BYTES).also { SecureRandom().nextBytes(it) }
+ val salt = ByteArray(PIN_SALT_BYTES).also { secureRandom.nextBytes(it) }
val hash = hashPin(pin, salt)
val saltBase64 = java.util.Base64.getEncoder().encodeToString(salt)
context.dataStore.edit { preferences ->
diff --git a/domain/src/main/java/com/streamvault/domain/usecase/GetCustomCategories.kt b/domain/src/main/java/com/streamvault/domain/usecase/GetCustomCategories.kt
index 52f4f254..d5978bfa 100644
--- a/domain/src/main/java/com/streamvault/domain/usecase/GetCustomCategories.kt
+++ b/domain/src/main/java/com/streamvault/domain/usecase/GetCustomCategories.kt
@@ -5,11 +5,15 @@ import com.streamvault.domain.model.ContentType
import com.streamvault.domain.model.VirtualCategoryIds
import com.streamvault.domain.repository.FavoriteRepository
import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
+import java.util.logging.Level
+import java.util.logging.Logger
import javax.inject.Inject
class GetCustomCategories @Inject constructor(
private val favoriteRepository: FavoriteRepository
) {
+ private val logger = Logger.getLogger("GetCustomCategories")
operator fun invoke(contentType: ContentType = ContentType.LIVE): Flow<List<Category>> {
return kotlinx.coroutines.flow.combine(
favoriteRepository.getGroups(contentType),
@@ -38,7 +42,10 @@ class GetCustomCategories @Inject constructor(
)
)
- categories
+ categories.toList()
+ }.catch { e ->
+ logger.log(Level.WARNING, "Failed to load custom categories", e)
+ emit(emptyList())
}
}
}
diff --git a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
index 56c72ac9..2f9ef32b 100644
--- a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
+++ b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
@@ -127,7 +127,7 @@ class Media3PlayerEngine @Inject constructor(
.setAudioAttributes(
AudioAttributes.Builder()
.setUsage(C.USAGE_MEDIA)
- .setContentType(C.CONTENT_TYPE_MOVIE)
+ .setContentType(C.AUDIO_CONTENT_TYPE_UNKNOWN)
.build(),
true // handleAudioFocus
)
@@ -139,6 +139,11 @@ class Media3PlayerEngine @Inject constructor(
format: Format,
decoderReuseEvaluation: DecoderReuseEvaluation?
) {
+ decoderReuseEvaluation?.let { eval ->
+ if (eval.result != 0) { // Not REUSE_RESULT_YES
+ Log.d(TAG, "Decoder reuse: result=${eval.result}, discardReasons=${eval.discardReasons}")
+ }
+ }
lastFrameRate = format.frameRate.takeIf { it > 0f } ?: lastFrameRate
_playerStats.update {
it.copy(