From cdbfe6d1b00a601fdcbe4524ddc86cea3fe06b5b Mon Sep 17 00:00:00 2001
From: gedoor <gekunfei@live.com>
Date: Sat, 24 Oct 2020 09:49:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=B8=85=E9=99=A4=E8=BF=87=E6=9C=9F=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/legado/app/constant/PreferKey.kt     |  1 +
 .../io/legado/app/ui/welcome/WelcomeActivity.kt  |  7 +++++--
 app/src/main/res/values-zh-rHK/strings.xml       |  2 ++
 app/src/main/res/values-zh-rTW/strings.xml       |  2 ++
 app/src/main/res/values-zh/strings.xml           |  2 ++
 app/src/main/res/values/strings.xml              |  2 ++
 app/src/main/res/xml/pref_config_other.xml       | 16 +++++++++++-----
 7 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/io/legado/app/constant/PreferKey.kt b/app/src/main/java/io/legado/app/constant/PreferKey.kt
index b55f35d57..0aa00ac2a 100644
--- a/app/src/main/java/io/legado/app/constant/PreferKey.kt
+++ b/app/src/main/java/io/legado/app/constant/PreferKey.kt
@@ -51,6 +51,7 @@ object PreferKey {
     const val defaultCover = "defaultCover"
     const val replaceEnableDefault = "replaceEnableDefault"
     const val showBrightnessView = "showBrightnessView"
+    const val autoClearExpired = "autoClearExpired"
 
     const val cPrimary = "colorPrimary"
     const val cAccent = "colorAccent"
diff --git a/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt b/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt
index c22b8ec13..f3f4e0be7 100644
--- a/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt
@@ -6,6 +6,7 @@ import com.hankcs.hanlp.HanLP
 import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.base.BaseActivity
+import io.legado.app.constant.PreferKey
 import io.legado.app.help.AppConfig
 import io.legado.app.help.coroutine.Coroutine
 import io.legado.app.help.storage.SyncBookProgress
@@ -33,8 +34,10 @@ open class WelcomeActivity : BaseActivity(R.layout.activity_welcome) {
     private fun init() {
         Coroutine.async {
             //清除过期数据
-            App.db.searchBookDao()
-                .clearExpired(System.currentTimeMillis() - TimeUnit.DAYS.toMillis(1))
+            if (getPrefBoolean(PreferKey.autoClearExpired, true)) {
+                App.db.searchBookDao()
+                    .clearExpired(System.currentTimeMillis() - TimeUnit.DAYS.toMillis(1))
+            }
             //初始化简繁转换引擎
             when (AppConfig.chineseConverterType) {
                 1 -> HanLP.convertToSimplifiedChinese("初始化")
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 598a5577d..a0c4f79a5 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -771,5 +771,7 @@
     <string name="explore_empty">当前没有发现源,关注公众号[开源阅读]添加带发现的书源!</string>
     <string name="page_key_set_help">将焦点放到输入框按下物理按键会自动录入键值,多个按键会自动用英文逗号隔开.</string>
     <string name="theme_name">主题名称</string>
+    <string name="auto_clear_expired">自动清除过期搜索数据</string>
+    <string name="auto_clear_expired_summary">超过一天的搜索数据</string>
 
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 17b939c02..43de70b8f 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -771,5 +771,7 @@
     <string name="explore_empty">目前沒有發現源,關注公眾號[开源阅读]添加包含發現的書源!</string>
     <string name="page_key_set_help">将焦点放到输入框按下物理按键会自动录入键值,多个按键会自动用英文逗号隔开.</string>
     <string name="theme_name">主题名称</string>
+    <string name="auto_clear_expired">自动清除过期搜索数据</string>
+    <string name="auto_clear_expired_summary">超过一天的搜索数据</string>
 
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 18c518d9c..62f3865dd 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -774,5 +774,7 @@
     <string name="explore_empty">当前没有发现源,关注公众号[开源阅读]添加带发现的书源!</string>
     <string name="page_key_set_help">将焦点放到输入框按下物理按键会自动录入键值,多个按键会自动用英文逗号隔开.</string>
     <string name="theme_name">主题名称</string>
+    <string name="auto_clear_expired">自动清除过期搜索数据</string>
+    <string name="auto_clear_expired_summary">超过一天的搜索数据</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cdb9bc509..870f42f73 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -777,5 +777,7 @@
     <string name="explore_empty">当前没有发现源,关注公众号[开源阅读]添加带发现的书源!</string>
     <string name="page_key_set_help">将焦点放到输入框按下物理按键会自动录入键值,多个按键会自动用英文逗号隔开.</string>
     <string name="theme_name">主题名称</string>
+    <string name="auto_clear_expired">自动清除过期搜索数据</string>
+    <string name="auto_clear_expired_summary">超过一天的搜索数据</string>
 
 </resources>
diff --git a/app/src/main/res/xml/pref_config_other.xml b/app/src/main/res/xml/pref_config_other.xml
index 0e3930546..1a1541988 100644
--- a/app/src/main/res/xml/pref_config_other.xml
+++ b/app/src/main/res/xml/pref_config_other.xml
@@ -58,11 +58,6 @@
             android:summary="@string/replace_enable_default_s"
             app:iconSpaceReserved="false" />
 
-        <io.legado.app.ui.widget.prefs.Preference
-            android:key="threadCount"
-            android:title="@string/threads_num_title"
-            app:iconSpaceReserved="false" />
-
         <io.legado.app.ui.widget.prefs.SwitchPreference
             android:defaultValue="true"
             android:key="mediaButtonOnExit"
@@ -70,6 +65,12 @@
             android:summary="@string/media_button_on_exit_summary"
             app:iconSpaceReserved="false" />
 
+        <io.legado.app.ui.widget.prefs.SwitchPreference
+            android:defaultValue="true"
+            android:key="autoClearExpired"
+            android:title="@string/auto_clear_expired"
+            android:summary="@string/auto_clear_expired_summary" />
+
         <io.legado.app.ui.widget.prefs.Preference
             android:key="webPort"
             android:title="@string/web_port_title"
@@ -81,6 +82,11 @@
             android:summary="@string/clear_cache_summary"
             app:iconSpaceReserved="false" />
 
+        <io.legado.app.ui.widget.prefs.Preference
+            android:key="threadCount"
+            android:title="@string/threads_num_title"
+            app:iconSpaceReserved="false" />
+
         <io.legado.app.ui.widget.prefs.SwitchPreference
             android:defaultValue="true"
             android:key="process_text"