From edb5ef48a2a5517f51e12dc24eb309fd921f32a8 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Sun, 12 Feb 2023 23:20:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=BD=AC=E5=8F=91?=
=?UTF-8?q?=E6=B6=88=E6=81=AF=E9=81=8D=E5=8E=86=E5=8F=91=E9=80=81=E9=80=9A?=
=?UTF-8?q?=E9=81=93=E6=97=B6=E6=9C=AA=E8=B7=B3=E8=BF=87=E5=B7=B2=E7=A6=81?=
=?UTF-8?q?=E7=94=A8=E7=9A=84=E9=80=9A=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/idormy/sms/forwarder/utils/SendUtils.kt | 11 +++++++++--
app/src/main/res/values-en/strings.xml | 2 ++
app/src/main/res/values/strings.xml | 2 ++
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/SendUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/SendUtils.kt
index 25ad525e..732b56f5 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/SendUtils.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/SendUtils.kt
@@ -21,7 +21,6 @@ import com.xuexiang.xui.utils.ResUtils
import com.xuexiang.xutil.XUtil
import java.util.*
-
object SendUtils {
private const val TAG = "SendUtils"
@@ -63,6 +62,12 @@ object SendUtils {
fun sendMsgSender(msgInfo: MsgInfo, rule: Rule, senderIndex: Int = 0, logId: Long = 0L, msgId: Long = 0L) {
try {
val sender = rule.senderList[senderIndex]
+ if (sender.status != 1) {
+ Log.d(TAG, "sender = $sender is disabled")
+ updateLogs(logId, 0, ResUtils.getString(R.string.sender_disabled))
+ senderLogic(0, msgInfo, rule, senderIndex, msgId)
+ return
+ }
when (sender.type) {
TYPE_DINGTALK_GROUP_ROBOT -> {
val settingVo = Gson().fromJson(sender.jsonSetting, DingtalkGroupRobotSetting::class.java)
@@ -129,12 +134,14 @@ object SendUtils {
SocketUtils.sendMsg(settingVo, msgInfo, rule, senderIndex, logId, msgId)
}
else -> {
- updateLogs(logId, 0, "未知发送通道")
+ updateLogs(logId, 0, ResUtils.getString(R.string.unknown_sender))
+ senderLogic(0, msgInfo, rule, senderIndex, msgId)
}
}
} catch (e: Exception) {
e.printStackTrace()
updateLogs(logId, 0, e.message.toString())
+ senderLogic(0, msgInfo, rule, senderIndex, msgId)
}
}
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 894c0280..b99fadbb 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -993,4 +993,6 @@
Client or server interaction messages are all encrypted and decrypted using SM4
Del Sender
+ Sender is disabled
+ Unknown sender
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 20b6d17f..0db4a1d3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -994,4 +994,6 @@
客户端/服务端交互采用SM4加解密
删除发送通道
+ 发送通道已禁用
+ 未知发送通道