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

show SMS time header also if a message was sent from a different SIM

Browse source
This commit is contained in:
tibbi 2022-05-23 20:21:43 +02:00
parent f41e1aa18e
commit 8b8ee88c43
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -631,12 +631,14 @@ class ThreadActivity : SimpleActivity() {
} }
var prevDateTime = 0 var prevDateTime = 0
var prevSIMId = -2
var hadUnreadItems = false var hadUnreadItems = false
val cnt = messages.size val cnt = messages.size
for (i in 0 until cnt) { for (i in 0 until cnt) {
val message = messages.getOrNull(i) ?: continue val message = messages.getOrNull(i) ?: continue
// 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 (message.date - prevDateTime > MIN_DATE_TIME_DIFF_SECS) { // or if the message is sent from a different SIM
if (message.date - prevDateTime > MIN_DATE_TIME_DIFF_SECS || prevSIMId != message.subscriptionId) {
val simCardID = subscriptionIdToSimId[message.subscriptionId] ?: "?" val simCardID = subscriptionIdToSimId[message.subscriptionId] ?: "?"
items.add(ThreadDateTime(message.date, simCardID)) items.add(ThreadDateTime(message.date, simCardID))
prevDateTime = message.date prevDateTime = message.date
@ -660,6 +662,7 @@ class ThreadActivity : SimpleActivity() {
if (i == cnt - 1 && (message.type == Telephony.Sms.MESSAGE_TYPE_SENT)) { if (i == cnt - 1 && (message.type == Telephony.Sms.MESSAGE_TYPE_SENT)) {
items.add(ThreadSent(message.id, delivered = message.status == Telephony.Sms.STATUS_COMPLETE)) items.add(ThreadSent(message.id, delivered = message.status == Telephony.Sms.STATUS_COMPLETE))
} }
prevSIMId = message.subscriptionId
} }
if (hadUnreadItems) { if (hadUnreadItems) {