fenix
/
Simple-SMS-Messenger
mirror of https://github.com/SimpleMobileTools/Simple-SMS-Messenger.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

select the appropriate messages at the individual ThreadActivity

This commit is contained in:
tibbi 2020-04-03 19:34:37 +02:00
parent a446a56afb
commit 70c1e7d6b7
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)
}
}

15
app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
View File

@ -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 {