refactor: migrate K9.isNotificationDuringQuietTimeEnabled to PreferenceDataStore

Author: shamim-emon

core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/notification/NotificationPreference.kt

@@ -3,9 +3,12 @@ package net.thunderbird.core.preference.notification
 const val NOTIFICATION_PREFERENCE_DEFAULT_IS_QUIET_TIME_ENABLED = false
 const val NOTIFICATION_PREFERENCE_DEFAULT_QUIET_TIME_STARTS = "21:00"
 const val NOTIFICATION_PREFERENCE_DEFAULT_QUIET_TIME_END = "7:00"
+const val NOTIFICATION_PREFERENCE_DEFAULT_IS_NOTIFICATION_DURING_QUIET_TIME_ENABLED = true
 
 data class NotificationPreference(
     val isQuietTimeEnabled: Boolean = NOTIFICATION_PREFERENCE_DEFAULT_IS_QUIET_TIME_ENABLED,
     val quietTimeStarts: String = NOTIFICATION_PREFERENCE_DEFAULT_QUIET_TIME_STARTS,
     val quietTimeEnds: String = NOTIFICATION_PREFERENCE_DEFAULT_QUIET_TIME_END,
+    val isNotificationDuringQuietTimeEnabled: Boolean =
+        NOTIFICATION_PREFERENCE_DEFAULT_IS_NOTIFICATION_DURING_QUIET_TIME_ENABLED,
 )

core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/notification/NotificationPreferenceManager.kt

@@ -5,5 +5,6 @@ import net.thunderbird.core.preference.PreferenceManager
 const val KEY_QUIET_TIME_ENDS = "quietTimeEnds"
 const val KEY_QUIET_TIME_STARTS = "quietTimeStarts"
 const val KEY_QUIET_TIME_ENABLED = "quietTimeEnabled"
+const val KEY_NOTIFICATION_DURING_QUIET_TIME_ENABLED = "notificationDuringQuietTimeEnabled"
 
 interface NotificationPreferenceManager : PreferenceManager<NotificationPreference>

core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/notification/DefaultNotificationPreferenceManager.kt

@@ -38,6 +38,10 @@ class DefaultNotificationPreferenceManager(
                 key = KEY_QUIET_TIME_ENDS,
                 defValue = NOTIFICATION_PREFERENCE_DEFAULT_QUIET_TIME_END,
             ),
+            isNotificationDuringQuietTimeEnabled = storage.getBoolean(
+                key = KEY_NOTIFICATION_DURING_QUIET_TIME_ENABLED,
+                defValue = NOTIFICATION_PREFERENCE_DEFAULT_IS_NOTIFICATION_DURING_QUIET_TIME_ENABLED,
+            ),
         ),
     )
 
@@ -54,6 +58,10 @@ class DefaultNotificationPreferenceManager(
                     KEY_QUIET_TIME_ENABLED,
                     config.isQuietTimeEnabled,
                 )
+                storageEditor.putBoolean(
+                    KEY_NOTIFICATION_DURING_QUIET_TIME_ENABLED,
+                    config.isNotificationDuringQuietTimeEnabled,
+                )
                 storageEditor.commit().also { commited ->
                     logger.verbose(TAG) { "writeConfig: storageEditor.commit() resulted in: $commited" }
                 }

legacy/common/src/main/java/com/fsck/k9/notification/K9NotificationStrategy.kt

@@ -2,7 +2,6 @@ package com.fsck.k9.notification
 
 import app.k9mail.core.android.common.contact.ContactRepository
 import app.k9mail.legacy.di.DI
-import com.fsck.k9.K9
 import com.fsck.k9.QuietTimeChecker
 import com.fsck.k9.mail.Flag
 import com.fsck.k9.mail.K9MailLib
@@ -29,7 +28,9 @@ class K9NotificationStrategy(
         message: LocalMessage,
         isOldMessage: Boolean,
     ): Boolean {
-        if (!K9.isNotificationDuringQuietTimeEnabled && generalSettingsManager.getConfig().notification.isQuietTime) {
+        if (!generalSettingsManager.getConfig().notification.isNotificationDuringQuietTimeEnabled &&
+            generalSettingsManager.getConfig().notification.isQuietTime
+        ) {
             Log.v("No notification: Quiet time is active")
             return false
         }

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

@@ -155,8 +155,6 @@ object K9 : KoinComponent {
     @JvmStatic
     var isShowAccountSelector = true
 
-    var isNotificationDuringQuietTimeEnabled = true
-
     @get:Synchronized
     @set:Synchronized
     @JvmStatic
@@ -237,8 +235,6 @@ object K9 : KoinComponent {
         isShowAccountSelector = storage.getBoolean("showAccountSelector", true)
         messageListPreviewLines = storage.getInt("messageListPreviewLines", 2)
 
-        isNotificationDuringQuietTimeEnabled = storage.getBoolean("notificationDuringQuietTimeEnabled", true)
-
         messageListDensity = storage.getEnum("messageListDensity", UiDensity.Default)
         contactNameColor = storage.getInt("registeredNameColor", 0xFF1093F5.toInt())
         messageViewPostMarkAsUnreadNavigation =
@@ -296,7 +292,6 @@ object K9 : KoinComponent {
 
     @Suppress("LongMethod")
     internal fun save(editor: StorageEditor) {
-        editor.putBoolean("notificationDuringQuietTimeEnabled", isNotificationDuringQuietTimeEnabled)
         editor.putEnum("messageListDensity", messageListDensity)
         editor.putBoolean("showAccountSelector", isShowAccountSelector)
         editor.putInt("messageListPreviewLines", messageListPreviewLines)

legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt

@@ -68,7 +68,8 @@ class GeneralSettingsDataStore(
             "quiet_time_enabled" -> generalSettingsManager.getConfig()
                 .notification.isQuietTimeEnabled
 
-            "disable_notifications_during_quiet_time" -> !K9.isNotificationDuringQuietTimeEnabled
+            "disable_notifications_during_quiet_time" -> !generalSettingsManager.getConfig()
+                .notification.isNotificationDuringQuietTimeEnabled
             "privacy_hide_useragent" -> generalSettingsManager.getConfig().privacy.isHideUserAgent
             "privacy_hide_timezone" -> generalSettingsManager.getConfig().privacy.isHideTimeZone
             "debug_logging" -> generalSettingsManager.getConfig().debugging.isDebugLoggingEnabled
@@ -108,7 +109,7 @@ class GeneralSettingsDataStore(
             "messageview_fixedwidth_font" -> setIsUseMessageViewFixedWidthFont(isUseMessageViewFixedWidthFont = value)
             "messageview_autofit_width" -> setIsAutoFitWidth(isAutoFitWidth = value)
             "quiet_time_enabled" -> setIsQuietTimeEnabled(isQuietTimeEnabled = value)
-            "disable_notifications_during_quiet_time" -> K9.isNotificationDuringQuietTimeEnabled = !value
+            "disable_notifications_during_quiet_time" -> setIsNotificationDuringQuietTimeEnabled(!value)
             "privacy_hide_useragent" -> setIsHideUserAgent(isHideUserAgent = value)
             "privacy_hide_timezone" -> setIsHideTimeZone(isHideTimeZone = value)
             "debug_logging" -> setIsDebugLoggingEnabled(isDebugLoggingEnabled = value)
@@ -585,6 +586,17 @@ class GeneralSettingsDataStore(
         }
     }
 
+    private fun setIsNotificationDuringQuietTimeEnabled(isNotificationDuringQuietTimeEnabled: Boolean) {
+        skipSaveSettings = true
+        generalSettingsManager.update { settings ->
+            settings.copy(
+                notification = settings.notification.copy(
+                    isNotificationDuringQuietTimeEnabled = isNotificationDuringQuietTimeEnabled,
+                ),
+            )
+        }
+    }
+
     private fun setIsHideTimeZone(isHideTimeZone: Boolean) {
         skipSaveSettings = true
         generalSettingsManager.update { settings ->