Unified to list handling directly

harshad1 · harshad1 · commit f1c6358407e9 · 2026-02-07T11:18:34.000-08:00
diff --git a/core/common/src/commonMain/kotlin/net/thunderbird/core/common/notification/NotificationActionTokens.kt b/core/common/src/commonMain/kotlin/net/thunderbird/core/common/notification/NotificationActionTokens.kt
@@ -11,5 +11,14 @@ object NotificationActionTokens {
     const val ARCHIVE = "archive"
     const val SPAM = "spam"
 
-    const val DEFAULT_ORDER = "$REPLY,$MARK_AS_READ,$DELETE,$STAR,$ARCHIVE,$SPAM"
+    val DEFAULT_ORDER: List<String> = listOf(REPLY, MARK_AS_READ, DELETE, STAR, ARCHIVE, SPAM)
+
+    fun parseOrder(raw: String): List<String> {
+        return raw
+            .split(',')
+            .map { it.trim() }
+            .filter { it.isNotEmpty() }
+    }
+
+    fun serializeOrder(tokens: List<String>): String = tokens.joinToString(separator = ",")
 }
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
@@ -7,7 +7,7 @@ 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
-const val NOTIFICATION_PREFERENCE_DEFAULT_MESSAGE_ACTIONS_ORDER = NotificationActionTokens.DEFAULT_ORDER
+val NOTIFICATION_PREFERENCE_DEFAULT_MESSAGE_ACTIONS_ORDER = NotificationActionTokens.DEFAULT_ORDER
 const val NOTIFICATION_PREFERENCE_DEFAULT_MESSAGE_ACTIONS_CUTOFF = 3
 const val NOTIFICATION_PREFERENCE_MAX_MESSAGE_ACTIONS_SHOWN = 3
 const val NOTIFICATION_PREFERENCE_DEFAULT_IS_SUMMARY_DELETE_ACTION_ENABLED = true
@@ -19,7 +19,7 @@ data class NotificationPreference(
     val quietTimeEnds: String = NOTIFICATION_PREFERENCE_DEFAULT_QUIET_TIME_END,
     val isNotificationDuringQuietTimeEnabled: Boolean =
         NOTIFICATION_PREFERENCE_DEFAULT_IS_NOTIFICATION_DURING_QUIET_TIME_ENABLED,
-    val messageActionsOrder: String = NOTIFICATION_PREFERENCE_DEFAULT_MESSAGE_ACTIONS_ORDER,
+    val messageActionsOrder: List<String> = NOTIFICATION_PREFERENCE_DEFAULT_MESSAGE_ACTIONS_ORDER,
     val messageActionsCutoff: Int = NOTIFICATION_PREFERENCE_DEFAULT_MESSAGE_ACTIONS_CUTOFF,
     val isSummaryDeleteActionEnabled: Boolean = NOTIFICATION_PREFERENCE_DEFAULT_IS_SUMMARY_DELETE_ACTION_ENABLED,
     val notificationQuickDeleteBehaviour: NotificationQuickDelete =
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
@@ -10,6 +10,7 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import net.thunderbird.core.common.notification.NotificationActionTokens
 import net.thunderbird.core.logging.Logger
 import net.thunderbird.core.preference.storage.Storage
 import net.thunderbird.core.preference.storage.StorageEditor
@@ -47,9 +48,13 @@ class DefaultNotificationPreferenceManager(
                 key = KEY_NOTIFICATION_DURING_QUIET_TIME_ENABLED,
                 defValue = NOTIFICATION_PREFERENCE_DEFAULT_IS_NOTIFICATION_DURING_QUIET_TIME_ENABLED,
             ),
-            messageActionsOrder = storage.getStringOrDefault(
-                key = KEY_MESSAGE_ACTIONS_ORDER,
-                defValue = NOTIFICATION_PREFERENCE_DEFAULT_MESSAGE_ACTIONS_ORDER,
+            messageActionsOrder = NotificationActionTokens.parseOrder(
+                storage.getStringOrDefault(
+                    key = KEY_MESSAGE_ACTIONS_ORDER,
+                    defValue = NotificationActionTokens.serializeOrder(
+                        NOTIFICATION_PREFERENCE_DEFAULT_MESSAGE_ACTIONS_ORDER,
+                    ),
+                ),
             ),
             messageActionsCutoff = storage.getInt(
                 key = KEY_MESSAGE_ACTIONS_CUTOFF,
@@ -83,7 +88,10 @@ class DefaultNotificationPreferenceManager(
                     KEY_NOTIFICATION_DURING_QUIET_TIME_ENABLED,
                     config.isNotificationDuringQuietTimeEnabled,
                 )
-                storageEditor.putString(KEY_MESSAGE_ACTIONS_ORDER, config.messageActionsOrder)
+                storageEditor.putString(
+                    KEY_MESSAGE_ACTIONS_ORDER,
+                    NotificationActionTokens.serializeOrder(config.messageActionsOrder),
+                )
                 storageEditor.putInt(KEY_MESSAGE_ACTIONS_CUTOFF, config.messageActionsCutoff)
                 storageEditor.putBoolean(KEY_IS_SUMMARY_DELETE_ACTION_ENABLED, config.isSummaryDeleteActionEnabled)
                 storageEditor.putEnum(
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
@@ -119,12 +119,7 @@ internal class SingleMessageNotificationDataCreator(
         return filled
     }
 
-    private fun parseActionsOrder(raw: String): List<NotificationAction> {
-        val tokens = raw
-            .split(',')
-            .map { it.trim() }
-            .filter { it.isNotEmpty() }
-
+    private fun parseActionsOrder(tokens: List<String>): List<NotificationAction> {
         val seen = LinkedHashSet<NotificationAction>()
         for (token in tokens) {
             tokenToAction(token)?.let { seen.add(it) }
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
@@ -224,7 +224,7 @@ class SingleMessageNotificationDataCreatorTest {
 
     private fun setMessageActions(cutoff: Int) {
         fakeNotificationPreferences.setMessageActions(
-            order = "reply,mark_as_read,delete,archive,spam",
+            order = listOf("reply", "mark_as_read", "delete", "archive", "spam"),
             cutoff = cutoff,
         )
     }
@@ -291,7 +291,7 @@ class SingleMessageNotificationDataCreatorTest {
             prefs.update { it.copy(notificationQuickDeleteBehaviour = behaviour) }
         }
 
-        fun setMessageActions(order: String, cutoff: Int) {
+        fun setMessageActions(order: List<String>, cutoff: Int) {
             prefs.update { it.copy(messageActionsOrder = order, messageActionsCutoff = cutoff) }
         }
     }
diff --git a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/notificationactions/MessageNotificationAction.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/notificationactions/MessageNotificationAction.kt
@@ -53,14 +53,14 @@ internal enum class MessageNotificationAction(
         }
 
         fun defaultOrder(): List<MessageNotificationAction> {
-          val seen = LinkedHashSet<MessageNotificationAction>()
-          for (token in NotificationActionTokens.DEFAULT_ORDER.split(',')) {
-              val trimmed = token.trim()
-              if (trimmed.isNotEmpty()) {
-                  fromToken(trimmed)?.let { seen.add(it) }
-              }
-          }
-          return seen.toList()
-      }
+            val seen = LinkedHashSet<MessageNotificationAction>()
+            for (token in NotificationActionTokens.DEFAULT_ORDER) {
+                fromToken(token)?.let { seen.add(it) }
+            }
+            for (action in entries) {
+                seen.add(action)
+            }
+            return seen.toList()
+        }
     }
 }
diff --git a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/notificationactions/NotificationActionsAdapter.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/notificationactions/NotificationActionsAdapter.kt
@@ -148,15 +148,13 @@ internal class NotificationActionsAdapter(
                 val actionHolder = holder as ActionViewHolder
                 actionHolder.bind(
                     item = item,
-                    minHeight = android.R.attr.listPreferredItemHeightSmall.dp,
                     onStartDrag = { itemTouchHelper.startDrag(actionHolder) },
                     onMove = ::moveItem,
                 )
             }
             is NotificationListItem.Cutoff -> {
                 val cutoffHolder = holder as CutoffViewHolder
                 cutoffHolder.bind(
-                    minHeight = android.R.attr.listPreferredItemHeightSmall.dp,
                     onStartDrag = { itemTouchHelper.startDrag(cutoffHolder) },
                     onMove = ::moveItem,
                 )
@@ -199,7 +197,6 @@ internal class NotificationActionsAdapter(
 
         fun bind(
             item: NotificationListItem.Action,
-            minHeight: Dp,
             onStartDrag: () -> Unit,
             onMove: (Int, Int) -> Boolean,
         ) {
@@ -209,7 +206,6 @@ internal class NotificationActionsAdapter(
                     NotificationActionRow(
                         action = item.action,
                         isDimmed = item.isDimmed,
-                        minHeight = minHeight,
                         onStartDrag = onStartDrag,
                     )
                 }
@@ -262,15 +258,13 @@ internal class NotificationActionsAdapter(
         }
 
         fun bind(
-            minHeight: Dp,
             onStartDrag: () -> Unit,
             onMove: (Int, Int) -> Boolean,
         ) {
             setReorderActions(onMove)
             composeView.setContent {
                 themeProvider.WithTheme {
                     NotificationCutoffRow(
-                        minHeight = minHeight,
                         onStartDrag = onStartDrag,
                     )
                 }
@@ -310,10 +304,10 @@ internal class NotificationActionsAdapter(
 private fun NotificationActionRow(
     action: MessageNotificationAction,
     isDimmed: Boolean,
-    minHeight: Dp,
     onStartDrag: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
+    val minHeight = MainTheme.sizes.iconAvatar
     Row(
         modifier = modifier
             .fillMaxWidth()
@@ -351,10 +345,10 @@ private fun NotificationActionRow(
 
 @Composable
 private fun NotificationCutoffRow(
-    minHeight: Dp,
     onStartDrag: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
+    val minHeight = MainTheme.sizes.iconAvatar
     Row(
         modifier = modifier
             .fillMaxWidth()
diff --git a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/notificationactions/NotificationActionsSettingsFragment.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/notificationactions/NotificationActionsSettingsFragment.kt
@@ -85,12 +85,10 @@ class NotificationActionsSettingsFragment : androidx.fragment.app.Fragment() {
 
     private fun persist() {
         val sanitizedCutoff = cutoff.coerceIn(0, NOTIFICATION_PREFERENCE_MAX_MESSAGE_ACTIONS_SHOWN)
-        val orderString = actionOrder.joinToString(separator = ",") { it.token }
-
         generalSettingsManager.update { settings ->
             settings.copy(
                 notification = settings.notification.copy(
-                    messageActionsOrder = orderString,
+                    messageActionsOrder = actionOrder.map { it.token },
                     messageActionsCutoff = sanitizedCutoff,
                 ),
             )
@@ -129,12 +127,7 @@ class NotificationActionsSettingsFragment : androidx.fragment.app.Fragment() {
         persist()
     }
 
-    private fun parseOrder(raw: String): List<MessageNotificationAction> {
-        val tokens = raw
-            .split(',')
-            .map { it.trim() }
-            .filter { it.isNotEmpty() }
-
+    private fun parseOrder(tokens: List<String>): List<MessageNotificationAction> {
         val seen = LinkedHashSet<MessageNotificationAction>()
         for (token in tokens) {
             MessageNotificationAction.fromToken(token)?.let { seen.add(it) }

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ class SingleMessageNotificationDataCreatorTest {`
`224`	`224`
`225`	`225`	`private fun setMessageActions(cutoff: Int) {`
`226`	`226`	`fakeNotificationPreferences.setMessageActions(`
`227`		`- order = "reply,mark_as_read,delete,archive,spam",`
	`227`	`+ order = listOf("reply", "mark_as_read", "delete", "archive", "spam"),`
`228`	`228`	`cutoff = cutoff,`
`229`	`229`	`)`
`230`	`230`	`}`
`@@ -291,7 +291,7 @@ class SingleMessageNotificationDataCreatorTest {`
`291`	`291`	`prefs.update { it.copy(notificationQuickDeleteBehaviour = behaviour) }`
`292`	`292`	`}`
`293`	`293`
`294`		`- fun setMessageActions(order: String, cutoff: Int) {`
	`294`	`+ fun setMessageActions(order: List<String>, cutoff: Int) {`
`295`	`295`	`prefs.update { it.copy(messageActionsOrder = order, messageActionsCutoff = cutoff) }`
`296`	`296`	`}`
`297`	`297`	`}`