From cfccc78ba072e6a86b13c3242b607a4782257aef Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Tue, 3 Nov 2020 22:31:22 +0100
Subject: [PATCH] [muc] Rename local variable 'presence' to
 'reflectedSelfPresence'

To increase readability, and with that maintainability, we rename
'presence' to 'reflectedSelfPresence' in MultiUserChat.enter(), to
make it clear what kind of presence this variable holds.

Also mark the variable as final.
---
 .../java/org/jivesoftware/smackx/muc/MultiUserChat.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 f5ee3ec53..054d0ec22 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
@@ -378,7 +378,7 @@ public class MultiUserChat {
                     );
         // @formatter:on
         StanzaCollector presenceStanzaCollector = null;
-        Presence presence;
+        final Presence reflectedSelfPresence;
         try {
             // This stanza collector will collect the final self presence from the MUC, which also signals that we have successful entered the MUC.
             StanzaCollector selfPresenceCollector = connection.createStanzaCollectorAndSend(responseFilter, joinPresence);
@@ -386,7 +386,7 @@ public class MultiUserChat {
                             selfPresenceCollector).setStanzaFilter(presenceFromRoomFilter);
             // This stanza collector is used to reset the timeout of the selfPresenceCollector.
             presenceStanzaCollector = connection.createStanzaCollector(presenceStanzaCollectorConfguration);
-            presence = selfPresenceCollector.nextResultOrThrow(conf.getTimeout());
+            reflectedSelfPresence = selfPresenceCollector.nextResultOrThrow(conf.getTimeout());
         }
         catch (NotConnectedException | InterruptedException | NoResponseException | XMPPErrorException e) {
             // Ensure that all callbacks are removed if there is an exception
@@ -401,12 +401,12 @@ public class MultiUserChat {
 
         // This presence must be send from a full JID. We use the resourcepart of this JID as nick, since the room may
         // performed roomnick rewriting
-        Resourcepart receivedNickname = presence.getFrom().getResourceOrThrow();
+        Resourcepart receivedNickname = reflectedSelfPresence.getFrom().getResourceOrThrow();
         setNickname(receivedNickname);
 
         // Update the list of joined rooms
         multiUserChatManager.addJoinedRoom(room);
-        return presence;
+        return reflectedSelfPresence;
     }
 
     private void setNickname(Resourcepart nickname) {