aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2019-07-13 22:31:50 +0200
committersteckbrief <steckbrief@chefmail.de>2019-07-13 22:31:50 +0200
commit653af7463e3c49f6d0ab7eed35220e06eca72e8b (patch)
treec005b23b7876f5b6752bc3654a294bfef250a7c5 /src/main
parent8c3d75db38a6e953916c2bd4c80d6aaab5b87a27 (diff)
relates to FS#299: Remove use of quicksy.im in Conversation checks
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/de/pixart/messenger/entities/Conversation.java4
1 files 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;
}