Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make sure we use the up-to-date version of Folder in RefreshController #2025

Merged
merged 1 commit into from
Sep 2, 2024
Merged

Make sure we use the up-to-date version of Folder in RefreshController #2025

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 19 additions & 21 deletions app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/RefreshController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,19 +388,18 @@ class RefreshController @Inject constructor(
apiResponse.data?.messages?.let { messages ->

writeBlocking {
findLatest(folder)?.let { latestFolder ->
val isConversationMode = localSettings.threadMode == ThreadMode.CONVERSATION
val allImpactedThreads = createThreads(scope, latestFolder, messages, isConversationMode).also { threads ->
val foldersIds = (if (isConversationMode) threads.map { it.folderId }.toSet() else emptySet()) + folder.id
foldersIds.forEach { refreshUnreadCount(id = it, realm = this) }
}
SentryLog.d(
"Realm",
"Saved Messages: ${latestFolder.displayForSentry()} | ${latestFolder.messages.count()}",
)

impactedThreads += allImpactedThreads.filter { it.folderId == folder.id }
val upToDateFolder = getUpToDateFolder(folder.id)
val isConversationMode = localSettings.threadMode == ThreadMode.CONVERSATION
val allImpactedThreads = createThreads(scope, upToDateFolder, messages, isConversationMode).also { threads ->
val foldersIds = (if (isConversationMode) threads.map { it.folderId }.toSet() else emptySet()) + folder.id
foldersIds.forEach { refreshUnreadCount(id = it, realm = this) }
}
SentryLog.d(
"Realm",
"Saved Messages: ${upToDateFolder.displayForSentry()} | ${upToDateFolder.messages.count()}",
)

impactedThreads += allImpactedThreads.filter { it.folderId == upToDateFolder.id }
}
}

Expand Down Expand Up @@ -725,16 +724,15 @@ class RefreshController @Inject constructor(

private fun Realm.sendSentryOrphans(folder: Folder, previousCursor: String? = null) {
writeBlocking {
findLatest(folder)?.let {
SentryDebug.sendOrphanMessages(previousCursor, folder = it).also { orphans ->
MessageController.deleteMessages(appContext, mailbox, orphans, realm = this)
}
SentryDebug.sendOrphanThreads(previousCursor, folder = it, realm = this).also { orphans ->
orphans.forEach { thread ->
MessageController.deleteMessages(appContext, mailbox, thread.messages, realm = this)
}
delete(orphans)
val upToDateFolder = getUpToDateFolder(folder.id)
SentryDebug.sendOrphanMessages(previousCursor, folder = upToDateFolder).also { orphans ->
MessageController.deleteMessages(appContext, mailbox, orphans, realm = this)
}
SentryDebug.sendOrphanThreads(previousCursor, folder = upToDateFolder, realm = this).also { orphans ->
orphans.forEach { thread ->
MessageController.deleteMessages(appContext, mailbox, thread.messages, realm = this)
}
delete(orphans)
}
}
}
Expand Down
Loading