Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-22 14:22:05 +01:00
Code Issues Releases Wiki Activity

muc: only call userHasLeft() at one site

Browse source 
There is no need to duplicate that code. Also ensure that
userHasLeft() is invoked *before* the listeners are invoked, so that
e.g. isJoined() returns false in the listeners.
This commit is contained in:
Florian Schmaus 2020-04-16 21:40:06 +02:00
parent ab2822be3e
commit 26ab832452
1 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
View file

@ -233,6 +233,9 @@ public class MultiUserChat {
occupantsMap.remove(from); occupantsMap.remove(from);
MUCUser mucUser = MUCUser.from(packet); MUCUser mucUser = MUCUser.from(packet);
if (mucUser != null && mucUser.hasStatus()) { if (mucUser != null && mucUser.hasStatus()) {
if (isUserStatusModification) {
userHasLeft();
}
// Fire events according to the received presence code // Fire events according to the received presence code
checkPresenceCode( checkPresenceCode(
mucUser.getStatus(), mucUser.getStatus(),
@ -2438,9 +2441,6 @@ public class MultiUserChat {
if (statusCodes.contains(Status.KICKED_307)) { if (statusCodes.contains(Status.KICKED_307)) {
// Check if this occupant was kicked // Check if this occupant was kicked
if (isUserModification) { if (isUserModification) {
// Reset occupant information.
userHasLeft();
for (UserStatusListener listener : userStatusListeners) { for (UserStatusListener listener : userStatusListeners) {
listener.kicked(mucUser.getItem().getActor(), mucUser.getItem().getReason()); listener.kicked(mucUser.getItem().getActor(), mucUser.getItem().getReason());
} }
@ -2455,15 +2455,9 @@ public class MultiUserChat {
if (statusCodes.contains(Status.BANNED_301)) { if (statusCodes.contains(Status.BANNED_301)) {
// Check if this occupant was banned // Check if this occupant was banned
if (isUserModification) { if (isUserModification) {
joined = false;
for (UserStatusListener listener : userStatusListeners) { for (UserStatusListener listener : userStatusListeners) {
listener.banned(mucUser.getItem().getActor(), mucUser.getItem().getReason()); listener.banned(mucUser.getItem().getActor(), mucUser.getItem().getReason());
} }
// Reset occupant information.
occupantsMap.clear();
myRoomJid = null;
userHasLeft();
} }
else { else {
for (ParticipantStatusListener listener : participantStatusListeners) { for (ParticipantStatusListener listener : participantStatusListeners) {
@ -2475,15 +2469,9 @@ public class MultiUserChat {
if (statusCodes.contains(Status.REMOVED_AFFIL_CHANGE_321)) { if (statusCodes.contains(Status.REMOVED_AFFIL_CHANGE_321)) {
// Check if this occupant's membership was revoked // Check if this occupant's membership was revoked
if (isUserModification) { if (isUserModification) {
joined = false;
for (UserStatusListener listener : userStatusListeners) { for (UserStatusListener listener : userStatusListeners) {
listener.membershipRevoked(); listener.membershipRevoked();
} }
// Reset occupant information.
occupantsMap.clear();
myRoomJid = null;
userHasLeft();
} }
} }
// A occupant has changed his nickname in the room // A occupant has changed his nickname in the room
@ -2498,11 +2486,6 @@ public class MultiUserChat {
for (UserStatusListener listener : userStatusListeners) { for (UserStatusListener listener : userStatusListeners) {
listener.roomDestroyed(alternateMUC, mucUser.getDestroy().getReason()); listener.roomDestroyed(alternateMUC, mucUser.getDestroy().getReason());
} }
// Reset occupant information.
occupantsMap.clear();
myRoomJid = null;
userHasLeft();
} }
} }