From 942fd562f0acee8ce51dad2d55c5b1ba20f20f70 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Thu, 31 Oct 2019 10:54:02 +0200
Subject: [PATCH 1/2] - Allow port in account AoR.

---
 app/src/main/kotlin/com/tutpro/baresip/Utils.kt | 7 ++++++-
 app/src/main/res/values/strings.xml             | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

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 Activity -->
     <string name="accounts">Accounts</string>
-    <string name="user_domain">user@domain</string>
-    <string name="invalid_aor">Invalid user@domain \'%1$s\'</string>
+    <string name="user_domain">user@domain[:port]</string>
+    <string name="invalid_aor">Invalid user@domain[:port] \'%1$s\'</string>
     <string name="account_exists">Account \'%1$s\' already exists.</string>
     <string name="account_allocation_failure">"Failed to allocate new account.</string>
     <string name="encrypt_password">Encrypt Password</string>

From 93b5c54073ffb13e9170b3a521f720cb0dba2c15 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Thu, 31 Oct 2019 13:43:08 +0200
Subject: [PATCH 2/2] - Fixed checking if account already eixts.

---
 app/src/main/kotlin/com/tutpro/baresip/Account.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
         }