use presence name not server name when verification is being used

Daniel Gultsch created 10 years ago

Change summary

src/main/java/eu/siacs/conversations/entities/Contact.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Detailed changes

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()) {