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

Jump to bottom

Temp fix attachments #1894

Merged
merged 4 commits into from
Jun 7, 2024
Merged

Temp fix attachments #1894

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a190af6
Add logic to fix attachments
NicolasBourdin88 Jun 5, 2024
f1e8f1e
Add comments to prevent that this fix is temporary
NicolasBourdin88 Jun 5, 2024
cc3948b
Put logic in a function
NicolasBourdin88 Jun 6, 2024
e2c6c22
Manage another case of the bug
NicolasBourdin88 Jun 7, 2024
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
22 changes: 22 additions & 0 deletions app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ThreadController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,10 @@ class ThreadController @Inject constructor(
//region Edit data
fun upsertThread(thread: Thread, realm: MutableRealm): Thread = realm.copyToRealm(thread, UpdatePolicy.ALL)

private fun updateThread(threadUid: String, realm: MutableRealm, onUpdate: (Thread?) -> Unit) {
onUpdate(getThread(threadUid, realm))
}

/**
* Asynchronously fetches heavy data for a list of messages within a given mailbox and realm.
*
Expand Down Expand Up @@ -266,6 +270,8 @@ class ThreadController @Inject constructor(
}

realm.writeBlocking {
var hasAttachmentsInThread = false

messages.forEach { localMessage ->

if (localMessage.isFullyDownloaded()) return@forEach
Expand All @@ -284,6 +290,9 @@ class ThreadController @Inject constructor(
latestCalendarEventResponse = localMessage.latestCalendarEventResponse,
messageIds = localMessage.messageIds,
)

if (remoteMessage.hasAttachments) hasAttachmentsInThread = true

MessageController.upsertMessage(remoteMessage, realm = this)
}
} else {
Expand All @@ -294,6 +303,9 @@ class ThreadController @Inject constructor(
// This `runCatching / onFailure` is here only to catch `OutOfMemoryError` when trying to deserialize very big Body
handleFailure(localMessage.uid)
}

// TODO: Remove this when the API returns the good value for `has_attachments`.
verifyAttachmentsValues(hasAttachmentsInThread, messages, this@writeBlocking)
}
}

Expand All @@ -309,6 +321,16 @@ class ThreadController @Inject constructor(
fun deleteSearchThreads(realm: MutableRealm) = with(realm) {
delete(query<Thread>("${Thread::isFromSearch.name} == true").find())
}

private fun verifyAttachmentsValues(hasAttachmentsInThread: Boolean, messages: List<Message>, realm: MutableRealm) {
messages.flatMapTo(mutableSetOf()) { it.threads }.forEach { thread ->
if (thread.hasAttachments != hasAttachmentsInThread) {
updateThread(thread.uid, realm) {
it?.hasAttachments = hasAttachmentsInThread
}
}
}
}
//endregion
}
}
Loading