jeena/sms-translate
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' of github.com:SimpleMobileTools/Simple-SMS-Messenger

Browse source
This commit is contained in:
tibbi 2022-01-31 21:38:12 +01:00
commit 78ec480760
1 changed files with 3 additions and 1 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

@ -232,6 +232,8 @@ class ThreadActivity : SimpleActivity() {
private fun setupThread() { private fun setupThread() {
val privateCursor = getMyContactsCursor(false, true)?.loadInBackground() val privateCursor = getMyContactsCursor(false, true)?.loadInBackground()
ensureBackgroundThread { ensureBackgroundThread {
privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor)
val cachedMessagesCode = messages.clone().hashCode() val cachedMessagesCode = messages.clone().hashCode()
messages = getMessages(threadId) messages = getMessages(threadId)
@ -241,6 +243,7 @@ class ThreadActivity : SimpleActivity() {
try { try {
if (participants.isNotEmpty() && messages.hashCode() == cachedMessagesCode && !hasParticipantWithoutName) { if (participants.isNotEmpty() && messages.hashCode() == cachedMessagesCode && !hasParticipantWithoutName) {
setupAdapter()
return@ensureBackgroundThread return@ensureBackgroundThread
} }
} catch (ignored: Exception) { } catch (ignored: Exception) {
@ -249,7 +252,6 @@ class ThreadActivity : SimpleActivity() {
setupParticipants() setupParticipants()
// 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
privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor)
if (privateContacts.isNotEmpty()) { if (privateContacts.isNotEmpty()) {
val senderNumbersToReplace = HashMap<String, String>() val senderNumbersToReplace = HashMap<String, String>()
participants.filter { it.doesHavePhoneNumber(it.name) }.forEach { participant -> participants.filter { it.doesHavePhoneNumber(it.name) }.forEach { participant ->