From b85dbf3b4b8a2dffe39483bd70565049e42f6664 Mon Sep 17 00:00:00 2001
From: Naveen <snaveen935@gmail.com>
Date: Sun, 18 Sep 2022 21:26:09 +0530
Subject: [PATCH] Prefer incoming address over user preference

This is what google messages does.
---
 .../smsmessenger/activities/ThreadActivity.kt             | 8 ++++++--
 1 file changed, 6 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 bad6f123..1d0dce0c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -573,7 +573,11 @@ class ThreadActivity : SimpleActivity() {
         val userPreferredSimIdx = availableSIMs.indexOfFirstOrNull { it.subscriptionId == userPreferredSimId }
 
         val lastMessage = messages.lastOrNull()
-        val senderPreferredSimIdx = availableSIMs.indexOfFirstOrNull { it.subscriptionId == lastMessage?.subscriptionId }
+        val senderPreferredSimIdx = if (lastMessage?.isReceivedMessage() == true) {
+            availableSIMs.indexOfFirstOrNull { it.subscriptionId == lastMessage.subscriptionId }
+        } else {
+            null
+        }
 
         val defaultSmsSubscriptionId = SmsManager.getDefaultSmsSubscriptionId()
         val systemPreferredSimIdx = if (defaultSmsSubscriptionId >= 0) {
@@ -583,7 +587,7 @@ class ThreadActivity : SimpleActivity() {
             null
         }
 
-        return userPreferredSimIdx ?: senderPreferredSimIdx ?: systemPreferredSimIdx ?: 0
+        return senderPreferredSimIdx ?: userPreferredSimIdx ?: systemPreferredSimIdx ?: 0
     }
 
     private fun blockNumber() {