Skip to content

Commit 707d749

Browse files
committed
better method: limit the total of sms+mms to MESSAGES_LIMIT
this causes the sms and mms to load together for a smoother flow
1 parent 7b5d32e commit 707d749

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ class ThreadActivity : SimpleActivity() {
514514
return
515515
}
516516

517-
val firstItem = messages.first{ !it.isMMS }
517+
val firstItem = messages.first()
518518
val dateOfFirstItem = firstItem.date
519519
if (oldestMessageDate == dateOfFirstItem) {
520520
allMessagesFetched = true
@@ -529,7 +529,7 @@ class ThreadActivity : SimpleActivity() {
529529
.filter { message -> !messages.contains(message) }
530530

531531
messages.addAll(0, olderMessages)
532-
allMessagesFetched = olderMessages.size < MESSAGES_LIMIT || olderMessages.isEmpty()
532+
allMessagesFetched = olderMessages.isEmpty()
533533
threadItems = getThreadItems()
534534

535535
runOnUiThread {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ fun Context.getMessages(
135135
.filter { it.participants.isNotEmpty() }
136136
.filterNot { it.isScheduled && it.millis() < System.currentTimeMillis() }
137137
.sortedWith(compareBy<Message> { it.date }.thenBy { it.id })
138+
.takeLast(limit)
138139
.toMutableList() as ArrayList<Message>
139140

140141
return messages

0 commit comments

Comments
 (0)