moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-08-13 15:53:48 -04:00
Code Issues Releases Wiki Activity

don't use own jid joined from another client to generate muc title

Browse Source
This commit is contained in:
Daniel Gultsch 2016-12-01 19:57:40 +01:00
parent 6e95ad4bdf
commit e127ba9361
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/eu/siacs/conversations/entities/MucOptions.java
View File

@ -401,11 +401,13 @@ public class MucOptions {
break; break;
} }
} }
boolean self = user.realJid != null && user.realJid.equals(account.getJid().toBareJid());
if (membersOnly() if (membersOnly()
&& nonanonymous() && nonanonymous()
&& user.affiliation.ranks(Affiliation.MEMBER) && user.affiliation.ranks(Affiliation.MEMBER)
&& user.realJid != null && user.realJid != null
&& !realJidInMuc) { && !realJidInMuc
&& !self) {
user.role = Role.NONE; user.role = Role.NONE;
user.avatar = null; user.avatar = null;
user.fullJid = null; user.fullJid = null;
@ -517,6 +519,7 @@ public class MucOptions {
public List<User> getUsers(int max) { public List<User> getUsers(int max) {
ArrayList<User> subset = new ArrayList<>(); ArrayList<User> subset = new ArrayList<>();
HashSet<Jid> jids = new HashSet<>(); HashSet<Jid> jids = new HashSet<>();
jids.add(account.getJid().toBareJid());
synchronized (users) { synchronized (users) {
for(User user : users) { for(User user : users) {
if (user.getRealJid() == null || jids.add(user.getRealJid())) { if (user.getRealJid() == null || jids.add(user.getRealJid())) {