From b33b4216159af810b78a58264c91ad75750ccb3b Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Wed, 12 Jun 2024 13:18:55 +0200 Subject: [PATCH] cancel muting should not exit select-mode exiting 'select mode' is unexpected when hitting 'cancel' - the user may still want to do other things with the selection. this makes the 'mute' behavior consisten with other cases showing a dialog, eg. 'delete' --- .../securesms/BaseConversationListFragment.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/BaseConversationListFragment.java b/src/main/java/org/thoughtcrime/securesms/BaseConversationListFragment.java index fa7d5a57d..c747f960d 100644 --- a/src/main/java/org/thoughtcrime/securesms/BaseConversationListFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/BaseConversationListFragment.java @@ -165,17 +165,22 @@ public abstract class BaseConversationListFragment extends Fragment implements A for (long chatId : selectedConversations) { dcContext.setChatMuteDuration((int)chatId, duration); } + + if (actionMode != null) { + actionMode.finish(); + actionMode = null; + } }); } else { // unmute for (long chatId : selectedConversations) { dcContext.setChatMuteDuration((int)chatId, 0); } - } - if (actionMode != null) { - actionMode.finish(); - actionMode = null; + if (actionMode != null) { + actionMode.finish(); + actionMode = null; + } } }