Archives/SmsForwarder
2
0
Fork 0
mirror of https://github.com/pppscn/SmsForwarder synced 2024-11-08 01:10:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

优化：检查合法的URL时支持IPv6地址（例如：主动控制·客户端的服务地址）

Browse Source
This commit is contained in:
pppscn 2022-10-05 19:56:35 +08:00
parent 35151aa924
commit c2ab087155
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/idormy/sms/forwarder/fragment/ClientFragment.kt
View File

@ -36,7 +36,6 @@ import com.xuexiang.xui.widget.dialog.materialdialog.DialogAction
import com.xuexiang.xui.widget.dialog.materialdialog.MaterialDialog import com.xuexiang.xui.widget.dialog.materialdialog.MaterialDialog
import com.xuexiang.xutil.XUtil import com.xuexiang.xutil.XUtil
@Suppress("PrivatePropertyName", "PropertyName") @Suppress("PrivatePropertyName", "PropertyName")
@Page(name = "主动控制·客户端") @Page(name = "主动控制·客户端")
class ClientFragment : BaseFragment<FragmentClientBinding?>(), class ClientFragment : BaseFragment<FragmentClientBinding?>(),

2
app/src/main/java/com/idormy/sms/forwarder/utils/CommonUtils.kt
View File

@ -243,7 +243,7 @@ class CommonUtils private constructor() {
//是否合法的url //是否合法的url
fun checkUrl(urls: String?, emptyResult: Boolean): Boolean { fun checkUrl(urls: String?, emptyResult: Boolean): Boolean {
if (TextUtils.isEmpty(urls)) return emptyResult if (TextUtils.isEmpty(urls)) return emptyResult
val regex = "^(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]" val regex = "^(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;\\[\\]]*[-a-zA-Z0-9+&@#/%=~_|\\[\\]]"
val pat = Pattern.compile(regex) val pat = Pattern.compile(regex)
val mat = pat.matcher(urls?.trim() ?: "") val mat = pat.matcher(urls?.trim() ?: "")
return mat.matches() return mat.matches()