Skip to content

refactor: Actions should work with messages not only threads. #2795

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

Open
solrubado wants to merge 14 commits into
base: main
Choose a base branch
from
Open

refactor: Actions should work with messages not only threads. #2795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
bc277e3
refactor: Change spam and move actions to use messages and not threads
solrubado Jan 27, 2026
e4d6299
feat: Refactor of actions to use messages instead of threads
solrubado Jan 30, 2026
0c30b1b
fix: Fix one message actions
solrubado Jan 30, 2026
82f209b
refactor: Remove unnused functions from MainViewModel and added unblo…
solrubado Jan 30, 2026
1bbb475
refactor: Refactor code
solrubado Jan 30, 2026
c5ebecc
fix: Permanently delete trigger and multiselect phishing
solrubado Feb 2, 2026
92cf576
refactor: Remove unnused variables, add parameters name
solrubado Feb 2, 2026
96172ac
refactor: Fix sonar issues
solrubado Feb 2, 2026
c9c7432
fix: Fix PR comments
solrubado Feb 17, 2026
d1520b6
refactor: Move mailbox initialization and add not translatable error …
solrubado Feb 17, 2026
5cfb0c9
refactor: Refactor current mailbox initialization
solrubado Feb 17, 2026
662c141
fix: Fix PR comments
solrubado Feb 23, 2026
af9d70a
fix: Remove comment in webview
solrubado Feb 23, 2026
1ca2595
fix: Fix review comments (#2812)
FabianDevel Feb 25, 2026
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
13 changes: 12 additions & 1 deletion app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/MessageController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,14 @@ class MessageController @Inject constructor(
return getMessagesFromThread(thread, "$byFolderId AND $isNotScheduledMessage", includeDuplicates = false)
}

suspend fun getUnscheduledMessages(thread: Thread, includeDuplicates: Boolean): List<Message> {
suspend fun getUnscheduledMessagesFromThread(thread: Thread, includeDuplicates: Boolean): List<Message> {
return getMessagesFromThread(thread, isNotScheduledMessage, includeDuplicates)
}

fun getUnscheduledMessages(messages: List<Message>): List<Message> {
return messages.filter { message -> !message.isScheduledMessage }
}

private suspend fun getMessagesFromThread(thread: Thread, query: String, includeDuplicates: Boolean): List<Message> {
val messages = thread.messages.query(query).findSuspend()
if (includeDuplicates) {
Expand All @@ -135,6 +139,13 @@ class MessageController @Inject constructor(
messagesAsync.await() + duplicatesAsync.await()
}

suspend fun getMessagesAndDuplicates(messages: List<Message>): List<Message> {
return messages.flatMap { message ->
if (message.threads.isEmpty()) return@flatMap listOf(message)
getMessageAndDuplicates(message.threads.first(), message)
}
}

suspend fun getMessageAndDuplicates(thread: Thread, message: Message): List<Message> {
return listOf(message) + thread.duplicates.query("${Message::messageId.name} == $0", message.messageId).findSuspend()
}
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/com/infomaniak/mail/ui/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ import com.infomaniak.mail.ui.main.folder.TwoPaneFragment
import com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerFragment
import com.infomaniak.mail.ui.main.onboarding.PermissionsOnboardingPagerFragment
import com.infomaniak.mail.ui.main.search.SearchFragmentArgs
import com.infomaniak.mail.ui.main.thread.actions.ActionsViewModel
import com.infomaniak.mail.ui.newMessage.NewMessageActivity
import com.infomaniak.mail.ui.sync.SyncAutoConfigActivity
import com.infomaniak.mail.ui.sync.discovery.SyncDiscoveryManager
Expand Down Expand Up @@ -113,6 +114,7 @@ class MainActivity : BaseActivity() {

private val binding by lazy { ActivityMainBinding.inflate(layoutInflater) }
private val mainViewModel: MainViewModel by viewModels()
private val actionsViewModel: ActionsViewModel by viewModels()

private val navigationArgs: MainActivityArgs? by lazy { intent?.extras?.let(MainActivityArgs::fromBundle) }

Expand Down Expand Up @@ -269,7 +271,7 @@ class MainActivity : BaseActivity() {
}

private fun observeActivityDialogLoaderReset() {
mainViewModel.activityDialogLoaderResetTrigger.observe(this) { descriptionDialog.resetLoadingAndDismiss() }
actionsViewModel.activityDialogLoaderResetTrigger.observe(this) { descriptionDialog.resetLoadingAndDismiss() }
}

private fun observeDraftWorkerResults() {
Expand Down Expand Up @@ -488,7 +490,7 @@ class MainActivity : BaseActivity() {
getAnchor = ::getAnchor,
onUndoData = {
trackEvent(MatomoMail.MatomoCategory.Snackbar, MatomoName.Undo)
mainViewModel.undoAction(it)
actionsViewModel.undoAction(it, mainViewModel.currentMailbox.value!!)
},
)
}
Expand Down
Loading