From e4d01a760703d3b9570f7768b2aacab0734b7326 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 13 May 2020 14:58:20 +0200
Subject: [PATCH] ignore messages and contacts without number

---
 .../com/simplemobiletools/smsmessenger/extensions/Context.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 12caccc8..819fba47 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
@@ -50,7 +50,7 @@ fun Context.getMessages(threadId: Int): ArrayList<Message> {
     val blockStatus = HashMap<String, Boolean>()
     var messages = ArrayList<Message>()
     queryCursor(uri, projection, selection, selectionArgs, sortOrder, showErrors = true) { cursor ->
-        val senderNumber = cursor.getStringValue(Sms.ADDRESS)
+        val senderNumber = cursor.getStringValue(Sms.ADDRESS) ?: return@queryCursor
 
         val isNumberBlocked = if (blockStatus.containsKey(senderNumber)) {
             blockStatus[senderNumber]!!
@@ -375,7 +375,7 @@ fun Context.getSuggestedContacts(): ArrayList<SimpleContact> {
     val sortOrder = "${Sms.DATE} DESC LIMIT 20"
 
     queryCursor(uri, projection, selection, selectionArgs, sortOrder, showErrors = true) { cursor ->
-        val senderNumber = cursor.getStringValue(Sms.ADDRESS)
+        val senderNumber = cursor.getStringValue(Sms.ADDRESS) ?: return@queryCursor
         val namePhoto = getNameAndPhotoFromPhoneNumber(senderNumber)
         if (namePhoto == null || namePhoto.name == senderNumber || isNumberBlocked(senderNumber)) {
             return@queryCursor