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

properly sort all fetched messages

Browse source
This commit is contained in:
tibbi 2020-04-07 23:24:27 +02:00
parent bda8ff863c
commit e8f37b69de
2 changed files with 7 additions and 2 deletions
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

@ -200,7 +200,7 @@ class ThreadActivity : SimpleActivity() {
private fun getThreadItems(threadID: Int): ArrayList<ThreadItem> { private fun getThreadItems(threadID: Int): ArrayList<ThreadItem> {
val messages = getMessages(threadID) val messages = getMessages(threadID)
messages.sortBy { it.id } messages.sortBy { it.date }
val items = ArrayList<ThreadItem>() val items = ArrayList<ThreadItem>()
var prevDateTime = 0 var prevDateTime = 0

7
app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
View file

@ -56,7 +56,7 @@ fun Context.getMessages(threadID: Int? = null): ArrayList<Message> {
arrayOf(threadID.toString()) arrayOf(threadID.toString())
} }
val messages = ArrayList<Message>() var messages = ArrayList<Message>()
queryCursor(uri, projection, selection, selectionArgs, showErrors = true) { cursor -> queryCursor(uri, projection, selection, selectionArgs, showErrors = true) { cursor ->
val id = cursor.getIntValue(Sms._ID) val id = cursor.getIntValue(Sms._ID)
val subject = cursor.getStringValue(Sms.SUBJECT) ?: "" val subject = cursor.getStringValue(Sms.SUBJECT) ?: ""
@ -85,6 +85,11 @@ fun Context.getMessages(threadID: Int? = null): ArrayList<Message> {
} }
messages.addAll(getMMS()) messages.addAll(getMMS())
messages = messages.sortedByDescending { it.date }.toMutableList() as ArrayList<Message>
if (threadID == null) {
messages = messages.distinctBy { it.thread }.toMutableList() as ArrayList<Message>
}
return messages return messages
} }