Skip to content

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

fix: buffer config, URL validation, EPG size limit, domain purity, classifier, track selection

Davidona668223af5900
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreen.kt
index 0e7edbb1..e6b3e96d 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreen.kt
@@ -338,7 +338,7 @@ fun FullEpgScreen(
label = stringResource(R.string.epg_program_progress_label),
value = stringResource(
R.string.epg_program_progress_value,
- (program.progressPercent * 100f).roundToInt(),
+ (program.progressPercent() * 100f).roundToInt(),
stringResource(R.string.epg_minutes_remaining, ((program.endTime - now) / 60_000L).coerceAtLeast(0L))
)
)
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 efee8701..10b9aa4c 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
@@ -943,7 +943,7 @@ private fun LivePreviewPane(
color = OnSurfaceDim
)
LinearProgressIndicator(
- progress = { program.progressPercent },
+ progress = { program.progressPercent() },
modifier = Modifier
.fillMaxWidth()
.height(4.dp),
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 dc716d22..58496ca8 100644
--- a/data/src/main/java/com/streamvault/data/parser/M3uParser.kt
+++ b/data/src/main/java/com/streamvault/data/parser/M3uParser.kt
@@ -158,6 +158,7 @@ class M3uParser {
private fun parseEntry(extinf: ParsedExtinf, url: String, globalUserAgent: String?): M3uEntry? {
if (url.isBlank() || extinf.name.isBlank()) return null
+ if (!isAllowedStreamUrl(url)) return null
return M3uEntry(
name = extinf.name.take(500),
groupTitle = (extinf.groupTitle ?: "Uncategorized").take(200),
@@ -358,6 +359,15 @@ class M3uParser {
group.contains("film")
}
+ private fun isAllowedStreamUrl(url: String): Boolean {
+ val trimmed = url.trim()
+ if (trimmed.length > 8192) return false
+ val lower = trimmed.lowercase()
+ if (lower.contains("%0a") || lower.contains("%0d")) return false
+ val allowedPrefixes = listOf("http://", "https://", "rtsp://", "rtmp://", "mms://")
+ return allowedPrefixes.any { lower.startsWith(it) }
+ }
+
private companion object {
val knownAttributes = setOf(
"tvg-id",
diff --git a/data/src/main/java/com/streamvault/data/repository/EpgRepositoryImpl.kt b/data/src/main/java/com/streamvault/data/repository/EpgRepositoryImpl.kt
index a0dc6965..7b5430ec 100644
--- a/data/src/main/java/com/streamvault/data/repository/EpgRepositoryImpl.kt
+++ b/data/src/main/java/com/streamvault/data/repository/EpgRepositoryImpl.kt
@@ -26,6 +26,10 @@ class EpgRepositoryImpl @Inject constructor(
private val transactionRunner: DatabaseTransactionRunner
) : EpgRepository {
+ companion object {
+ private const val MAX_EPG_SIZE_BYTES = 200L * 1_048_576 // 200 MB
+ }
+
override fun getProgramsForChannel(
providerId: Long,
channelId: String,
@@ -90,6 +94,12 @@ class EpgRepositoryImpl @Inject constructor(
return@withContext Result.error("Failed to download EPG: HTTP ${response.code}")
}
+ val contentLength = response.header("Content-Length")?.toLongOrNull() ?: -1L
+ if (contentLength > MAX_EPG_SIZE_BYTES) {
+ response.close()
+ return@withContext Result.error("EPG file too large (${contentLength / 1_048_576}MB)")
+ }
+
val body = response.body ?: return@withContext Result.error("Empty EPG response")
body.byteStream().use { inputStream ->
diff --git a/data/src/main/java/com/streamvault/data/util/AdultContentClassifier.kt b/data/src/main/java/com/streamvault/data/util/AdultContentClassifier.kt
index 98981949..6b83ec9f 100644
--- a/data/src/main/java/com/streamvault/data/util/AdultContentClassifier.kt
+++ b/data/src/main/java/com/streamvault/data/util/AdultContentClassifier.kt
@@ -1,9 +1,11 @@
package com.streamvault.data.util
+import java.text.Normalizer
import java.util.Locale
object AdultContentClassifier {
private val keywords = listOf(
+ // English
"xxx",
"adult",
"18+",
@@ -16,7 +18,28 @@ object AdultContentClassifier {
"hustler",
"playboy",
"redlight",
- "red light"
+ "red light",
+ // Spanish
+ "adulto",
+ "adultos",
+ // French
+ "adulte",
+ "adultes",
+ "erotique",
+ // German
+ "erwachsene",
+ "erotik",
+ // Russian (transliterated)
+ "vzroslye",
+ "dlya vzroslykh",
+ // Arabic (transliterated)
+ "lilkbar",
+ // Turkish
+ "yetiskin",
+ // Common IPTV labels
+ "for adults",
+ "pour adultes",
+ "para adultos"
)
fun isAdultCategoryName(name: String?): Boolean {
@@ -34,7 +57,9 @@ object AdultContentClassifier {
}
private fun normalize(value: String): String {
- return value
+ val decomposed = Normalizer.normalize(value, Normalizer.Form.NFD)
+ return decomposed
+ .replace(Regex("\\p{InCombiningDiacriticalMarks}+"), "")
.lowercase(Locale.ROOT)
.replace(Regex("[^a-z0-9+]+"), " ")
.trim()
diff --git a/domain/src/main/java/com/streamvault/domain/model/Program.kt b/domain/src/main/java/com/streamvault/domain/model/Program.kt
index bd5816bd..63825e77 100644
--- a/domain/src/main/java/com/streamvault/domain/model/Program.kt
+++ b/domain/src/main/java/com/streamvault/domain/model/Program.kt
@@ -15,11 +15,9 @@ data class Program(
val durationMinutes: Int
get() = ((endTime - startTime) / 60000).toInt()
- val progressPercent: Float
- get() {
- if (!isNowPlaying) return 0f
- val now = System.currentTimeMillis()
- if (now < startTime || endTime <= startTime) return 0f
- return ((now - startTime).toFloat() / (endTime - startTime).toFloat()).coerceIn(0f, 1f)
- }
+ fun progressPercent(currentTimeMillis: Long = System.currentTimeMillis()): Float {
+ if (!isNowPlaying) return 0f
+ if (currentTimeMillis < startTime || endTime <= startTime) return 0f
+ return ((currentTimeMillis - startTime).toFloat() / (endTime - startTime).toFloat()).coerceIn(0f, 1f)
+ }
}
diff --git a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
index 51047d93..4f0504b5 100644
--- a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
+++ b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
@@ -104,13 +104,13 @@ class Media3PlayerEngine @Inject constructor(
)
}
- // Optimize for multi-stream (reduce memory pressure/buffer)
+ // Tuned for IPTV live streams: larger buffer for variable network conditions
val loadControl = DefaultLoadControl.Builder()
.setBufferDurationsMs(
- 15000, // min buffer
- 30000, // max buffer
- 2500, // buffer for playback
- 5000 // buffer for rebuffering
+ 30_000, // min buffer
+ 60_000, // max buffer
+ 2500, // buffer for playback
+ 5000 // buffer for rebuffering
)
.build()
@@ -381,11 +381,6 @@ class Media3PlayerEngine @Inject constructor(
override fun selectAudioTrack(trackId: String) {
exoPlayer?.let { player ->
- player.trackSelectionParameters = player.trackSelectionParameters
- .buildUpon()
- .setTrackTypeDisabled(C.TRACK_TYPE_AUDIO, false)
- .build()
-
val tracks = player.currentTracks
for (group in tracks.groups) {
if (group.mediaTrackGroup.type == C.TRACK_TYPE_AUDIO) {
@@ -395,6 +390,7 @@ class Media3PlayerEngine @Inject constructor(
if (id == trackId) {
player.trackSelectionParameters = player.trackSelectionParameters
.buildUpon()
+ .setTrackTypeDisabled(C.TRACK_TYPE_AUDIO, false)
.setOverrideForType(
androidx.media3.common.TrackSelectionOverride(
group.mediaTrackGroup,
@@ -419,11 +415,6 @@ class Media3PlayerEngine @Inject constructor(
.clearOverridesOfType(C.TRACK_TYPE_TEXT)
.build()
} else {
- player.trackSelectionParameters = player.trackSelectionParameters
- .buildUpon()
- .setTrackTypeDisabled(C.TRACK_TYPE_TEXT, false)
- .build()
-
val tracks = player.currentTracks
for (group in tracks.groups) {
if (group.mediaTrackGroup.type == C.TRACK_TYPE_TEXT) {
@@ -433,6 +424,7 @@ class Media3PlayerEngine @Inject constructor(
if (id == trackId) {
player.trackSelectionParameters = player.trackSelectionParameters
.buildUpon()
+ .setTrackTypeDisabled(C.TRACK_TYPE_TEXT, false)
.setOverrideForType(
androidx.media3.common.TrackSelectionOverride(
group.mediaTrackGroup,