jeena/sms-translate
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

lets pass more info at the ThreadActivity again, as backup

Browse source
This commit is contained in:
tibbi 2020-04-06 20:24:30 +02:00
parent 8736473b35
commit 705f015a96
3 changed files with 41 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
View file

@ -15,12 +15,12 @@ import com.simplemobiletools.commons.extensions.value
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.smsmessenger.R
import com.simplemobiletools.smsmessenger.adapters.ThreadAdapter
import com.simplemobiletools.smsmessenger.extensions.*
import com.simplemobiletools.smsmessenger.extensions.config
import com.simplemobiletools.smsmessenger.extensions.getMessages
import com.simplemobiletools.smsmessenger.extensions.getThreadInfo
import com.simplemobiletools.smsmessenger.extensions.markSMSRead
import com.simplemobiletools.smsmessenger.helpers.*
import com.simplemobiletools.smsmessenger.models.Events
import com.simplemobiletools.smsmessenger.models.ThreadDateTime
import com.simplemobiletools.smsmessenger.models.ThreadError
import com.simplemobiletools.smsmessenger.models.ThreadItem
import com.simplemobiletools.smsmessenger.models.*
import com.simplemobiletools.smsmessenger.receivers.SmsSentReceiver
import kotlinx.android.synthetic.main.activity_thread.*
import org.greenrobot.eventbus.EventBus
@ -38,14 +38,27 @@ class ThreadActivity : SimpleActivity() {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_thread)
threadId = intent.getIntExtra(THREAD_ID, 0)
val thread = getThreadInfo(threadId)
if (thread == null) {
val extras = intent.extras
if (extras == null) {
toast(R.string.unknown_error_occurred)
finish()
return
}
threadId = intent.getIntExtra(THREAD_ID, 0)
var thread = getThreadInfo(threadId)
if (thread == null) {
if (extras.containsKey(THREAD_NUMBER)) {
val threadTitle = extras.getString(THREAD_NAME) ?: getString(R.string.app_launcher_name)
targetNumber = extras.getString(THREAD_NUMBER)!!
thread = MessagingThread(threadId, threadTitle, targetNumber)
} else {
toast(R.string.unknown_error_occurred)
finish()
return
}
}
title = thread.title
targetNumber = thread.address
bus = EventBus.getDefault()