优化

app/src/main/java/io/legado/app/help/storage/Restore.kt

@@ -167,46 +167,43 @@ object Restore {
                 appDb.serverDao.insert(*it.toTypedArray())
             }
         }
-        try {
+        File(path, DirectLinkUpload.ruleFileName).takeIf {
-            val file = File(path, DirectLinkUpload.ruleFileName)
+            it.exists()
-            if (file.exists()) {
+        }?.runCatching {
-                val json = file.readText()
+            val json = readText()
             ACache.get(cacheDir = false).put(DirectLinkUpload.ruleFileName, json)
+        }?.onFailure {
+            AppLog.put("直链上传恢复出错\n${it.localizedMessage}", it)
         }
-        } catch (e: Exception) {
+        //恢复主题配置
-            AppLog.put("直链上传出错\n${e.localizedMessage}", e)
+        File(path, ThemeConfig.configFileName).takeIf {
-        }
+            it.exists()
-        try {
+        }?.runCatching {
-            val file = File(path, ThemeConfig.configFileName)
-            if (file.exists()) {
             FileUtils.delete(ThemeConfig.configFilePath)
-                file.copyTo(File(ThemeConfig.configFilePath))
+            copyTo(File(ThemeConfig.configFilePath))
             ThemeConfig.upConfig()
-            }
+        }?.onFailure {
-        } catch (e: Exception) {
+            AppLog.put("恢复主题出错\n${it.localizedMessage}", it)
-            AppLog.put("恢复主题出错\n${e.localizedMessage}", e)
         }
         if (!BackupConfig.ignoreReadConfig) {
             //恢复阅读界面配置
-            try {
+            File(path, ReadBookConfig.configFileName).takeIf {
-                val file = File(path, ReadBookConfig.configFileName)
+                it.exists()
-                if (file.exists()) {
+            }?.runCatching {
                 FileUtils.delete(ReadBookConfig.configFilePath)
-                    file.copyTo(File(ReadBookConfig.configFilePath))
+                copyTo(File(ReadBookConfig.configFilePath))
                 ReadBookConfig.initConfigs()
+            }?.onFailure {
+                AppLog.put("恢复阅读界面出错\n${it.localizedMessage}", it)
             }
-            } catch (e: Exception) {
+            File(path, ReadBookConfig.shareConfigFileName).takeIf {
-                AppLog.put("恢复阅读界面出错\n${e.localizedMessage}", e)
+                it.exists()
-            }
+            }?.runCatching {
-            try {
-                val file = File(path, ReadBookConfig.shareConfigFileName)
-                if (file.exists()) {
                 FileUtils.delete(ReadBookConfig.shareConfigFilePath)
-                    file.copyTo(File(ReadBookConfig.shareConfigFilePath))
+                copyTo(File(ReadBookConfig.shareConfigFilePath))
                 ReadBookConfig.initShareConfig()
-                }
+            }?.onFailure {
-            } catch (e: Exception) {
+                AppLog.put("恢复阅读界面出错\n${it.localizedMessage}", it)
-                AppLog.put("恢复阅读界面出错\n${e.localizedMessage}", e)
             }
         }
         appCtx.getSharedPreferences(path, "config")?.all?.let { map ->