From 5319c453d2c1feeef71b77771ed85a207a368e5b Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Mon, 3 Feb 2020 11:01:57 +0100 Subject: [PATCH] Fix #716 Signed-off-by: Mario Danic --- .../com/nextcloud/talk/models/json/chat/ChatMessage.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt index 08536b6f7..fc1265af0 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt @@ -188,8 +188,7 @@ class ChatMessage : IMessage, MessageContentType, MessageContentType.Image { val lastMessageDisplayText: String get() { - if (messageType == MessageType.REGULAR_TEXT_MESSAGE || messageType == - MessageType.SYSTEM_MESSAGE) { + if (messageType == MessageType.REGULAR_TEXT_MESSAGE || messageType == MessageType.SYSTEM_MESSAGE || messageType == MessageType.SINGLE_LINK_MESSAGE) { return text } else { if (messageType == MessageType.SINGLE_LINK_GIPHY_MESSAGE || messageType == MessageType.SINGLE_LINK_TENOR_MESSAGE || messageType == MessageType.SINGLE_LINK_GIF_MESSAGE) { @@ -212,7 +211,7 @@ class ChatMessage : IMessage, MessageContentType, MessageContentType.Image { if (!TextUtils.isEmpty(actorDisplayName)) actorDisplayName else sharedApplication !!.getString(R.string.nc_guest)) } - } else if (messageType == MessageType.SINGLE_LINK_MESSAGE) { + /*} else if (messageType == MessageType.SINGLE_LINK_MESSAGE) { return if (actorId.equals(activeUser!!.userId)) { sharedApplication!!.resources.getString(R.string.nc_sent_a_link_you) } else { @@ -220,7 +219,7 @@ class ChatMessage : IMessage, MessageContentType, MessageContentType.Image { !!.resources .getString(R.string.nc_sent_a_link), if (!TextUtils.isEmpty(actorDisplayName)) actorDisplayName else sharedApplication!!.getString(R.string.nc_guest)) - } + }*/ } else if (messageType == MessageType.SINGLE_LINK_AUDIO_MESSAGE) { return if (actorId.equals(activeUser!!.userId)) { sharedApplication!!.resources.getString(R.string.nc_sent_an_audio_you)