Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit c37bf416 authored by Rafael Tonholo's avatar Rafael Tonholo
Browse files

refactor(outbox): use OutboxFolderManager to retrieve the outbox id in FolderInfoHolder

parent f247ee1c

legacy/ui/legacy/src/main/java/com/fsck/k9/activity/FolderInfoHolder.kt

+9 −3
Original line number Diff line number Diff line
@@ -5,9 +5,11 @@ import com.fsck.k9.mailstore.LocalFolder 
import net.thunderbird.core.android.account.LegacyAccount

import net.thunderbird.feature.mail.folder.api.Folder

import net.thunderbird.feature.mail.folder.api.FolderType

import net.thunderbird.feature.mail.folder.api.OutboxFolderManager



class FolderInfoHolder(

    private val folderNameFormatter: FolderNameFormatter,

    private val outboxFolderManager: OutboxFolderManager,

    localFolder: LocalFolder,

    account: LegacyAccount,

) {
@@ -28,7 +30,7 @@ class FolderInfoHolder( 
        val folder = Folder(

            id = folderId,

            name = localFolder.name,

            type = getFolderType(account, folderId),

            type = getFolderType(outboxFolderManager, account, folderId),

            isLocalOnly = localFolder.isLocalOnly,

        )

        return folderNameFormatter.displayName(folder)
@@ -36,10 +38,14 @@ class FolderInfoHolder( 


    companion object {

        @JvmStatic

        fun getFolderType(account: LegacyAccount, folderId: Long): FolderType {

        fun getFolderType(

            outboxFolderManager: OutboxFolderManager,

            account: LegacyAccount,

            folderId: Long,

        ): FolderType {

            return when (folderId) {

                account.inboxFolderId -> FolderType.INBOX

                account.outboxFolderId -> FolderType.OUTBOX

                outboxFolderManager.getOutboxFolderIdSync(account.id) -> FolderType.OUTBOX

                account.archiveFolderId -> FolderType.ARCHIVE

                account.draftsFolderId -> FolderType.DRAFTS

                account.sentFolderId -> FolderType.SENT

legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt

+3 −1
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ import net.thunderbird.core.logging.Logger 
import net.thunderbird.core.logging.legacy.Log

import net.thunderbird.core.preference.GeneralSettingsManager

import net.thunderbird.core.ui.theme.api.FeatureThemeProvider

import net.thunderbird.feature.mail.folder.api.OutboxFolderManager

import net.thunderbird.feature.mail.message.list.domain.DomainContract

import net.thunderbird.feature.mail.message.list.ui.dialog.SetupArchiveFolderDialogFragmentFactory

import net.thunderbird.feature.notification.api.ui.InAppNotificationHost
@@ -138,6 +139,7 @@ class MessageListFragment : 
    private val featureFlagProvider: FeatureFlagProvider by inject()

    private val featureThemeProvider: FeatureThemeProvider by inject()

    private val logger: Logger by inject()

    private val outboxFolderManager: OutboxFolderManager by inject()



    private val handler = MessageListHandler(this)

    private val activityListener = MessageListActivityListener()
@@ -793,7 +795,7 @@ class MessageListFragment : 
        val localStore = localStoreProvider.getInstanceByLegacyAccount(account)

        val localFolder = localStore.getFolder(folderId)

        localFolder.open()

        return FolderInfoHolder(folderNameFormatter, localFolder, account)

        return FolderInfoHolder(folderNameFormatter,  outboxFolderManager, localFolder, account)

    }



    override fun onResume() {