From 0765d6d1da8dc0f6520e4ea4ed718dd3eda4b4ac Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 27 Jun 2019 15:21:10 +0200
Subject: [PATCH] Fix / Action bottom sheet show preview for encrypted messages

---
 .../room/detail/timeline/action/MessageActionsViewModel.kt     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
index 95cb4f52..dfe37bf9 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -66,9 +66,10 @@ class MessageActionsViewModel(initialState: MessageActionState) : VectorViewMode
             var body: CharSequence? = null
             val originTs = event?.root?.originServerTs
             return if (event != null) {
-                when (event.root.type) {
+                when (event.root.getClearType()) {
                     EventType.MESSAGE     -> {
                         val messageContent: MessageContent? = event.annotations?.editSummary?.aggregatedContent?.toModel()
+                                ?: event.root.getClearContent().toModel()
                                 ?: event.root.content.toModel()
                         body = messageContent?.body
                         if (messageContent is MessageTextContent && messageContent.format == MessageType.FORMAT_MATRIX_HTML) {