rewriting the loop checking the messages

This commit is contained in:
tibbi
2020-08-23 21:30:27 +02:00
parent f1dfe8c9cc
commit e66a24c8f8

View File

@@ -439,22 +439,23 @@ class ThreadActivity : SimpleActivity() {
var prevDateTime = 0 var prevDateTime = 0
var hadUnreadItems = false var hadUnreadItems = false
messages.forEach { for (i in 0 until messages.size) {
val message = messages[i]
// do not show the date/time above every message, only if the difference between the 2 messages is at least MIN_DATE_TIME_DIFF_SECS // do not show the date/time above every message, only if the difference between the 2 messages is at least MIN_DATE_TIME_DIFF_SECS
if (it.date - prevDateTime > MIN_DATE_TIME_DIFF_SECS) { if (message.date - prevDateTime > MIN_DATE_TIME_DIFF_SECS) {
val simCardID = subscriptionIdToSimId[it.subscriptionId] ?: "?" val simCardID = subscriptionIdToSimId[message.subscriptionId] ?: "?"
items.add(ThreadDateTime(it.date, simCardID)) items.add(ThreadDateTime(message.date, simCardID))
prevDateTime = it.date prevDateTime = message.date
} }
items.add(it) items.add(message)
if (it.type == Telephony.Sms.MESSAGE_TYPE_FAILED) { if (message.type == Telephony.Sms.MESSAGE_TYPE_FAILED) {
items.add(ThreadError(it.id)) items.add(ThreadError(message.id))
} }
if (!it.read) { if (!message.read) {
hadUnreadItems = true hadUnreadItems = true
markMessageRead(it.id, it.isMMS) markMessageRead(message.id, message.isMMS)
conversationsDB.markRead(threadId.toLong()) conversationsDB.markRead(threadId.toLong())
} }
} }