From 1673d15e5e21194c262372f1eca7869382bb42a2 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Thu, 27 May 2021 09:30:04 +0200 Subject: [PATCH] dont show deletion option for attachments (deletion for attachments in talk is not supported by server) Signed-off-by: Marcel Hibbe --- .../main/java/com/nextcloud/talk/controllers/ChatController.kt | 2 ++ .../java/com/nextcloud/talk/models/json/chat/ChatMessage.java | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt index 9a5bc22cd..29ac0f3a7 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt @@ -1800,6 +1800,8 @@ class ChatController(args: Bundle) : if (message.isDeleted) return false + if (message.hasFileAttachment()) return false + val sixHoursInMillis = 6 * 3600 * 1000 val isOlderThanSixHours = message.createdAt?.before(Date(System.currentTimeMillis() - sixHoursInMillis)) == true if (isOlderThanSixHours) return false diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java index b13ff44cd..aa704cb35 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java +++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java @@ -91,7 +91,7 @@ public class ChatMessage implements IMessage, MessageContentType, MessageContent MessageType.SYSTEM_MESSAGE, MessageType.SINGLE_LINK_VIDEO_MESSAGE, MessageType.SINGLE_LINK_AUDIO_MESSAGE, MessageType.SINGLE_LINK_MESSAGE); - private boolean hasFileAttachment() { + public boolean hasFileAttachment() { if (messageParameters != null && messageParameters.size() > 0) { for (String key : messageParameters.keySet()) { Map individualHashMap = messageParameters.get(key); @@ -100,7 +100,6 @@ public class ChatMessage implements IMessage, MessageContentType, MessageContent } } } - return false; }