From 44faec7051c9fced6bdf7aee5a1f67a05969fc52 Mon Sep 17 00:00:00 2001
From: Michael <betheg@bitcloner.org>
Date: Fri, 21 Nov 2014 16:14:56 +0100
Subject: STATUS_CODE_SELF_PRESENCE is not set in all case.

---
 .../siacs/conversations/entities/MucOptions.java   | 26 +++++++++++++---------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'src/main/java/eu')

diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
index df3c39a9d..c82593277 100644
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
@@ -28,6 +28,7 @@ public class MucOptions {
 	public static final String STATUS_CODE_BANNED = "301";
 	public static final String STATUS_CODE_CHANGED_NICK = "303";
 	public static final String STATUS_CODE_KICKED = "307";
+	public static final String STATUS_CODE_LOST_MEMBERSHIP = "321";
 
 	private interface OnEventListener {
 		public void onSuccess();
@@ -210,18 +211,23 @@ public class MucOptions {
 						}
 					}
 				}
-			} else if (type.equals("unavailable") && codes.contains(STATUS_CODE_SELF_PRESENCE)) {
-				if (codes.contains(STATUS_CODE_CHANGED_NICK)) {
-					this.mNickChangingInProgress = true;
-				} else if (codes.contains(STATUS_CODE_KICKED)) {
-					setError(KICKED_FROM_ROOM);
-				} else if (codes.contains(STATUS_CODE_BANNED)) {
-					setError(ERROR_BANNED);
+			} else if (type.equals("unavailable")) {
+				if (codes.contains(STATUS_CODE_SELF_PRESENCE) ||
+						packet.getFrom().equals(this.conversation.getContactJid())) {
+					if (codes.contains(STATUS_CODE_CHANGED_NICK)) {
+						this.mNickChangingInProgress = true;
+					} else if (codes.contains(STATUS_CODE_KICKED)) {
+						setError(KICKED_FROM_ROOM);
+					} else if (codes.contains(STATUS_CODE_BANNED)) {
+						setError(ERROR_BANNED);
+					} else if (codes.contains(STATUS_CODE_LOST_MEMBERSHIP)) {
+						setError(ERROR_MEMBERS_ONLY);
+					} else {
+						setError(ERROR_UNKNOWN);
+					}
 				} else {
-					setError(ERROR_UNKNOWN);
+					deleteUser(name);
 				}
-			} else if (type.equals("unavailable")) {
-				deleteUser(name);
 			} else if (type.equals("error")) {
 				Element error = packet.findChild("error");
 				if (error != null && error.hasChild("conflict")) {
-- 
cgit v1.2.3