refactor: replace all direct calls to K9.isHideUserAgent with PreferenceDataStore (225c17bd) · Commits · e / os / Mail

core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/privacy/PrivacySettings.kt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2,4 +2,5 @@ package net.thunderbird.core.preference.privacy

	data class PrivacySettings(		data class PrivacySettings(
	val isHideTimeZone: Boolean,		val isHideTimeZone: Boolean,
			val isHideUserAgent: Boolean,
	)		)

core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/privacy/PrivacySettingsManager.kt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4,4 +4,5 @@ interface PrivacySettingsManager {
	val privacySettings: PrivacySettings		val privacySettings: PrivacySettings

	fun setIsHideTimeZone(isHideTimeZone: Boolean)		fun setIsHideTimeZone(isHideTimeZone: Boolean)
			fun setIsHideUserAgent(isHideUserAgent: Boolean)
	}		}

core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/privacy/DefaultPrivacySettingsManager.kt

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -10,4 +10,9 @@ class DefaultPrivacySettingsManager(
	val privacySettings = preferenceManager.getConfig()		val privacySettings = preferenceManager.getConfig()
	preferenceManager.save(privacySettings.copy(isHideTimeZone = isHideTimeZone))		preferenceManager.save(privacySettings.copy(isHideTimeZone = isHideTimeZone))
	}		}

			override fun setIsHideUserAgent(isHideUserAgent: Boolean) {
			val privacySettings = preferenceManager.getConfig()
			preferenceManager.save(privacySettings.copy(isHideUserAgent = isHideUserAgent))
			}
	}		}

core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/privacy/DefaultPrivacySettingsPreferenceManager.kt

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -65,12 +65,14 @@ class DefaultPrivacySettingsPreferenceManager(

	private fun loadConfig(): PrivacySettings = PrivacySettings(		private fun loadConfig(): PrivacySettings = PrivacySettings(
	isHideTimeZone = storage.getBoolean(KEY_HIDE_TIME_ZONE, false),		isHideTimeZone = storage.getBoolean(KEY_HIDE_TIME_ZONE, false),
			isHideUserAgent = storage.getBoolean(KEY_HIDE_USER_AGENT, false),
	)		)

	private fun writeConfig(config: PrivacySettings) {		private fun writeConfig(config: PrivacySettings) {
	scope.launch(ioDispatcher) {		scope.launch(ioDispatcher) {
	mutex.withLock {		mutex.withLock {
	storageEditor.putBoolean(KEY_HIDE_TIME_ZONE, config.isHideTimeZone)		storageEditor.putBoolean(KEY_HIDE_TIME_ZONE, config.isHideTimeZone)
			storageEditor.putBoolean(KEY_HIDE_USER_AGENT, config.isHideUserAgent)
	storageEditor.commit()		storageEditor.commit()
	}		}
	}		}
	@@ -78,5 +80,6 @@ class DefaultPrivacySettingsPreferenceManager(

	companion object {		companion object {
	private const val KEY_HIDE_TIME_ZONE = "hideTimeZone"		private const val KEY_HIDE_TIME_ZONE = "hideTimeZone"
			private const val KEY_HIDE_USER_AGENT = "hideUserAgent"
	}		}
	}		}

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

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -197,9 +197,6 @@ object K9 : KoinComponent {

	var isNotificationDuringQuietTimeEnabled = true		var isNotificationDuringQuietTimeEnabled = true

	@JvmStatic
	var isHideUserAgent = false

	@get:Synchronized		@get:Synchronized
	@set:Synchronized		@set:Synchronized
	@JvmStatic		@JvmStatic
	@@ -296,7 +293,6 @@ object K9 : KoinComponent {
	storage.getEnum("messageViewPostDeleteAction", PostRemoveNavigation.ReturnToMessageList)		storage.getEnum("messageViewPostDeleteAction", PostRemoveNavigation.ReturnToMessageList)
	messageViewPostMarkAsUnreadNavigation =		messageViewPostMarkAsUnreadNavigation =
	storage.getEnum("messageViewPostMarkAsUnreadAction", PostMarkAsUnreadNavigation.ReturnToMessageList)		storage.getEnum("messageViewPostMarkAsUnreadAction", PostMarkAsUnreadNavigation.ReturnToMessageList)
	isHideUserAgent = storage.getBoolean("hideUserAgent", false)

	isConfirmDelete = storage.getBoolean("confirmDelete", false)		isConfirmDelete = storage.getBoolean("confirmDelete", false)
	isConfirmDiscardMessage = storage.getBoolean("confirmDiscardMessage", true)		isConfirmDiscardMessage = storage.getBoolean("confirmDiscardMessage", true)
	@@ -369,7 +365,6 @@ object K9 : KoinComponent {
	editor.putInt("registeredNameColor", contactNameColor)		editor.putInt("registeredNameColor", contactNameColor)
	editor.putEnum("messageViewPostDeleteAction", messageViewPostRemoveNavigation)		editor.putEnum("messageViewPostDeleteAction", messageViewPostRemoveNavigation)
	editor.putEnum("messageViewPostMarkAsUnreadAction", messageViewPostMarkAsUnreadNavigation)		editor.putEnum("messageViewPostMarkAsUnreadAction", messageViewPostMarkAsUnreadNavigation)
	editor.putBoolean("hideUserAgent", isHideUserAgent)

	editor.putString("language", k9Language)		editor.putString("language", k9Language)