diff --git a/app/src/main/kotlin/com/tutpro/baresip/Contact.kt b/app/src/main/kotlin/com/tutpro/baresip/Contact.kt index 81a97828..d46ee67b 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/Contact.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/Contact.kt @@ -51,37 +51,7 @@ sealed class Contact { return uri } - fun contactUri(name: String, latest: String?): String? { - for (c in contacts()) - when (c) { - is BaresipContact -> { - if (c.name.equals(name, ignoreCase = true)) - return c.uri.removePrefix("<") - .replaceAfter(">", "") - .replace(">", "") - } - is AndroidContact -> { - if (c.name == name) { - return if (c.uris.isNotEmpty()) { - var uri = c.uris.first() - if (c.uris.size > 1 && latest != null) { - for (u in c.uris) - if (u == latest) { - uri = latest - break - } - } - uri - } else { - null - } - } - } - } - return null - } - - // Return URIs of contact name or null if contact is not found + // Return URIs of contact name fun contactUris(name: String): ArrayList { val uris = ArrayList() for (c in contacts()) diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt index 6b8d0975..58ce86fd 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt @@ -1448,7 +1448,9 @@ class MainActivity : AppCompatActivity() { dialog.dismiss() var uriText = transferUri.text.toString().trim() if (uriText.isNotEmpty()) { - uriText = Contact.contactUri(uriText, null) ?: uriText + val uris = Contact.contactUris(uriText) + if (uris.size >= 1) + uriText = uris[0] if (Utils.isTelNumber(uriText)) uriText = "tel:$uriText" val uri = if (Utils.isTelUri(uriText))