TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-24 02:47:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: removing debug logs, adding failure error handling logs for expiry message updater, properly using the message thread ID created for the expiring messages. Process the non-thread messages properly with await in BatchMessageReceiveJob

Browse Source
This commit is contained in:
0x330a
2023-05-02 16:30:35 +10:00
parent 216070fa5d
commit f7b4fe216f
5 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libsession/src/main/java/org/session/libsession/messaging/jobs/BatchMessageReceiveJob.kt
View File

@@ -156,7 +156,6 @@ class BatchMessageReceiveJob(
val messageIds = linkedMapOf<Long, Pair<Boolean, Boolean>>()
val myLastSeen = storage.getLastSeen(threadId)
var newLastSeen = if (myLastSeen == -1L) 0 else myLastSeen
Log.d("Loki-DBG", "myLastSeen = $newLastSeen")
messages.forEach { (parameters, message, proto) ->
try {
when (message) {
@@ -226,11 +225,9 @@ class BatchMessageReceiveJob(
// last seen will be the current last seen if not changed (re-computes the read counts for thread record)
// might have been updated from a different thread at this point
val currentLastSeen = storage.getLastSeen(threadId).let { if (it == -1L) 0 else it }
Log.d("Loki-DBG", "currentLastSeen = $currentLastSeen")
if (currentLastSeen > newLastSeen) {
newLastSeen = currentLastSeen
}
Log.d("Loki-DBG", "newLastSeen = $newLastSeen")
storage.markConversationAsRead(threadId, newLastSeen)
storage.updateThread(threadId, true)
SSKEnvironment.shared.notificationManager.updateNotification(context, threadId)
@@ -243,7 +240,7 @@ class BatchMessageReceiveJob(
}
// await all thread processing
deferredThreadMap.awaitAll()
processMessages(NO_THREAD_MAPPING, noThreadMessages)
processMessages(NO_THREAD_MAPPING, noThreadMessages).await()
}
if (failures.isEmpty()) {
handleSuccess(dispatcherName)