From ab9aa5d2badda2937e101cd3c27af77c270cb4f1 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 14 Apr 2020 09:58:19 +0200
Subject: [PATCH] send the number to Thread activity too, use it if necessary

---
 .../activities/NewConversationActivity.kt           |  1 +
 .../smsmessenger/activities/ThreadActivity.kt       | 13 +++++++++++++
 .../smsmessenger/helpers/Constants.kt               |  1 +
 3 files changed, 15 insertions(+)

diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt
index a2b4071d..49850c06 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt
@@ -174,6 +174,7 @@ class NewConversationActivity : SimpleActivity() {
             putExtra(THREAD_ID, getThreadId(phoneNumber).toInt())
             putExtra(THREAD_TITLE, name)
             putExtra(THREAD_TEXT, text)
+            putExtra(THREAD_NUMBER, phoneNumber)
 
             if (intent.action == Intent.ACTION_SEND && intent.extras?.containsKey(Intent.EXTRA_STREAM) == true) {
                 val uri = intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM)
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 0923a660..e6572c9e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -80,6 +80,19 @@ class ThreadActivity : SimpleActivity() {
                 messages.first().participants
             }
 
+            if (participants.isEmpty()) {
+                val name = intent.getStringExtra(THREAD_TITLE) ?: ""
+                val number = intent.getStringExtra(THREAD_NUMBER)
+                if (number == null) {
+                    toast(R.string.unknown_error_occurred)
+                    finish()
+                    return@ensureBackgroundThread
+                }
+
+                val contact = Contact(0, name, "", number)
+                participants.add(contact)
+            }
+
             messages.filter { it.attachment != null }.forEach {
                 it.attachment!!.attachments.forEach {
                     try {
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt
index 2fe15cf5..b4c507b7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt
@@ -6,6 +6,7 @@ import org.greenrobot.eventbus.EventBus
 const val THREAD_ID = "thread_id"
 const val THREAD_TITLE = "thread_title"
 const val THREAD_TEXT = "thread_text"
+const val THREAD_NUMBER = "thread_number"
 const val THREAD_ATTACHMENT_URI = "thread_attachment_uri"
 const val THREAD_ATTACHMENT_URIS = "thread_attachment_uris"