From 6088913fb6381f315f60e62b12a8a2fbd728710d Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 5 Mar 2017 17:42:17 +0100
Subject: [PATCH] fixed multi-session-nick renaming behaviour

---
 .../conversations/entities/MucOptions.java    |  5 +++--
 .../conversations/parser/PresenceParser.java  | 20 ++++++++-----------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
index 7e7908e0a..bee5fa447 100644
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
@@ -332,7 +332,6 @@ public class MucOptions {
 	private User self;
 	private String subject = null;
 	private String password = null;
-	public boolean mNickChangingInProgress = false;
 
 	public MucOptions(Conversation conversation) {
 		this.account = conversation.getAccount();
@@ -448,8 +447,10 @@ public class MucOptions {
 			if (old != null) {
 				users.remove(old);
 			}
+			boolean fullJidIsSelf = isOnline && user.getFullJid() != null && user.getFullJid().equals(self.getFullJid());
 			if ((!membersOnly() || user.getAffiliation().ranks(Affiliation.MEMBER))
-					&& user.getAffiliation().outranks(Affiliation.OUTCAST)){
+					&& user.getAffiliation().outranks(Affiliation.OUTCAST)
+					&& !fullJidIsSelf){
 				this.users.add(user);
 			}
 		}
diff --git a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
index 63bec8bf1..de02cd34c 100644
--- a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
@@ -65,18 +65,15 @@ public class PresenceParser extends AbstractParser implements
 					if (item != null && !from.isBareJid()) {
 						mucOptions.setError(MucOptions.Error.NONE);
 						MucOptions.User user = parseItem(conversation, item, from);
-						if (codes.contains(MucOptions.STATUS_CODE_SELF_PRESENCE) || packet.getFrom().equals(mucOptions.getConversation().getJid())) {
+						if (codes.contains(MucOptions.STATUS_CODE_SELF_PRESENCE)) {
 							mucOptions.setOnline();
 							mucOptions.setSelf(user);
-							if (mucOptions.mNickChangingInProgress) {
-								if (mucOptions.onRenameListener != null) {
-									mucOptions.onRenameListener.onSuccess();
-								}
-								mucOptions.mNickChangingInProgress = false;
+							if (mucOptions.onRenameListener != null) {
+								mucOptions.onRenameListener.onSuccess();
+								mucOptions.onRenameListener = null;
 							}
-						} else {
-							mucOptions.updateUser(user);
 						}
+						mucOptions.updateUser(user);
 						if (codes.contains(MucOptions.STATUS_CODE_ROOM_CREATED) && mucOptions.autoPushConfiguration()) {
 							Log.d(Config.LOGTAG,mucOptions.getAccount().getJid().toBareJid()
 									+": room '"
@@ -112,9 +109,7 @@ public class PresenceParser extends AbstractParser implements
 			} else if (type.equals("unavailable")) {
 				if (codes.contains(MucOptions.STATUS_CODE_SELF_PRESENCE) ||
 						packet.getFrom().equals(mucOptions.getConversation().getJid())) {
-					if (codes.contains(MucOptions.STATUS_CODE_CHANGED_NICK)) {
-						mucOptions.mNickChangingInProgress = true;
-					} else if (codes.contains(MucOptions.STATUS_CODE_KICKED)) {
+					if (codes.contains(MucOptions.STATUS_CODE_KICKED)) {
 						mucOptions.setError(MucOptions.Error.KICKED);
 					} else if (codes.contains(MucOptions.STATUS_CODE_BANNED)) {
 						mucOptions.setError(MucOptions.Error.BANNED);
@@ -124,7 +119,7 @@ public class PresenceParser extends AbstractParser implements
 						mucOptions.setError(MucOptions.Error.MEMBERS_ONLY);
 					} else if (codes.contains(MucOptions.STATUS_CODE_SHUTDOWN)) {
 						mucOptions.setError(MucOptions.Error.SHUTDOWN);
-					} else {
+					} else if (!codes.contains(MucOptions.STATUS_CODE_CHANGED_NICK)) {
 						mucOptions.setError(MucOptions.Error.UNKNOWN);
 						Log.d(Config.LOGTAG, "unknown error in conference: " + packet);
 					}
@@ -144,6 +139,7 @@ public class PresenceParser extends AbstractParser implements
 					if (mucOptions.online()) {
 						if (mucOptions.onRenameListener != null) {
 							mucOptions.onRenameListener.onFailure();
+							mucOptions.onRenameListener = null;
 						}
 					} else {
 						mucOptions.setError(MucOptions.Error.NICK_IN_USE);