jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always use Contact.contactUris function

Browse Source
This commit is contained in:
Juha Heinanen
2023-03-06 07:36:51 +02:00
parent 44a6839aee
commit 739fddcff8
2 changed files with 4 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/src/main/kotlin/com/tutpro/baresip/Contact.kt
View File

@ -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<String> {
val uris = ArrayList<String>()
for (c in contacts())

4
app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
View File

@ -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))