diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-11-30 21:18:48 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-11-30 21:18:48 +0100 |
commit | 591f585a7a1eaafaf388821dc05a638c7d3044be (patch) | |
tree | 9b10d086500aa23992382337e7a77040f7394e4b /src/main/java/de/pixart/messenger/entities/Conversation.java | |
parent | 126b71398479c39c915d2205ec316703a9d2dfbb (diff) |
transmit display name (nick) in subscription requests
Diffstat (limited to 'src/main/java/de/pixart/messenger/entities/Conversation.java')
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Conversation.java | 5 |
1 files changed, 3 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 1fa1c7a2d..b6179fa2e 100644 --- a/src/main/java/de/pixart/messenger/entities/Conversation.java +++ b/src/main/java/de/pixart/messenger/entities/Conversation.java @@ -29,6 +29,7 @@ import de.pixart.messenger.Config; import de.pixart.messenger.crypto.OmemoSetting; import de.pixart.messenger.crypto.PgpDecryptionService; import de.pixart.messenger.crypto.axolotl.AxolotlService; +import de.pixart.messenger.services.QuickConversationsService; import de.pixart.messenger.utils.JidHelper; import de.pixart.messenger.xmpp.chatstate.ChatState; import de.pixart.messenger.xmpp.mam.MamReference; @@ -561,10 +562,10 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl return contactJid.getLocal() != null ? contactJid.getLocal() : contactJid; } } - } else if (isWithStranger()) { + } else if ((QuickConversationsService.isConversations() || !Config.QUICKSY_DOMAIN.equals(contactJid.getDomain())) && isWithStranger()) { return contactJid; } else { - return this.getContact().getDisplayName(); + return this.getContact().getDisplayName();public PresencePacket requestPresenceUpdatesFrom(Contact contact) { } } |