Drop migration of data from old versions

This commit is contained in:
2026-10-31 11:59:09 +02:00
parent c929a827c5
commit 8f4cd6d7f2
2 changed files with 0 additions and 15 deletions
@@ -377,7 +377,6 @@ private class BlocklistStore(context: Context) {
fun loadListHashes(url: String): LongArray { fun loadListHashes(url: String): LongArray {
val file = binFile(url) val file = binFile(url)
if (!file.exists()) migrateText(url)?.let { return it }
if (!file.exists()) return LongArray(0) if (!file.exists()) return LongArray(0)
return runCatching { return runCatching {
FileInputStream(file).use { stream -> FileInputStream(file).use { stream ->
@@ -391,7 +390,6 @@ private class BlocklistStore(context: Context) {
fun deleteListFile(url: String) { fun deleteListFile(url: String) {
binFile(url).delete() binFile(url).delete()
textFile(url).delete()
sp.edit().remove(etagKey(url)).remove(modifiedKey(url)).apply() 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 etagKey(url: String) = "etag_${hash(url)}"
private fun modifiedKey(url: String) = "modified_${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) if (value == null) remove(key) else putString(key, value)
private fun binFile(url: String) = File(dir, "list_${hash(url)}.bin") 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()) private fun hash(url: String) = MessageDigest.getInstance("SHA-256").digest(url.toByteArray())
.take(8).joinToString("") { "%02x".format(it) } .take(8).joinToString("") { "%02x".format(it) }
@@ -21,8 +21,6 @@ class SparkleApp : Application() {
Prefs(this).providerId Prefs(this).providerId
CrashLog.load(this) CrashLog.load(this)
StatsStore.init(this) StatsStore.init(this)
// Older versions cached a server list downloaded from the repository
File(filesDir, "servers.txt").delete()
AutoUpdate.apply(this) AutoUpdate.apply(this)
// Lists can hold millions of entries; loading them should not take CPU from the first frames // Lists can hold millions of entries; loading them should not take CPU from the first frames
Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND) Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND)