- If there is only one account, append account's domain to contact URI

given without hostpart.
This commit is contained in:
Juha Heinanen
2019-05-25 17:49:15 +03:00
parent d419304845
commit 2d484cbfcc

View File

@ -70,14 +70,18 @@ class ContactActivity : AppCompatActivity() {
} }
var newUri = uriView.text.toString().trim() var newUri = uriView.text.toString().trim()
if (!newUri.startsWith("<")) { if (!newUri.startsWith("sip:")) {
if (!newUri.startsWith("sip:")) newUri = "sip:$newUri" if (newUri.contains("@") || (BaresipService.uas.size != 1)) {
if (!Utils.checkAor(newUri.substringAfter("sip:"))) { newUri = "sip:$newUri"
Utils.alertView(this, getString(R.string.error), } else {
String.format(getString(R.string.invalid_contact_uri), newUri)) newUri = "sip:$newUri@${Utils.aorDomain(BaresipService.uas[0].account.aor)}"
return false
} }
} }
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 (new) {
if (Contact.contacts().size >= Contact.CONTACTS_SIZE) { if (Contact.contacts().size >= Contact.CONTACTS_SIZE) {