fenix/Simple-SMS-Messenger
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-SMS-Messenger.git synced 2025-02-19 21:20:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

better method: limit the total of sms+mms to MESSAGES_LIMIT

Browse Source 
this causes the sms and mms to load together for a smoother flow
This commit is contained in:
yparitcher 2023-05-10 20:35:12 -04:00
parent 7b5d32e624
commit 707d7499e3
No known key found for this signature in database
GPG Key ID: 551EFB312130B5D9
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -514,7 +514,7 @@ class ThreadActivity : SimpleActivity() {
return return
} }
val firstItem = messages.first{ !it.isMMS } val firstItem = messages.first()
val dateOfFirstItem = firstItem.date val dateOfFirstItem = firstItem.date
if (oldestMessageDate == dateOfFirstItem) { if (oldestMessageDate == dateOfFirstItem) {
allMessagesFetched = true allMessagesFetched = true
@ -529,7 +529,7 @@ class ThreadActivity : SimpleActivity() {
.filter { message -> !messages.contains(message) } .filter { message -> !messages.contains(message) }
messages.addAll(0, olderMessages) messages.addAll(0, olderMessages)
allMessagesFetched = olderMessages.size < MESSAGES_LIMIT || olderMessages.isEmpty() allMessagesFetched = olderMessages.isEmpty()
threadItems = getThreadItems() threadItems = getThreadItems()
runOnUiThread { 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() } .filter { it.participants.isNotEmpty() }
.filterNot { it.isScheduled && it.millis() < System.currentTimeMillis() } .filterNot { it.isScheduled && it.millis() < System.currentTimeMillis() }
.sortedWith(compareBy<Message> { it.date }.thenBy { it.id }) .sortedWith(compareBy<Message> { it.date }.thenBy { it.id })
.takeLast(limit)
.toMutableList() as ArrayList<Message> .toMutableList() as ArrayList<Message>
return messages return messages