Skip to content

fix: display Settings reset/mix up when toggling "Colorize contact pictures" #10259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wmontwe merged 1 commit into from
Dec 17, 2025
Merged

fix: display Settings reset/mix up when toggling "Colorize contact pictures" #10259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...re/preference/display/visualSettings/message/list/DefaultMessageListPreferencesManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ class DefaultMessageListPreferencesManager(
storageEditor.putBoolean(KEY_SHOW_CORRESPONDENT_NAMES, preferences.isShowCorrespondentNames)
storageEditor.putInt(KEY_MESSAGE_LIST_VIEW_PREVIEW_LINES, preferences.previewLines)
storageEditor.putEnum(KEY_MESSAGE_LIST_VIEW_DENSITY, preferences.uiDensity)
storageEditor.commit().also { commited ->
logger.verbose(TAG) { "writeConfig: storageEditor.commit() resulted in: $commited" }
}
}

override fun getConfig(): DisplayMessageListSettings = preferences.value
Expand Down
15 changes: 15 additions & 0 deletions legacy/core/src/main/java/com/fsck/k9/preferences/DefaultGeneralSettingsManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import net.thunderbird.core.common.appConfig.PlatformConfigProvider
import net.thunderbird.core.logging.Logger
import net.thunderbird.core.logging.config.DebugLogConfigurator
import net.thunderbird.core.preference.GeneralSettings
import net.thunderbird.core.preference.GeneralSettingsManager
Expand All @@ -24,6 +25,7 @@ import net.thunderbird.core.preference.display.coreSettings.DisplayCoreSettingsP
import net.thunderbird.core.preference.display.inboxSettings.DisplayInboxSettingsPreferenceManager
import net.thunderbird.core.preference.display.miscSettings.DisplayMiscSettingsPreferenceManager
import net.thunderbird.core.preference.display.visualSettings.DisplayVisualSettingsPreferenceManager
import net.thunderbird.core.preference.display.visualSettings.message.list.MessageListPreferencesManager
import net.thunderbird.core.preference.interaction.InteractionSettingsPreferenceManager
import net.thunderbird.core.preference.network.NetworkSettingsPreferenceManager
import net.thunderbird.core.preference.notification.NotificationPreferenceManager
Expand All @@ -50,13 +52,15 @@ internal class DefaultGeneralSettingsManager(
private val displayCoreSettingsPreferenceManager: DisplayCoreSettingsPreferenceManager,
private val displayInboxSettingsPreferenceManager: DisplayInboxSettingsPreferenceManager,
private val displayVisualSettingsPreferenceManager: DisplayVisualSettingsPreferenceManager,
private val messageListPreferencesManager: MessageListPreferencesManager,
private val displayMiscSettingsPreferenceManager: DisplayMiscSettingsPreferenceManager,
private val networkSettingsPreferenceManager: NetworkSettingsPreferenceManager,
private val debuggingSettingsPreferenceManager: DebuggingSettingsPreferenceManager,
private val interactionSettingsPreferenceManager: InteractionSettingsPreferenceManager,
private val debugLogConfigurator: DebugLogConfigurator,
private val backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO,
private val platformConfigProvider: PlatformConfigProvider,
private val logger: Logger,
) : GeneralSettingsManager {
val mutex = Mutex()
private val generalSettings = privacySettingsPreferenceManager.getConfigFlow()
Expand Down Expand Up @@ -93,6 +97,16 @@ internal class DefaultGeneralSettingsManager(
display = generalSettings.display.copy(visualSettings = visualSettings),
)
}
.combine(messageListPreferencesManager.getConfigFlow()) { generalSettings, messageListSettings ->
logger.debug { "messageListSettings: $messageListSettings" }
Copy link
Contributor

@dani-zilla dani-zilla Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worth noting that logger is currently not recommended:

"Use a net.thunderbird.core.logging.Logger instance via dependency injection instead. " +
        "This class will be removed in a future release.",

Copy link
Collaborator Author

@shamim-emon shamim-emon Dec 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated, now injecting net.thunderbird.core.logging.Logger instance instead as per suggestion.

generalSettings.copy(
display = generalSettings.display.copy(
visualSettings = generalSettings.display.visualSettings.copy(
messageListSettings = messageListSettings,
),
),
)
}
.combine(displayMiscSettingsPreferenceManager.getConfigFlow()) { generalSettings, miscSettings ->
generalSettings.copy(
display = generalSettings.display.copy(miscSettings = miscSettings),
Expand Down Expand Up @@ -163,6 +177,7 @@ internal class DefaultGeneralSettingsManager(
displayCoreSettingsPreferenceManager.save(config.display.coreSettings)
displayInboxSettingsPreferenceManager.save(config.display.inboxSettings)
displayVisualSettingsPreferenceManager.save(config.display.visualSettings)
messageListPreferencesManager.save(config.display.visualSettings.messageListSettings)
displayMiscSettingsPreferenceManager.save(config.display.miscSettings)
networkSettingsPreferenceManager.save(config.network)
debuggingSettingsPreferenceManager.save(config.debugging)
Expand Down
2 changes: 2 additions & 0 deletions legacy/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,14 @@ val preferencesModule = module {
displayCoreSettingsPreferenceManager = get(),
displayInboxSettingsPreferenceManager = get(),
displayVisualSettingsPreferenceManager = get(),
messageListPreferencesManager = get(),
displayMiscSettingsPreferenceManager = get(),
networkSettingsPreferenceManager = get(),
debuggingSettingsPreferenceManager = get(),
interactionSettingsPreferenceManager = get(),
debugLogConfigurator = get(),
platformConfigProvider = get(),
logger = get(),
)
} bind GeneralSettingsManager::class
single {
Expand Down
Loading