aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-12-19 13:07:38 +0100
committerDaniel Gultsch <daniel@gultsch.de>2015-12-19 13:07:38 +0100
commitade89beb9647f753ebe7382b1b07bcfb3b688798 (patch)
treeff58a94d0f6ffafe5e689dc47c6e75b7352376fa /src/main
parent15c8cb8ac6de9b16d7ef4e405b4129b2377a42b8 (diff)
use presence name not server name when verification is being used
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Contact.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java
index ecba70a77..c2d8b278b 100644
--- a/src/main/java/eu/siacs/conversations/entities/Contact.java
+++ b/src/main/java/eu/siacs/conversations/entities/Contact.java
@@ -105,12 +105,12 @@ public class Contact implements ListItem, Blockable {
}
public String getDisplayName() {
- if (this.systemName != null && !Config.X509_VERIFICATION) {
+ if (this.presenceName != null && Config.X509_VERIFICATION) {
+ return this.presenceName;
+ } else if (this.systemName != null) {
return this.systemName;
} else if (this.serverName != null) {
return this.serverName;
- } else if (this.systemName != null) {
- return this.systemName;
} else if (this.presenceName != null) {
return this.presenceName;
} else if (jid.hasLocalpart()) {