From 3a75f7718ad8b5421ed708e6c619e3c779b580d3 Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 3 Dec 2023 14:58:08 -0500 Subject: [PATCH] Force recreate download index cache on upgrade Fixes #10187 (cherry picked from commit ccadfc8fe53ff1b8ab66b0e91a4fa5a21481bcda) # Conflicts: # app/build.gradle.kts --- app/src/main/java/eu/kanade/tachiyomi/Migrations.kt | 5 +++++ .../java/eu/kanade/tachiyomi/data/download/DownloadCache.kt | 2 +- app/src/main/java/exh/EXHMigrations.kt | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt index 8f12972c4..5c7539366 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt @@ -419,6 +419,11 @@ object Migrations { newKey = { Preference.appStateKey(it) }, ) } + if (oldVersion < 111) { + File(context.cacheDir, "dl_index_cache") + .takeIf { it.exists() } + ?.delete() + } return true } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt index ca86efe3e..baba2b761 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt @@ -94,7 +94,7 @@ class DownloadCache( .stateIn(scope, SharingStarted.WhileSubscribed(), false) private val diskCacheFile: File - get() = File(context.cacheDir, "dl_index_cache") + get() = File(context.cacheDir, "dl_index_cache_v2") private val rootDownloadsDirLock = Mutex() private var rootDownloadsDir = RootDirectory(provider.downloadsDir) diff --git a/app/src/main/java/exh/EXHMigrations.kt b/app/src/main/java/exh/EXHMigrations.kt index c49260fc9..1e6adc9a1 100644 --- a/app/src/main/java/exh/EXHMigrations.kt +++ b/app/src/main/java/exh/EXHMigrations.kt @@ -665,6 +665,10 @@ object EXHMigrations { filterPredicate = { it.key in privatePrefsToReplace }, newKey = { Preference.privateKey(it) }, ) + + File(context.cacheDir, "dl_index_cache") + .takeIf { it.exists() } + ?.delete() } // if (oldVersion under 1) { } (1 is current release version)