Merge pull request #9268 from shamim-emon/fix-issue-9267 (9222ebcf) · Commits · e / os / Mail

core/preferences/src/commonMain/kotlin/net/thunderbird/core/preferences/GeneralSettings.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ data class GeneralSettings(
		val isShowStarredCount: Boolean,
		val isShowMessageListStars: Boolean,
		val isShowAnimations: Boolean,
		val isShowCorrespondentNames: Boolean,
		)

		enum class BackgroundSync {

+1 −0

Original line number	Diff line number	Diff line
		@@ -20,4 +20,5 @@ interface GeneralSettingsManager {
		fun setIsShowStarredCount(isShowStarredCount: Boolean)
		fun setIsShowMessageListStars(isShowMessageListStars: Boolean)
		fun setIsShowAnimations(isShowAnimations: Boolean)
		fun setIsShowCorrespondentNames(isShowCorrespondentNames: Boolean)
		}

+8 −1

Original line number	Diff line number	Diff line
		@@ -3,5 +3,12 @@ package net.thunderbird.feature.widget.message.list
		import org.koin.dsl.module

		val featureWidgetMessageListModule = module {
		factory { MessageListLoader(preferences = get(), messageListRepository = get(), messageHelper = get()) }
		factory {
		MessageListLoader(
		preferences = get(),
		messageListRepository = get(),
		messageHelper = get(),
		generalSettingsManager = get(),
		)
		}
		}

+6 −1

Original line number	Diff line number	Diff line
		@@ -8,10 +8,12 @@ import com.fsck.k9.ui.helper.DisplayAddressHelper
		import java.util.Calendar
		import java.util.Locale
		import net.thunderbird.core.android.account.LegacyAccount
		import net.thunderbird.core.preferences.GeneralSettingsManager

		internal class MessageListItemMapper(
		private val messageHelper: MessageHelper,
		private val account: LegacyAccount,
		private val generalSettingsManager: GeneralSettingsManager,
		) : MessageMapper<MessageListItem> {
		private val calendar: Calendar = Calendar.getInstance()

		@@ -24,7 +26,10 @@ internal class MessageListItemMapper(
		val showRecipients = DisplayAddressHelper.shouldShowRecipients(account, message.folderId)
		val displayAddress = if (showRecipients) toAddresses.firstOrNull() else fromAddresses.firstOrNull()
		val displayName = if (showRecipients) {
		messageHelper.getRecipientDisplayNames(toAddresses.toTypedArray()).toString()
		messageHelper.getRecipientDisplayNames(
		toAddresses.toTypedArray(),
		generalSettingsManager.getSettings().isShowCorrespondentNames,
		).toString()
		} else {
		messageHelper.getSenderDisplayName(displayAddress).toString()
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -9,11 +9,13 @@ import com.fsck.k9.search.getAccounts
		import net.thunderbird.core.android.account.LegacyAccount
		import net.thunderbird.core.android.account.SortType
		import net.thunderbird.core.logging.legacy.Log
		import net.thunderbird.core.preferences.GeneralSettingsManager

		internal class MessageListLoader(
		private val preferences: Preferences,
		private val messageListRepository: MessageListRepository,
		private val messageHelper: MessageHelper,
		private val generalSettingsManager: GeneralSettingsManager,
		) {

		@Suppress("TooGenericExceptionCaught")
		@@ -42,7 +44,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)
		val mapper = MessageListItemMapper(messageHelper, account, generalSettingsManager)

		return if (config.showingThreadedList) {
		val (selection, selectionArgs) = buildSelection(config)