diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-12-01 19:57:40 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-12-01 19:57:40 +0100 |
| commit | e127ba93611fdc246217bbf90e6f56821b60a512 (patch) | |
| tree | 65f5f4ea569498bb6a981e84ef8187d788475423 /src/main/java | |
| parent | 6e95ad4bdf4b8657c0ed40acbab802c791f52c32 (diff) | |
don't use own jid joined from another client to generate muc title
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/MucOptions.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java index 93925299..bbc3e370 100644 --- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java +++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java @@ -401,11 +401,13 @@ public class MucOptions { break; } } + boolean self = user.realJid != null && user.realJid.equals(account.getJid().toBareJid()); if (membersOnly() && nonanonymous() && user.affiliation.ranks(Affiliation.MEMBER) && user.realJid != null - && !realJidInMuc) { + && !realJidInMuc + && !self) { user.role = Role.NONE; user.avatar = null; user.fullJid = null; @@ -517,6 +519,7 @@ public class MucOptions { public List<User> getUsers(int max) { ArrayList<User> subset = new ArrayList<>(); HashSet<Jid> jids = new HashSet<>(); + jids.add(account.getJid().toBareJid()); synchronized (users) { for(User user : users) { if (user.getRealJid() == null || jids.add(user.getRealJid())) { |