From 2d484cbfcc931cd73c9f9500ae384e1e1984bbfc Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Sat, 25 May 2019 17:49:15 +0300
Subject: [PATCH] - If there is only one account, append account's domain to
 contact URI   given without hostpart.

---
 .../kotlin/com/tutpro/baresip/ContactActivity.kt | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt
index 98dbf987..ac77495e 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt
@@ -70,14 +70,18 @@ class ContactActivity : AppCompatActivity() {
             }
 
             var newUri = uriView.text.toString().trim()
-            if (!newUri.startsWith("<")) {
-                if (!newUri.startsWith("sip:")) newUri = "sip:$newUri"
-                if (!Utils.checkAor(newUri.substringAfter("sip:"))) {
-                    Utils.alertView(this, getString(R.string.error),
-                            String.format(getString(R.string.invalid_contact_uri), newUri))
-                    return false
+            if (!newUri.startsWith("sip:")) {
+                if (newUri.contains("@") || (BaresipService.uas.size != 1)) {
+                    newUri = "sip:$newUri"
+                } else {
+                    newUri = "sip:$newUri@${Utils.aorDomain(BaresipService.uas[0].account.aor)}"
                 }
             }
+            if (!Utils.checkSipUri(newUri)) {
+                Utils.alertView(this, getString(R.string.error),
+                        String.format(getString(R.string.invalid_contact_uri), newUri))
+                return false
+            }
 
             if (new) {
                 if (Contact.contacts().size >= Contact.CONTACTS_SIZE) {