From a76bc74a970b051c3ac247ebd3d20fc5a98c8542 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Tue, 1 Aug 2017 13:41:26 +0200 Subject: avoid empty strings when figuring out display name --- src/main/java/de/pixart/messenger/entities/Contact.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/de/pixart/messenger') diff --git a/src/main/java/de/pixart/messenger/entities/Contact.java b/src/main/java/de/pixart/messenger/entities/Contact.java index 8079ff2db..9681e69bc 100644 --- a/src/main/java/de/pixart/messenger/entities/Contact.java +++ b/src/main/java/de/pixart/messenger/entities/Contact.java @@ -112,13 +112,13 @@ public class Contact implements ListItem, Blockable { } public String getDisplayName() { - if (this.commonName != null && Config.X509_VERIFICATION) { + if (Config.X509_VERIFICATION && this.commonName != null && !this.commonName.isEmpty()) { return this.commonName; - } else if (this.systemName != null) { + } else if (this.systemName != null && !this.systemName.isEmpty()) { return this.systemName; - } else if (this.serverName != null) { + } else if (this.serverName != null && !this.serverName.isEmpty()) { return this.serverName; - } else if (this.presenceName != null && mutualPresenceSubscription()) { + } else if (this.presenceName != null && !this.presenceName.isEmpty() && mutualPresenceSubscription()) { return this.presenceName; } else if (jid.hasLocalpart()) { return jid.getUnescapedLocalpart(); -- cgit v1.2.3