empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Ignore edit limits for note to self.

Browse source 
Fixes #13716
This commit is contained in:
Greyson Parrelli 2024-09-28 08:18:22 -04:00
parent aa252b1733
commit a3e05f4a75
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
View file

@ -2367,7 +2367,8 @@ class ConversationFragment :
} }
private fun handleEditMessage(conversationMessage: ConversationMessage) { private fun handleEditMessage(conversationMessage: ConversationMessage) {
if (!MessageConstraintsUtil.isWithinMaxEdits(conversationMessage.messageRecord)) { val isNoteToSelf = viewModel.recipientSnapshot?.isSelf ?: false
if (!isNoteToSelf && !MessageConstraintsUtil.isWithinMaxEdits(conversationMessage.messageRecord)) {
Log.i(TAG, "Too many edits to the message") 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)) Dialogs.showAlertDialog(requireContext(), null, resources.getQuantityString(R.plurals.ConversationActivity_edit_message_too_many_edits, MessageConstraintsUtil.MAX_EDIT_COUNT, MessageConstraintsUtil.MAX_EDIT_COUNT))

5
app/src/main/java/org/thoughtcrime/securesms/util/MessageConstraintsUtil.kt
View file

@ -62,8 +62,11 @@ object MessageConstraintsUtil {
} else { } else {
targetMessage targetMessage
} }
val isNoteToSelf = targetMessage.toRecipient.isSelf && targetMessage.fromRecipient.isSelf
return isValidRemoteDeleteSend(originalMessage, currentTime) && return isValidRemoteDeleteSend(originalMessage, currentTime) &&
targetMessage.revisionNumber < MAX_EDIT_COUNT && (isNoteToSelf || targetMessage.revisionNumber < MAX_EDIT_COUNT) &&
!targetMessage.isViewOnceMessage() && !targetMessage.isViewOnceMessage() &&
!targetMessage.hasAudio() && !targetMessage.hasAudio() &&
!targetMessage.hasSharedContact() && !targetMessage.hasSharedContact() &&