From c2b94274b0329825a455ee0492a3c4d034b77e10 Mon Sep 17 00:00:00 2001 From: Nicholas Tinsley Date: Mon, 12 Sep 2022 15:14:57 -0400 Subject: [PATCH] Cancel Send if we return to fragment. This plugs a lifecycle hole: previously if you leave this fragment (SelectionConfirmed), you get stuck in that state even if you return. --- .../mutiselect/forward/MultiselectForwardFragment.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt index e6ca9ca31..185a084e0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt @@ -253,7 +253,9 @@ class MultiselectForwardFragment : val expiringMessages = args.multiShareArgs.filter { it.expiresAt > 0L } val firstToExpire = expiringMessages.minByOrNull { it.expiresAt } val earliestExpiration = firstToExpire?.expiresAt ?: -1L - + if (viewModel.state.value?.stage is MultiselectForwardState.Stage.SelectionConfirmed && contactSearchMediator.getSelectedContacts().isNotEmpty()) { + onCanceled() + } if (earliestExpiration > 0) { if (earliestExpiration <= now) { handleMessageExpired()