diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2016-05-16 15:50:57 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2016-05-16 19:58:36 +0200 |
commit | fc5304c6feb302334d15be183d55663965a29de1 (patch) | |
tree | 4f7b8f43419754ad960cb205f2246d4a6ba79029 /src/main/java/eu/siacs/conversations/entities/MucOptions.java | |
parent | 8d0693ed6a46ea45844f4d8319f5d051ec256756 (diff) |
change affiliation for in memory users that are currently not joined in a conference
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/MucOptions.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/MucOptions.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java index a221c7011..50641f5a4 100644 --- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java +++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java @@ -28,10 +28,12 @@ public class MucOptions { public void changeAffiliation(Jid jid, Affiliation affiliation) { User user = findUserByRealJid(jid); - if (user != null) { + if (user != null && user.getRole() == Role.NONE) { users.remove(user); - user.affiliation = affiliation; - users.add(user); + if (affiliation.ranks(Affiliation.MEMBER)) { + user.affiliation = affiliation; + users.add(user); + } } } |