From 91d81e3bd87386a50e292a2ff64d45843b68fef1 Mon Sep 17 00:00:00 2001 From: darthpaul Date: Fri, 24 Sep 2021 13:57:15 +0100 Subject: [PATCH 1/3] fix wrong sender name from private contacts - use SimpleContact.doesHavePhoneNumber to perform comparision between a sender and private contact. SimpleContact.doesHavePhoneNumber does equality check. --- .../smsmessenger/activities/ThreadActivity.kt | 4 ++-- .../com/simplemobiletools/smsmessenger/extensions/Context.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt index 28c5b7ef..4216b2c3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt @@ -218,8 +218,8 @@ class ThreadActivity : SimpleActivity() { privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor) if (privateContacts.isNotEmpty()) { val senderNumbersToReplace = HashMap() - participants.filter { it.doesContainPhoneNumber(it.name) }.forEach { participant -> - privateContacts.firstOrNull { it.doesContainPhoneNumber(participant.phoneNumbers.first()) }?.apply { + participants.filter { it.doesHavePhoneNumber(it.name) }.forEach { participant -> + privateContacts.firstOrNull { it.doesHavePhoneNumber(participant.phoneNumbers.first()) }?.apply { senderNumbersToReplace[participant.phoneNumbers.first()] = name participant.name = name participant.photoUri = photoUri diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt index 4ff626ce..d9e7b93e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt @@ -401,7 +401,7 @@ fun Context.getThreadContactNames(phoneNumbers: List, privateContacts: A if (name != number) { names.add(name) } else { - val privateContact = privateContacts.firstOrNull { it.doesContainPhoneNumber(number) } + val privateContact = privateContacts.firstOrNull { it.doesHavePhoneNumber(number) } if (privateContact == null) { names.add(name) } else { From 492cbdf13ae4c3988ea706157fb6fd26fcaa273c Mon Sep 17 00:00:00 2001 From: darthpaul Date: Fri, 24 Sep 2021 14:30:17 +0100 Subject: [PATCH 2/3] fix wrong sender name in SMS notification --- .../com/simplemobiletools/smsmessenger/extensions/Context.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt index d9e7b93e..a1f00e5b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt @@ -668,7 +668,7 @@ fun Context.getNameFromAddress(address: String, privateCursor: Cursor?): String var sender = getNameAndPhotoFromPhoneNumber(address).name if (address == sender) { val privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor) - sender = privateContacts.firstOrNull { it.doesContainPhoneNumber(address) }?.name ?: address + sender = privateContacts.firstOrNull { it.doesHavePhoneNumber(address) }?.name ?: address } return sender } From 5e3c0af34d9b100e9381ca864464c041942b0ed4 Mon Sep 17 00:00:00 2001 From: darthpaul Date: Fri, 24 Sep 2021 14:56:51 +0100 Subject: [PATCH 3/3] update commons dependency --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index ab02e588..c2b026b3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,7 +56,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:f49f7b5f89' + implementation 'com.github.SimpleMobileTools:Simple-Commons:307e9e2e82' implementation 'org.greenrobot:eventbus:3.2.0' implementation 'com.klinkerapps:android-smsmms:5.2.6' implementation 'com.github.tibbi:IndicatorFastScroll:c3de1d040a'