fenix
/
Simple-SMS-Messenger
mirror of https://github.com/SimpleMobileTools/Simple-SMS-Messenger.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lets check those private contacts only if we actually have any

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,9 +151,11 @@ 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)
conversations.filter { it.title == it.phoneNumber }.forEach { conversation -> if (privateContacts.isNotEmpty()) {
privateContacts.firstOrNull { it.phoneNumber == conversation.phoneNumber }?.apply { conversations.filter { it.title == it.phoneNumber }.forEach { conversation ->
conversation.title = name privateContacts.firstOrNull { it.phoneNumber == conversation.phoneNumber }?.apply {
conversation.title = name
}
} }
} }

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

@ -95,19 +95,21 @@ 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)
participants.filter { it.name == it.phoneNumber }.forEach { participant -> if (privateContacts.isNotEmpty()) {
privateContacts.firstOrNull { it.phoneNumber == participant.phoneNumber }?.apply { val senderNumbersToReplace = HashMap<String, String>()
senderNumbersToReplace[participant.phoneNumber] = name participants.filter { it.name == it.phoneNumber }.forEach { participant ->
participant.name = name privateContacts.firstOrNull { it.phoneNumber == participant.phoneNumber }?.apply {
senderNumbersToReplace[participant.phoneNumber] = name
participant.name = name
}
} }
}
messages.forEach { message -> messages.forEach { message ->
if (senderNumbersToReplace.keys.contains(message.senderName)) { if (senderNumbersToReplace.keys.contains(message.senderName)) {
message.senderName = senderNumbersToReplace[message.senderName]!! message.senderName = senderNumbersToReplace[message.senderName]!!
}
} }
} }