From 6bb4de4940ffb1fc154ed55743029f6aee3cda8b Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Tue, 15 Feb 2022 17:24:26 +0200
Subject: [PATCH] Sort all contact names and keep them in up to date list

---
 .../com/tutpro/baresip/AndroidContactsActivity.kt      |  1 +
 .../main/kotlin/com/tutpro/baresip/BaresipService.kt   |  1 +
 app/src/main/kotlin/com/tutpro/baresip/Contact.kt      |  1 +
 app/src/main/kotlin/com/tutpro/baresip/Utils.kt        | 10 ++++++++--
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/AndroidContactsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AndroidContactsActivity.kt
index 21a524c3..5b322597 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AndroidContactsActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AndroidContactsActivity.kt
@@ -187,6 +187,7 @@ class AndroidContactsActivity : AppCompatActivity() {
             for ((_, value) in contacts)
                 if (value.name != "")
                     BaresipService.androidContacts.add(value)
+            Utils.reloadContactNames()
             return
         }
 
diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
index eb0b772e..4e4ba9f6 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
@@ -1440,6 +1440,7 @@ class BaresipService: Service() {
         val registrationUpdate = MutableLiveData<Long>()
         val contacts = ArrayList<Contact>()
         val androidContacts = ArrayList<AndroidContact>()
+        val contactNames = mutableListOf<String>()
         val chatTexts: MutableMap<String, String> = mutableMapOf()
         val activities = mutableListOf<String>()
         var dnsServers = listOf<InetAddress>()
diff --git a/app/src/main/kotlin/com/tutpro/baresip/Contact.kt b/app/src/main/kotlin/com/tutpro/baresip/Contact.kt
index ec9babde..1b4f576f 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Contact.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Contact.kt
@@ -70,6 +70,7 @@ class Contact(var name: String, var uri: String, var color: Int, val id: Long) {
                     BaresipService.contacts.add(contact)
                 }
             }
+            Utils.reloadContactNames()
             return true
         }
 
diff --git a/app/src/main/kotlin/com/tutpro/baresip/Utils.kt b/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
index 933f5d0e..885e4576 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
@@ -328,9 +328,15 @@ object Utils {
         return ContactsActivity.contactUri(name) ?: AndroidContactsActivity.contactUri(name)
     }
 
+    fun reloadContactNames() {
+        BaresipService.contactNames.clear()
+        BaresipService.contactNames.addAll(Contact.contacts().map{Contact -> Contact.name})
+        BaresipService.contactNames.addAll(AndroidContact.contacts().map{AndroidContact -> AndroidContact.name})
+        BaresipService.contactNames.sort()
+    }
+
     fun contactNames() : List<String> {
-        return Contact.contacts().map{Contact -> Contact.name} +
-                AndroidContact.contacts().map{AndroidContact -> AndroidContact.name}
+        return BaresipService.contactNames
     }
 
     fun setAvatar(ctx: Context, imageView: ImageView, textView: TextView, uri: String) {