From 85ce06a9a9371db90dec2bb334e86c17babece98 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Tue, 7 Aug 2018 23:45:35 +0200 Subject: [PATCH] Optimize Signed-off-by: Mario Danic --- .../nextcloud/talk/controllers/ChatController.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java index 1b165dba2..2dc4ca706 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java @@ -751,10 +751,13 @@ public class ChatController extends BaseController implements MessagesListAdapte } else { boolean foundRealMessage = false; - for (int i = 0; i < chatMessageList.size(); i++) { - if (TextUtils.isEmpty(chatMessageList.get(i).getSystemMessage())) { - foundRealMessage = true; - break; + + if (conversationUser.hasSpreedCapabilityWithName("system-messages")) { + for (int i = 0; i < chatMessageList.size(); i++) { + if (TextUtils.isEmpty(chatMessageList.get(i).getSystemMessage())) { + foundRealMessage = true; + break; + } } }