fenix/Simple-SMS-Messenger
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-SMS-Messenger.git synced 2025-06-05 21:49:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix wrong sender name from private contacts

Browse Source 
- use SimpleContact.doesHavePhoneNumber to perform comparision between a sender and private contact. SimpleContact.doesHavePhoneNumber does equality check.
This commit is contained in:
darthpaul
2021-09-24 13:57:15 +01:00
parent 52ebeeedc6
commit 91d81e3bd8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
View File

@@ -218,8 +218,8 @@ class ThreadActivity : SimpleActivity() {
privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor) privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor)
if (privateContacts.isNotEmpty()) { if (privateContacts.isNotEmpty()) {
val senderNumbersToReplace = HashMap<String, String>() val senderNumbersToReplace = HashMap<String, String>()
participants.filter { it.doesContainPhoneNumber(it.name) }.forEach { participant -> participants.filter { it.doesHavePhoneNumber(it.name) }.forEach { participant ->
privateContacts.firstOrNull { it.doesContainPhoneNumber(participant.phoneNumbers.first()) }?.apply { privateContacts.firstOrNull { it.doesHavePhoneNumber(participant.phoneNumbers.first()) }?.apply {
senderNumbersToReplace[participant.phoneNumbers.first()] = name senderNumbersToReplace[participant.phoneNumbers.first()] = name
participant.name = name participant.name = name
participant.photoUri = photoUri participant.photoUri = photoUri

2
app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
View File

@@ -401,7 +401,7 @@ fun Context.getThreadContactNames(phoneNumbers: List<String>, privateContacts: A
if (name != number) { if (name != number) {
names.add(name) names.add(name)
} else { } else {
val privateContact = privateContacts.firstOrNull { it.doesContainPhoneNumber(number) } val privateContact = privateContacts.firstOrNull { it.doesHavePhoneNumber(number) }
if (privateContact == null) { if (privateContact == null) {
names.add(name) names.add(name)
} else { } else {