From 4ee2cbf906ce0e0cb17b64c9db626f413876d7c8 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Sun, 12 Feb 2023 16:16:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A`=E4=B8=80=E9=94=AE?=
 =?UTF-8?q?=E6=8D=A2=E6=96=B0=E6=9C=BA`=E6=94=AF=E6=8C=81`=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=B6=88=E9=99=A4=E9=A2=9D=E5=A4=96APP=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5`=E8=AE=BE=E7=BD=AE=E5=85=8B=E9=9A=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/idormy/sms/forwarder/entity/CloneInfo.kt    | 2 ++
 .../java/com/idormy/sms/forwarder/utils/HttpServerUtils.kt    | 2 ++
 .../main/java/com/idormy/sms/forwarder/utils/SettingUtils.kt  | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/idormy/sms/forwarder/entity/CloneInfo.kt b/app/src/main/java/com/idormy/sms/forwarder/entity/CloneInfo.kt
index 5763d38f..e77ff87c 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/entity/CloneInfo.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/entity/CloneInfo.kt
@@ -31,6 +31,8 @@ data class CloneInfo(
     var enableAppNotify: Boolean = false,
     @SerializedName("cancel_app_notify")
     var cancelAppNotify: Boolean = false,
+    @SerializedName("cancel_extra_app_notify")
+    var cancelExtraAppNotify: String? = null,
     @SerializedName("enable_not_user_present")
     var enableNotUserPresent: Boolean = false,
     @SerializedName("enable_load_app_list")
diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/HttpServerUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/HttpServerUtils.kt
index 83593175..813962a1 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/HttpServerUtils.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/HttpServerUtils.kt
@@ -154,6 +154,7 @@ class HttpServerUtils private constructor() {
             cloneInfo.callType6 = SettingUtils.enableCallType6
             cloneInfo.enableAppNotify = SettingUtils.enableAppNotify
             cloneInfo.cancelAppNotify = SettingUtils.enableCancelAppNotify
+            cloneInfo.cancelExtraAppNotify = SettingUtils.cancelExtraAppNotify
             cloneInfo.enableNotUserPresent = SettingUtils.enableNotUserPresent
             cloneInfo.enableLoadAppList = SettingUtils.enableLoadAppList
             cloneInfo.enableLoadUserAppList = SettingUtils.enableLoadUserAppList
@@ -199,6 +200,7 @@ class HttpServerUtils private constructor() {
                 SettingUtils.enableCallType6 = cloneInfo.callType6
                 SettingUtils.enableAppNotify = cloneInfo.enableAppNotify
                 SettingUtils.enableCancelAppNotify = cloneInfo.cancelAppNotify
+                SettingUtils.cancelExtraAppNotify = cloneInfo.cancelExtraAppNotify.toString()
                 SettingUtils.enableNotUserPresent = cloneInfo.enableNotUserPresent
                 SettingUtils.enableLoadAppList = cloneInfo.enableLoadAppList
                 SettingUtils.enableLoadUserAppList = cloneInfo.enableLoadUserAppList
diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtils.kt
index 6015a575..148010b6 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtils.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtils.kt
@@ -40,10 +40,10 @@ class SettingUtils private constructor() {
         var enableAppNotify: Boolean by SharedPreference(SP_ENABLE_APP_NOTIFY, false)
 
         //是否转发应用通知——自动消除通知
-        var enableCancelAppNotify: Boolean by SharedPreference(SP_CANCEL_EXTRA_APP_NOTIFY, false)
+        var enableCancelAppNotify: Boolean by SharedPreference(SP_ENABLE_CANCEL_APP_NOTIFY, false)
 
         //是否转发应用通知——自动消除额外APP通知
-        var cancelExtraAppNotify: String by SharedPreference(SP_BATTERY_CRON_START_TIME, "")
+        var cancelExtraAppNotify: String by SharedPreference(SP_CANCEL_EXTRA_APP_NOTIFY, "")
 
         //是否转发应用通知——仅锁屏状态
         var enableNotUserPresent: Boolean by SharedPreference(SP_ENABLE_NOT_USER_PRESENT, false)