From a4adf59323b0f710705c30a64d7b33c7ecdf3967 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 11 Apr 2020 19:43:39 +0200
Subject: [PATCH] cleaning up getMessages, threadId cannot be null

---
 .../smsmessenger/extensions/Context.kt        | 19 +++----------------
 1 file changed, 3 insertions(+), 16 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 2f6e946b..0ae46472 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
@@ -43,7 +43,7 @@ import kotlin.collections.ArrayList
 
 val Context.config: Config get() = Config.newInstance(applicationContext)
 
-fun Context.getMessages(threadId: Int? = null): ArrayList<Message> {
+fun Context.getMessages(threadId: Int): ArrayList<Message> {
     val uri = Sms.CONTENT_URI
     val projection = arrayOf(
         Sms._ID,
@@ -55,17 +55,8 @@ fun Context.getMessages(threadId: Int? = null): ArrayList<Message> {
         Sms.THREAD_ID
     )
 
-    val selection = if (threadId == null) {
-        "1 == 1) GROUP BY (${Sms.THREAD_ID}"
-    } else {
-        "${Sms.THREAD_ID} = ?"
-    }
-
-    val selectionArgs = if (threadId == null) {
-        null
-    } else {
-        arrayOf(threadId.toString())
-    }
+    val selection = "${Sms.THREAD_ID} = ?"
+    val selectionArgs = arrayOf(threadId.toString())
 
     var messages = ArrayList<Message>()
     queryCursor(uri, projection, selection, selectionArgs, showErrors = true) { cursor ->
@@ -93,10 +84,6 @@ fun Context.getMessages(threadId: Int? = null): ArrayList<Message> {
     messages = messages.filter { it.participants.isNotEmpty() }
         .sortedByDescending { it.date }.toMutableList() as ArrayList<Message>
 
-    if (threadId == null) {
-        messages = messages.distinctBy { it.thread }.toMutableList() as ArrayList<Message>
-    }
-
     return messages
 }