refactor: use PreferenceDataStore for notificationQuickDeleteBehaviour (#10422)

dani-zilla · web-flow · commit eea9b1c8e2e2 · 2026-01-29T11:55:08.000-05:00
diff --git a/core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/GeneralSettings.kt b/core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/GeneralSettings.kt
@@ -64,3 +64,12 @@ enum class SplitViewMode {
     WHEN_IN_LANDSCAPE,
     WHEN_UNFOLDED,
 }
+
+/**
+ * Controls behaviour of delete button in notifications.
+ */
+enum class NotificationQuickDelete {
+    ALWAYS,
+    FOR_SINGLE_MSG,
+    NEVER,
+}
diff --git a/core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/notification/NotificationPreference.kt b/core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/notification/NotificationPreference.kt
@@ -1,14 +1,19 @@
 package net.thunderbird.core.preference.notification
 
+import net.thunderbird.core.preference.NotificationQuickDelete
+
 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
+val NOTIFICATION_PREFERENCE_DEFAULT_QUICK_DELETE_BEHAVIOUR = NotificationQuickDelete.ALWAYS
 
 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,
+    val notificationQuickDeleteBehaviour: NotificationQuickDelete =
+        NOTIFICATION_PREFERENCE_DEFAULT_QUICK_DELETE_BEHAVIOUR,
 )
diff --git a/core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/notification/NotificationPreferenceManager.kt b/core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/notification/NotificationPreferenceManager.kt
@@ -7,4 +7,6 @@ const val KEY_QUIET_TIME_STARTS = "quietTimeStarts"
 const val KEY_QUIET_TIME_ENABLED = "quietTimeEnabled"
 const val KEY_NOTIFICATION_DURING_QUIET_TIME_ENABLED = "notificationDuringQuietTimeEnabled"
 
+const val KEY_NOTIFICATION_QUICK_DELETE_BEHAVIOUR = "notificationQuickDelete"
+
 interface NotificationPreferenceManager : PreferenceManager<NotificationPreference>
diff --git a/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/notification/DefaultNotificationPreferenceManager.kt b/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/notification/DefaultNotificationPreferenceManager.kt
@@ -14,6 +14,8 @@ import net.thunderbird.core.logging.Logger
 import net.thunderbird.core.preference.storage.Storage
 import net.thunderbird.core.preference.storage.StorageEditor
 import net.thunderbird.core.preference.storage.StoragePersister
+import net.thunderbird.core.preference.storage.getEnumOrDefault
+import net.thunderbird.core.preference.storage.putEnum
 
 private const val TAG = "DefaultNotificationPreferenceManager"
 
@@ -45,6 +47,10 @@ class DefaultNotificationPreferenceManager(
                 key = KEY_NOTIFICATION_DURING_QUIET_TIME_ENABLED,
                 defValue = NOTIFICATION_PREFERENCE_DEFAULT_IS_NOTIFICATION_DURING_QUIET_TIME_ENABLED,
             ),
+            notificationQuickDeleteBehaviour = storage.getEnumOrDefault(
+                key = KEY_NOTIFICATION_QUICK_DELETE_BEHAVIOUR,
+                default = NOTIFICATION_PREFERENCE_DEFAULT_QUICK_DELETE_BEHAVIOUR,
+            ),
         ),
     )
 
@@ -65,6 +71,10 @@ class DefaultNotificationPreferenceManager(
                     KEY_NOTIFICATION_DURING_QUIET_TIME_ENABLED,
                     config.isNotificationDuringQuietTimeEnabled,
                 )
+                storageEditor.putEnum(
+                    KEY_NOTIFICATION_QUICK_DELETE_BEHAVIOUR,
+                    config.notificationQuickDeleteBehaviour,
+                )
                 storageEditor.commit().also { commited ->
                     logger.verbose(TAG) { "writeConfig: storageEditor.commit() resulted in: $commited" }
                 }
diff --git a/feature/mail/message/list/internal/src/test/kotlin/net/thunderbird/feature/mail/message/list/internal/ui/state/sideeffect/LoadPreferencesSideEffectTest.kt b/feature/mail/message/list/internal/src/test/kotlin/net/thunderbird/feature/mail/message/list/internal/ui/state/sideeffect/LoadPreferencesSideEffectTest.kt
@@ -8,7 +8,6 @@ import dev.mokkery.mock
 import dev.mokkery.spy
 import dev.mokkery.verify
 import dev.mokkery.verify.VerifyMode
-import kotlin.random.Random
 import kotlin.test.Test
 import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.collections.immutable.persistentSetOf
@@ -112,14 +111,14 @@ class LoadPreferencesSideEffectTest {
 
             // Act
             testSubject.handle(oldState, newState)
-            repeat(times = 10) {
+            repeat(times = 10) { index ->
                 fakeGetMessageListPreferences.emit(
                     preferences = createMessageListPreferences(
-                        density = UiDensity.entries.random(),
-                        showMessageAvatar = Random.nextBoolean(),
-                        showFavouriteButton = Random.nextBoolean(),
-                        senderAboveSubject = Random.nextBoolean(),
-                        colorizeBackgroundWhenRead = Random.nextBoolean(),
+                        density = UiDensity.entries[index % UiDensity.entries.size],
+                        showMessageAvatar = index % 2 == 0,
+                        showFavouriteButton = index % 3 == 0,
+                        senderAboveSubject = index % 4 == 0,
+                        colorizeBackgroundWhenRead = index % 5 == 0,
                     ),
                 )
             }
diff --git a/legacy/core/src/main/java/com/fsck/k9/K9.kt b/legacy/core/src/main/java/com/fsck/k9/K9.kt
@@ -113,9 +113,6 @@ object K9 : KoinComponent {
     @JvmStatic
     val fontSizes = FontSizes()
 
-    @JvmStatic
-    var notificationQuickDeleteBehaviour = NotificationQuickDelete.ALWAYS
-
     @JvmStatic
     var lockScreenNotificationVisibility = LockScreenNotificationVisibility.MESSAGE_COUNT
 
@@ -205,8 +202,6 @@ object K9 : KoinComponent {
         val sortAscendingSetting = storage.getBoolean("sortAscending", AccountDefaultsProvider.DEFAULT_SORT_ASCENDING)
         sortAscending[sortType] = sortAscendingSetting
 
-        notificationQuickDeleteBehaviour = storage.getEnum("notificationQuickDelete", NotificationQuickDelete.ALWAYS)
-
         lockScreenNotificationVisibility = storage.getEnum(
             "lockScreenNotificationVisibility",
             LockScreenNotificationVisibility.MESSAGE_COUNT,
@@ -241,8 +236,6 @@ object K9 : KoinComponent {
 
         editor.putEnum("sortTypeEnum", sortType)
         editor.putBoolean("sortAscending", sortAscending[sortType] ?: false)
-
-        editor.putString("notificationQuickDelete", notificationQuickDeleteBehaviour.toString())
         editor.putString("lockScreenNotificationVisibility", lockScreenNotificationVisibility.toString())
 
         editor.putBoolean("messageViewArchiveActionVisible", isMessageViewArchiveActionVisible)
@@ -302,15 +295,6 @@ object K9 : KoinComponent {
 
     const val MANUAL_WAKE_LOCK_TIMEOUT = 120000
 
-    /**
-     * Controls behaviour of delete button in notifications.
-     */
-    enum class NotificationQuickDelete {
-        ALWAYS,
-        FOR_SINGLE_MSG,
-        NEVER,
-    }
-
     enum class LockScreenNotificationVisibility {
         EVERYTHING,
         SENDERS,
diff --git a/legacy/core/src/main/java/com/fsck/k9/notification/CoreNotificationKoinModule.kt b/legacy/core/src/main/java/com/fsck/k9/notification/CoreNotificationKoinModule.kt
@@ -99,7 +99,7 @@ val coreNotificationModule = module {
         )
     }
     factory { BaseNotificationDataCreator() }
-    factory { SingleMessageNotificationDataCreator(get()) }
+    factory { SingleMessageNotificationDataCreator(interactionPreferences = get(), notificationPreference = get()) }
     factory {
         SummaryNotificationDataCreator(
             singleMessageNotificationDataCreator = get(),
diff --git a/legacy/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationDataCreator.kt b/legacy/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationDataCreator.kt
@@ -1,14 +1,17 @@
 package com.fsck.k9.notification
 
-import com.fsck.k9.K9
 import net.thunderbird.core.android.account.LegacyAccountDto
+import net.thunderbird.core.preference.NotificationQuickDelete
 import net.thunderbird.core.preference.interaction.InteractionSettingsPreferenceManager
+import net.thunderbird.core.preference.notification.NotificationPreferenceManager
 
 internal class SingleMessageNotificationDataCreator(
     private val interactionPreferences: InteractionSettingsPreferenceManager,
+    private val notificationPreference: NotificationPreferenceManager,
 ) {
 
     private val interactionSettings get() = interactionPreferences.getConfig()
+    private val notificationSettings get() = notificationPreference.getConfig()
 
     fun createSingleNotificationData(
         account: LegacyAccountDto,
@@ -77,7 +80,7 @@ internal class SingleMessageNotificationDataCreator(
     }
 
     private fun isDeleteActionEnabled(): Boolean {
-        return K9.notificationQuickDeleteBehaviour != K9.NotificationQuickDelete.NEVER
+        return notificationSettings.notificationQuickDeleteBehaviour != NotificationQuickDelete.NEVER
     }
 
     // We don't support confirming actions on Wear devices. So don't show the action when confirmation is enabled.
diff --git a/legacy/core/src/main/java/com/fsck/k9/notification/SummaryNotificationDataCreator.kt b/legacy/core/src/main/java/com/fsck/k9/notification/SummaryNotificationDataCreator.kt
@@ -1,8 +1,8 @@
 package com.fsck.k9.notification
 
-import com.fsck.k9.K9
 import net.thunderbird.core.android.account.LegacyAccountDto
 import net.thunderbird.core.preference.GeneralSettingsManager
+import net.thunderbird.core.preference.NotificationQuickDelete
 
 private const val MAX_NUMBER_OF_MESSAGES_FOR_SUMMARY_NOTIFICATION = 5
 
@@ -72,7 +72,8 @@ internal class SummaryNotificationDataCreator(
     }
 
     private fun isDeleteActionEnabled(): Boolean {
-        return K9.notificationQuickDeleteBehaviour == K9.NotificationQuickDelete.ALWAYS
+        return generalSettingsManager.getConfig().notification.notificationQuickDeleteBehaviour ==
+            NotificationQuickDelete.ALWAYS
     }
 
     // We don't support confirming actions on Wear devices. So don't show the action when confirmation is enabled.
diff --git a/legacy/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java b/legacy/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java
@@ -12,7 +12,6 @@
 import app.k9mail.feature.telemetry.api.TelemetryManager;
 import app.k9mail.legacy.di.DI;
 import com.fsck.k9.FontSizes;
-import com.fsck.k9.K9.NotificationQuickDelete;
 import com.fsck.k9.K9.PostMarkAsUnreadNavigation;
 import com.fsck.k9.core.R;
 import com.fsck.k9.preferences.Settings.BooleanSetting;
@@ -38,6 +37,7 @@
 import net.thunderbird.core.preference.BackgroundOps;
 import net.thunderbird.core.preference.GeneralSettingsManager;
 import net.thunderbird.core.preference.BodyContentType;
+import net.thunderbird.core.preference.NotificationQuickDelete;
 import net.thunderbird.core.preference.SplitViewMode;
 import net.thunderbird.core.preference.SubTheme;
 import net.thunderbird.core.preference.display.coreSettings.DisplayCoreSettingsKt;
diff --git a/legacy/core/src/test/java/com/fsck/k9/notification/NewMailNotificationManagerTest.kt b/legacy/core/src/test/java/com/fsck/k9/notification/NewMailNotificationManagerTest.kt
@@ -62,12 +62,14 @@ class NewMailNotificationManagerTest {
             interactionPreferences = mock {
                 on { getConfig() } doReturn InteractionSettings()
             },
+            notificationPreference = mock { on { getConfig() } doReturn NotificationPreference() },
         ),
         SummaryNotificationDataCreator(
             singleMessageNotificationDataCreator = SingleMessageNotificationDataCreator(
                 interactionPreferences = mock {
                     on { getConfig() } doReturn InteractionSettings()
                 },
+                notificationPreference = mock { on { getConfig() } doReturn NotificationPreference() },
             ),
             generalSettingsManager = mock {
                 on { getConfig() } doReturn GeneralSettings(
diff --git a/legacy/core/src/test/java/com/fsck/k9/notification/SingleMessageNotificationDataCreatorTest.kt b/legacy/core/src/test/java/com/fsck/k9/notification/SingleMessageNotificationDataCreatorTest.kt
@@ -7,22 +7,25 @@ import assertk.assertions.doesNotContain
 import assertk.assertions.isEqualTo
 import assertk.assertions.isFalse
 import assertk.assertions.isTrue
-import com.fsck.k9.K9
-import com.fsck.k9.K9.NotificationQuickDelete
 import com.fsck.k9.mail.Address
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.update
 import net.thunderbird.core.android.account.LegacyAccountDto
+import net.thunderbird.core.preference.NotificationQuickDelete
 import net.thunderbird.core.preference.interaction.InteractionSettings
 import net.thunderbird.core.preference.interaction.InteractionSettingsPreferenceManager
+import net.thunderbird.core.preference.notification.NotificationPreference
+import net.thunderbird.core.preference.notification.NotificationPreferenceManager
 import org.junit.Test
 
 class SingleMessageNotificationDataCreatorTest {
     private val account = createAccount()
     private val fakeInteractionPreferences = FakeInteractionSettingsPreferenceManager()
+    private val fakeNotificationPreferences = FakeNotificationPreferenceManager()
     private val notificationDataCreator = SingleMessageNotificationDataCreator(
         interactionPreferences = fakeInteractionPreferences,
+        notificationPreference = fakeNotificationPreferences,
     )
 
     @Test
@@ -255,7 +258,7 @@ class SingleMessageNotificationDataCreatorTest {
     }
 
     private fun setDeleteAction(mode: NotificationQuickDelete) {
-        K9.notificationQuickDeleteBehaviour = mode
+        fakeNotificationPreferences.setNotificationQuickDeleteBehaviour(mode)
     }
 
     private fun createAccount(): LegacyAccountDto {
@@ -303,4 +306,17 @@ class SingleMessageNotificationDataCreatorTest {
             prefs.update { it.copy(isConfirmSpam = confirm) }
         }
     }
+    private class FakeNotificationPreferenceManager : NotificationPreferenceManager {
+        private val prefs = MutableStateFlow(NotificationPreference())
+
+        override fun save(config: NotificationPreference) = Unit
+
+        override fun getConfig(): NotificationPreference = prefs.value
+
+        override fun getConfigFlow(): Flow<NotificationPreference> = prefs
+
+        fun setNotificationQuickDeleteBehaviour(behaviour: NotificationQuickDelete) {
+            prefs.update { it.copy(notificationQuickDeleteBehaviour = behaviour) }
+        }
+    }
 }
diff --git a/legacy/core/src/test/java/com/fsck/k9/notification/SummaryNotificationDataCreatorTest.kt b/legacy/core/src/test/java/com/fsck/k9/notification/SummaryNotificationDataCreatorTest.kt
@@ -8,14 +8,14 @@ import assertk.assertions.isEqualTo
 import assertk.assertions.isFalse
 import assertk.assertions.isInstanceOf
 import assertk.assertions.isTrue
-import com.fsck.k9.K9
 import com.fsck.k9.mail.Address
 import java.util.Calendar
 import kotlin.time.Clock
 import kotlin.time.ExperimentalTime
 import kotlin.time.Instant
 import net.thunderbird.core.android.account.LegacyAccountDto
 import net.thunderbird.core.preference.GeneralSettings
+import net.thunderbird.core.preference.NotificationQuickDelete
 import net.thunderbird.core.preference.display.DisplaySettings
 import net.thunderbird.core.preference.network.NetworkSettings
 import net.thunderbird.core.preference.notification.NotificationPreference
@@ -52,6 +52,7 @@ class SummaryNotificationDataCreatorTest {
             interactionPreferences = mock {
                 on { getConfig() } doAnswer { generalSettings.interaction }
             },
+            notificationPreference = mock { on { getConfig() } doReturn generalSettings.notification },
         ),
         generalSettingsManager = mock {
             on { getConfig() } doAnswer { generalSettings }
@@ -98,6 +99,9 @@ class SummaryNotificationDataCreatorTest {
                 interactionPreferences = mock {
                     on { getConfig() } doReturn generalSettings.interaction
                 },
+                notificationPreference = mock {
+                    on { getConfig() } doReturn generalSettings.notification
+                },
             ),
             generalSettingsManager = mock {
                 on { getConfig() } doReturn generalSettings.copy(
@@ -139,6 +143,9 @@ class SummaryNotificationDataCreatorTest {
                 interactionPreferences = mock {
                     on { getConfig() } doReturn generalSettings.interaction
                 },
+                notificationPreference = mock {
+                    on { getConfig() } doReturn generalSettings.notification
+                },
             ),
             generalSettingsManager = mock {
                 on { getConfig() } doReturn generalSettings.copy(
@@ -201,7 +208,7 @@ class SummaryNotificationDataCreatorTest {
 
     @Test
     fun `always show delete action without confirmation`() {
-        setDeleteAction(K9.NotificationQuickDelete.ALWAYS)
+        setDeleteAction(NotificationQuickDelete.ALWAYS)
         setConfirmDeleteFromNotification(false)
         val notificationData = createNotificationDataWithMultipleMessages()
 
@@ -217,7 +224,7 @@ class SummaryNotificationDataCreatorTest {
 
     @Test
     fun `always show delete action with confirmation`() {
-        setDeleteAction(K9.NotificationQuickDelete.ALWAYS)
+        setDeleteAction(NotificationQuickDelete.ALWAYS)
         setConfirmDeleteFromNotification(true)
         val notificationData = createNotificationDataWithMultipleMessages()
 
@@ -233,7 +240,7 @@ class SummaryNotificationDataCreatorTest {
 
     @Test
     fun `show delete action for single notification without confirmation`() {
-        setDeleteAction(K9.NotificationQuickDelete.FOR_SINGLE_MSG)
+        setDeleteAction(NotificationQuickDelete.FOR_SINGLE_MSG)
         setConfirmDeleteFromNotification(false)
         val notificationData = createNotificationDataWithMultipleMessages()
 
@@ -249,7 +256,7 @@ class SummaryNotificationDataCreatorTest {
 
     @Test
     fun `never show delete action`() {
-        setDeleteAction(K9.NotificationQuickDelete.NEVER)
+        setDeleteAction(NotificationQuickDelete.NEVER)
         val notificationData = createNotificationDataWithMultipleMessages()
 
         val result = notificationDataCreator.createSummaryNotificationData(
@@ -296,8 +303,10 @@ class SummaryNotificationDataCreatorTest {
         )
     }
 
-    private fun setDeleteAction(mode: K9.NotificationQuickDelete) {
-        K9.notificationQuickDeleteBehaviour = mode
+    private fun setDeleteAction(mode: NotificationQuickDelete) {
+        generalSettings = generalSettings.copy(
+            notification = generalSettings.notification.copy(notificationQuickDeleteBehaviour = mode),
+        )
     }
 
     private fun setConfirmDeleteFromNotification(confirm: Boolean) {
diff --git a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ val coreNotificationModule = module {`
`99`	`99`	`)`
`100`	`100`	`}`
`101`	`101`	`factory { BaseNotificationDataCreator() }`
`102`		`- factory { SingleMessageNotificationDataCreator(get()) }`
	`102`	`+ factory { SingleMessageNotificationDataCreator(interactionPreferences = get(), notificationPreference = get()) }`
`103`	`103`	`factory {`
`104`	`104`	`SummaryNotificationDataCreator(`
`105`	`105`	`singleMessageNotificationDataCreator = get(),`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package com.fsck.k9.notification`
`2`	`2`
`3`		`-import com.fsck.k9.K9`
`4`	`3`	`import net.thunderbird.core.android.account.LegacyAccountDto`
`5`	`4`	`import net.thunderbird.core.preference.GeneralSettingsManager`
	`5`	`+import net.thunderbird.core.preference.NotificationQuickDelete`
`6`	`6`
`7`	`7`	`private const val MAX_NUMBER_OF_MESSAGES_FOR_SUMMARY_NOTIFICATION = 5`
`8`	`8`
`@@ -72,7 +72,8 @@ internal class SummaryNotificationDataCreator(`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`private fun isDeleteActionEnabled(): Boolean {`
`75`		`- return K9.notificationQuickDeleteBehaviour == K9.NotificationQuickDelete.ALWAYS`
	`75`	`+ return generalSettingsManager.getConfig().notification.notificationQuickDeleteBehaviour ==`
	`76`	`+ NotificationQuickDelete.ALWAYS`
`76`	`77`	`}`
`77`	`78`
`78`	`79`	`// We don't support confirming actions on Wear devices. So don't show the action when confirmation is enabled.`