From 60a0565ba8957855c93af588ea92795d008f02fb Mon Sep 17 00:00:00 2001 From: Arthur-GYT Date: Mon, 8 Jul 2024 19:36:20 +0200 Subject: [PATCH] Show max edits warning before editing. Fixes #13428 Closes #13615 Signed-off-by: Arthur-GYT --- .../conversation/v2/ConversationFragment.kt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt index 45ce476ac4..8f50f1c4ef 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt @@ -1557,12 +1557,6 @@ class ConversationFragment : return } - if (!MessageConstraintsUtil.isWithinMaxEdits(editMessage)) { - Log.i(TAG, "Too many edits to the message") - Dialogs.showAlertDialog(requireContext(), null, resources.getQuantityString(R.plurals.ConversationActivity_edit_message_too_many_edits, MessageConstraintsUtil.MAX_EDIT_COUNT, MessageConstraintsUtil.MAX_EDIT_COUNT)) - return - } - if (!isValidEditMessageSend(editMessage, System.currentTimeMillis())) { Log.i(TAG, "Edit message no longer valid") val editDurationHours = getEditMessageThresholdHours() @@ -2320,6 +2314,13 @@ class ConversationFragment : } private fun handleEditMessage(conversationMessage: ConversationMessage) { + if (!MessageConstraintsUtil.isWithinMaxEdits(conversationMessage.messageRecord)) { + Log.i(TAG, "Too many edits to the message") + Dialogs.showAlertDialog(requireContext(), null, resources.getQuantityString(R.plurals.ConversationActivity_edit_message_too_many_edits, MessageConstraintsUtil.MAX_EDIT_COUNT, MessageConstraintsUtil.MAX_EDIT_COUNT)) + + return + } + if (isSearchRequested) { searchMenuItem?.collapseActionView() }