From 70c1e7d6b768a1ab4c09dd2cd605161a13813a13 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 3 Apr 2020 19:34:37 +0200
Subject: [PATCH] select the appropriate messages at the individual
 ThreadActivity

---
 .../smsmessenger/activities/ThreadActivity.kt     |  2 ++
 .../smsmessenger/extensions/Context.kt            | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 3 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 e9a03cfb..4740641e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -2,6 +2,7 @@ package com.simplemobiletools.smsmessenger.activities
 
 import android.os.Bundle
 import com.simplemobiletools.smsmessenger.R
+import com.simplemobiletools.smsmessenger.extensions.getMessages
 import com.simplemobiletools.smsmessenger.helpers.THREAD_ID
 
 class ThreadActivity : SimpleActivity() {
@@ -10,5 +11,6 @@ class ThreadActivity : SimpleActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_thread)
         val threadID = intent.getIntExtra(THREAD_ID, 0)
+        val messages = getMessages(threadID)
     }
 }
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 678e5c52..323d4897 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
@@ -13,7 +13,7 @@ import com.simplemobiletools.smsmessenger.models.Message
 
 val Context.config: Config get() = Config.newInstance(applicationContext)
 
-fun Context.getMessages(): ArrayList<Message> {
+fun Context.getMessages(threadID: Int? = null): ArrayList<Message> {
     val messages = ArrayList<Message>()
     val hasContactsPermission = hasPermission(PERMISSION_READ_CONTACTS)
     val uri = Telephony.Sms.CONTENT_URI
@@ -29,8 +29,17 @@ fun Context.getMessages(): ArrayList<Message> {
         Telephony.Sms.THREAD_ID
     )
 
-    val selection = "1 == 1) GROUP BY (${Telephony.Sms.THREAD_ID}"
-    val selectionArgs = null
+    val selection = if (threadID == null) {
+        "1 == 1) GROUP BY (${Telephony.Sms.THREAD_ID}"
+    } else {
+        "${Telephony.Sms.THREAD_ID} = ?"
+    }
+
+    val selectionArgs = if (threadID == null) {
+        null
+    } else {
+        arrayOf(threadID.toString())
+    }
 
     var cursor: Cursor? = null
     try {