From b5328d38fae81031167f55f4031722412b54525e Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Tue, 14 Oct 2014 09:41:48 +0200
Subject: [PATCH] MUC: Establish callbacks before sending the presence

---
 .../smackx/muc/MultiUserChat.java             | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
index 179e15524..cd3b26d65 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
@@ -286,15 +286,8 @@ public class MultiUserChat {
         // Wait for a presence packet back from the server.
         PacketFilter responseFilter = new AndFilter(FromMatchesFilter.createFull(room + "/"
                         + nickname), new PacketTypeFilter(Presence.class));
-        PacketCollector response = null;
 
-        response = connection.createPacketCollectorAndSend(responseFilter, joinPresence);
-        // Wait up to a certain number of seconds for a reply.
-        Presence presence = response.nextResultOrThrow(timeout);
-
-        this.nickname = nickname;
-        joined = true;
-        // Setup the messageListeners and presenceListeners
+        // Setup the messageListeners and presenceListeners *before* the join presence is send.
         connection.addPacketListener(messageListener, fromRoomGroupchatFilter);
         connection.addPacketListener(presenceListener, new AndFilter(fromRoomFilter,
                         PacketTypeFilter.PRESENCE));
@@ -305,6 +298,20 @@ public class MultiUserChat {
         connection.addPacketInterceptor(presenceInterceptor, new AndFilter(new ToFilter(room),
                         PacketTypeFilter.PRESENCE));
         messageCollector = connection.createPacketCollector(fromRoomGroupchatFilter);
+
+        Presence presence;
+        try {
+            presence = connection.createPacketCollectorAndSend(responseFilter, joinPresence).nextResultOrThrow(timeout);
+        }
+        catch (NoResponseException | XMPPErrorException e) {
+            // Ensure that all callbacks are removed if there is an exception
+            removeConnectionCallbacks();
+            throw e;
+        }
+
+        this.nickname = nickname;
+        joined = true;
+
         // Update the list of joined rooms
         multiUserChatManager.addJoinedRoom(room);
         return presence;
@@ -1667,11 +1674,10 @@ public class MultiUserChat {
     }
 
     /**
-     * Notification message that the user has left the room.
+     * Remove the connection callbacks (PacketListener, PacketInterceptor, PacketCollector) used by this MUC from the
+     * connection.
      */
-    private synchronized void userHasLeft() {
-        // Update the list of joined rooms
-        multiUserChatManager.removeJoinedRoom(room);
+    private void removeConnectionCallbacks() {
         connection.removePacketListener(messageListener);
         connection.removePacketListener(presenceListener);
         connection.removePacketListener(declinesListener);
@@ -1682,6 +1688,15 @@ public class MultiUserChat {
         }
     }
 
+    /**
+     * Remove all callbacks and resources necessary when the user has left the room for some reason.
+     */
+    private synchronized void userHasLeft() {
+        // Update the list of joined rooms
+        multiUserChatManager.removeJoinedRoom(room);
+        removeConnectionCallbacks();
+    }
+
     /**
      * Adds a listener that will be notified of changes in your status in the room
      * such as the user being kicked, banned, or granted admin permissions.