From 928246eaea8c23f089a27c90fb4743559e3d4326 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 25 Dec 2021 18:37:47 +0100 Subject: [PATCH] fix #206, solving a glitch with number being shown instead of name --- .../smsmessenger/activities/ThreadActivity.kt | 1 - .../simplemobiletools/smsmessenger/receivers/SmsReceiver.kt | 6 +++++- 2 files changed, 5 insertions(+), 2 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 ce8e9ff7..e426b931 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt @@ -431,7 +431,6 @@ class ThreadActivity : SimpleActivity() { participants = if (messages.isEmpty()) { val intentNumbers = getPhoneNumbersFromIntent() val participants = getThreadParticipants(threadId, null) - fixParticipantNumbers(participants, intentNumbers) } else { messages.first().participants diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt index 62b2aee8..89e18c0c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt @@ -6,6 +6,7 @@ import android.content.Intent import android.os.Handler import android.os.Looper import android.provider.Telephony +import com.simplemobiletools.commons.extensions.getMyContactsCursor import com.simplemobiletools.commons.extensions.isNumberBlocked import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.commons.models.SimpleContact @@ -37,6 +38,7 @@ class SmsReceiver : BroadcastReceiver() { } Handler(Looper.getMainLooper()).post { + val privateCursor = context.getMyContactsCursor(false, true)?.loadInBackground() if (!context.isNumberBlocked(address)) { ensureBackgroundThread { val newMessageId = context.insertNewSMS(address, subject, body, date, read, threadId, type, subscriptionId) @@ -52,9 +54,11 @@ class SmsReceiver : BroadcastReceiver() { } catch (ignored: Exception) { } - val participant = SimpleContact(0, 0, address, "", arrayListOf(address), ArrayList(), ArrayList()) + val senderName = context.getNameFromAddress(address, privateCursor) + val participant = SimpleContact(0, 0, senderName, "", arrayListOf(address), ArrayList(), ArrayList()) val participants = arrayListOf(participant) val messageDate = (date / 1000).toInt() + val message = Message(newMessageId, body, type, status, participants, messageDate, false, threadId, false, null, address, "", subscriptionId) context.messagesDB.insertOrUpdate(message)