mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Always display contacts with same phone number if display name is different

Browse source
This commit is contained in:
Sylvain Berfini 2022-03-17 16:40:28 +01:00
parent 06dbb87b62
commit 9ce96b3aa3
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactsListViewModel.kt
View file

@ -34,6 +34,7 @@ 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<Boolean>()
@ -217,7 +218,9 @@ class ContactsListViewModel : ViewModel() {
private fun searchMatchingContact(searchResult: SearchResult): Contact? {
val friend = searchResult.friend
var displayName = ""
if (friend != null) {
displayName = friend.name ?: ""
val contact: Contact? = friend.userData as? Contact
if (contact != null) return contact
@ -227,13 +230,15 @@ class ContactsListViewModel : ViewModel() {
val address = searchResult.address
if (address != null) {
if (displayName == "") displayName = LinphoneUtils.getDisplayName(address)
val contact = coreContext.contactsManager.findContactByAddress(address, ignoreLocalContact = true)
if (contact != null) return contact
}
val phoneNumber = searchResult.phoneNumber
if (phoneNumber != null) {
return coreContext.contactsManager.findContactByPhoneNumber(phoneNumber)
val contact = coreContext.contactsManager.findContactByPhoneNumber(phoneNumber)
if (contact != null && contact.fullName != displayName) return contact
}
return null