filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MessageActions: disable if not synced atm

This commit is contained in:
ganfra 2019-10-23 12:20:03 +02:00
parent 50bf6df7fe
commit 3196dcb57e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vector/src/main/java/im/vector/riotx/core/extensions/TimelineEvent.kt
View File

@ -17,11 +17,12 @@
package im.vector.riotx.core.extensions package im.vector.riotx.core.extensions
import im.vector.matrix.android.api.session.events.model.EventType import im.vector.matrix.android.api.session.events.model.EventType
import im.vector.matrix.android.api.session.room.send.SendState
import im.vector.matrix.android.api.session.room.timeline.TimelineEvent import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
fun TimelineEvent.canReact(): Boolean { fun TimelineEvent.canReact(): Boolean {
// Only event of type Event.EVENT_TYPE_MESSAGE are supported for the moment // Only event of type Event.EVENT_TYPE_MESSAGE are supported for the moment
return root.getClearType() == EventType.MESSAGE && root.sendState.isSent() && !root.isRedacted() return root.getClearType() == EventType.MESSAGE && root.sendState == SendState.SYNCED && !root.isRedacted()
} }
fun TimelineEvent.displayReadMarker(myUserId: String): Boolean { fun TimelineEvent.displayReadMarker(myUserId: String): Boolean {

2
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
View File

@ -201,7 +201,7 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
if (canCancel(event)) { if (canCancel(event)) {
add(SimpleAction.Cancel(eventId)) add(SimpleAction.Cancel(eventId))
} }
} else { } else if (event.root.sendState == SendState.SYNCED) {
if (!event.root.isRedacted()) { if (!event.root.isRedacted()) {
if (canReply(event, messageContent)) { if (canReply(event, messageContent)) {
add(SimpleAction.Reply(eventId)) add(SimpleAction.Reply(eventId))