From fc5304c6feb302334d15be183d55663965a29de1 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 16 May 2016 15:50:57 +0200
Subject: change affiliation for in memory users that are currently not joined
 in a conference

---
 src/main/java/eu/siacs/conversations/entities/MucOptions.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/entities')

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);
+			}
 		}
 	}
 
-- 
cgit v1.2.3