From a27da6b1d3d4b65eeaac563294d6b1e395d33af1 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Thu, 15 Feb 2024 17:12:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A`=E4=B8=80=E6=8D=A2?=
 =?UTF-8?q?=E6=96=B0=E6=96=B0=E6=9C=BA`=C2=B7`=E8=BF=98=E5=8E=9F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE`=E6=97=B6=E4=BF=9D=E7=95=99=E6=9C=AC=E6=9C=BA?=
 =?UTF-8?q?=E7=9A=84`=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0`=E5=92=8C`SIM?=
 =?UTF-8?q?=E5=8D=A1=E4=B8=BB=E9=94=AE/=E5=A4=87=E6=B3=A8`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sms/forwarder/utils/HttpServerUtils.kt       | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

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 b0888426..d6ff2a51 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
@@ -153,15 +153,21 @@ class HttpServerUtils private constructor() {
         //还原设置
         fun restoreSettings(cloneInfo: CloneInfo): Boolean {
             return try {
+                //保留设备名称、SIM卡主键/备注
+                val extraDeviceMark = SettingUtils.extraDeviceMark
+                val subidSim1 = SettingUtils.subidSim1
+                val extraSim1 = SettingUtils.extraSim1
+                val subidSim2 = SettingUtils.subidSim2
+                val extraSim2 = SettingUtils.extraSim2
                 //应用配置
                 SharedPreference.clearPreference()
                 SharedPreference.importPreference(cloneInfo.settings)
                 //需要排除的配置
-                SettingUtils.extraDeviceMark = ""
-                SettingUtils.subidSim1 = 0
-                SettingUtils.extraSim1 = ""
-                SettingUtils.subidSim2 = 0
-                SettingUtils.extraSim2 = ""
+                SettingUtils.extraDeviceMark = extraDeviceMark
+                SettingUtils.subidSim1 = subidSim1
+                SettingUtils.extraSim1 = extraSim1
+                SettingUtils.subidSim2 = subidSim2
+                SettingUtils.extraSim2 = extraSim2
                 //删除消息与转发日志
                 Core.logs.deleteAll()
                 Core.msg.deleteAll()