From 1a3327f2b12493dcd86b4032127020a41eec620d Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Fri, 7 Nov 2014 22:34:54 -0500 Subject: Create avatar's for JID's w/o localparts --- src/main/java/eu/siacs/conversations/entities/Contact.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/main/java/eu/siacs/conversations/entities') diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java index 8fa91b02..9a827f85 100644 --- a/src/main/java/eu/siacs/conversations/entities/Contact.java +++ b/src/main/java/eu/siacs/conversations/entities/Contact.java @@ -78,14 +78,16 @@ public class Contact implements ListItem { public String getDisplayName() { if (this.systemName != null) { - return this.systemName; - } else if (this.serverName != null) { - return this.serverName; + return this.systemName; + } else if (this.serverName != null) { + return this.serverName; } else if (this.presenceName != null) { - return this.presenceName; + return this.presenceName; + } else if (jid.hasLocalpart()) { + return jid.getLocalpart(); } else { - return jid.getLocalpart(); - } + return jid.getDomainpart(); + } } public String getProfilePhoto() { -- cgit v1.2.3