Skip to content

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

Port safe storage reductions from PR 172

David Nashashfaf6d2b683bd
diff --git a/app/src/main/java/com/streamvault/app/di/NetworkModule.kt b/app/src/main/java/com/streamvault/app/di/NetworkModule.kt
index 379227a6..49cf92cb 100644
--- a/app/src/main/java/com/streamvault/app/di/NetworkModule.kt
+++ b/app/src/main/java/com/streamvault/app/di/NetworkModule.kt
@@ -37,6 +37,8 @@ import javax.inject.Singleton
@InstallIn(SingletonComponent::class)
object NetworkModule {
+ private const val HTTP_CACHE_MAX_BYTES = 16L * 1024 * 1024
+
@Provides
@Singleton
fun provideOkHttpClient(
@@ -60,7 +62,7 @@ object NetworkModule {
.cache(
Cache(
directory = File(context.cacheDir, "streamvault_http_cache"),
- maxSize = 256L * 1024 * 1024
+ maxSize = HTTP_CACHE_MAX_BYTES
)
)
.connectTimeout(NetworkTimeoutConfig.CONNECT_TIMEOUT_SECONDS, SECONDS)
diff --git a/data/src/main/java/com/streamvault/data/sync/DatabaseMaintenanceManager.kt b/data/src/main/java/com/streamvault/data/sync/DatabaseMaintenanceManager.kt
index 7a73ac6a..8e2db7c3 100644
--- a/data/src/main/java/com/streamvault/data/sync/DatabaseMaintenanceManager.kt
+++ b/data/src/main/java/com/streamvault/data/sync/DatabaseMaintenanceManager.kt
@@ -16,6 +16,14 @@ import javax.inject.Singleton
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
+private const val MILLIS_PER_DAY = 24L * 60 * 60 * 1000L
+
+// Keep enough history for the maximum supported +/-12-hour EPG correction.
+private const val PROGRAM_MIN_RETENTION_MILLIS = 12L * 60 * 60 * 1000L
+
+internal fun calculateProgramRetentionMillis(catchUpDays: Int): Long =
+ maxOf(PROGRAM_MIN_RETENTION_MILLIS, catchUpDays.coerceAtLeast(0) * MILLIS_PER_DAY)
+
@Singleton
class DatabaseMaintenanceManager @Inject constructor(
private val database: StreamVaultDatabase,
@@ -137,8 +145,8 @@ class DatabaseMaintenanceManager @Inject constructor(
}
private suspend fun programRetentionMillis(): Long {
- val catchUpDays = channelDao.getMaxCatchUpDaysAcrossAllProviders().coerceAtLeast(0)
- return maxOf(PROGRAM_MIN_RETENTION_MILLIS, catchUpDays * MILLIS_PER_DAY)
+ val catchUpDays = channelDao.getMaxCatchUpDaysAcrossAllProviders()
+ return calculateProgramRetentionMillis(catchUpDays)
}
@WorkerThread
@@ -215,8 +223,6 @@ class DatabaseMaintenanceManager @Inject constructor(
companion object {
private const val TAG = "DbMaintenance"
- private const val MILLIS_PER_DAY = 24L * 60 * 60 * 1000L
- private const val PROGRAM_MIN_RETENTION_MILLIS = MILLIS_PER_DAY
private const val PROGRAM_REMINDER_RETENTION_MILLIS = MILLIS_PER_DAY
private const val SEARCH_HISTORY_RETENTION_MILLIS = 90L * MILLIS_PER_DAY
private const val MIN_RECLAIMABLE_BYTES = 32L * 1024 * 1024
diff --git a/data/src/test/java/com/streamvault/data/sync/DatabaseMaintenancePolicyTest.kt b/data/src/test/java/com/streamvault/data/sync/DatabaseMaintenancePolicyTest.kt
new file mode 100644
index 00000000..80c88fc6
--- /dev/null
+++ b/data/src/test/java/com/streamvault/data/sync/DatabaseMaintenancePolicyTest.kt
@@ -0,0 +1,25 @@
+package com.streamvault.data.sync
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class DatabaseMaintenancePolicyTest {
+
+ @Test
+ fun `program retention covers maximum EPG correction without catch-up`() {
+ assertThat(calculateProgramRetentionMillis(catchUpDays = 0))
+ .isEqualTo(12L * 60 * 60 * 1000L)
+ }
+
+ @Test
+ fun `program retention ignores invalid negative catch-up days`() {
+ assertThat(calculateProgramRetentionMillis(catchUpDays = -1))
+ .isEqualTo(12L * 60 * 60 * 1000L)
+ }
+
+ @Test
+ fun `program retention preserves provider catch-up window`() {
+ assertThat(calculateProgramRetentionMillis(catchUpDays = 7))
+ .isEqualTo(7L * 24 * 60 * 60 * 1000L)
+ }
+}