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

Merge branch 'master' of github.com:SimpleMobileTools/Simple-SMS-Messenger

This commit is contained in:
tibbi 2023-05-19 22:54:22 +02:00
parent 3dadb0ccb8 dd48fa544e
commit 16734aa93d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -520,7 +520,8 @@ class ThreadActivity : SimpleActivity() {
return
}
val dateOfFirstItem = messages.first().date
val firstItem = messages.first()
val dateOfFirstItem = firstItem.date
if (oldestMessageDate == dateOfFirstItem) {
allMessagesFetched = true
return
@ -530,12 +531,11 @@ class ThreadActivity : SimpleActivity() {
loadingOlderMessages = true
ensureBackgroundThread {
val firstItem = messages.first()
val olderMessages = getMessages(threadId, true, oldestMessageDate)
.filter { message -> !messages.contains(message) }
messages.addAll(0, olderMessages)
allMessagesFetched = olderMessages.size < MESSAGES_LIMIT || olderMessages.isEmpty()
allMessagesFetched = olderMessages.isEmpty()
threadItems = getThreadItems()
runOnUiThread {

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

@ -135,6 +135,7 @@ fun Context.getMessages(
.filter { it.participants.isNotEmpty() }
.filterNot { it.isScheduled && it.millis() < System.currentTimeMillis() }
.sortedWith(compareBy<Message> { it.date }.thenBy { it.id })
.takeLast(limit)
.toMutableList() as ArrayList<Message>
return messages