From 1a1515f62ae20933324dc0b48f99394917808635 Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Thu, 19 Jul 2018 10:30:58 +0300 Subject: [PATCH] show contact name of caller (if exists) when call comes in --- .../main/kotlin/com/tutpro/baresip/ContactsActivity.kt | 8 ++++++++ app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/tutpro/baresip/ContactsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ContactsActivity.kt index 7b7cfe7b..4687b0ba 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/ContactsActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/ContactsActivity.kt @@ -122,6 +122,14 @@ class ContactsActivity : AppCompatActivity() { return false } + fun contactName(uri: String): String { + for (c in contacts) + if ((Utils.uriUserPart(c.uri) == Utils.uriUserPart(uri)) && + (Utils.uriHostPart(c.uri) == Utils.uriHostPart(uri))) + return c.name + return uri + } + external fun contacts_remove() external fun contact_add(contact: String) diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt index 371b832e..9c4b8e35 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt @@ -784,7 +784,7 @@ class MainActivity : AppCompatActivity() { caller_row.layoutParams = caller_row_params val caller_uri = TextView(applicationContext) - caller_uri.text = call.peerURI + caller_uri.text = ContactsActivity.contactName(call.peerURI) caller_uri.setTextColor(Color.BLUE) caller_uri.textSize = 20f caller_uri.setPadding(10, 10, 0, 10)