mirror of
https://github.com/signalapp/Signal-Android.git
synced 2025-12-24 21:15:48 +00:00
Disallow reacting to pending or failed messages.
This commit is contained in:
@@ -1570,9 +1570,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
|
||||
return;
|
||||
}
|
||||
|
||||
if (messageRecord.isSecure() &&
|
||||
!messageRecord.isRemoteDelete() &&
|
||||
!messageRecord.isUpdate() &&
|
||||
if (MessageRecordUtil.isValidReactionTarget(messageRecord) &&
|
||||
!recipient.get().isBlocked() &&
|
||||
!messageRequestViewModel.shouldShowMessageRequest() &&
|
||||
(!recipient.get().isGroup() || recipient.get().isActiveGroup()) &&
|
||||
|
||||
@@ -275,6 +275,7 @@ import org.thoughtcrime.securesms.util.fragments.requireListener
|
||||
import org.thoughtcrime.securesms.util.getRecordQuoteType
|
||||
import org.thoughtcrime.securesms.util.hasAudio
|
||||
import org.thoughtcrime.securesms.util.hasGiftBadge
|
||||
import org.thoughtcrime.securesms.util.isValidReactionTarget
|
||||
import org.thoughtcrime.securesms.util.viewModel
|
||||
import org.thoughtcrime.securesms.util.views.Stub
|
||||
import org.thoughtcrime.securesms.util.visible
|
||||
@@ -2122,9 +2123,7 @@ class ConversationFragment :
|
||||
return
|
||||
}
|
||||
|
||||
if (messageRecord.isSecure &&
|
||||
!messageRecord.isRemoteDelete &&
|
||||
!messageRecord.isUpdate &&
|
||||
if (messageRecord.isValidReactionTarget() &&
|
||||
!recipient.isBlocked &&
|
||||
!viewModel.hasMessageRequestState &&
|
||||
(!recipient.isGroup || recipient.isActiveGroup) &&
|
||||
|
||||
@@ -155,3 +155,10 @@ fun MessageRecord.getRecordQuoteType(): QuoteModel.Type {
|
||||
fun MessageRecord.isEditMessage(): Boolean {
|
||||
return this is MediaMmsMessageRecord && isEditMessage
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns whether or not the given message record can be reacted to.
|
||||
*/
|
||||
fun MessageRecord.isValidReactionTarget(): Boolean {
|
||||
return isSecure && !isPending && !isFailed && !isRemoteDelete && !isUpdate
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user