From d8947f5c0bebb611d170844a8035476d24b4c4c7 Mon Sep 17 00:00:00 2001 From: Onuray Sahin Date: Fri, 10 Jun 2022 14:01:43 +0300 Subject: [PATCH] Add report action for live location messages. --- .../org/matrix/android/sdk/api/session/events/model/Event.kt | 3 +++ .../room/detail/timeline/action/MessageActionsViewModel.kt | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt index f28746ad0c..7f9ab4c6dd 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt @@ -427,3 +427,6 @@ fun Event.getPollContent(): MessagePollContent? { fun Event.supportsNotification() = this.getClearType() in EventType.MESSAGE + EventType.POLL_START + EventType.STATE_ROOM_BEACON_INFO + +fun Event.isContentReportable() = + this.getClearType() in EventType.MESSAGE + EventType.STATE_ROOM_BEACON_INFO diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt index 15d8eae509..05089cce81 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt @@ -45,6 +45,7 @@ import org.matrix.android.sdk.api.session.Session import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState import org.matrix.android.sdk.api.session.events.model.EventType import org.matrix.android.sdk.api.session.events.model.isAttachmentMessage +import org.matrix.android.sdk.api.session.events.model.isContentReportable import org.matrix.android.sdk.api.session.events.model.isTextMessage import org.matrix.android.sdk.api.session.events.model.isThread import org.matrix.android.sdk.api.session.events.model.toModel @@ -421,7 +422,7 @@ class MessageActionsViewModel @AssistedInject constructor( add(EventSharedAction.CopyPermalink(eventId)) if (session.myUserId != timelineEvent.root.senderId) { // not sent by me - if (timelineEvent.root.getClearType() == EventType.MESSAGE) { + if (timelineEvent.root.isContentReportable()) { add(EventSharedAction.ReportContent(eventId, timelineEvent.root.senderId)) }