Skip to content

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

fixed EPG issue

David Nashash3b027df2cb8f
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 914f502e..1215ab48 100644
--- a/data/src/main/java/com/streamvault/data/repository/EpgRepositoryImpl.kt
+++ b/data/src/main/java/com/streamvault/data/repository/EpgRepositoryImpl.kt
@@ -42,7 +42,6 @@ import java.io.FilterInputStream
import java.io.InputStream
import java.io.IOException
import java.util.concurrent.TimeUnit
-import java.util.zip.GZIPInputStream
import com.streamvault.data.remote.NetworkTimeoutConfig
import java.util.concurrent.ConcurrentHashMap
import javax.inject.Inject
@@ -244,63 +243,49 @@ class EpgRepositoryImpl @Inject constructor(
?: HttpRequestProfile(ownerTag = "provider:$providerId/epg")
val request = Request.Builder()
.url(epgUrl)
- .header("Accept-Encoding", "identity")
.build()
.withRequestProfile(providerRequestProfile)
- val response = epgHttpClient.newCall(request).execute()
-
- if (!response.isSuccessful) {
- Log.w(
- "EpgRepository",
- "EPG request failed for provider $providerId (${request.safeRequestIdentitySummary(providerRequestProfile)}): HTTP ${response.code}"
- )
- return@withLock 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@withLock Result.error("EPG file too large (${contentLength / 1_048_576}MB)")
- }
+ epgHttpClient.newCall(request).execute().use { response ->
+ if (!response.isSuccessful) {
+ Log.w(
+ "EpgRepository",
+ "EPG request failed for provider $providerId (${request.safeRequestIdentitySummary(providerRequestProfile)}): HTTP ${response.code}"
+ )
+ return@withLock Result.error("Failed to download EPG: HTTP ${response.code}")
+ }
- val body = response.body ?: return@withLock Result.error("Empty EPG response")
- val contentEncoding = response.header("Content-Encoding")
+ val contentLength = response.header("Content-Length")?.toLongOrNull() ?: -1L
+ if (contentLength > MAX_EPG_SIZE_BYTES) {
+ return@withLock Result.error("EPG file too large (${contentLength / 1_048_576}MB)")
+ }
- transactionRunner.inTransaction {
- programDao.deleteByProvider(stagingProviderId)
- }
+ val body = response.body ?: return@withLock Result.error("Empty EPG response")
- body.byteStream().use { rawStream ->
- val alreadyDecompressed = contentEncoding?.contains("gzip", ignoreCase = true) == true
- // Decompress Content-Encoding: gzip manually since we requested
- // Accept-Encoding: identity to disable OkHttp's transparent decompression.
- val httpStream: InputStream = if (alreadyDecompressed) {
- GZIPInputStream(rawStream)
- } else {
- rawStream
+ transactionRunner.inTransaction {
+ programDao.deleteByProvider(stagingProviderId)
}
- // Cap total bytes read even when Content-Length is absent (chunked transfer)
- val limitedStream = object : FilterInputStream(httpStream) {
- private var bytesRead = 0L
- override fun read(): Int {
- if (bytesRead >= MAX_EPG_SIZE_BYTES) throw IOException("EPG response too large (>200 MB)")
- return super.read().also { if (it >= 0) bytesRead++ }
- }
- override fun read(b: ByteArray, off: Int, len: Int): Int {
- if (bytesRead >= MAX_EPG_SIZE_BYTES) throw IOException("EPG response too large (>200 MB)")
- return super.read(b, off, len).also { if (it > 0) bytesRead += it }
+
+ body.byteStream().use { rawStream ->
+ // Let OkHttp negotiate/decompress standard gzip responses. We still
+ // inspect the bytes so download-style URLs that return raw `.gz`
+ // payloads without transparent decompression continue to work.
+ val limitedStream = object : FilterInputStream(rawStream) {
+ private var bytesRead = 0L
+ override fun read(): Int {
+ if (bytesRead >= MAX_EPG_SIZE_BYTES) throw IOException("EPG response too large (>200 MB)")
+ return super.read().also { if (it >= 0) bytesRead++ }
+ }
+ override fun read(b: ByteArray, off: Int, len: Int): Int {
+ if (bytesRead >= MAX_EPG_SIZE_BYTES) throw IOException("EPG response too large (>200 MB)")
+ return super.read(b, off, len).also { if (it > 0) bytesRead += it }
+ }
}
- }
- val xmlInput: InputStream = if (alreadyDecompressed) {
- limitedStream
- } else {
- xmltvParser.maybeDecompressGzip(epgUrl, limitedStream)
- }
- xmlInput.use {
- xmltvParser.parseStreaming(xmlInput, timezoneId = providerTimezoneId) { program ->
- batch.add(program.copy(providerId = stagingProviderId).toEntity())
- if (batch.size >= EPG_PROGRAM_BATCH_SIZE) {
- flushBatch()
+ xmltvParser.maybeDecompressGzip(epgUrl, limitedStream).use { xmlInput ->
+ xmltvParser.parseStreaming(xmlInput, timezoneId = providerTimezoneId) { program ->
+ batch.add(program.copy(providerId = stagingProviderId).toEntity())
+ if (batch.size >= EPG_PROGRAM_BATCH_SIZE) {
+ flushBatch()
+ }
}
}
}
diff --git a/data/src/main/java/com/streamvault/data/repository/EpgSourceRepositoryImpl.kt b/data/src/main/java/com/streamvault/data/repository/EpgSourceRepositoryImpl.kt
index cd7d7e4e..0cd6e4c6 100644
--- a/data/src/main/java/com/streamvault/data/repository/EpgSourceRepositoryImpl.kt
+++ b/data/src/main/java/com/streamvault/data/repository/EpgSourceRepositoryImpl.kt
@@ -47,7 +47,6 @@ import okhttp3.Request
import java.io.FilterInputStream
import java.io.IOException
import java.util.concurrent.TimeUnit
-import java.util.zip.GZIPInputStream
import com.streamvault.data.remote.NetworkTimeoutConfig
import dagger.hilt.android.qualifiers.ApplicationContext
import java.util.concurrent.ConcurrentHashMap
@@ -239,14 +238,12 @@ class EpgSourceRepositoryImpl @Inject constructor(
return@withLock Result.error(err)
}
} else {
- // Disable OkHttp's transparent gzip by requesting identity encoding.
- // This prevents double-decompression when the URL ends in .gz:
- // OkHttp would silently decompress gzip responses, and then
- // maybeDecompressGzip() would try again — corrupting the stream.
+ // Let OkHttp negotiate/decompress standard gzip responses. We still
+ // inspect the payload bytes later so download URLs that return raw
+ // gzip data without transparent decompression continue to work.
val requestProfile = HttpRequestProfile(ownerTag = "epg-source:$sourceId")
val request = Request.Builder()
.url(source.url)
- .header("Accept-Encoding", "identity")
.apply {
source.etag?.let { header("If-None-Match", it) }
source.lastModifiedHeader?.let { header("If-Modified-Since", it) }
@@ -285,19 +282,20 @@ class EpgSourceRepositoryImpl @Inject constructor(
}
val bodyStream = response.body?.byteStream() ?: run {
+ response.close()
epgSourceDao.updateRefreshError(sourceId, "Empty response")
return@withLock Result.error("Empty EPG response")
}
responseEtag = response.header("ETag")
responseLastModified = response.header("Last-Modified")
- // Some servers send Content-Encoding: gzip even when identity was requested.
- // Since OkHttp no longer decompresses (we set Accept-Encoding manually),
- // we must handle it here.
- val contentEncoding = response.header("Content-Encoding")
- if (contentEncoding?.contains("gzip", ignoreCase = true) == true) {
- GZIPInputStream(bodyStream)
- } else {
- bodyStream
+ object : FilterInputStream(bodyStream) {
+ override fun close() {
+ try {
+ super.close()
+ } finally {
+ response.close()
+ }
+ }
}
}
diff --git a/data/src/test/java/com/streamvault/data/repository/EpgRepositoryImplTest.kt b/data/src/test/java/com/streamvault/data/repository/EpgRepositoryImplTest.kt
index b881a3c1..bf74948b 100644
--- a/data/src/test/java/com/streamvault/data/repository/EpgRepositoryImplTest.kt
+++ b/data/src/test/java/com/streamvault/data/repository/EpgRepositoryImplTest.kt
@@ -24,6 +24,7 @@ import kotlinx.coroutines.test.runTest
import okhttp3.MediaType.Companion.toMediaType
import okhttp3.OkHttpClient
import okhttp3.Protocol
+import okhttp3.Request
import okhttp3.Response
import okhttp3.ResponseBody.Companion.toResponseBody
import org.junit.Before
@@ -324,6 +325,27 @@ class EpgRepositoryImplTest {
assertThat(insertedPrograms.allValues.flatten().map { it.title }).contains("CDN Morning News")
}
+ @Test
+ fun `refreshEpg does not force identity encoding`() = runTest {
+ val requestRef = java.util.concurrent.atomic.AtomicReference<Request>()
+ val repository = EpgRepositoryImpl(
+ programDao = programDao,
+ providerDao = providerDao,
+ xmltvParser = xmltvParser,
+ okHttpClient = okHttpClientReturningBody(
+ body = "<tv></tv>".toByteArray(Charsets.UTF_8),
+ onRequest = { requestRef.set(it) }
+ ),
+ transactionRunner = transactionRunner,
+ epgSourceRepository = epgSourceRepository
+ )
+
+ val result = repository.refreshEpg(7L, "https://example.com/epg.xml")
+
+ assertThat(result.isSuccess).isTrue()
+ assertThat(requestRef.get()?.header("Accept-Encoding")).isNull()
+ }
+
@Test
fun `getNowPlaying refreshes over time for long lived subscriptions`() = runTest {
whenever(programDao.getNowPlaying(eq(7L), eq("bbc1.uk"), any())).thenReturn(
@@ -630,10 +652,12 @@ class EpgRepositoryImplTest {
private fun okHttpClientReturningBody(
body: ByteArray,
contentType: String = "application/xml",
- headers: Map<String, String> = emptyMap()
+ headers: Map<String, String> = emptyMap(),
+ onRequest: ((Request) -> Unit)? = null
): OkHttpClient =
OkHttpClient.Builder()
.addInterceptor { chain ->
+ onRequest?.invoke(chain.request())
Response.Builder().apply {
headers.forEach { (name, value) -> addHeader(name, value) }
}
diff --git a/data/src/test/java/com/streamvault/data/repository/EpgSourceRepositoryImplTest.kt b/data/src/test/java/com/streamvault/data/repository/EpgSourceRepositoryImplTest.kt
index c234fa7f..5f538189 100644
--- a/data/src/test/java/com/streamvault/data/repository/EpgSourceRepositoryImplTest.kt
+++ b/data/src/test/java/com/streamvault/data/repository/EpgSourceRepositoryImplTest.kt
@@ -347,6 +347,36 @@ class EpgSourceRepositoryImplTest {
verify(epgSourceDao).updateRefreshSuccess(eq(10L), any())
}
+ @Test
+ fun `refreshSource does not force identity encoding for remote downloads`() = runTest {
+ val source = EpgSourceEntity(
+ id = 10L,
+ name = "MyEPG",
+ url = "https://myepg.example/download?order=private&key=redacted",
+ lastRefreshAt = 0L
+ )
+ val requestCaptor = argumentCaptor<Request>()
+ val response = Response.Builder()
+ .request(Request.Builder().url(source.url).build())
+ .protocol(Protocol.HTTP_1_1)
+ .code(200)
+ .message("OK")
+ .body("<tv></tv>".toResponseBody("application/xml".toMediaType()))
+ .build()
+ val call: Call = mock()
+
+ whenever(epgSourceDao.getById(10L)).thenReturn(source)
+ whenever(okHttpClient.newCall(requestCaptor.capture())).thenReturn(call)
+ whenever(call.execute()).thenReturn(response)
+ whenever(providerEpgSourceDao.getProviderIdsForSourceSync(10L)).thenReturn(emptyList())
+ whenever(xmltvParser.maybeDecompressGzip(eq(source.url), any())).thenAnswer { it.arguments[1] }
+
+ val result = repository.refreshSource(10L)
+
+ assertThat(result is Result.Success).isTrue()
+ assertThat(requestCaptor.firstValue.header("Accept-Encoding")).isNull()
+ }
+
@Test
fun `refreshSource rebuilds affected providers when remote source returns 304`() = runTest {
val source = EpgSourceEntity(