diff --git a/app/src/main/kotlin/com/tutpro/baresip/Account.kt b/app/src/main/kotlin/com/tutpro/baresip/Account.kt index a0acdbf4..8f40a073 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/Account.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/Account.kt @@ -200,7 +200,7 @@ class Account(val accp: String) { fun exists(aor: String): Boolean { for (ua in UserAgent.uas()) { - if (ua.account.aor == aor) return true + if (ua.account.aor == "sip:$aor") return true } return false } diff --git a/app/src/main/kotlin/com/tutpro/baresip/Utils.kt b/app/src/main/kotlin/com/tutpro/baresip/Utils.kt index afe6ada3..1e593f1a 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/Utils.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/Utils.kt @@ -90,7 +90,12 @@ object Utils { } fun checkAor(aor: String): Boolean { - return checkUriUser(aorUser(aor)) && checkDomain(aorDomain(aor)) + val parts = aor.split(":") + if (parts.size == 1) + return checkUriUser(aorUser(aor)) && checkDomain(aorDomain(aor)) + else + return checkUriUser(aorUser(parts[0])) && checkDomain(aorDomain(parts[0])) && + checkPort(parts[1]) } fun checkTelNo(no: String): Boolean { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d51b53fe..93dedea6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -92,8 +92,8 @@ Accounts - user@domain - Invalid user@domain \'%1$s\' + user@domain[:port] + Invalid user@domain[:port] \'%1$s\' Account \'%1$s\' already exists. "Failed to allocate new account. Encrypt Password