refactor: Actions should work with messages not only threads. #2795
Open
refactor: Actions should work with messages not only threads. #2795
Conversation
solrubado
changed the title
solrubado
force-pushed
the
threads-to-message-list
branch
2 times, most recently
from
b10b893 to
5fb3f9e
Compare
FabianDevel
force-pushed
the
threads-to-message-list
branch
2 times, most recently
from
b6a55aa to
3548060
Compare
FabianDevel
requested changes
Feb 11, 2026
Contributor
FabianDevel
left a comment
FabianDevel
left a comment
There was a problem hiding this comment.
I'm not sure we should keep the thread in the actionViewModel's function at all.
I believe we have all we need to directly pass the messages list to the functions
For now this feels a bit confusing between the function that accepts threads + messages, and the one that only accept messages but still used for threads too.
app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/MessageController.kt
Show resolved
Hide resolved
app/src/main/java/com/infomaniak/mail/ui/main/folder/PerformSwipeActionManager.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/ActionsViewModel.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/MultiSelectBottomSheetDialog.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/com/infomaniak/mail/ui/main/folder/PerformSwipeActionManager.kt
Outdated
Show resolved
Hide resolved
Comment on lines
171
to
173
| val updatedSendersRestrictions = data!!.apply { | ||
| blockedSenders.removeIf { it.email == email } | ||
| } |
Contributor
There was a problem hiding this comment.
Manage the !! with an error snackbar
| //endregion | ||
|
|
||
| //region Move | ||
| fun moveThreadsOrMessagesTo( |
Contributor
There was a problem hiding this comment.
We should look how to remove this from the mainViewModel also, to avoid having duplicated logic.
Comment on lines
465
to
473
| private fun refreshFoldersAsync( | ||
| mailbox: Mailbox, | ||
| messagesFoldersIds: ImpactedFolders, | ||
| currentFolderId: String? = null, | ||
| destinationFolderId: String? = null, | ||
| callbacks: RefreshCallbacks? = null, | ||
| ) = viewModelScope.launch(ioCoroutineContext) { | ||
| sharedUtils.refreshFolders(mailbox, messagesFoldersIds, destinationFolderId, currentFolderId, callbacks) | ||
| } |
Contributor
There was a problem hiding this comment.
Put this outside the action regions, at the bottom of the class
Comment on lines
+795
to
+819
| fun trySendEmojiReply( | ||
| emoji: String, | ||
| messageUid: String, | ||
| reactions: Map<String, Reaction>, | ||
| hasNetwork: Boolean, | ||
| mailbox: Mailbox, | ||
| onAllowed: () -> Unit = {}, | ||
| ) { | ||
| viewModelScope.launch { | ||
| when (val status = reactions.getEmojiSendStatus(emoji, hasNetwork)) { | ||
| EmojiSendStatus.Allowed -> { | ||
| onAllowed() | ||
| sendEmojiReply(emoji, messageUid, mailbox) | ||
| } | ||
| is EmojiSendStatus.NotAllowed -> snackbarManager.postValue(appContext.getString(status.errorMessageRes)) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun Map<String, Reaction>.getEmojiSendStatus(emoji: String, hasNetwork: Boolean): EmojiSendStatus = when { | ||
| this[emoji]?.hasReacted == true -> EmojiSendStatus.NotAllowed.AlreadyUsed | ||
| hasAvailableReactionSlot().not() -> EmojiSendStatus.NotAllowed.MaxReactionReached | ||
| hasNetwork.not() -> EmojiSendStatus.NotAllowed.NoInternet | ||
| else -> EmojiSendStatus.Allowed | ||
| } |
Contributor
There was a problem hiding this comment.
I think all the emoji stuff should be left out of this viewModel, it's not directly linked to the actions
Comment on lines
828
to
829
| if (hasFailedFetching) return | ||
| val draftMode = Draft.DraftMode.REPLY_ALL |
Contributor
There was a problem hiding this comment.
Add a blank line to separate the early return from the rest of the code
…ck functions to actionsViewModel
solrubado
force-pushed
the
threads-to-message-list
branch
from
3548060 to
96172ac
Compare
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.