From 653af7463e3c49f6d0ab7eed35220e06eca72e8b Mon Sep 17 00:00:00 2001 From: steckbrief Date: Sat, 13 Jul 2019 22:31:50 +0200 Subject: relates to FS#299: Remove use of quicksy.im in Conversation checks --- src/main/java/de/pixart/messenger/entities/Conversation.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java index 77cf2dea8..6155c82cb 100644 --- a/src/main/java/de/pixart/messenger/entities/Conversation.java +++ b/src/main/java/de/pixart/messenger/entities/Conversation.java @@ -584,7 +584,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl return contactJid.getLocal() != null ? contactJid.getLocal() : contactJid; } } - } else if ((QuickConversationsService.isConversations() || !Config.QUICKSY_DOMAIN.equals(contactJid.getDomain())) && isWithStranger()) { + } else if ((QuickConversationsService.isConversations()) && isWithStranger()) { return contactJid; } else { return this.getContact().getDisplayName(); @@ -1168,7 +1168,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl && !contact.isOwnServer() && !contact.showInContactList() && !contact.isSelf() - && !Config.QUICKSY_DOMAIN.equals(contact.getJid().toEscapedString()) + // WHAT IS THIS::: && !Config.QUICKSY_DOMAIN.equals(contact.getJid().toEscapedString()) && sentMessagesCount() == 0; } -- cgit v1.2.3