Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-15 07:28:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use original message instead of edit message when checking if we can edit.

Browse Source
This commit is contained in:
Clark
2023-06-21 17:52:33 -04:00
committed by GitHub
parent df8aaa2005
commit 5db770ca44
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/util/MessageConstraintsUtil.kt
View File

@@ -1,5 +1,6 @@
package org.thoughtcrime.securesms.util
import org.thoughtcrime.securesms.database.SignalDatabase
import org.thoughtcrime.securesms.database.model.MessageRecord
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.recipients.RecipientId
@@ -51,7 +52,12 @@ object MessageConstraintsUtil {
*/
@JvmStatic
fun isValidEditMessageSend(targetMessage: MessageRecord, currentTime: Long): Boolean {
return isValidRemoteDeleteSend(targetMessage, currentTime) &&
val originalMessage = if (targetMessage.isEditMessage && targetMessage.id != targetMessage.originalMessageId?.id) {
SignalDatabase.messages.getMessageRecord(targetMessage.originalMessageId!!.id)
} else {
targetMessage
}
return isValidRemoteDeleteSend(originalMessage, currentTime) &&
targetMessage.revisionNumber < MAX_EDIT_COUNT &&
!targetMessage.isViewOnceMessage() &&
!targetMessage.hasAudio() &&