From 1779754ca3283523d78134d7ad535fd604a075fa Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Tue, 19 Apr 2022 20:18:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E4=BB=BD=E9=94=AE=E7=9B=98=E8=BE=85?=
 =?UTF-8?q?=E5=8A=A9=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/io/legado/app/help/DefaultData.kt   |  7 ++-----
 .../main/java/io/legado/app/help/storage/Backup.kt    | 11 ++++++-----
 .../main/java/io/legado/app/help/storage/Restore.kt   |  5 ++---
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/io/legado/app/help/DefaultData.kt b/app/src/main/java/io/legado/app/help/DefaultData.kt
index 33ebfb05e..3b569acb8 100644
--- a/app/src/main/java/io/legado/app/help/DefaultData.kt
+++ b/app/src/main/java/io/legado/app/help/DefaultData.kt
@@ -16,13 +16,10 @@ import java.io.File
 
 object DefaultData {
 
-    const val httpTtsFileName = "httpTTS.json"
-    const val txtTocRuleFileName = "txtTocRule.json"
-
     val httpTTS: List<HttpTTS> by lazy {
         val json =
             String(
-                appCtx.assets.open("defaultData${File.separator}$httpTtsFileName")
+                appCtx.assets.open("defaultData${File.separator}httpTTS.json")
                     .readBytes()
             )
         HttpTTS.fromJsonArray(json)
@@ -39,7 +36,7 @@ object DefaultData {
 
     val txtTocRules: List<TxtTocRule> by lazy {
         val json = String(
-            appCtx.assets.open("defaultData${File.separator}$txtTocRuleFileName")
+            appCtx.assets.open("defaultData${File.separator}txtTocRule.json")
                 .readBytes()
         )
         GSON.fromJsonArray<TxtTocRule>(json).getOrNull() ?: emptyList()
diff --git a/app/src/main/java/io/legado/app/help/storage/Backup.kt b/app/src/main/java/io/legado/app/help/storage/Backup.kt
index b117020bb..3383e6464 100644
--- a/app/src/main/java/io/legado/app/help/storage/Backup.kt
+++ b/app/src/main/java/io/legado/app/help/storage/Backup.kt
@@ -7,7 +7,6 @@ import io.legado.app.R
 import io.legado.app.constant.AppLog
 import io.legado.app.constant.PreferKey
 import io.legado.app.data.appDb
-import io.legado.app.help.DefaultData
 import io.legado.app.help.config.ReadBookConfig
 import io.legado.app.help.config.ThemeConfig
 import io.legado.app.help.coroutine.Coroutine
@@ -38,8 +37,9 @@ object Backup {
             "readRecord.json",
             "searchHistory.json",
             "sourceSub.json",
-            DefaultData.txtTocRuleFileName,
-            DefaultData.httpTtsFileName,
+            "txtTocRule.json",
+            "httpTTS.json",
+            "keyboardAssists.json",
             ReadBookConfig.configFileName,
             ReadBookConfig.shareConfigFileName,
             ThemeConfig.configFileName,
@@ -77,8 +77,9 @@ object Backup {
             writeListToJson(appDb.readRecordDao.all, "readRecord.json", backupPath)
             writeListToJson(appDb.searchKeywordDao.all, "searchHistory.json", backupPath)
             writeListToJson(appDb.ruleSubDao.all, "sourceSub.json", backupPath)
-            writeListToJson(appDb.txtTocRuleDao.all, DefaultData.txtTocRuleFileName, backupPath)
-            writeListToJson(appDb.httpTTSDao.all, DefaultData.httpTtsFileName, backupPath)
+            writeListToJson(appDb.txtTocRuleDao.all, "txtTocRule.json", backupPath)
+            writeListToJson(appDb.httpTTSDao.all, "httpTTS.json", backupPath)
+            writeListToJson(appDb.keyboardAssistsDao.all, "keyboardAssists.json", backupPath)
             GSON.toJson(ReadBookConfig.configList).let {
                 FileUtils.createFileIfNotExist(backupPath + File.separator + ReadBookConfig.configFileName)
                     .writeText(it)
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 884cb923b..10f874cd6 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
@@ -11,7 +11,6 @@ import io.legado.app.constant.EventBus
 import io.legado.app.constant.PreferKey
 import io.legado.app.data.appDb
 import io.legado.app.data.entities.*
-import io.legado.app.help.DefaultData
 import io.legado.app.help.LauncherIconHelp
 import io.legado.app.help.config.ReadBookConfig
 import io.legado.app.help.config.ThemeConfig
@@ -96,10 +95,10 @@ object Restore {
             fileToListT<RuleSub>(path, "sourceSub.json")?.let {
                 appDb.ruleSubDao.insert(*it.toTypedArray())
             }
-            fileToListT<TxtTocRule>(path, DefaultData.txtTocRuleFileName)?.let {
+            fileToListT<TxtTocRule>(path, "txtTocRule.json")?.let {
                 appDb.txtTocRuleDao.insert(*it.toTypedArray())
             }
-            fileToListT<HttpTTS>(path, DefaultData.httpTtsFileName)?.let {
+            fileToListT<HttpTTS>(path, "httpTTS.json")?.let {
                 appDb.httpTTSDao.insert(*it.toTypedArray())
             }
             fileToListT<ReadRecord>(path, "readRecord.json")?.let {