From aca8075a49e6230ee81220d85af684f7ace11a74 Mon Sep 17 00:00:00 2001 From: kunfei Date: Wed, 19 Apr 2023 22:31:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/io/legado/app/help/storage/Restore.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/io/legado/app/help/storage/Restore.kt b/app/src/main/java/io/legado/app/help/storage/Restore.kt index 1da04c9dc..43844ad64 100644 --- a/app/src/main/java/io/legado/app/help/storage/Restore.kt +++ b/app/src/main/java/io/legado/app/help/storage/Restore.kt @@ -44,6 +44,7 @@ import io.legado.app.utils.getPrefInt import io.legado.app.utils.getPrefString import io.legado.app.utils.getSharedPreferences import io.legado.app.utils.isContentScheme +import io.legado.app.utils.isJsonArray import io.legado.app.utils.openInputStream import io.legado.app.utils.postEvent import io.legado.app.utils.toastOnUi @@ -160,7 +161,10 @@ object Restore { File(path, "servers.json").takeIf { it.exists() }?.run { - val json = aes.decryptStr(readText()) + var json = readText() + if (!json.isJsonArray()) { + json = aes.decryptStr(json) + } GSON.fromJsonArray(json).getOrNull()?.let { appDb.serverDao.insert(*it.toTypedArray()) }