fenix/Simple-SMS-Messenger
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-SMS-Messenger.git synced 2025-02-18 12:40:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

send the number to Thread activity too, use it if necessary

Browse Source
This commit is contained in:
tibbi 2020-04-14 09:58:19 +02:00
parent b231f2c644
commit ab9aa5d2ba
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt
View File

@ -174,6 +174,7 @@ class NewConversationActivity : SimpleActivity() {
putExtra(THREAD_ID, getThreadId(phoneNumber).toInt()) putExtra(THREAD_ID, getThreadId(phoneNumber).toInt())
putExtra(THREAD_TITLE, name) putExtra(THREAD_TITLE, name)
putExtra(THREAD_TEXT, text) putExtra(THREAD_TEXT, text)
putExtra(THREAD_NUMBER, phoneNumber)
if (intent.action == Intent.ACTION_SEND && intent.extras?.containsKey(Intent.EXTRA_STREAM) == true) { if (intent.action == Intent.ACTION_SEND && intent.extras?.containsKey(Intent.EXTRA_STREAM) == true) {
val uri = intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM) val uri = intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM)

13
app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
View File

@ -80,6 +80,19 @@ class ThreadActivity : SimpleActivity() {
messages.first().participants 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 { messages.filter { it.attachment != null }.forEach {
it.attachment!!.attachments.forEach { it.attachment!!.attachments.forEach {
try { try {

1
app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt
View File

@ -6,6 +6,7 @@ import org.greenrobot.eventbus.EventBus
const val THREAD_ID = "thread_id" const val THREAD_ID = "thread_id"
const val THREAD_TITLE = "thread_title" const val THREAD_TITLE = "thread_title"
const val THREAD_TEXT = "thread_text" const val THREAD_TEXT = "thread_text"
const val THREAD_NUMBER = "thread_number"
const val THREAD_ATTACHMENT_URI = "thread_attachment_uri" const val THREAD_ATTACHMENT_URI = "thread_attachment_uri"
const val THREAD_ATTACHMENT_URIS = "thread_attachment_uris" const val THREAD_ATTACHMENT_URIS = "thread_attachment_uris"