From 93a687a172b3e7924aea7d79bcb6216b2184d42e Mon Sep 17 00:00:00 2001 From: onurays Date: Wed, 26 Feb 2020 17:55:23 +0300 Subject: [PATCH] Code review fixes. --- .../home/room/detail/timeline/action/MessageActionsViewModel.kt | 2 +- .../room/detail/timeline/format/DisplayableEventFormatter.kt | 2 +- .../home/room/detail/timeline/format/NoticeEventFormatter.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsViewModel.kt index edbf4b1a71..ad6cccaf44 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsViewModel.kt @@ -169,7 +169,7 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted private fun computeMessageBody(timelineEvent: TimelineEvent): CharSequence { if (timelineEvent.root.isRedacted()) { - return noticeEventFormatter.getRedactionReason(timelineEvent.root) + return noticeEventFormatter.formatRedactedEvent(timelineEvent.root) } return when (timelineEvent.root.getClearType()) { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt index b214640ef3..2f7b52de62 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt @@ -37,7 +37,7 @@ class DisplayableEventFormatter @Inject constructor( fun format(timelineEvent: TimelineEvent, appendAuthor: Boolean): CharSequence { if (timelineEvent.root.isRedacted()) { - return noticeEventFormatter.getRedactionReason(timelineEvent.root) + return noticeEventFormatter.formatRedactedEvent(timelineEvent.root) } if (timelineEvent.root.isEncrypted() diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt index 5453ba8403..39e17b7c35 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt @@ -318,7 +318,7 @@ class NoticeEventFormatter @Inject constructor(private val sessionHolder: Active } } - fun getRedactionReason(event: Event): String { + fun formatRedactedEvent(event: Event): String { return (event .unsignedData ?.redactedEvent