From 422ccf4b6a532b1f679d4e8adc7ad1a1353e0f7f Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 18 May 2020 23:38:56 +0200
Subject: [PATCH] lets check those private contacts only if we actually have
 any

---
 .../smsmessenger/activities/MainActivity.kt   |  8 +++++---
 .../smsmessenger/activities/ThreadActivity.kt | 20 ++++++++++---------
 2 files changed, 16 insertions(+), 12 deletions(-)

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 f2636220..e71e842c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
@@ -151,9 +151,11 @@ class MainActivity : SimpleActivity() {
 
             // check if no message came from a privately stored contact in Simple Contacts
             val privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor)
-            conversations.filter { it.title == it.phoneNumber }.forEach { conversation ->
-                privateContacts.firstOrNull { it.phoneNumber == conversation.phoneNumber }?.apply {
-                    conversation.title = name
+            if (privateContacts.isNotEmpty()) {
+                conversations.filter { it.title == it.phoneNumber }.forEach { conversation ->
+                    privateContacts.firstOrNull { it.phoneNumber == conversation.phoneNumber }?.apply {
+                        conversation.title = name
+                    }
                 }
             }
 
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 f92b68c1..bb0d7c19 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -95,19 +95,21 @@ class ThreadActivity : SimpleActivity() {
                 messages.first().participants
             }
 
-            val senderNumbersToReplace = HashMap<String, String>()
             // check if no participant came from a privately stored contact in Simple Contacts
             val privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor)
-            participants.filter { it.name == it.phoneNumber }.forEach { participant ->
-                privateContacts.firstOrNull { it.phoneNumber == participant.phoneNumber }?.apply {
-                    senderNumbersToReplace[participant.phoneNumber] = name
-                    participant.name = name
+            if (privateContacts.isNotEmpty()) {
+                val senderNumbersToReplace = HashMap<String, String>()
+                participants.filter { it.name == it.phoneNumber }.forEach { participant ->
+                    privateContacts.firstOrNull { it.phoneNumber == participant.phoneNumber }?.apply {
+                        senderNumbersToReplace[participant.phoneNumber] = name
+                        participant.name = name
+                    }
                 }
-            }
 
-            messages.forEach { message ->
-                if (senderNumbersToReplace.keys.contains(message.senderName)) {
-                    message.senderName = senderNumbersToReplace[message.senderName]!!
+                messages.forEach { message ->
+                    if (senderNumbersToReplace.keys.contains(message.senderName)) {
+                        message.senderName = senderNumbersToReplace[message.senderName]!!
+                    }
                 }
             }