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/Contact.java | |
parent | 126b71398479c39c915d2205ec316703a9d2dfbb (diff) |
transmit display name (nick) in subscription requests
Diffstat (limited to 'src/main/java/de/pixart/messenger/entities/Contact.java')
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Contact.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Contact.java b/src/main/java/de/pixart/messenger/entities/Contact.java index 1df6e120a..aa7319ad9 100644 --- a/src/main/java/de/pixart/messenger/entities/Contact.java +++ b/src/main/java/de/pixart/messenger/entities/Contact.java @@ -21,6 +21,7 @@ import java.util.Locale; import de.pixart.messenger.Config; import de.pixart.messenger.R; import de.pixart.messenger.android.AbstractPhoneContact; +import de.pixart.messenger.services.QuickConversationsService; import de.pixart.messenger.utils.JidHelper; import de.pixart.messenger.utils.UIHelper; import de.pixart.messenger.xml.Element; @@ -133,7 +134,7 @@ public class Contact implements ListItem, Blockable { return this.systemName; } else if (!TextUtils.isEmpty(this.serverName)) { return this.serverName; - } else if (!TextUtils.isEmpty(this.presenceName) && mutualPresenceSubscription()) { + } else if (!TextUtils.isEmpty(this.presenceName) && ((QuickConversationsService.isQuicksy() && Config.QUICKSY_DOMAIN.equals(jid.getDomain())) ||mutualPresenceSubscription())) { return this.presenceName; } else if (jid.getLocal() != null) { return JidHelper.localPartOrFallback(jid); |