From f1eccda86528e90a5b8c0e338ec000e42d5263be Mon Sep 17 00:00:00 2001 From: kunfei Date: Thu, 20 Apr 2023 08:20:30 +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, 4 insertions(+), 2 deletions(-) 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 a553a8cce..583eb8107 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 @@ -158,7 +158,7 @@ object Restore { } File(path, "servers.json").takeIf { it.exists() - }?.run { + }?.runCatching { var json = readText() if (!json.isJsonArray()) { json = aes.decryptStr(json) @@ -166,6 +166,8 @@ object Restore { GSON.fromJsonArray(json).getOrNull()?.let { appDb.serverDao.insert(*it.toTypedArray()) } + }?.onFailure { + AppLog.put("恢复服务器配置出错\n${it.localizedMessage}", it) } File(path, DirectLinkUpload.ruleFileName).takeIf { it.exists() @@ -173,7 +175,7 @@ object Restore { val json = readText() ACache.get(cacheDir = false).put(DirectLinkUpload.ruleFileName, json) }?.onFailure { - AppLog.put("直链上传恢复出错\n${it.localizedMessage}", it) + AppLog.put("恢复直链上传出错\n${it.localizedMessage}", it) } //恢复主题配置 File(path, ThemeConfig.configFileName).takeIf {