From 1c1a2d28554714c945039b18f20da8a2224c45a2 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 20 May 2020 16:52:43 +0200
Subject: [PATCH] get the Photo Uri of private contacts too

---
 .../simplemobiletools/smsmessenger/activities/MainActivity.kt  | 1 +
 .../smsmessenger/activities/ThreadActivity.kt                  | 1 +
 .../com/simplemobiletools/smsmessenger/extensions/Context.kt   | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
index 756573b9..01c694b9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
@@ -155,6 +155,7 @@ class MainActivity : SimpleActivity() {
                 conversations.filter { it.title == it.phoneNumber }.forEach { conversation ->
                     privateContacts.firstOrNull { it.phoneNumber == conversation.phoneNumber }?.apply {
                         conversation.title = name
+                        conversation.photoUri = photoUri
                     }
                 }
             }
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 abae32a5..c36d4a6a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -104,6 +104,7 @@ class ThreadActivity : SimpleActivity() {
                     privateContacts.firstOrNull { it.phoneNumber == participant.phoneNumber }?.apply {
                         senderNumbersToReplace[participant.phoneNumber] = name
                         participant.name = name
+                        participant.photoUri = photoUri
                     }
                 }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
index 27c5199b..8fab8ba9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
@@ -383,6 +383,7 @@ fun Context.getSuggestedContacts(privateContacts: ArrayList<SimpleContact>): Arr
         val senderNumber = cursor.getStringValue(Sms.ADDRESS) ?: return@queryCursor
         val namePhoto = getNameAndPhotoFromPhoneNumber(senderNumber)
         var senderName = namePhoto?.name ?: ""
+        var photoUri = namePhoto?.photoUri ?: ""
         if (namePhoto == null || isNumberBlocked(senderNumber)) {
             return@queryCursor
         } else if (namePhoto.name == senderNumber) {
@@ -390,6 +391,7 @@ fun Context.getSuggestedContacts(privateContacts: ArrayList<SimpleContact>): Arr
                 val privateContact = privateContacts.firstOrNull { it.phoneNumber == senderNumber }
                 if (privateContact != null) {
                     senderName = privateContact.name
+                    photoUri = privateContact.photoUri
                 } else {
                     return@queryCursor
                 }
@@ -398,7 +400,6 @@ fun Context.getSuggestedContacts(privateContacts: ArrayList<SimpleContact>): Arr
             }
         }
 
-        val photoUri = namePhoto.photoUri ?: ""
         val contact = SimpleContact(0, 0, senderName, photoUri, senderNumber)
         if (!contacts.map { it.phoneNumber.trimToComparableNumber() }.contains(senderNumber.trimToComparableNumber())) {
             contacts.add(contact)