From bd470b79ef4a76c3588cb501999784144bcfc221 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 24 Mar 2025 13:34:10 +0100 Subject: [PATCH] Fixed contact lookup if phone number starts by 00 instead of + --- app/src/main/java/org/linphone/contacts/ContactsManager.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/linphone/contacts/ContactsManager.kt b/app/src/main/java/org/linphone/contacts/ContactsManager.kt index 1f9afffa1..291fc6516 100644 --- a/app/src/main/java/org/linphone/contacts/ContactsManager.kt +++ b/app/src/main/java/org/linphone/contacts/ContactsManager.kt @@ -32,6 +32,7 @@ import androidx.annotation.WorkerThread import androidx.core.app.ActivityCompat import androidx.core.app.Person import androidx.core.graphics.drawable.IconCompat +import androidx.core.text.isDigitsOnly import androidx.loader.app.LoaderManager import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -454,7 +455,7 @@ class ContactsManager sipUri } - return if (!username.isNullOrEmpty() && username.startsWith("+")) { + return if (!username.isNullOrEmpty() && (username.startsWith("+") || username.isDigitsOnly())) { Log.d("$TAG Looking for friend with phone number [$username]") val foundUsingPhoneNumber = coreContext.core.findFriendByPhoneNumber(username) if (foundUsingPhoneNumber != null) { @@ -516,7 +517,7 @@ class ContactsManager model } else { Log.d("$TAG Looking for friend matching SIP URI [$key]") - val friend = coreContext.contactsManager.findContactByAddress(clone) + val friend = findContactByAddress(clone) if (friend != null) { Log.d("$TAG Matching friend [${friend.name}] found for SIP URI [$key]") val model = ContactAvatarModel(friend, address)