From 0aba25ffe28ba5c9b7fd4d20be22e4e7795d1d0c Mon Sep 17 00:00:00 2001 From: pppscn <35696959@qq.com> Date: Wed, 5 Oct 2022 19:58:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=8F=90=E5=8D=87?= =?UTF-8?q?=E5=8F=91=E9=80=81=E9=80=9A=E9=81=93=E5=A4=9A=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=88=86=E9=9A=94=E7=9A=84=E5=85=BC=E5=AE=B9=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sms/forwarder/fragment/senders/EmailFragment.kt | 6 ++++++ .../forwarder/utils/sender/DingtalkGroupRobotUtils.kt | 4 ++-- .../forwarder/utils/sender/DingtalkInnerRobotUtils.kt | 2 +- .../idormy/sms/forwarder/utils/sender/EmailUtils.kt | 10 +--------- .../idormy/sms/forwarder/utils/sender/WebhookUtils.kt | 2 +- app/src/main/res/values-en/strings.xml | 1 + app/src/main/res/values/strings.xml | 3 ++- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/EmailFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/EmailFragment.kt index 8c36339d..ffaa9e68 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/EmailFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/EmailFragment.kt @@ -284,6 +284,12 @@ class EmailFragment : BaseFragment(), View.OnClick val startTls = binding!!.sbStartTls.isChecked val toEmail = binding!!.etToEmail.text.toString().trim() val title = binding!!.etTitleTemplate.text.toString().trim() + if (TextUtils.isEmpty(fromEmail) || TextUtils.isEmpty(pwd) || TextUtils.isEmpty(toEmail)) { + throw Exception(getString(R.string.invalid_email)) + } + if (mailType == getString(R.string.other_mail_type) && (TextUtils.isEmpty(host) || TextUtils.isEmpty(port))) { + throw Exception(getString(R.string.invalid_email_server)) + } return EmailSetting(mailType, fromEmail, pwd, nickname, host, port, ssl, startTls, toEmail, title) } diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/DingtalkGroupRobotUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/DingtalkGroupRobotUtils.kt index 0345507d..b6f6f319 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/DingtalkGroupRobotUtils.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/DingtalkGroupRobotUtils.kt @@ -66,8 +66,8 @@ class DingtalkGroupRobotUtils private constructor() { } else { atMap["isAtAll"] = false if (!TextUtils.isEmpty(setting.atMobiles)) { - val atMobilesArray: Array? = setting.atMobiles?.split(",".toRegex())?.toTypedArray() - if (atMobilesArray != null) { + val atMobilesArray: Array = setting.atMobiles.toString().replace("[,，;；]".toRegex(), ",").trim(',').split(',').toTypedArray() + if (atMobilesArray.isNotEmpty()) { val atMobilesList: MutableList = ArrayList() for (atMobile in atMobilesArray) { if (TextUtils.isDigitsOnly(atMobile)) { diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/DingtalkInnerRobotUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/DingtalkInnerRobotUtils.kt index 0cf14001..644e5f40 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/DingtalkInnerRobotUtils.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/DingtalkInnerRobotUtils.kt @@ -155,7 +155,7 @@ class DingtalkInnerRobotUtils private constructor() { val textMsgMap: MutableMap = mutableMapOf() textMsgMap["robotCode"] = setting.appKey - textMsgMap["userIds"] = setting.userIds.split('|').toTypedArray() + textMsgMap["userIds"] = setting.userIds.replace("[,，;；|]".toRegex(), "|").trim('|').split('|').toTypedArray() textMsgMap["msgKey"] = setting.msgKey textMsgMap["msgParam"] = Gson().toJson(msgParam) diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/EmailUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/EmailUtils.kt index 4a9124f1..6035693e 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/EmailUtils.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/EmailUtils.kt @@ -115,15 +115,7 @@ class EmailUtils { } //收件地址 - val toAddressList = ArrayList() - val emailArray = setting.toEmail.toString().split("[,，;；]".toRegex()) - if (emailArray.isNotEmpty()) { - for (email in emailArray) { - toAddressList.add(email) - } - } else { - toAddressList.add(setting.toEmail.toString()) - } + val toAddressList = setting.toEmail.toString().replace("[,，;；]".toRegex(), ",").trim(',').split(',') as ArrayList //创建邮箱 val mail = Mail().apply { diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WebhookUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WebhookUtils.kt index b2a95185..7f937eda 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WebhookUtils.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WebhookUtils.kt @@ -141,7 +141,7 @@ class WebhookUtils { "PATCH" -> XHttp.patch(requestUrl).keepJson(true) else -> XHttp.post(requestUrl).keepJson(true) } - webParams.split("&").forEach { + webParams.trim('&').split("&").forEach { val param = it.split("=") if (param.size == 2) { postRequest.params( diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 7c5704af..a77859cc 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -274,6 +274,7 @@ Channel name cannot be empty invalid token Email parameter is incomplete + Email Server parameter is incomplete The bark-icon is not a valid URL The bark-url is not a valid URL bark-server is empty or not a valid URL diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e660490f..5b7512ae 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -274,7 +274,8 @@ 发送失败： 通道名称不能为空 token不合法 - 邮箱参数不完整 + 发件邮箱/登录密码/收件地址不可为空 + 服务器信息的主机/端口不可为空 消息图标不是有效URL 消息链接不是有效URL bark-server为空 或 不是有效URL