From f07bc19d5f116f8e5b6babfa9bec4c4bc227ebb2 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 18 Mar 2022 09:31:47 +0100 Subject: [PATCH] Fixed missing contacts after LDAP query --- .../main/contact/viewmodels/ContactsListViewModel.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactsListViewModel.kt b/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactsListViewModel.kt index 2af6ac4a7..8285e3b65 100644 --- a/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactsListViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactsListViewModel.kt @@ -34,7 +34,6 @@ import org.linphone.contact.NativeContact import org.linphone.core.* import org.linphone.core.tools.Log import org.linphone.utils.Event -import org.linphone.utils.LinphoneUtils class ContactsListViewModel : ViewModel() { val sipContactsSelected = MutableLiveData() @@ -230,15 +229,15 @@ class ContactsListViewModel : ViewModel() { val address = searchResult.address if (address != null) { - if (displayName == "") displayName = LinphoneUtils.getDisplayName(address) + if (displayName.isEmpty()) displayName = address.displayName ?: "" val contact = coreContext.contactsManager.findContactByAddress(address, ignoreLocalContact = true) - if (contact != null) return contact + if (contact != null && (displayName.isEmpty() || contact.fullName == displayName)) return contact } val phoneNumber = searchResult.phoneNumber - if (phoneNumber != null) { + if (phoneNumber != null && address?.username != phoneNumber) { val contact = coreContext.contactsManager.findContactByPhoneNumber(phoneNumber) - if (contact != null && contact.fullName != displayName) return contact + if (contact != null && (displayName.isEmpty() || contact.fullName == displayName)) return contact } return null