From ade89beb9647f753ebe7382b1b07bcfb3b688798 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 19 Dec 2015 13:07:38 +0100
Subject: [PATCH] use presence name not server name when verification is being
 used

---
 src/main/java/eu/siacs/conversations/entities/Contact.java | 6 +++---
 1 file 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()) {