From feea25ba06d4c6dd0b17c1450aee6e9ed828c436 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Tue, 21 Feb 2023 15:22:15 +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

---
 .../java/io/legado/app/data/dao/DictRuleDao.kt     |  3 +++
 .../io/legado/app/ui/dict/rule/DictRuleActivity.kt |  2 +-
 .../legado/app/ui/dict/rule/DictRuleViewModel.kt   | 10 +++++++++-
 app/src/main/res/xml/pref_main.xml                 | 14 +++++++-------
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/io/legado/app/data/dao/DictRuleDao.kt b/app/src/main/java/io/legado/app/data/dao/DictRuleDao.kt
index 2a3fda677..7e53c3213 100644
--- a/app/src/main/java/io/legado/app/data/dao/DictRuleDao.kt
+++ b/app/src/main/java/io/legado/app/data/dao/DictRuleDao.kt
@@ -23,6 +23,9 @@ interface DictRuleDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insert(vararg dictRule: DictRule)
 
+    @Update
+    fun update(vararg dictRule: DictRule)
+
     @Delete
     fun delete(vararg dictRule: DictRule)
 
diff --git a/app/src/main/java/io/legado/app/ui/dict/rule/DictRuleActivity.kt b/app/src/main/java/io/legado/app/ui/dict/rule/DictRuleActivity.kt
index 36d9b0a0c..41087409e 100644
--- a/app/src/main/java/io/legado/app/ui/dict/rule/DictRuleActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/dict/rule/DictRuleActivity.kt
@@ -166,7 +166,7 @@ class DictRuleActivity : VMBaseActivity<ActivityDictRuleBinding, DictRuleViewMod
     }
 
     override fun update(vararg rule: DictRule) {
-        viewModel.upsert(*rule)
+        viewModel.update(*rule)
     }
 
     override fun delete(rule: DictRule) {
diff --git a/app/src/main/java/io/legado/app/ui/dict/rule/DictRuleViewModel.kt b/app/src/main/java/io/legado/app/ui/dict/rule/DictRuleViewModel.kt
index 9a43513c9..ba3b6d7d6 100644
--- a/app/src/main/java/io/legado/app/ui/dict/rule/DictRuleViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/dict/rule/DictRuleViewModel.kt
@@ -2,22 +2,30 @@ package io.legado.app.ui.dict.rule
 
 import android.app.Application
 import io.legado.app.base.BaseViewModel
+import io.legado.app.constant.AppLog
 import io.legado.app.data.appDb
 import io.legado.app.data.entities.DictRule
 import io.legado.app.help.DefaultData
+import io.legado.app.utils.toastOnUi
 
 class DictRuleViewModel(application: Application) : BaseViewModel(application) {
 
 
-    fun upsert(vararg dictRule: DictRule) {
+    fun update(vararg dictRule: DictRule) {
         execute {
             appDb.dictRuleDao.insert(*dictRule)
+        }.onError {
+            AppLog.put(it.localizedMessage, it)
+            context.toastOnUi(it.localizedMessage)
         }
     }
 
     fun delete(vararg dictRule: DictRule) {
         execute {
             appDb.dictRuleDao.delete(*dictRule)
+        }.onError {
+            AppLog.put(it.localizedMessage, it)
+            context.toastOnUi(it.localizedMessage)
         }
     }
 
diff --git a/app/src/main/res/xml/pref_main.xml b/app/src/main/res/xml/pref_main.xml
index c966f05c8..a4576340a 100644
--- a/app/src/main/res/xml/pref_main.xml
+++ b/app/src/main/res/xml/pref_main.xml
@@ -12,6 +12,13 @@
         android:icon="@drawable/ic_cfg_source"
         app:iconSpaceReserved="false" />
 
+    <io.legado.app.lib.prefs.Preference
+        android:key="txtTocRegexManage"
+        android:title="@string/txt_toc_regex"
+        android:summary="@string/config_txt_toc_regex"
+        android:icon="@drawable/ic_cfg_source"
+        app:iconSpaceReserved="false" />
+
     <io.legado.app.lib.prefs.Preference
         android:key="replaceManage"
         android:title="@string/replace_purify"
@@ -26,13 +33,6 @@
         android:icon="@drawable/ic_translate"
         app:iconSpaceReserved="false" />
 
-    <io.legado.app.lib.prefs.Preference
-        android:key="txtTocRegexManage"
-        android:title="@string/txt_toc_regex"
-        android:summary="@string/config_txt_toc_regex"
-        android:icon="@drawable/ic_cfg_source"
-        app:iconSpaceReserved="false" />
-
     <io.legado.app.lib.prefs.NameListPreference
         android:defaultValue="0"
         android:entries="@array/theme_mode"