fenix/Simple-SMS-Messenger
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-SMS-Messenger.git synced 2025-06-05 21:49:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

fetch only the wanted MMS messages at threads

Browse Source
This commit is contained in:
tibbi
2020-04-07 23:26:43 +02:00
parent e8f37b69de
commit 1e54e6cde0
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ import kotlin.collections.ArrayList
val Context.config: Config get() = Config.newInstance(applicationContext) val Context.config: Config get() = Config.newInstance(applicationContext)
fun Context.getMessages(threadID: Int? = null): ArrayList<Message> { fun Context.getMessages(threadId: Int? = null): ArrayList<Message> {
val hasContactsPermission = hasPermission(PERMISSION_READ_CONTACTS) val hasContactsPermission = hasPermission(PERMISSION_READ_CONTACTS)
val uri = Sms.CONTENT_URI val uri = Sms.CONTENT_URI
val projection = arrayOf( val projection = arrayOf(
@@ -44,16 +44,16 @@ fun Context.getMessages(threadID: Int? = null): ArrayList<Message> {
Sms.THREAD_ID Sms.THREAD_ID
) )
val selection = if (threadID == null) { val selection = if (threadId == null) {
"1 == 1) GROUP BY (${Sms.THREAD_ID}" "1 == 1) GROUP BY (${Sms.THREAD_ID}"
} else { } else {
"${Sms.THREAD_ID} = ?" "${Sms.THREAD_ID} = ?"
} }
val selectionArgs = if (threadID == null) { val selectionArgs = if (threadId == null) {
null null
} else { } else {
arrayOf(threadID.toString()) arrayOf(threadId.toString())
} }
var messages = ArrayList<Message>() var messages = ArrayList<Message>()
@@ -84,16 +84,16 @@ fun Context.getMessages(threadID: Int? = null): ArrayList<Message> {
messages.add(message) messages.add(message)
} }
messages.addAll(getMMS()) messages.addAll(getMMS(threadId))
messages = messages.sortedByDescending { it.date }.toMutableList() as ArrayList<Message> messages = messages.sortedByDescending { it.date }.toMutableList() as ArrayList<Message>
if (threadID == null) { if (threadId == null) {
messages = messages.distinctBy { it.thread }.toMutableList() as ArrayList<Message> messages = messages.distinctBy { it.thread }.toMutableList() as ArrayList<Message>
} }
return messages return messages
} }
fun Context.getMMS(): ArrayList<Message> { fun Context.getMMS(threadId: Int? = null): ArrayList<Message> {
val hasContactsPermission = hasPermission(PERMISSION_READ_CONTACTS) val hasContactsPermission = hasPermission(PERMISSION_READ_CONTACTS)
val uri = Mms.CONTENT_URI val uri = Mms.CONTENT_URI
val projection = arrayOf( val projection = arrayOf(
@@ -105,8 +105,20 @@ fun Context.getMMS(): ArrayList<Message> {
Mms.THREAD_ID Mms.THREAD_ID
) )
val selection = if (threadId == null) {
null
} else {
"${Mms.THREAD_ID} = ?"
}
val selectionArgs = if (threadId == null) {
null
} else {
arrayOf(threadId.toString())
}
val messages = ArrayList<Message>() val messages = ArrayList<Message>()
queryCursor(uri, projection, showErrors = true) { cursor -> queryCursor(uri, projection, selection, selectionArgs, showErrors = true) { cursor ->
val id = cursor.getIntValue(Mms._ID) val id = cursor.getIntValue(Mms._ID)
val subject = cursor.getStringValue(Mms.SUBJECT) ?: "" val subject = cursor.getStringValue(Mms.SUBJECT) ?: ""
val type = cursor.getIntValue(Mms.MESSAGE_BOX) val type = cursor.getIntValue(Mms.MESSAGE_BOX)