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

Unverified Commit d20882ab authored Jun 23, 2025 by Rafael Tonholo Committed by GitHub Jun 23, 2025

Merge pull request #9346 from shamim-emon/fix-issue-9342

Replace Direct Calls to K9.isChangeContactNameColor with PreferenceDataStore integration

parents ccda088c 67ef1f62

core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/GeneralSettings.kt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,6 +26,7 @@ data class GeneralSettings(
	val isMessageListSenderAboveSubject: Boolean,		val isMessageListSenderAboveSubject: Boolean,
	val isShowContactName: Boolean,		val isShowContactName: Boolean,
	val isShowContactPicture: Boolean,		val isShowContactPicture: Boolean,
			val isChangeContactNameColor: Boolean,
	)		)

	enum class BackgroundSync {		enum class BackgroundSync {

core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/GeneralSettingsManager.kt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,4 +25,5 @@ interface GeneralSettingsManager {
	fun setIsMessageListSenderAboveSubject(isMessageListSenderAboveSubject: Boolean)		fun setIsMessageListSenderAboveSubject(isMessageListSenderAboveSubject: Boolean)
	fun setIsShowContactName(isShowContactName: Boolean)		fun setIsShowContactName(isShowContactName: Boolean)
	fun setIsShowContactPicture(isShowContactPicture: Boolean)		fun setIsShowContactPicture(isShowContactPicture: Boolean)
			fun setIsChangeContactNameColor(isChangeContactNameColor: Boolean)
	}		}

feature/mail/message/list/src/test/kotlin/net/thunderbird/feature/mail/message/list/domain/usecase/BuildSwipeActionsTest.kt

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -43,6 +43,7 @@ class BuildSwipeActionsTest {
	isMessageListSenderAboveSubject = false,		isMessageListSenderAboveSubject = false,
	isShowContactName = false,		isShowContactName = false,
	isShowContactPicture = false,		isShowContactPicture = false,
			isChangeContactNameColor = false,
	)		)

	@Test		@Test
	@@ -398,6 +399,8 @@ private class FakeGeneralSettingsManager(
	override fun setIsShowContactName(isShowContactName: Boolean) = error("not implemented")		override fun setIsShowContactName(isShowContactName: Boolean) = error("not implemented")

	override fun setIsShowContactPicture(isShowContactPicture: Boolean) = error("not implemented")		override fun setIsShowContactPicture(isShowContactPicture: Boolean) = error("not implemented")

			override fun setIsChangeContactNameColor(isChangeContactNameColor: Boolean) = error("not implemented")
	}		}

	private class FakeStorage(		private class FakeStorage(

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

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -27,8 +27,9 @@ internal class MessageListItemMapper(
	val displayAddress = if (showRecipients) toAddresses.firstOrNull() else fromAddresses.firstOrNull()		val displayAddress = if (showRecipients) toAddresses.firstOrNull() else fromAddresses.firstOrNull()
	val displayName = if (showRecipients) {		val displayName = if (showRecipients) {
	messageHelper.getRecipientDisplayNames(		messageHelper.getRecipientDisplayNames(
	toAddresses.toTypedArray(),		addresses = toAddresses.toTypedArray(),
	generalSettingsManager.getSettings().isShowCorrespondentNames,		isShowCorrespondentNames = generalSettingsManager.getSettings().isShowCorrespondentNames,
			isChangeContactNameColor = generalSettingsManager.getSettings().isChangeContactNameColor,
	).toString()		).toString()
	} else {		} else {
	messageHelper.getSenderDisplayName(displayAddress).toString()		messageHelper.getSenderDisplayName(displayAddress).toString()

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

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -27,8 +27,9 @@ internal class MessageListItemMapper(
	val displayAddress = if (showRecipients) toAddresses.firstOrNull() else fromAddresses.firstOrNull()		val displayAddress = if (showRecipients) toAddresses.firstOrNull() else fromAddresses.firstOrNull()
	val displayName = if (showRecipients) {		val displayName = if (showRecipients) {
	messageHelper.getRecipientDisplayNames(		messageHelper.getRecipientDisplayNames(
	toAddresses.toTypedArray(),		addresses = toAddresses.toTypedArray(),
	generalSettingsManager.getSettings().isShowCorrespondentNames,		isShowCorrespondentNames = generalSettingsManager.getSettings().isShowCorrespondentNames,
			isChangeContactNameColor = generalSettingsManager.getSettings().isChangeContactNameColor,
	).toString()		).toString()
	} else {		} else {
	messageHelper.getSenderDisplayName(displayAddress).toString()		messageHelper.getSenderDisplayName(displayAddress).toString()