Optimise DAR message expiry update & lookup

This commit is contained in:
andrew 2023-10-15 01:11:00 +10:30
parent 793fe63260
commit 008bbd8c38
1 changed files with 4 additions and 4 deletions

View File

@ -69,19 +69,20 @@ class MarkReadReceiver : BroadcastReceiver() {
markedReadMessages.forEach { scheduleDeletion(context, it.expirationInfo) }
getHashToMessage(context, markedReadMessages)?.let {
hashToDisappearAfterReadMessage(context, markedReadMessages)?.let {
fetchUpdatedExpiriesAndScheduleDeletion(context, it)
shortenExpiryOfDisappearingAfterRead(context, it)
}
}
private fun getHashToMessage(
private fun hashToDisappearAfterReadMessage(
context: Context,
markedReadMessages: List<MarkedMessageInfo>
): Map<String, MarkedMessageInfo>? {
val loki = DatabaseComponent.get(context).lokiMessageDatabase()
return markedReadMessages
.filter { it.guessExpiryType() == ExpiryType.AFTER_READ }
.associateByNotNull { it.expirationInfo.run { loki.getMessageServerHash(id, isMms) } }
.takeIf { it.isNotEmpty() }
}
@ -90,8 +91,7 @@ class MarkReadReceiver : BroadcastReceiver() {
context: Context,
hashToMessage: Map<String, MarkedMessageInfo>
) {
hashToMessage.filterValues { it.guessExpiryType() == ExpiryType.AFTER_READ }
.entries
hashToMessage.entries
.groupBy(
keySelector = { it.value.expirationInfo.expiresIn },
valueTransform = { it.key }