diff options
author | Christian Schneppe <christian@pix-art.de> | 2017-09-04 20:33:13 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2017-09-04 20:33:13 +0200 |
commit | 62885d86d3337802a0420bf9fd777c4202e87603 (patch) | |
tree | 8e32e9163197ea57830cc295128a73da3e6b4c9b /src/main/java/de/pixart/messenger | |
parent | c8571284457136d9221e5f7a652780f6f7fd10f9 (diff) |
fixed conference naming for joined people not in your contact list
Diffstat (limited to 'src/main/java/de/pixart/messenger')
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/MucOptions.java | 10 |
1 files changed, 8 insertions, 2 deletions
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(); |