[bot] AutoMerging: merge all upstream's changes:

* 'main' of /~https://github.com/pppscn/SmsForwarder: 优化：提升发送通道多参数分隔的兼容性优化：Bark的消息链接支持URL Scheme pppscn#229
venpong · Oct 14, 2022 · bdcced6 · bdcced6
2 parents 9fdefc3 + 1b93aeb
commit bdcced6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/BarkFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/BarkFragment.kt
@@ -258,7 +258,7 @@ class BarkFragment : BaseFragment<FragmentSendersBarkBinding?>(), View.OnClickLi
         val sound = binding!!.etSound.text.toString().trim()
         val badge = binding!!.etBadge.text.toString().trim()
         val url = binding!!.etUrl.text.toString().trim()
-        if (!CommonUtils.checkUrl(url, true)) {
+        if (!TextUtils.isEmpty(url) && !url.contains("[a-z]+://".toRegex())) {
             throw Exception(getString(R.string.invalid_bark_url))
         }
         val title = binding!!.etTitleTemplate.text.toString().trim()

diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/mail/Mail.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/mail/Mail.kt
@@ -14,7 +14,7 @@ data class Mail(
     var fromNickname: String = "", // 发件人昵称
     var password: String = "", // 发件箱授权码（密码）
 
-    var toAddress: ArrayList<String> = ArrayList(), // 直接收件人邮箱
+    var toAddress: List<String> = ArrayList(), // 直接收件人邮箱
     var ccAddress: ArrayList<String> = ArrayList(), // 抄送者邮箱
     var bccAddress: ArrayList<String> = ArrayList(), // 密送者邮箱
 

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
@@ -115,7 +115,7 @@ class EmailUtils {
             }
 
             //收件地址
-            val toAddressList = setting.toEmail.toString().replace("[,，;；]".toRegex(), ",").trim(',').split(',') as ArrayList<String>
+            val toAddressList = setting.toEmail.toString().replace("[,，;；]".toRegex(), ",").trim(',').split(',')
 
             //创建邮箱
             val mail = Mail().apply {