Merge pull request #9388 from shamim-emon/fix-issue-9387 (616705c1) · Commits · e / os / Mail

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ data class GeneralSettings(
		val isShowComposeButtonOnMessageList: Boolean,
		val isThreadedViewEnabled: Boolean,
		val isUseMessageViewFixedWidthFont: Boolean,
		val isAutoFitWidth: Boolean,
		)

		enum class BackgroundSync {

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -31,4 +31,5 @@ interface GeneralSettingsManager {
		fun setIsShowComposeButtonOnMessageList(isShowComposeButtonOnMessageList: Boolean)
		fun setIsThreadedViewEnabled(isThreadedViewEnabled: Boolean)
		fun setIsUseMessageViewFixedWidthFont(isUseMessageViewFixedWidthFont: Boolean)
		fun setIsAutoFitWidth(isAutoFitWidth: Boolean)
		}

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ class BuildSwipeActionsTest {
		isShowComposeButtonOnMessageList = false,
		isThreadedViewEnabled = false,
		isUseMessageViewFixedWidthFont = false,
		isAutoFitWidth = false,
		)

		@Test
		@@ -426,6 +427,10 @@ private class FakeGeneralSettingsManager(
		override fun setIsUseMessageViewFixedWidthFont(isUseMessageViewFixedWidthFont: Boolean) = error(
		"not implemented",
		)

		override fun setIsAutoFitWidth(isAutoFitWidth: Boolean) = error(
		"not implemented",
		)
		}

		private class FakeStorage(

legacy/core/src/main/java/com/fsck/k9/K9.kt

+0 −6

Original line number	Diff line number	Diff line
		@@ -197,9 +197,6 @@ object K9 : KoinComponent {
		@JvmStatic
		var isShowAccountSelector = true

		@JvmStatic
		var isAutoFitWidth: Boolean = false

		var isQuietTimeEnabled = false
		var isNotificationDuringQuietTimeEnabled = true
		var quietTimeStarts: String? = null
		@@ -310,8 +307,6 @@ object K9 : KoinComponent {
		isShowAccountSelector = storage.getBoolean("showAccountSelector", true)
		messageListPreviewLines = storage.getInt("messageListPreviewLines", 2)

		isAutoFitWidth = storage.getBoolean("autofitWidth", true)

		isQuietTimeEnabled = storage.getBoolean("quietTimeEnabled", false)
		isNotificationDuringQuietTimeEnabled = storage.getBoolean("notificationDuringQuietTimeEnabled", true)
		quietTimeStarts = storage.getStringOrDefault("quietTimeStarts", "21:00")
		@@ -390,7 +385,6 @@ object K9 : KoinComponent {
		editor.putBoolean("enableSensitiveLogging", isSensitiveDebugLoggingEnabled)
		editor.putEnum("backgroundOperations", backgroundOps)
		editor.putBoolean("useVolumeKeysForNavigation", isUseVolumeKeysForNavigation)
		editor.putBoolean("autofitWidth", isAutoFitWidth)
		editor.putBoolean("quietTimeEnabled", isQuietTimeEnabled)
		editor.putBoolean("notificationDuringQuietTimeEnabled", isNotificationDuringQuietTimeEnabled)
		editor.putString("quietTimeStarts", quietTimeStarts)

legacy/core/src/main/java/com/fsck/k9/preferences/RealGeneralSettingsManager.kt

+7 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ internal const val KEY_USE_BACKGROUND_AS_UNREAD_INDICATOR = "isUseBackgroundAsUn
		internal const val KEY_SHOW_COMPOSE_BUTTON_ON_MESSAGE_LIST = "showComposeButtonOnMessageList"
		internal const val KEY_THREAD_VIEW_ENABLED = "isThreadedViewEnabled"
		internal const val KEY_MESSAGE_VIEW_FIXED_WIDTH_FONT = "messageViewFixedWidthFont"
		internal const val KEY_AUTO_FIT_WIDTH = "autofitWidth"

		/**
		* Retrieve and modify general settings.
		@@ -205,6 +206,10 @@ internal class RealGeneralSettingsManager(
		getSettings().copy(isUseMessageViewFixedWidthFont = isUseMessageViewFixedWidthFont).persist()
		}

		override fun setIsAutoFitWidth(isAutoFitWidth: Boolean) {
		getSettings().copy(isAutoFitWidth = isAutoFitWidth).persist()
		}

		private fun writeSettings(editor: StorageEditor, settings: GeneralSettings) {
		editor.putBoolean("showRecentChanges", settings.showRecentChanges)
		editor.putEnum("theme", settings.appTheme)
		@@ -226,6 +231,7 @@ internal class RealGeneralSettingsManager(
		editor.putBoolean(KEY_SHOW_COMPOSE_BUTTON_ON_MESSAGE_LIST, settings.isShowComposeButtonOnMessageList)
		editor.putBoolean(KEY_THREAD_VIEW_ENABLED, settings.isThreadedViewEnabled)
		editor.putBoolean(KEY_MESSAGE_VIEW_FIXED_WIDTH_FONT, settings.isUseMessageViewFixedWidthFont)
		editor.putBoolean(KEY_AUTO_FIT_WIDTH, settings.isAutoFitWidth)
		}

		private fun loadGeneralSettings(): GeneralSettings {
		@@ -262,6 +268,7 @@ internal class RealGeneralSettingsManager(
		isShowComposeButtonOnMessageList = storage.getBoolean(KEY_SHOW_COMPOSE_BUTTON_ON_MESSAGE_LIST, true),
		isThreadedViewEnabled = storage.getBoolean(KEY_THREAD_VIEW_ENABLED, true),
		isUseMessageViewFixedWidthFont = storage.getBoolean(KEY_MESSAGE_VIEW_FIXED_WIDTH_FONT, false),
		isAutoFitWidth = storage.getBoolean(KEY_AUTO_FIT_WIDTH, true),
		)

		updateSettingsFlow(settings)