From 09c8b96f55fddc3917d46ee90d49a163fd39e45b Mon Sep 17 00:00:00 2001 From: Sergey Ponomarev Date: Tue, 13 Jan 2026 13:41:05 +0200 Subject: [PATCH] refactor: remove unused params nickname and password from ConferenceUtils.enterRoom() The nickname will be anyway taken from preferences inside the JoinRoomSwingWorker --- .../spark/ui/conferences/ConferenceServices.java | 2 +- .../spark/ui/conferences/ConferenceUtils.java | 14 +++++--------- .../ui/conferences/ConversationInvitation.java | 2 +- .../ui/conferences/GroupChatInvitationUI.java | 2 +- .../fastpath/internal/WorkgroupManager.java | 2 +- .../jivesoftware/fastpath/workspace/Workpane.java | 2 +- .../workspace/panes/AgentConversations.java | 12 ++---------- .../fastpath/workspace/panes/CurrentActivity.java | 11 ++--------- .../fastpath/workspace/panes/InvitationPane.java | 2 +- .../workspace/panes/UserInvitationPane.java | 2 +- 10 files changed, 16 insertions(+), 35 deletions(-) diff --git a/core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceServices.java b/core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceServices.java index e6bf35be8..ed69088c0 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceServices.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceServices.java @@ -453,7 +453,7 @@ public class ConferenceServices implements InvitationListener { EntityBareJid bareJID = inviter.asEntityBareJid(); if (_localPreferences.isAutoAcceptMucInvite()) { - ConferenceUtils.enterRoomOnSameThread(room.getRoom().getLocalpart().toString(), room.getRoom(), null, password); + ConferenceUtils.enterRoomOnSameThread(room.getRoom().getLocalpart().toString(), room.getRoom(), password); MultiUserChatManager manager = MultiUserChatManager.getInstanceFor( SparkManager.getConnection() ); GroupChatRoom chat = UIComponentRegistry.createGroupChatRoom(manager.getMultiUserChat( room.getRoom() )); diff --git a/core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceUtils.java b/core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceUtils.java index d1c3243f2..2e86f3d47 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceUtils.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceUtils.java @@ -36,7 +36,6 @@ import org.jivesoftware.spark.PresenceManager; import org.jivesoftware.spark.SparkManager; import org.jivesoftware.spark.ui.ChatRoomNotFoundException; import org.jivesoftware.spark.ui.rooms.GroupChatRoom; -import org.jivesoftware.spark.util.ModelUtil; import org.jivesoftware.spark.util.UIComponentRegistry; import org.jivesoftware.spark.util.log.Log; import org.jivesoftware.sparkimpl.plugin.privacy.PrivacyManager; @@ -46,11 +45,9 @@ import org.jxmpp.jid.DomainBareJid; import org.jxmpp.jid.EntityBareJid; import org.jxmpp.jid.Jid; import org.jxmpp.jid.impl.JidCreate; -import org.jxmpp.jid.parts.Localpart; import org.jxmpp.jid.parts.Resourcepart; import org.jxmpp.stringprep.XmppStringprepException; -import javax.annotation.Nullable; import javax.swing.*; import java.awt.*; import java.text.DateFormat; @@ -115,21 +112,20 @@ public class ConferenceUtils { * Enters a GroupChatRoom on the event thread. * * @param roomName the name of the room. - * @param roomJID the rooms jid. - * @param nickname THe nickname that the user joining will be using (optional). + * @param roomJID the jid of the room. * @param password the rooms password (if any). * @return the GroupChatRoom created. */ - public static GroupChatRoom enterRoomOnSameThread(final CharSequence roomName, EntityBareJid roomJID, final Resourcepart nickname, String password ) + public static GroupChatRoom enterRoomOnSameThread(final CharSequence roomName, EntityBareJid roomJID, String password ) { - final JoinRoomSwingWorker worker = new JoinRoomSwingWorker( roomJID, nickname, password, roomName.toString() ); + final JoinRoomSwingWorker worker = new JoinRoomSwingWorker( roomJID, null, password, roomName.toString() ); worker.start(); return (GroupChatRoom) worker.get(); // blocks until completed. } - public static GroupChatRoom enterRoom(final MultiUserChat groupChat, CharSequence tabTitle, final Resourcepart nickname, final String password) + public static GroupChatRoom enterRoom(final MultiUserChat groupChat, CharSequence tabTitle) { - final JoinRoomSwingWorker worker = new JoinRoomSwingWorker( groupChat.getRoom(), nickname, password, tabTitle.toString() ); + final JoinRoomSwingWorker worker = new JoinRoomSwingWorker( groupChat.getRoom(), null, null, tabTitle.toString() ); worker.start(); return (GroupChatRoom) worker.get(); // blocks until completed. } diff --git a/core/src/main/java/org/jivesoftware/spark/ui/conferences/ConversationInvitation.java b/core/src/main/java/org/jivesoftware/spark/ui/conferences/ConversationInvitation.java index bca6acde2..1f143cfcb 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/conferences/ConversationInvitation.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/conferences/ConversationInvitation.java @@ -163,7 +163,7 @@ public class ConversationInvitation extends JPanel implements ContainerComponent final Object obj = actionEvent.getSource(); if (obj == joinButton) { Localpart name = roomName.getLocalpart(); - ConferenceUtils.enterRoomOnSameThread(name.toString(), roomName, null, password); + ConferenceUtils.enterRoomOnSameThread(name.toString(), roomName, password); } else { try diff --git a/core/src/main/java/org/jivesoftware/spark/ui/conferences/GroupChatInvitationUI.java b/core/src/main/java/org/jivesoftware/spark/ui/conferences/GroupChatInvitationUI.java index 2b19d4549..ebc9ac2e8 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/conferences/GroupChatInvitationUI.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/conferences/GroupChatInvitationUI.java @@ -151,7 +151,7 @@ public class GroupChatInvitationUI extends JPanel implements ActionListener { private void acceptInvitation() { setVisible(false); Localpart name = room.getLocalpart(); - ConferenceUtils.enterRoomOnSameThread(name.toString(), room, null, password); + ConferenceUtils.enterRoomOnSameThread(name.toString(), room, password); final TimerTask removeUITask = new SwingTimerTask() { @Override diff --git a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/internal/WorkgroupManager.java b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/internal/WorkgroupManager.java index e9e4df367..d42592067 100644 --- a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/internal/WorkgroupManager.java +++ b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/internal/WorkgroupManager.java @@ -405,7 +405,7 @@ public class WorkgroupManager { if (message.hasExtension(WorkgroupInformation.class)) { Localpart workgroupName = inviter.getLocalpart(); - GroupChatRoom groupChatRoom = ConferenceUtils.enterRoomOnSameThread(workgroupName, room.getRoom(), null, password); + GroupChatRoom groupChatRoom = ConferenceUtils.enterRoomOnSameThread(workgroupName, room.getRoom(), password); int tabLocation = SparkManager.getChatManager().getChatContainer().indexOfComponent(groupChatRoom); groupChatRoom.setTabIcon(FastpathRes.getImageIcon(FastpathRes.FASTPATH_IMAGE_16x16)); diff --git a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/Workpane.java b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/Workpane.java index c889f2004..63889f8c1 100644 --- a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/Workpane.java +++ b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/Workpane.java @@ -587,7 +587,7 @@ public class Workpane { String roomName = utils.getUsername() != null ? utils.getUsername() : chat.getRoom().getLocalpart().asUnescapedString(); // Create the Group Chat Room - GroupChatRoom groupChatRoom = ConferenceUtils.enterRoomOnSameThread(roomName, chat.getRoom(), null, password); + GroupChatRoom groupChatRoom = ConferenceUtils.enterRoomOnSameThread(roomName, chat.getRoom(), password); groupChatRoom.getSplitPane().setDividerSize(5); groupChatRoom.getVerticalSlipPane().setDividerLocation(0.6); groupChatRoom.getSplitPane().setDividerLocation(0.6); diff --git a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/AgentConversations.java b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/AgentConversations.java index 8123c108f..0e9e10449 100644 --- a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/AgentConversations.java +++ b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/AgentConversations.java @@ -59,13 +59,10 @@ import org.jivesoftware.spark.ui.conferences.ConferenceUtils; import org.jivesoftware.spark.util.ModelUtil; import org.jivesoftware.spark.util.SwingWorker; import org.jivesoftware.spark.util.log.Log; -import org.jivesoftware.sparkimpl.settings.local.LocalPreferences; -import org.jivesoftware.sparkimpl.settings.local.SettingsManager; import org.jxmpp.jid.DomainBareJid; import org.jxmpp.jid.EntityBareJid; import org.jxmpp.jid.Jid; import org.jxmpp.jid.impl.JidCreate; -import org.jxmpp.jid.parts.Resourcepart; import org.jxmpp.jid.util.JidUtil; import org.jxmpp.stringprep.XmppStringprepException; @@ -292,12 +289,9 @@ public final class AgentConversations extends JPanel implements ChangeListener { DomainBareJid serviceName = col.iterator().next(); EntityBareJid roomName = JidCreate.entityBareFrom(sessionID + "@" + serviceName); - LocalPreferences pref = SettingsManager.getLocalPreferences(); - - final Resourcepart nickname = pref.getNickname(); MultiUserChat muc = multiUserChatManager.getMultiUserChat( roomName ); - ConferenceUtils.enterRoom(muc, roomName, nickname, null); + ConferenceUtils.enterRoom(muc, roomName); if (muc.isJoined()) { // Try and remove myself as an owner if I am one. @@ -355,11 +349,9 @@ public final class AgentConversations extends JPanel implements ChangeListener { DomainBareJid serviceName = col.iterator().next(); EntityBareJid roomName = JidCreate.entityBareFrom(sessionID + "@" + serviceName); - LocalPreferences pref = SettingsManager.getLocalPreferences(); - final Resourcepart nickname = pref.getNickname(); MultiUserChat muc = multiUserChatManager.getMultiUserChat( roomName); - ConferenceUtils.enterRoom(muc, roomName, nickname, null); + ConferenceUtils.enterRoom(muc, roomName); } catch (XMPPException | SmackException | InterruptedException | XmppStringprepException e1) { diff --git a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/CurrentActivity.java b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/CurrentActivity.java index 72eacb515..f0114c8da 100644 --- a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/CurrentActivity.java +++ b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/CurrentActivity.java @@ -61,14 +61,11 @@ import org.jivesoftware.spark.ui.conferences.ConferenceUtils; import org.jivesoftware.spark.util.ModelUtil; import org.jivesoftware.spark.util.SwingWorker; import org.jivesoftware.spark.util.log.Log; -import org.jivesoftware.sparkimpl.settings.local.LocalPreferences; -import org.jivesoftware.sparkimpl.settings.local.SettingsManager; import org.jxmpp.jid.BareJid; import org.jxmpp.jid.DomainBareJid; import org.jxmpp.jid.EntityBareJid; import org.jxmpp.jid.Jid; import org.jxmpp.jid.impl.JidCreate; -import org.jxmpp.jid.parts.Resourcepart; import org.jxmpp.jid.util.JidUtil; /** @@ -245,11 +242,9 @@ public final class CurrentActivity extends JPanel { DomainBareJid serviceName = col.iterator().next(); EntityBareJid roomName = JidCreate.entityBareFromOrThrowUnchecked(sessionID + "@" + serviceName); - final LocalPreferences pref = SettingsManager.getLocalPreferences(); - final Resourcepart nickname = pref.getNickname(); MultiUserChat muc = multiUserChatManager.getMultiUserChat(roomName); - ConferenceUtils.enterRoom(muc, roomName, nickname, null); + ConferenceUtils.enterRoom(muc, roomName); if (muc.isJoined()) { // Try and remove myself as an owner if I am one. @@ -307,11 +302,9 @@ public final class CurrentActivity extends JPanel { DomainBareJid serviceName = col.iterator().next(); EntityBareJid roomName = JidCreate.entityBareFromOrThrowUnchecked(sessionID + "@" + serviceName); - LocalPreferences pref = SettingsManager.getLocalPreferences(); - final Resourcepart nickname = pref.getNickname(); MultiUserChat muc = manager.getMultiUserChat( roomName ); - ConferenceUtils.enterRoom(muc, roomName, nickname, null); + ConferenceUtils.enterRoom(muc, roomName); } catch (XMPPException | SmackException | InterruptedException e1) { Log.error(e1); diff --git a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/InvitationPane.java b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/InvitationPane.java index 61f335171..0b07ec3dc 100644 --- a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/InvitationPane.java +++ b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/InvitationPane.java @@ -188,7 +188,7 @@ public class InvitationPane { Log.error(e); } - ConferenceUtils.enterRoomOnSameThread(roomName, room, null, password); + ConferenceUtils.enterRoomOnSameThread(roomName, room, password); removeOwner(chatRoom.getMultiUserChat()); FastpathPlugin.getLitWorkspace().checkForDecoration(chatRoom, request.getSessionID()); diff --git a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/UserInvitationPane.java b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/UserInvitationPane.java index 744b8f282..db3fdc213 100644 --- a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/UserInvitationPane.java +++ b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/UserInvitationPane.java @@ -443,7 +443,7 @@ public class UserInvitationPane { Log.error(e); } - ConferenceUtils.enterRoomOnSameThread(roomName, fullRoomJID, null,null); + ConferenceUtils.enterRoomOnSameThread(roomName, fullRoomJID, null); removeOwner(chatRoom.getMultiUserChat()); FastpathPlugin.getLitWorkspace().checkForDecoration(chatRoom, offer.getSessionID());