From 8f4cd6d7f2394f9fa5e011555896b0989edd6428 Mon Sep 17 00:00:00 2001 From: kalarina Date: Sat, 31 Oct 2026 11:59:09 +0200 Subject: [PATCH] Drop migration of data from old versions --- .../main/java/cc/skysparkle/sparkledns/Blocklist.kt | 13 ------------- .../main/java/cc/skysparkle/sparkledns/CrashLog.kt | 2 -- 2 files changed, 15 deletions(-) diff --git a/app/src/main/java/cc/skysparkle/sparkledns/Blocklist.kt b/app/src/main/java/cc/skysparkle/sparkledns/Blocklist.kt index 81602c9..0de3489 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/Blocklist.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/Blocklist.kt @@ -377,7 +377,6 @@ private class BlocklistStore(context: Context) { fun loadListHashes(url: String): LongArray { val file = binFile(url) - if (!file.exists()) migrateText(url)?.let { return it } if (!file.exists()) return LongArray(0) return runCatching { FileInputStream(file).use { stream -> @@ -391,7 +390,6 @@ private class BlocklistStore(context: Context) { fun deleteListFile(url: String) { binFile(url).delete() - textFile(url).delete() sp.edit().remove(etagKey(url)).remove(modifiedKey(url)).apply() } @@ -440,16 +438,6 @@ private class BlocklistStore(context: Context) { } } - // Lists saved by older versions as plain text are converted once - private fun migrateText(url: String): LongArray? { - val text = textFile(url) - if (!text.exists()) return null - val result = text.readLines().map { DomainHash.of(it) }.toLongArray().sortUnique() - runCatching { write(url, result) } - text.delete() - return result - } - private fun etagKey(url: String) = "etag_${hash(url)}" private fun modifiedKey(url: String) = "modified_${hash(url)}" @@ -457,7 +445,6 @@ private class BlocklistStore(context: Context) { if (value == null) remove(key) else putString(key, value) private fun binFile(url: String) = File(dir, "list_${hash(url)}.bin") - private fun textFile(url: String) = File(dir, "list_${hash(url)}.txt") private fun hash(url: String) = MessageDigest.getInstance("SHA-256").digest(url.toByteArray()) .take(8).joinToString("") { "%02x".format(it) } diff --git a/app/src/main/java/cc/skysparkle/sparkledns/CrashLog.kt b/app/src/main/java/cc/skysparkle/sparkledns/CrashLog.kt index 4450f74..2104bd8 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/CrashLog.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/CrashLog.kt @@ -21,8 +21,6 @@ class SparkleApp : Application() { Prefs(this).providerId CrashLog.load(this) StatsStore.init(this) - // Older versions cached a server list downloaded from the repository - File(filesDir, "servers.txt").delete() AutoUpdate.apply(this) // Lists can hold millions of entries; loading them should not take CPU from the first frames Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND)