StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
fix: ViewModel Job leaks, ParentalControlManager race, category ID collision, parser robustness
Davidona2e530aaf4675
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pronew file mode 100644index 00000000..0299774e--- /dev/null+++ b/app/proguard-rules.pro@@ -0,0 +1,76 @@+# StreamVault ProGuard Rules+# ============================================================++# ── Kotlin ──────────────────────────────────────────────────+-dontwarn kotlin.**+-keep class kotlin.Metadata { *; }++# ── Hilt / Dagger ───────────────────────────────────────────+-keepclasseswithmembers class * {+ @dagger.* <methods>;+}+-keep class dagger.hilt.** { *; }+-keep class javax.inject.** { *; }+-keep class * extends dagger.hilt.android.internal.managers.ViewComponentManager$FragmentContextWrapper { *; }++# ── Retrofit / OkHttp ───────────────────────────────────────+-keepattributes Signature+-keepattributes *Annotation*+-keep,allowobfuscation interface retrofit2.Call+-keep,allowobfuscation interface retrofit2.Callback+-dontwarn retrofit2.**+-keep class retrofit2.** { *; }+-keepclassmembers,allowobfuscation class * {+ @retrofit2.http.* <methods>;+}+-dontwarn okhttp3.internal.platform.**+-dontwarn org.conscrypt.**+-dontwarn org.bouncycastle.**+-dontwarn org.openjsse.**++# ── GSON ────────────────────────────────────────────────────+-keepattributes Signature+-keepattributes EnclosingMethod+-keep class com.google.gson.** { *; }+-keep class * implements com.google.gson.TypeAdapterFactory+-keep class * implements com.google.gson.JsonSerializer+-keep class * implements com.google.gson.JsonDeserializer+# Keep fields that GSON accesses via reflection+-keepclassmembers class com.streamvault.data.remote.** { <fields>; }++# ── Room ────────────────────────────────────────────────────+-keep class * extends androidx.room.RoomDatabase+-keep @androidx.room.Entity class *+-dontwarn androidx.room.paging.**++# ── Domain models (serialized by GSON / passed across modules) ──+-keep class com.streamvault.domain.model.** { *; }+-keep class com.streamvault.data.local.entity.** { *; }+-keep class com.streamvault.data.remote.xtream.model.** { *; }++# ── Media3 / ExoPlayer ─────────────────────────────────────+-keep class androidx.media3.** { *; }+-dontwarn androidx.media3.**++# ── Coroutines ──────────────────────────────────────────────+-keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}+-keepnames class kotlinx.coroutines.CoroutineExceptionHandler {}+-keepclassmembers class kotlinx.coroutines.** {+ volatile <fields>;+}++# ── Compose ─────────────────────────────────────────────────+-dontwarn androidx.compose.**++# ── Coil (image loading) ───────────────────────────────────+-dontwarn coil3.**++# ── DataStore ───────────────────────────────────────────────+-keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {+ <fields>;+}++# ── General ─────────────────────────────────────────────────+-keepattributes SourceFile,LineNumberTable # Better crash reports+-renamesourcefileattribute SourceFile+-keepattributes RuntimeVisibleAnnotations,RuntimeVisibleParameterAnnotationsdiff --git a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeViewModel.ktindex 47c9d027..a1195a45 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeViewModel.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeViewModel.kt@@ -857,6 +857,10 @@ class HomeViewModel @Inject constructor(.toList()override fun onCleared() {+ epgJob?.cancel()+ loadChannelsJob?.cancel()+ categoriesJob?.cancel()+ recentChannelsJob?.cancel()clearPreview()super.onCleared()}diff --git a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewViewModel.ktindex 2c19f1dd..c1afdb5c 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewViewModel.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewViewModel.kt@@ -351,6 +351,7 @@ class MultiViewViewModel @Inject constructor(override fun onCleared() {super.onCleared()telemetryJob?.cancel()+ borderHideJob?.cancel()cancelSlotStartupJobs()unregisterThermalListener()playerEngines.values.forEach { it.release() }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.ktindex e8a3e18f..2cca2a09 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@@ -1534,6 +1534,8 @@ class PlayerViewModel @Inject constructor(zapBufferWatchdogJob?.cancel()progressTrackingJob?.cancel()aspectRatioJob?.cancel()+ recentChannelsJob?.cancel()+ lastVisitedCategoryJob?.cancel()playerEngine.release()}}diff --git a/data/src/main/java/com/streamvault/data/parser/M3uParser.kt b/data/src/main/java/com/streamvault/data/parser/M3uParser.ktindex dd50f464..dc716d22 100644--- a/data/src/main/java/com/streamvault/data/parser/M3uParser.kt+++ b/data/src/main/java/com/streamvault/data/parser/M3uParser.kt@@ -159,8 +159,8 @@ class M3uParser {private fun parseEntry(extinf: ParsedExtinf, url: String, globalUserAgent: String?): M3uEntry? {if (url.isBlank() || extinf.name.isBlank()) return nullreturn M3uEntry(- name = extinf.name,- groupTitle = extinf.groupTitle ?: "Uncategorized",+ name = extinf.name.take(500),+ groupTitle = (extinf.groupTitle ?: "Uncategorized").take(200),tvgId = extinf.tvgId,tvgName = extinf.tvgName,tvgLogo = extinf.tvgLogo,diff --git a/data/src/main/java/com/streamvault/data/parser/XmltvParser.kt b/data/src/main/java/com/streamvault/data/parser/XmltvParser.ktindex 8baa83e7..b782d181 100644--- a/data/src/main/java/com/streamvault/data/parser/XmltvParser.kt+++ b/data/src/main/java/com/streamvault/data/parser/XmltvParser.kt@@ -27,7 +27,10 @@ class XmltvParser {private val dateFormats = listOf(SimpleDateFormat("yyyyMMddHHmmss Z", Locale.US),SimpleDateFormat("yyyyMMddHHmmss", Locale.US),- SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US)+ SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.US),+ SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US),+ SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US),+ SimpleDateFormat("yyyyMMddHHmm", Locale.US)).onEach { it.timeZone = TimeZone.getTimeZone("UTC") }fun parse(inputStream: InputStream): List<Program> {@@ -221,6 +224,7 @@ class XmltvParser {// Give up}+ logger.warning("Unparseable XMLTV date: $dateStr")return 0}}diff --git a/data/src/main/java/com/streamvault/data/sync/SyncManager.kt b/data/src/main/java/com/streamvault/data/sync/SyncManager.ktindex 5cadb6a1..233a7cd4 100644--- a/data/src/main/java/com/streamvault/data/sync/SyncManager.kt+++ b/data/src/main/java/com/streamvault/data/sync/SyncManager.kt@@ -92,7 +92,7 @@ class SyncManager @Inject constructor(private val categoryIds = LinkedHashMap<String, Long>()fun idFor(name: String): Long {- return categoryIds.getOrPut(name) { startId + categoryIds.size }+ return categoryIds.getOrPut(name) { providerId * 100_000L + startId + categoryIds.size }}fun entities(): List<CategoryEntity> {diff --git a/domain/src/main/java/com/streamvault/domain/manager/ParentalControlManager.kt b/domain/src/main/java/com/streamvault/domain/manager/ParentalControlManager.ktindex 6e65c12b..012521e0 100644--- a/domain/src/main/java/com/streamvault/domain/manager/ParentalControlManager.kt+++ b/domain/src/main/java/com/streamvault/domain/manager/ParentalControlManager.kt@@ -4,6 +4,7 @@ import kotlinx.coroutines.flow.MutableStateFlowimport kotlinx.coroutines.flow.StateFlowimport kotlinx.coroutines.flow.asStateFlowimport kotlinx.coroutines.flow.map+import kotlinx.coroutines.flow.updateimport javax.inject.Injectimport javax.inject.Singleton@@ -17,11 +18,10 @@ class ParentalControlManager @Inject constructor() {unlockedCategoriesByProvider.map { it[providerId] ?: emptySet() }fun unlockCategory(providerId: Long, categoryId: Long) {- val current = _unlockedCategoriesByProvider.value.toMutableMap()- val providerSet = (current[providerId] ?: emptySet()).toMutableSet()- providerSet.add(categoryId)- current[providerId] = providerSet- _unlockedCategoriesByProvider.value = current+ _unlockedCategoriesByProvider.update { current ->+ val providerSet = (current[providerId] ?: emptySet()) + categoryId+ current + (providerId to providerSet)+ }}fun isCategoryUnlocked(providerId: Long, categoryId: Long): Boolean {@@ -34,8 +34,8 @@ class ParentalControlManager @Inject constructor() {return}- val current = _unlockedCategoriesByProvider.value.toMutableMap()- current.remove(providerId)- _unlockedCategoriesByProvider.value = current+ _unlockedCategoriesByProvider.update { current ->+ current - providerId+ }}}diff --git a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.ktindex f034186d..f330c61c 100644--- a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt+++ b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt@@ -26,6 +26,9 @@ import com.streamvault.domain.model.StreamTypeimport com.streamvault.domain.model.VideoFormatimport androidx.media3.exoplayer.DefaultLoadControlimport androidx.media3.common.AudioAttributes+import android.os.Handler+import android.os.Looper+import android.util.Logimport dagger.hilt.android.qualifiers.ApplicationContextimport kotlinx.coroutines.*import kotlinx.coroutines.flow.*@@ -43,6 +46,16 @@ class Media3PlayerEngine @Inject constructor(private var exoPlayer: ExoPlayer? = nullprivate var currentDecoderMode: DecoderMode = DecoderMode.AUTOprivate var pollingJob: Job? = null+ private var lastStreamInfo: StreamInfo? = null+ private var retryCount = 0+ private var lastFrameRate: Float = 0f+ private val handler = Handler(Looper.getMainLooper())++ companion object {+ private const val TAG = "Media3PlayerEngine"+ private const val MAX_RETRIES = 3+ private const val RETRY_BASE_DELAY_MS = 2000L+ }private val _playbackState = MutableStateFlow(PlaybackState.IDLE)override val playbackState: StateFlow<PlaybackState> = _playbackState.asStateFlow()@@ -80,8 +93,8 @@ class Media3PlayerEngine @Inject constructor(setExtensionRendererMode(when (currentDecoderMode) {DecoderMode.AUTO -> DefaultRenderersFactory.EXTENSION_RENDERER_MODE_PREFER- DecoderMode.HARDWARE -> DefaultRenderersFactory.EXTENSION_RENDERER_MODE_OFF- DecoderMode.SOFTWARE -> DefaultRenderersFactory.EXTENSION_RENDERER_MODE_PREFER+ DecoderMode.HARDWARE -> DefaultRenderersFactory.EXTENSION_RENDERER_MODE_PREFER+ DecoderMode.SOFTWARE -> DefaultRenderersFactory.EXTENSION_RENDERER_MODE_OFF})}@@ -120,6 +133,7 @@ class Media3PlayerEngine @Inject constructor(format: Format,decoderReuseEvaluation: DecoderReuseEvaluation?) {+ lastFrameRate = format.frameRate.takeIf { it > 0f } ?: lastFrameRate_playerStats.update {it.copy(videoCodec = format.sampleMimeType ?: format.codecs ?: it.videoCodec,@@ -176,15 +190,21 @@ class Media3PlayerEngine @Inject constructor(_videoFormat.value = VideoFormat(width = videoSize.width,height = videoSize.height,- frameRate = videoSize.pixelWidthHeightRatio // Using this as proxy or just storing what we have+ frameRate = lastFrameRate)- // Note: ExoPlayer's VideoSize doesn't directly expose bitrate/codec here easily without TrackSelection- // tailored logic, but width/height is the main request.}override fun onPlayerError(error: PlaybackException) {- _error.tryEmit(PlayerError.fromException(error))- _playbackState.value = PlaybackState.ERROR+ if (retryCount < MAX_RETRIES && isRecoverableError(error)) {+ retryCount+++ Log.w(TAG, "Recoverable error (attempt $retryCount/$MAX_RETRIES), retrying...")+ handler.postDelayed({+ lastStreamInfo?.let { prepare(it) }+ }, retryCount * RETRY_BASE_DELAY_MS)+ } else {+ _error.tryEmit(PlayerError.fromException(error))+ _playbackState.value = PlaybackState.ERROR+ }}override fun onPositionDiscontinuity(@@ -236,6 +256,10 @@ class Media3PlayerEngine @Inject constructor(}override fun prepare(streamInfo: StreamInfo) {+ lastStreamInfo = streamInfo+ retryCount = 0+ lastFrameRate = 0f+ handler.removeCallbacksAndMessages(null)val player = getOrCreatePlayer()_error.tryEmit(null)_playerStats.value = PlayerStats() // reset stats@@ -417,13 +441,25 @@ class Media3PlayerEngine @Inject constructor(override fun release() {stopPolling()+ handler.removeCallbacksAndMessages(null)exoPlayer?.release()exoPlayer = null+ lastStreamInfo = nullscope.cancel()_playbackState.value = PlaybackState.IDLE_isPlaying.value = false}+ private fun isRecoverableError(error: PlaybackException): Boolean {+ return when (error.errorCode) {+ PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED,+ PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_TIMEOUT,+ PlaybackException.ERROR_CODE_IO_UNSPECIFIED,+ PlaybackException.ERROR_CODE_BEHIND_LIVE_WINDOW -> true+ else -> false+ }+ }+private fun startPolling() {pollingJob?.cancel()pollingJob = scope.launch {