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

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

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

parent 51cae10c

feature/widget/message-list-glance/src/main/kotlin/net/thunderbird/feature/widget/message/list/KoinModule.kt

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ val featureWidgetMessageListModule = module { 
            messageListRepository = get(),

            messageHelper = get(),

            generalSettingsManager = get(),

            outboxFolderManager = get(),

        )

    }

}

feature/widget/message-list-glance/src/main/kotlin/net/thunderbird/feature/widget/message/list/MessageListItemMapper.kt

+3 −1
Original line number Diff line number Diff line
@@ -9,11 +9,13 @@ import java.util.Calendar 
import java.util.Locale

import net.thunderbird.core.android.account.LegacyAccount

import net.thunderbird.core.preference.GeneralSettingsManager

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



internal class MessageListItemMapper(

    private val messageHelper: MessageHelper,

    private val account: LegacyAccount,

    private val generalSettingsManager: GeneralSettingsManager,

    private val outboxFolderManager: OutboxFolderManager,

) : MessageMapper<MessageListItem> {

    private val calendar: Calendar = Calendar.getInstance()
@@ -23,7 +25,7 @@ internal class MessageListItemMapper( 
        val previewResult = message.preview

        val previewText = if (previewResult.isPreviewTextAvailable) previewResult.previewText else ""

        val uniqueId = createUniqueId(account, message.id)

        val showRecipients = DisplayAddressHelper.shouldShowRecipients(account, message.folderId)

        val showRecipients = DisplayAddressHelper.shouldShowRecipients(outboxFolderManager, account, message.folderId)

        val displayAddress = if (showRecipients) toAddresses.firstOrNull() else fromAddresses.firstOrNull()

        val displayName = if (showRecipients) {

            messageHelper.getRecipientDisplayNames(

feature/widget/message-list-glance/src/main/kotlin/net/thunderbird/feature/widget/message/list/MessageListLoader.kt

+3 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ import net.thunderbird.core.android.account.LegacyAccountManager 
import net.thunderbird.core.android.account.SortType

import net.thunderbird.core.logging.legacy.Log

import net.thunderbird.core.preference.GeneralSettingsManager

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

import net.thunderbird.feature.search.legacy.sql.SqlWhereClause



internal class MessageListLoader(
@@ -16,6 +17,7 @@ internal class MessageListLoader( 
    private val messageListRepository: MessageListRepository,

    private val messageHelper: MessageHelper,

    private val generalSettingsManager: GeneralSettingsManager,

    private val outboxFolderManager: OutboxFolderManager,

) {



    @Suppress("TooGenericExceptionCaught")
@@ -44,7 +46,7 @@ internal class MessageListLoader( 
    private fun loadMessageListForAccount(account: LegacyAccount, config: MessageListConfig): List<MessageListItem> {

        val accountUuid = account.uuid

        val sortOrder = buildSortOrder(config)

        val mapper = MessageListItemMapper(messageHelper, account, generalSettingsManager)

        val mapper = MessageListItemMapper(messageHelper, account, generalSettingsManager, outboxFolderManager)



        return if (config.showingThreadedList) {

            val (selection, selectionArgs) = buildSelection(config)

feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/KoinModule.kt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ val messageListWidgetModule = module { 
            messageListRepository = get(),

            messageHelper = get(),

            generalSettingsManager = get(),

            outboxFolderManager = get(),

        )

    }

}

feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListItemMapper.kt

+3 −1
Original line number Diff line number Diff line
@@ -9,11 +9,13 @@ import java.util.Calendar 
import java.util.Locale

import net.thunderbird.core.android.account.LegacyAccount

import net.thunderbird.core.preference.GeneralSettingsManager

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



internal class MessageListItemMapper(

    private val messageHelper: MessageHelper,

    private val account: LegacyAccount,

    private val generalSettingsManager: GeneralSettingsManager,

    private val outboxFolderManager: OutboxFolderManager,

) : MessageMapper<MessageListItem> {

    private val calendar: Calendar = Calendar.getInstance()
@@ -23,7 +25,7 @@ internal class MessageListItemMapper( 
        val previewResult = message.preview

        val previewText = if (previewResult.isPreviewTextAvailable) previewResult.previewText else ""

        val uniqueId = createUniqueId(account, message.id)

        val showRecipients = DisplayAddressHelper.shouldShowRecipients(account, message.folderId)

        val showRecipients = DisplayAddressHelper.shouldShowRecipients(outboxFolderManager, account, message.folderId)

        val displayAddress = if (showRecipients) toAddresses.firstOrNull() else fromAddresses.firstOrNull()

        val displayName = if (showRecipients) {

            messageHelper.getRecipientDisplayNames(