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

lets check those private contacts only if we actually have any

Browse Source
This commit is contained in:
tibbi
2020-05-18 23:38:56 +02:00
parent 83dcc7423c
commit 422ccf4b6a
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
View File

@ -151,11 +151,13 @@ class MainActivity : SimpleActivity() {
// check if no message came from a privately stored contact in Simple Contacts // check if no message came from a privately stored contact in Simple Contacts
val privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor) val privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor)
if (privateContacts.isNotEmpty()) {
conversations.filter { it.title == it.phoneNumber }.forEach { conversation -> conversations.filter { it.title == it.phoneNumber }.forEach { conversation ->
privateContacts.firstOrNull { it.phoneNumber == conversation.phoneNumber }?.apply { privateContacts.firstOrNull { it.phoneNumber == conversation.phoneNumber }?.apply {
conversation.title = name conversation.title = name
} }
} }
}
runOnUiThread { runOnUiThread {
val hasConversations = conversations.isNotEmpty() val hasConversations = conversations.isNotEmpty()

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

@ -95,9 +95,10 @@ class ThreadActivity : SimpleActivity() {
messages.first().participants messages.first().participants
} }
val senderNumbersToReplace = HashMap<String, String>()
// check if no participant came from a privately stored contact in Simple Contacts // check if no participant came from a privately stored contact in Simple Contacts
val privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor) val privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor)
if (privateContacts.isNotEmpty()) {
val senderNumbersToReplace = HashMap<String, String>()
participants.filter { it.name == it.phoneNumber }.forEach { participant -> participants.filter { it.name == it.phoneNumber }.forEach { participant ->
privateContacts.firstOrNull { it.phoneNumber == participant.phoneNumber }?.apply { privateContacts.firstOrNull { it.phoneNumber == participant.phoneNumber }?.apply {
senderNumbersToReplace[participant.phoneNumber] = name senderNumbersToReplace[participant.phoneNumber] = name
@ -110,6 +111,7 @@ class ThreadActivity : SimpleActivity() {
message.senderName = senderNumbersToReplace[message.senderName]!! message.senderName = senderNumbersToReplace[message.senderName]!!
} }
} }
}
if (participants.isEmpty()) { if (participants.isEmpty()) {
val name = intent.getStringExtra(THREAD_TITLE) ?: "" val name = intent.getStringExtra(THREAD_TITLE) ?: ""