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

refactor: Clean code #2235

Open
wants to merge 3 commits into
base: tidy-up
Choose a base branch
from
Open

refactor: Clean code #2235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98740be
refactor: Typo
KevinBoulongne Mar 7, 2025
4e54be7
refactor: Remove now unused parameter
KevinBoulongne Mar 7, 2025
f6a60cb
refactor: Update FolderRole imports
KevinBoulongne Mar 7, 2025
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
4 changes: 2 additions & 2 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 @@ -518,7 +518,7 @@ class RefreshController @Inject constructor(

initMessageLocalValues(remoteMessage, folder)
addedMessagesUids.add(remoteMessage.shortUid)
refreshStrategy.handleAddedMessages(scope, remoteMessage, isConversationMode, impactedThreadsManaged, realm = this)
refreshStrategy.handleAddedMessage(scope, remoteMessage, isConversationMode, impactedThreadsManaged, realm = this)
}

addSentryBreadcrumbForAddedUidsInFolder(addedMessagesUids)
Expand Down Expand Up @@ -654,7 +654,7 @@ class RefreshController @Inject constructor(
extraFolderUpdates?.invoke(currentFolder)
}

// Some folders such as inbox and snooze require to query again the other folder's threads as well. For example, if a
// Some folders such as INBOX and Snooze require to query again the other folder's threads as well. For example, if a
// message uid is returned as "added" or "deleted" in the snooze folder, it should disappear or appear from inbox as well.
currentFolderRefreshStrategy.otherFolderRolesToQueryThreads().forEach { folderRole ->
getUpToDateFolder(folderRole)?.let { otherFolder ->
Expand Down
4 changes: 2 additions & 2 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 @@ -97,7 +97,7 @@ class ThreadController @Inject constructor(
filterFolder: Folder?,
): List<Thread> = withContext(ioDispatcher) {

fun MutableRealm.keepOldMessagesAndAddToSearchFolder(remoteThread: Thread, searchFolder: Folder) {
fun MutableRealm.keepOldMessagesAndAddToSearchFolder(remoteThread: Thread) {

remoteThread.messages.forEach { remoteMessage: Message ->
ensureActive()
Expand Down Expand Up @@ -145,7 +145,7 @@ class ThreadController @Inject constructor(
}
remoteThread.folderId = folderId

keepOldMessagesAndAddToSearchFolder(remoteThread, searchFolder)
keepOldMessagesAndAddToSearchFolder(remoteThread)

return@map remoteThread
}.also(searchFolder.threads::addAll)
Expand Down
2 changes: 1 addition & 1 deletion ...com/infomaniak/mail/data/cache/mailboxContent/refreshStrategies/DefaultRefreshStrategy.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ interface DefaultRefreshStrategy : RefreshStrategy {

private fun Thread.getNumberOfMessagesInFolder() = messages.count { message -> message.folderId == folderId }

override fun handleAddedMessages(
override fun handleAddedMessage(
scope: CoroutineScope,
remoteMessage: Message,
isConversationMode: Boolean,
Expand Down
6 changes: 3 additions & 3 deletions ...a/com/infomaniak/mail/data/cache/mailboxContent/refreshStrategies/InboxRefreshStrategy.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package com.infomaniak.mail.data.cache.mailboxContent.refreshStrategies

import com.infomaniak.mail.data.cache.mailboxContent.ImpactedFolders
import com.infomaniak.mail.data.cache.mailboxContent.ThreadController
import com.infomaniak.mail.data.models.Folder
import com.infomaniak.mail.data.models.Folder.FolderRole
import com.infomaniak.mail.data.models.thread.Thread
import io.realm.kotlin.TypedRealm

Expand All @@ -28,10 +28,10 @@ val inboxRefreshStrategy = object : DefaultRefreshStrategy {
return ThreadController.getInboxThreadsWithSnoozeFilter(withSnooze = false, realm = realm)
}

override fun otherFolderRolesToQueryThreads(): List<Folder.FolderRole> = listOf(Folder.FolderRole.SNOOZED)
override fun otherFolderRolesToQueryThreads(): List<FolderRole> = listOf(FolderRole.SNOOZED)

override fun addFolderToImpactedFolders(folderId: String, impactedFolders: ImpactedFolders) {
impactedFolders += folderId
impactedFolders += Folder.FolderRole.SNOOZED
impactedFolders += FolderRole.SNOOZED
}
}
2 changes: 1 addition & 1 deletion ...n/java/com/infomaniak/mail/data/cache/mailboxContent/refreshStrategies/RefreshStrategy.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ interface RefreshStrategy {
* It represents all the Threads that will need to be recomputed to reflect the changes of the newly added Messages.
* We need to pass down a reference to the MutableSet to enable both addition and removal of Threads in it.
*/
fun handleAddedMessages(
fun handleAddedMessage(
scope: CoroutineScope,
remoteMessage: Message,
isConversationMode: Boolean,
Expand Down
10 changes: 5 additions & 5 deletions .../com/infomaniak/mail/data/cache/mailboxContent/refreshStrategies/SnoozeRefreshStrategy.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import com.infomaniak.mail.data.cache.mailboxContent.FolderController
import com.infomaniak.mail.data.cache.mailboxContent.ImpactedFolders
import com.infomaniak.mail.data.cache.mailboxContent.MessageController
import com.infomaniak.mail.data.cache.mailboxContent.ThreadController
import com.infomaniak.mail.data.models.Folder
import com.infomaniak.mail.data.models.Folder.FolderRole
import com.infomaniak.mail.data.models.mailbox.Mailbox
import com.infomaniak.mail.data.models.message.Message
import com.infomaniak.mail.data.models.message.Message.MessageInitialState
Expand All @@ -36,12 +36,12 @@ val snoozeRefreshStrategy = object : DefaultRefreshStrategy {
return ThreadController.getInboxThreadsWithSnoozeFilter(withSnooze = true, realm = realm)
}

override fun otherFolderRolesToQueryThreads(): List<Folder.FolderRole> = listOf(Folder.FolderRole.INBOX)
override fun otherFolderRolesToQueryThreads(): List<FolderRole> = listOf(FolderRole.INBOX)

override fun shouldHideEmptyFolder(): Boolean = true

override fun getMessageFromShortUid(shortUid: String, folderId: String, realm: TypedRealm): Message? {
val inboxId = FolderController.getFolder(Folder.FolderRole.INBOX, realm)?.id ?: return null
val inboxId = FolderController.getFolder(FolderRole.INBOX, realm)?.id ?: return null
return super.getMessageFromShortUid(shortUid, inboxId, realm)
}

Expand All @@ -61,7 +61,7 @@ val snoozeRefreshStrategy = object : DefaultRefreshStrategy {

override fun addFolderToImpactedFolders(folderId: String, impactedFolders: ImpactedFolders) {
impactedFolders += folderId
impactedFolders += Folder.FolderRole.INBOX
impactedFolders += FolderRole.INBOX
}

override fun processDeletedThread(thread: Thread, realm: MutableRealm) = thread.recomputeThread()
Expand All @@ -74,7 +74,7 @@ val snoozeRefreshStrategy = object : DefaultRefreshStrategy {
* So we take the [remoteMessage] (because it contains the up-to-date data about the snooze state),
* we give it the localMessage local values, then we upsert it into Realm.
*/
override fun handleAddedMessages(
override fun handleAddedMessage(
scope: CoroutineScope,
remoteMessage: Message,
isConversationMode: Boolean,
Expand Down