Skip to content

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

fix: localization, URL validation, CategoryRow keys

Davidonad5bb53e02279
diff --git a/app/src/main/java/com/streamvault/app/ui/components/CategoryRow.kt b/app/src/main/java/com/streamvault/app/ui/components/CategoryRow.kt
index 82c93514..f5fe7d59 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/CategoryRow.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/CategoryRow.kt
@@ -22,11 +22,12 @@ import com.streamvault.app.R
// ── Netflix-style horizontal category row ─────────────────────────
@Composable
-fun <T> CategoryRow(
+fun <T : Any> CategoryRow(
title: String,
items: List<T>,
modifier: Modifier = Modifier,
onSeeAll: (() -> Unit)? = null,
+ keySelector: ((T) -> Any)? = null,
itemContent: @Composable (T) -> Unit
) {
Column(modifier = modifier.fillMaxWidth()) {
@@ -68,7 +69,7 @@ fun <T> CategoryRow(
) {
items(
items = items,
- key = { it.hashCode() }
+ key = keySelector ?: { it.hashCode() }
) { item ->
itemContent(item)
}
diff --git a/app/src/main/java/com/streamvault/app/ui/components/CustomKeyboard.kt b/app/src/main/java/com/streamvault/app/ui/components/CustomKeyboard.kt
index 2502f386..2effc3b9 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/CustomKeyboard.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/CustomKeyboard.kt
@@ -8,7 +8,9 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
+import androidx.compose.ui.res.stringResource
import androidx.tv.material3.*
+import com.streamvault.app.R
import com.streamvault.app.ui.theme.Primary
@Composable
@@ -54,22 +56,22 @@ fun TvKeyboard(
modifier = Modifier.padding(top = 8.dp)
) {
KeyboardButton(
- text = "Space",
+ text = stringResource(R.string.action_space),
onClick = { onKeyPress(" ") },
modifier = Modifier.width(96.dp)
)
KeyboardButton(
- text = "Delete",
+ text = stringResource(R.string.action_delete),
onClick = onDelete,
modifier = Modifier.width(96.dp)
)
KeyboardButton(
- text = "Clear",
+ text = stringResource(R.string.action_clear),
onClick = onClear,
modifier = Modifier.width(96.dp)
)
KeyboardButton(
- text = "Done",
+ text = stringResource(R.string.action_done),
onClick = onDone,
modifier = Modifier.width(96.dp),
backgroundColor = Primary
diff --git a/app/src/main/java/com/streamvault/app/ui/components/PlaylistSwitcher.kt b/app/src/main/java/com/streamvault/app/ui/components/PlaylistSwitcher.kt
index 4ede8dd8..7975cc00 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/PlaylistSwitcher.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/PlaylistSwitcher.kt
@@ -56,7 +56,7 @@ fun PlaylistSwitcher(
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
Text(
- text = "PROVIDER",
+ text = stringResource(R.string.label_provider),
style = MaterialTheme.typography.labelSmall,
color = if (isFocused) Primary else OnSurfaceDim
)
@@ -129,7 +129,7 @@ private fun ProviderItem(
)
if (isSelected) {
Text(
- text = "Selected",
+ text = stringResource(R.string.label_selected),
style = MaterialTheme.typography.labelSmall,
color = Primary
)
diff --git a/app/src/main/java/com/streamvault/app/ui/components/ReorderTopBar.kt b/app/src/main/java/com/streamvault/app/ui/components/ReorderTopBar.kt
index dcf99ee3..d6038739 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/ReorderTopBar.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/ReorderTopBar.kt
@@ -12,7 +12,9 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
+import androidx.compose.ui.res.stringResource
import androidx.tv.material3.*
+import com.streamvault.app.R
import com.streamvault.app.ui.theme.OnSurface
import com.streamvault.app.ui.theme.Primary
import com.streamvault.app.ui.theme.SurfaceElevated
@@ -59,7 +61,7 @@ fun ReorderTopBar(
verticalArrangement = Arrangement.spacedBy(4.dp)
) {
Text(
- text = "Reordering $categoryName",
+ text = stringResource(R.string.label_reordering, categoryName),
style = MaterialTheme.typography.titleLarge,
color = TextPrimary
)
@@ -79,7 +81,7 @@ fun ReorderTopBar(
contentColor = OnSurface
)
) {
- Text("Cancel", modifier = Modifier.padding(horizontal = 8.dp))
+ Text(stringResource(R.string.action_cancel), modifier = Modifier.padding(horizontal = 8.dp))
}
Button(
@@ -89,7 +91,7 @@ fun ReorderTopBar(
contentColor = Color.White
)
) {
- Text("Save Order", modifier = Modifier.padding(horizontal = 8.dp))
+ Text(stringResource(R.string.action_save_order), modifier = Modifier.padding(horizontal = 8.dp))
}
}
}
diff --git a/app/src/main/java/com/streamvault/app/ui/components/shell/AppMediaCards.kt b/app/src/main/java/com/streamvault/app/ui/components/shell/AppMediaCards.kt
index 92f973ab..e2eef1b3 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/shell/AppMediaCards.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/shell/AppMediaCards.kt
@@ -32,12 +32,14 @@ import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
+import androidx.compose.ui.res.stringResource
import androidx.tv.material3.Border
import androidx.tv.material3.ClickableSurfaceDefaults
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Surface
import androidx.tv.material3.Text
import coil3.compose.AsyncImage
+import com.streamvault.app.R
import com.streamvault.app.ui.design.AppColors
import com.streamvault.app.ui.design.AppMotion
import com.streamvault.app.ui.design.FocusSpec
@@ -154,7 +156,7 @@ fun LiveChannelRowCard(
}
} else {
Text(
- text = "No schedule information",
+ text = stringResource(R.string.label_no_schedule),
style = if (isDense) MaterialTheme.typography.labelMedium else MaterialTheme.typography.bodySmall,
color = AppColors.TextTertiary
)
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 887766ec..efee8701 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
@@ -402,7 +402,7 @@ fun HomeScreen(
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
Text(
- text = "SPLIT",
+ text = stringResource(R.string.action_split),
fontSize = 14.sp
)
Column(modifier = Modifier.weight(1f)) {
@@ -413,7 +413,7 @@ fun HomeScreen(
fontWeight = FontWeight.Medium
)
Text(
- text = "${splitSlots.count { it != null }}/4 slots",
+ text = stringResource(R.string.label_slots_count, splitSlots.count { it != null }),
style = androidx.compose.ui.text.TextStyle(
fontSize = 9.sp,
color = Color(0xFF81C784)
@@ -1116,7 +1116,7 @@ fun ReorderSidePanel(
contentColor = Color.White
),
modifier = Modifier.weight(1f)
- ) { Text("Save", maxLines = 1) }
+ ) { Text(stringResource(R.string.action_save), maxLines = 1) }
androidx.tv.material3.Button(
onClick = onCancel,
@@ -1125,7 +1125,7 @@ fun ReorderSidePanel(
contentColor = OnSurface
),
modifier = Modifier.weight(1f)
- ) { Text("Cancel", maxLines = 1) }
+ ) { Text(stringResource(R.string.action_cancel), maxLines = 1) }
}
// List
@@ -1187,7 +1187,7 @@ fun ReorderSidePanel(
verticalAlignment = Alignment.CenterVertically
) {
if (isDraggingThis) {
- Text("MOVE", color = Color.White, modifier = Modifier.padding(end = 8.dp))
+ Text(stringResource(R.string.action_move), color = Color.White, modifier = Modifier.padding(end = 8.dp))
}
Text(
"${index + 1}. ${channel.name}",
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerOverlays.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerOverlays.kt
index 60a54072..e66da455 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerOverlays.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerOverlays.kt
@@ -1240,7 +1240,7 @@ fun CategoryListOverlay(
) {
item {
Text(
- text = "Categories",
+ text = stringResource(R.string.label_categories),
style = MaterialTheme.typography.titleMedium,
color = Primary,
modifier = Modifier.padding(horizontal = 8.dp, vertical = 12.dp)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a5581a12..7a63445c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -742,4 +742,26 @@
<string name="settings_clear_history_confirm">Clear History</string>
<string name="settings_clear_history_dialog_title">Clear Watch History?</string>
<string name="settings_clear_history_dialog_body">This will permanently delete all watch history, continue watching progress, and last visited categories across all providers.</string>
+
+ <!-- Common Actions -->
+ <string name="action_save">Save</string>
+ <string name="action_cancel">Cancel</string>
+ <string name="action_save_order">Save Order</string>
+ <string name="action_done">Done</string>
+ <string name="action_delete">Delete</string>
+ <string name="action_clear">Clear</string>
+ <string name="action_space">Space</string>
+ <string name="action_move">MOVE</string>
+ <string name="action_split">SPLIT</string>
+
+ <!-- Misc UI -->
+ <string name="label_provider">PROVIDER</string>
+ <string name="label_selected">Selected</string>
+ <string name="label_categories">Categories</string>
+ <string name="label_no_schedule">No schedule information</string>
+ <string name="label_reordering">Reordering %1$s</string>
+ <string name="label_slots_count">%1$d/4 slots</string>
+ <string name="label_rating">RTG %1$s</string>
+ <string name="label_episode">E%1$d</string>
+ <string name="label_duration_min">%1$d min</string>
</resources>
diff --git a/data/src/main/java/com/streamvault/data/util/UrlSecurityPolicy.kt b/data/src/main/java/com/streamvault/data/util/UrlSecurityPolicy.kt
index bbfea295..83d2e6d4 100644
--- a/data/src/main/java/com/streamvault/data/util/UrlSecurityPolicy.kt
+++ b/data/src/main/java/com/streamvault/data/util/UrlSecurityPolicy.kt
@@ -7,10 +7,10 @@ object UrlSecurityPolicy {
private val secureRemoteSchemes = setOf("https")
private val localSchemes = setOf("file", "content")
- fun isSecureRemoteUrl(url: String): Boolean = hasAllowedScheme(url, secureRemoteSchemes)
+ fun isSecureRemoteUrl(url: String): Boolean = !containsNewlines(url) && hasAllowedScheme(url, secureRemoteSchemes)
fun isAllowedImportedUrl(url: String): Boolean =
- hasAllowedScheme(url, secureRemoteSchemes + localSchemes)
+ !containsNewlines(url) && hasAllowedScheme(url, secureRemoteSchemes + localSchemes)
fun validateXtreamServerUrl(url: String): String? {
return if (isSecureRemoteUrl(url)) {
@@ -46,6 +46,12 @@ object UrlSecurityPolicy {
return scheme in allowedSchemes
}
+ private fun containsNewlines(url: String): Boolean {
+ val decoded = url.replace("%0A", "\n", ignoreCase = true)
+ .replace("%0D", "\r", ignoreCase = true)
+ return decoded.contains('\n') || decoded.contains('\r')
+ }
+
private fun parseScheme(url: String): String? {
return runCatching { URI(url.trim()).scheme }
.getOrNull()