mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2026-03-25 08:55:37 +00:00
Code Issues Projects Releases Wiki Activity

refactor: remove unused params nickname and password from ConferenceUtils.enterRoom()

Browse Source 
The nickname will be anyway taken from preferences inside the JoinRoomSwingWorker
This commit is contained in:
Sergey Ponomarev
2026-01-13 13:41:05 +02:00
parent a89d9293e9
commit 09c8b96f55
10 changed files with 16 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceServices.java
View File

@ -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() ));

14
core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceUtils.java
View File

@ -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.
}

2
core/src/main/java/org/jivesoftware/spark/ui/conferences/ConversationInvitation.java
View File

@ -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

2
core/src/main/java/org/jivesoftware/spark/ui/conferences/GroupChatInvitationUI.java
View File

@ -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

2
plugins/fastpath/src/main/java/org/jivesoftware/fastpath/internal/WorkgroupManager.java
View File

@ -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));

2
plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/Workpane.java
View File

@ -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);

12
plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/AgentConversations.java
View File

@ -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) {

11
plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/CurrentActivity.java
View File

@ -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);

2
plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/InvitationPane.java
View File

@ -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());

2
plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/UserInvitationPane.java
View File

@ -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());