aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-06-15 09:44:01 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-06-15 09:44:01 +0200
commit73679b97f1264f6c2fe7f06a46f91611d9d96217 (patch)
treee409a629c307e337a3c0e67728bae24297986e34 /src
parent49de43b364fb58ae083bd06f3665c1d244922213 (diff)
show xep-0172 nick only for contacts with mutual presence subscription
Diffstat (limited to 'src')
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Contact.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java
index 70878a73..9f2dfba9 100644
--- a/src/main/java/eu/siacs/conversations/entities/Contact.java
+++ b/src/main/java/eu/siacs/conversations/entities/Contact.java
@@ -116,7 +116,7 @@ public class Contact implements ListItem, Blockable {
return this.systemName;
} else if (this.serverName != null) {
return this.serverName;
- } else if (this.presenceName != null) {
+ } else if (this.presenceName != null && trusted()) {
return this.presenceName;
} else if (jid.hasLocalpart()) {
return jid.getLocalpart();