From 62885d86d3337802a0420bf9fd777c4202e87603 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Mon, 4 Sep 2017 20:33:13 +0200 Subject: fixed conference naming for joined people not in your contact list --- src/main/java/de/pixart/messenger/entities/MucOptions.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/de/pixart/messenger/entities/MucOptions.java b/src/main/java/de/pixart/messenger/entities/MucOptions.java index 3e2349c9c..6560e3bb7 100644 --- a/src/main/java/de/pixart/messenger/entities/MucOptions.java +++ b/src/main/java/de/pixart/messenger/entities/MucOptions.java @@ -663,8 +663,14 @@ public class MucOptions { Contact contact = user.getContact(); if (contact != null && !contact.getDisplayName().isEmpty()) { builder.append(contact.getDisplayName().split("\\s+")[0]); - } else if (user.getName() != null) { - builder.append(user.getName()); + } else { + final String name = user.getName(); + final Jid jid = user.getRealJid(); + if (name != null) { + builder.append(name.split("\\s+")[0]); + } else if (jid != null) { + builder.append(jid.getLocalpart()); + } } } return builder.toString(); -- cgit v1.2.3