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 index 22125a11bc..3359e06712 100644 --- 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(), 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 index a294cd8a46..66763670ac 100644 --- 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 = ArrayList(), // 直接收件人邮箱 + var toAddress: List = ArrayList(), // 直接收件人邮箱 var ccAddress: ArrayList = ArrayList(), // 抄送者邮箱 var bccAddress: ArrayList = 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 index 6035693ebc..942b1eba9b 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,7 +115,7 @@ class EmailUtils { } //收件地址 - val toAddressList = setting.toEmail.toString().replace("[,,;;]".toRegex(), ",").trim(',').split(',') as ArrayList + val toAddressList = setting.toEmail.toString().replace("[,,;;]".toRegex(), ",").trim(',').split(',') //创建邮箱 val mail = Mail().apply {