fix(message-list): auto-exit selection mode when no messages selected

Author: rafaeltonholo

feature/mail/message/list/api/src/main/kotlin/net/thunderbird/feature/mail/message/list/ui/effect/MessageListEffect.kt

@@ -95,6 +95,8 @@ sealed interface MessageListEffect {
         val isAllSelected: Boolean,
     ) : MessageListEffect
 
+    data object ResetToolbarActionMode : MessageListEffect
+
     data class ScrollToMessage(val message: MessageItemUi) : MessageListEffect
 
     data class OpenMessage(val message: MessageItemUi) : MessageListEffect

feature/mail/message/list/internal/src/main/kotlin/net/thunderbird/feature/mail/message/list/internal/ui/MessageListViewModel.kt

@@ -34,13 +34,17 @@ internal class MessageListViewModel(
                     is MessageListState.SelectingMessages -> {
                         val selectedCount = state.messages.count { it.selected }
                         emitEffect(
-                            MessageListEffect.UpdateToolbarActionMode(
-                                title = stringsResourceManager.stringResource(
-                                    MessageListApiR.string.actionbar_selected,
-                                    selectedCount,
-                                ),
-                                isAllSelected = selectedCount == state.messages.size,
-                            ),
+                            if (selectedCount > 0) {
+                                MessageListEffect.UpdateToolbarActionMode(
+                                    title = stringsResourceManager.stringResource(
+                                        MessageListApiR.string.actionbar_selected,
+                                        selectedCount,
+                                    ),
+                                    isAllSelected = selectedCount == state.messages.size,
+                                )
+                            } else {
+                                MessageListEffect.ResetToolbarActionMode
+                            },
                         )
                     }
 

feature/mail/message/list/internal/src/main/kotlin/net/thunderbird/feature/mail/message/list/internal/ui/state/machine/MessageListStateMachine.kt

@@ -61,7 +61,7 @@ class MessageListStateMachine(
         globalState()
         loadingMessagesState(dispatch)
         loadedMessagesState()
-        selectingMessagesState()
+        selectingMessagesState(dispatch, dispatchUiEffect)
         searchingMessagesState()
     },
 ) : StateMachine<MessageListState, MessageListEvent> by stateMachine {

feature/mail/message/list/internal/src/main/kotlin/net/thunderbird/feature/mail/message/list/internal/ui/state/machine/SetupSelectingMessagesState.kt

@@ -2,8 +2,10 @@ package net.thunderbird.feature.mail.message.list.internal.ui.state.machine
 
 import kotlinx.collections.immutable.toPersistentList
 import net.thunderbird.core.common.state.builder.StateMachineBuilder
+import net.thunderbird.feature.mail.message.list.ui.effect.MessageListEffect
 import net.thunderbird.feature.mail.message.list.ui.event.MessageItemEvent
 import net.thunderbird.feature.mail.message.list.ui.event.MessageListEvent
+import net.thunderbird.feature.mail.message.list.ui.state.MessageItemUi
 import net.thunderbird.feature.mail.message.list.ui.state.MessageListState
 
 /**
@@ -16,29 +18,49 @@ import net.thunderbird.feature.mail.message.list.ui.state.MessageListState
  *  - [MessageListEvent.ExitSelectionMode]: Exits selection mode, deselecting all messages and returning
  *   to the [MessageListState.LoadedMessages] state.
  */
-internal fun StateMachineBuilder<MessageListState, MessageListEvent>.selectingMessagesState() {
+internal fun StateMachineBuilder<MessageListState, MessageListEvent>.selectingMessagesState(
+    dispatch: (MessageListEvent) -> Unit,
+    dispatchUiEffect: (MessageListEffect) -> Unit,
+) {
     state<MessageListState.SelectingMessages> {
         transition<MessageItemEvent.ToggleSelectMessages> { state, event ->
-            state.copy(
-                messages = state.messages.map { message ->
-                    if (message in event.messages) message.copy(selected = !message.selected) else message
-                }.toPersistentList(),
-            )
+            toggleSelectMessages(state, event.messages, dispatch, dispatchUiEffect)
         }
+
         transition<MessageListEvent.ExitSelectionMode> { state, _ ->
+            dispatchUiEffect(MessageListEffect.ResetToolbarActionMode)
             MessageListState.LoadedMessages(
                 metadata = state.metadata,
                 preferences = state.preferences,
                 messages = state.messages.map { message -> message.copy(selected = false) }.toPersistentList(),
             )
         }
 
-        transition<MessageItemEvent.OnMessageClick> { currentState, event ->
-            currentState.copy(
-                messages = currentState.messages.map { message ->
-                    if (message == event.message) message.copy(selected = !message.selected) else message
-                }.toPersistentList(),
-            )
+        transition<MessageItemEvent.OnMessageClick> { state, event ->
+            toggleSelectMessages(state, listOf(event.message), dispatch, dispatchUiEffect)
         }
     }
 }
+
+private fun toggleSelectMessages(
+    state: MessageListState.SelectingMessages,
+    messages: List<MessageItemUi>,
+    dispatch: (MessageListEvent) -> Unit,
+    dispatchUiEffect: (MessageListEffect) -> Unit,
+): MessageListState.SelectingMessages {
+    var selectedCount = 0
+    val newMessages = state.messages.map { message ->
+        if (message in messages) {
+            message.copy(selected = !message.selected)
+        } else {
+            message
+        }.also { selectedCount += if (it.selected) 1 else 0 }
+    }.toPersistentList()
+    return if (selectedCount == 0) {
+        dispatch(MessageListEvent.ExitSelectionMode)
+        dispatchUiEffect(MessageListEffect.ResetToolbarActionMode)
+        state
+    } else {
+        state.copy(messages = newMessages)
+    }
+}

feature/mail/message/list/internal/src/main/kotlin/net/thunderbird/feature/mail/message/list/internal/ui/state/sideeffect/inject/MessageListSideEffectsModule.kt

@@ -7,10 +7,10 @@ import net.thunderbird.feature.mail.message.list.internal.ui.state.sideeffect.Lo
 import net.thunderbird.feature.mail.message.list.internal.ui.state.sideeffect.LoadPreferencesSideEffect
 import net.thunderbird.feature.mail.message.list.internal.ui.state.sideeffect.LoadSortCriteriaStateSideEffectHandler
 import net.thunderbird.feature.mail.message.list.internal.ui.state.sideeffect.LoadSwipeActionsStateSideEffectHandler
-import net.thunderbird.feature.mail.message.list.internal.ui.state.sideeffect.ToggleMessageSideEffect
 import net.thunderbird.feature.mail.message.list.internal.ui.state.sideeffect.legacy.LoadMessagesLegacySideEffect
 import net.thunderbird.feature.mail.message.list.internal.ui.state.sideeffect.ui.OpenMessageSideEffect
 import net.thunderbird.feature.mail.message.list.internal.ui.state.sideeffect.ui.SetMessageActiveSideEffect
+import net.thunderbird.feature.mail.message.list.internal.ui.state.sideeffect.ui.ToggleMessageSideEffect
 import net.thunderbird.feature.mail.message.list.ui.MessageListContract
 import net.thunderbird.feature.mail.message.list.ui.state.sideeffect.MessageListStateSideEffectHandlerFactory
 import org.koin.dsl.module

feature/mail/message/list/internal/src/main/kotlin/net/thunderbird/feature/mail/message/list/internal/ui/state/sideeffect/ui/OpenMessageSideEffect.kt

@@ -15,7 +15,9 @@ internal class OpenMessageSideEffect(
     dispatchUiEffect: suspend (MessageListEffect) -> Unit,
 ) : MessageListStateSideEffectHandler(logger, dispatch, dispatchUiEffect) {
     override fun accept(event: MessageListEvent, oldState: MessageListState, newState: MessageListState): Boolean =
-        event is MessageItemEvent.OnMessageClick && newState is MessageListState.LoadedMessages
+        event is MessageItemEvent.OnMessageClick &&
+            oldState is MessageListState.LoadedMessages &&
+            newState is MessageListState.LoadedMessages
 
     override suspend fun consume(
         event: MessageListEvent,

…te/sideeffect/ToggleMessageSideEffect.kt …sideeffect/ui/ToggleMessageSideEffect.ktfeature/mail/message/list/internal/src/main/kotlin/net/thunderbird/feature/mail/message/list/internal/ui/state/sideeffect/ToggleMessageSideEffect.kt renamed to feature/mail/message/list/internal/src/main/kotlin/net/thunderbird/feature/mail/message/list/internal/ui/state/sideeffect/ui/ToggleMessageSideEffect.kt feature/mail/message/list/internal/src/main/kotlin/net/thunderbird/feature/mail/message/list/internal/ui/state/sideeffect/ToggleMessageSideEffect.kt renamed to feature/mail/message/list/internal/src/main/kotlin/net/thunderbird/feature/mail/message/list/internal/ui/state/sideeffect/ui/ToggleMessageSideEffect.kt

@@ -1,4 +1,4 @@
-package net.thunderbird.feature.mail.message.list.internal.ui.state.sideeffect
+package net.thunderbird.feature.mail.message.list.internal.ui.state.sideeffect.ui
 
 import kotlinx.coroutines.CoroutineScope
 import net.thunderbird.core.logging.Logger
@@ -15,7 +15,9 @@ internal class ToggleMessageSideEffect(
 ) : MessageListStateSideEffectHandler(logger, dispatch) {
 
     override fun accept(event: MessageListEvent, oldState: MessageListState, newState: MessageListState): Boolean =
-        event is MessageItemEvent.OnMessageClick && newState is MessageListState.SelectingMessages
+        event is MessageItemEvent.OnMessageClick &&
+            oldState is MessageListState.SelectingMessages &&
+            newState is MessageListState.SelectingMessages
 
     override suspend fun consume(
         event: MessageListEvent,

feature/mail/message/list/internal/src/test/kotlin/net/thunderbird/feature/mail/message/list/internal/ui/state/sideeffect/ToggleMessageSideEffectTest.kt

@@ -9,13 +9,32 @@ import kotlin.test.Test
 import kotlinx.coroutines.test.runTest
 import net.thunderbird.core.common.state.sideeffect.StateSideEffectHandler
 import net.thunderbird.core.logging.testing.TestLogger
+import net.thunderbird.feature.mail.message.list.internal.ui.state.sideeffect.ui.ToggleMessageSideEffect
 import net.thunderbird.feature.mail.message.list.ui.event.MessageItemEvent
 import net.thunderbird.feature.mail.message.list.ui.event.MessageListEvent
 
 class ToggleMessageSideEffectTest : BaseSideEffectHandlerTest() {
 
     @Test
-    fun `handle() should return Consumed when event is OnMessageClick and newState is SelectingMessages`() = runTest {
+    fun `handle() should return Consumed when event is OnMessageClick and both states are SelectingMessages`() =
+        runTest {
+            // Arrange
+            val message = createMessageItemUi()
+            val testSubject = createTestSubject()
+
+            // Act
+            val result = testSubject.handle(
+                event = MessageItemEvent.OnMessageClick(message),
+                oldState = createSelectingMessagesState(),
+                newState = createSelectingMessagesState(),
+            )
+
+            // Assert
+            assertThat(result).isEqualTo(StateSideEffectHandler.ConsumeResult.Consumed)
+        }
+
+    @Test
+    fun `handle() should return Ignored when event is OnMessageClick but oldState is LoadedMessages`() = runTest {
         // Arrange
         val message = createMessageItemUi()
         val testSubject = createTestSubject()
@@ -28,7 +47,7 @@ class ToggleMessageSideEffectTest : BaseSideEffectHandlerTest() {
         )
 
         // Assert
-        assertThat(result).isEqualTo(StateSideEffectHandler.ConsumeResult.Consumed)
+        assertThat(result).isEqualTo(StateSideEffectHandler.ConsumeResult.Ignored)
     }
 
     @Test
@@ -40,7 +59,7 @@ class ToggleMessageSideEffectTest : BaseSideEffectHandlerTest() {
         // Act
         val result = testSubject.handle(
             event = MessageItemEvent.OnMessageClick(message),
-            oldState = createLoadedMessagesState(),
+            oldState = createSelectingMessagesState(),
             newState = createLoadedMessagesState(),
         )
 
@@ -56,7 +75,7 @@ class ToggleMessageSideEffectTest : BaseSideEffectHandlerTest() {
         // Act
         val result = testSubject.handle(
             event = MessageListEvent.EnterSelectionMode,
-            oldState = createLoadedMessagesState(),
+            oldState = createSelectingMessagesState(),
             newState = createSelectingMessagesState(),
         )
 
@@ -74,7 +93,7 @@ class ToggleMessageSideEffectTest : BaseSideEffectHandlerTest() {
         // Act
         testSubject.handle(
             event = MessageItemEvent.OnMessageClick(message),
-            oldState = createLoadedMessagesState(),
+            oldState = createSelectingMessagesState(),
             newState = createSelectingMessagesState(),
         )
 

legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt

@@ -2412,6 +2412,9 @@ class MessageListFragment :
         when (effect) {
             is MessageListEffect.ScrollToMessage -> scrollToMessage(effect.message)
             is MessageListEffect.UpdateToolbarActionMode -> {
+                println(
+                    "[MessageList] UpdateToolbarActionMode called with title: ${effect.title}, state = $stateSnapshot",
+                )
                 if (actionMode == null) {
                     startAndPrepareActionMode()
                 }
@@ -2422,6 +2425,11 @@ class MessageListFragment :
                 }
             }
 
+            is MessageListEffect.ResetToolbarActionMode -> {
+                println("[MessageList] ResetToolbarActionMode called with state = $stateSnapshot")
+                resetActionMode()
+            }
+
             is MessageListEffect.RefreshMessageList -> {
                 val (primarySortType, secondarySortType) = effect.currentState.metadata.currentSortCriteria
                 val (sortType, sortAscending) = primarySortType.toDomainSortType()