From 932b66eccc177e723c4cb9654bac72316872f848 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Wed, 20 May 2026 15:50:14 +0300
Subject: [PATCH] Make sure contact list is immediately updated after import

---
 .../main/kotlin/com/tutpro/baresip/Contact.kt | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/Contact.kt b/app/src/main/kotlin/com/tutpro/baresip/Contact.kt
index 5c08d95a..f8c63dac 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Contact.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Contact.kt
@@ -231,7 +231,7 @@ sealed class Contact {
             val contacts = String(content)
             var contactNo = 0
             val baseId = System.currentTimeMillis()
-            BaresipService.baresipContacts.value = mutableListOf()
+            val newBaresipContacts = mutableListOf<BaresipContact>()
             contacts.lines().forEach {
                 val parts = it.split("\"")
                 if (parts.size == 3) {
@@ -266,25 +266,29 @@ sealed class Contact {
                             Log.e(TAG, "Could not read avatar image from file $id.png: ${e.message}")
                         }
                     }
-                    BaresipService.baresipContacts.value += contact
+                    newBaresipContacts.add(contact)
                 }
             }
+            BaresipService.baresipContacts.value = newBaresipContacts.toList()
             return true
         }
 
         fun contactsUpdate() {
-            BaresipService.contacts = mutableListOf()
+            val newContacts = mutableListOf<Contact>()
             if (BaresipService.contactsMode != "android")
                 for (c in BaresipService.baresipContacts.value)
-                    BaresipService.contacts.add(c.copy())
+                    newContacts.add(c.copy())
             if (BaresipService.contactsMode != "baresip")
                 for (c in BaresipService.androidContacts.value)
-                    if (!nameExists(c.name, BaresipService.contacts, true))
-                        BaresipService.contacts.add(c.copy())
-            BaresipService.contacts.sortBy{ when (it) {
-                is BaresipContact -> if (it.favorite) "0" + it.name else "1" + it.name
-                is AndroidContact -> if (it.favorite) "0" + it.name else "1" + it.name
-            }}
+                    if (!nameExists(c.name, newContacts, true))
+                        newContacts.add(c.copy())
+            newContacts.sortBy {
+                when (it) {
+                    is BaresipContact -> if (it.favorite) "0" + it.name else "1" + it.name
+                    is AndroidContact -> if (it.favorite) "0" + it.name else "1" + it.name
+                }
+            }
+            BaresipService.contacts = newContacts
             generateContactNames()
         }