TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-04 15:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimise DAR message expiry update & lookup

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.kt
View File

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