Move MenuDrawer list computation to background thread

Author: KevinBoulongne

app/src/main/java/com/infomaniak/mail/ui/main/menuDrawer/MenuDrawerAdapter.kt

@@ -51,6 +51,7 @@ import com.infomaniak.mail.ui.main.menuDrawer.items.InvalidMailboxViewHolder
 import com.infomaniak.mail.ui.main.menuDrawer.items.MailboxViewHolder
 import com.infomaniak.mail.ui.main.menuDrawer.items.MailboxesHeaderViewHolder
 import com.infomaniak.mail.ui.main.menuDrawer.items.MailboxesHeaderViewHolder.MailboxesHeader
+import com.infomaniak.mail.utils.AccountUtils
 import com.infomaniak.mail.utils.Utils.runCatchingRealm
 import javax.inject.Inject
 
@@ -67,25 +68,26 @@ class MenuDrawerAdapter @Inject constructor() : ListAdapter<Any, MenuDrawerViewH
         return this
     }
 
-    fun setItems(mediatorContainer: MediatorContainer) = runCatchingRealm {
+    fun formatList(mediatorContainer: MediatorContainer) = mutableListOf<Any>().apply {
+        runCatchingRealm {
 
-        val (
-            currentMailbox,
-            areMailboxesExpanded,
-            otherMailboxes,
-            allFolders,
-            areCustomFoldersExpanded,
-            permissions,
-            quotas,
-        ) = mediatorContainer
-
-        val items = mutableListOf<Any>().apply {
+            val (
+                mailboxes,
+                areMailboxesExpanded,
+                allFolders,
+                areCustomFoldersExpanded,
+                permissions,
+                quotas,
+            ) = mediatorContainer
 
             var count = 0
             var temporaryHasCollapsableDefaultFolder = false
             var temporaryHasCollapsableCustomFolder = false
 
             // Mailboxes
+            val currentMailboxIndex = mailboxes.indexOfFirst { it.mailboxId == AccountUtils.currentMailboxId }
+            val otherMailboxes = mailboxes.toMutableList()
+            val currentMailbox = otherMailboxes.removeAt(currentMailboxIndex)
             add(MailboxesHeader(currentMailbox, otherMailboxes.isNotEmpty(), areMailboxesExpanded))
             if (areMailboxesExpanded) addAll(otherMailboxes)
 
@@ -120,8 +122,6 @@ class MenuDrawerAdapter @Inject constructor() : ListAdapter<Any, MenuDrawerViewH
             add(ItemType.DIVIDER)
             add(MenuDrawerFooter(permissions, quotas))
         }
-
-        submitList(items)
     }
 
     fun notifySelectedFolder(currentFolder: Folder) {

app/src/main/java/com/infomaniak/mail/ui/main/menuDrawer/MenuDrawerFragment.kt

@@ -27,6 +27,8 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle.State
+import androidx.lifecycle.asFlow
+import androidx.lifecycle.asLiveData
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.infomaniak.lib.bugtracker.BugTrackerActivity
@@ -59,6 +61,9 @@ import com.infomaniak.mail.utils.extensions.bindAlertToViewLifecycle
 import com.infomaniak.mail.utils.extensions.launchSyncAutoConfigActivityForResult
 import com.infomaniak.mail.utils.extensions.observeNotNull
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -249,26 +254,29 @@ class MenuDrawerFragment : Fragment() {
     private fun observeMenuDrawerData() = with(mainViewModel) {
 
         Utils.waitInitMediator(
-            currentMailbox,
+            mailboxesLive,
             menuDrawerViewModel.areMailboxesExpanded,
-            menuDrawerViewModel.otherMailboxesLive,
             currentFoldersLive,
             menuDrawerViewModel.areCustomFoldersExpanded,
             currentPermissionsLive,
             currentQuotasLive,
             constructor = {
                 @Suppress("UNCHECKED_CAST")
                 MediatorContainer(
-                    it[0] as Mailbox?,
+                    it[0] as List<Mailbox>,
                     it[1] as Boolean,
-                    it[2] as List<Mailbox>,
-                    it[3] as List<Folder>,
-                    it[4] as Boolean,
-                    it[5] as MailboxPermissions?,
-                    it[6] as Quotas?,
+                    it[2] as List<Folder>,
+                    it[3] as Boolean,
+                    it[4] as MailboxPermissions?,
+                    it[5] as Quotas?,
                 )
             }
-        ).observe(viewLifecycleOwner, menuDrawerAdapter::setItems)
+        )
+            .asFlow()
+            .map(menuDrawerAdapter::formatList)
+            .flowOn(Dispatchers.IO)
+            .asLiveData()
+            .observe(viewLifecycleOwner, menuDrawerAdapter::submitList)
     }
 
     private fun observeCurrentFolder() {
@@ -297,9 +305,8 @@ class MenuDrawerFragment : Fragment() {
     }
 
     data class MediatorContainer(
-        val currentMailbox: Mailbox?,
+        val mailboxes: List<Mailbox>,
         val areMailboxesExpanded: Boolean,
-        val otherMailboxes: List<Mailbox>,
         val allFolders: List<Folder>,
         val areCustomFoldersExpanded: Boolean,
         val permissions: MailboxPermissions?,

app/src/main/java/com/infomaniak/mail/ui/main/menuDrawer/MenuDrawerViewModel.kt

@@ -19,13 +19,10 @@ package com.infomaniak.mail.ui.main.menuDrawer
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.asLiveData
 import androidx.lifecycle.viewModelScope
 import com.infomaniak.mail.data.cache.RealmDatabase
 import com.infomaniak.mail.data.cache.mailboxContent.FolderController
-import com.infomaniak.mail.data.cache.mailboxInfo.MailboxController
 import com.infomaniak.mail.di.IoDispatcher
-import com.infomaniak.mail.utils.AccountUtils
 import com.infomaniak.mail.utils.coroutineContext
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
@@ -35,17 +32,11 @@ import javax.inject.Inject
 @HiltViewModel
 class MenuDrawerViewModel @Inject constructor(
     private val mailboxContentRealm: RealmDatabase.MailboxContent,
-    mailboxController: MailboxController,
     @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : ViewModel() {
 
     private val ioCoroutineContext = viewModelScope.coroutineContext(ioDispatcher)
 
-    val otherMailboxesLive = mailboxController.getMailboxesAsync(
-        userId = AccountUtils.currentUserId,
-        exceptionMailboxIds = listOf(AccountUtils.currentMailboxId),
-    ).asLiveData(ioCoroutineContext)
-
     val areMailboxesExpanded = MutableLiveData(false)
     val areCustomFoldersExpanded = MutableLiveData(true)