Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

No actions (so far) for redacted events

Browse source
This commit is contained in:
Benoit Marty 2022-11-28 16:56:28 +01:00
parent c51eb4823c
commit a3989cf1f4
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
features/messages/src/main/java/io/element/android/x/features/messages/MessagesViewModel.kt
View file

@ -9,6 +9,7 @@ import io.element.android.x.features.messages.model.MessagesItemAction
import io.element.android.x.features.messages.model.MessagesItemActionsSheetState import io.element.android.x.features.messages.model.MessagesItemActionsSheetState
import io.element.android.x.features.messages.model.MessagesTimelineItemState import io.element.android.x.features.messages.model.MessagesTimelineItemState
import io.element.android.x.features.messages.model.MessagesViewState import io.element.android.x.features.messages.model.MessagesViewState
import io.element.android.x.features.messages.model.content.MessagesTimelineItemRedactedContent
import io.element.android.x.matrix.MatrixClient import io.element.android.x.matrix.MatrixClient
import io.element.android.x.matrix.MatrixInstance import io.element.android.x.matrix.MatrixInstance
import io.element.android.x.matrix.media.MediaResolver import io.element.android.x.matrix.media.MediaResolver
@ -104,12 +105,18 @@ class MessagesViewModel(
fun computeActionsSheetState(messagesTimelineItemState: MessagesTimelineItemState.MessageEvent) { fun computeActionsSheetState(messagesTimelineItemState: MessagesTimelineItemState.MessageEvent) {
suspend { suspend {
val actions = mutableListOf( val actions =
if (messagesTimelineItemState.content is MessagesTimelineItemRedactedContent) {
emptyList()
} else {
mutableListOf(
MessagesItemAction.Forward, MessagesItemAction.Forward,
MessagesItemAction.Copy, MessagesItemAction.Copy,
) ).also {
if (messagesTimelineItemState.isMine) { if (messagesTimelineItemState.isMine) {
actions.add(MessagesItemAction.Redact) it.add(MessagesItemAction.Redact)
}
}
} }
MessagesItemActionsSheetState( MessagesItemActionsSheetState(
targetItem = messagesTimelineItemState, targetItem = messagesTimelineItemState,