aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-06-28 10:32:06 +0200
committerChristian Schneppe <christian@pix-art.de>2016-06-28 14:01:39 +0200
commit67e0de4ec287d2b93d7f8f285df18f050785d95a (patch)
tree5821a212a23fe4d105461ea5646afc017c5d7258 /src/main
parentd781b0008519026eef517df11c979dceea04c072 (diff)
only keep offline members in members only conferences
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/siacs/conversations/entities/MucOptions.java5
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 bdbe94146..eb2963af7 100644
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
@@ -393,7 +393,10 @@ public class MucOptions {
if (user != null) {
synchronized (users) {
users.remove(user);
- if (user.affiliation.ranks(Affiliation.MEMBER) && user.realJid != null) {
+ if (membersOnly() &&
+ nonanonymous() &&
+ user.affiliation.ranks(Affiliation.MEMBER) &&
+ user.realJid != null) {
user.role = Role.NONE;
user.avatar = null;
user.fullJid = null;