Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix conference browser #870

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix conference browser #870

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80a0d78
ConferenceRoomBrowser.createRoom() reformat
stokito Aug 11, 2024
2267f9a
ConferenceRoomBrowser.addRoomToTable() accept room name as a String
stokito Aug 11, 2024
bd34a83
ConferenceRoomBrowser: ignore not_implemented and service_unavailable…
stokito Aug 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 56 additions & 51 deletions core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceRoomBrowser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import org.jivesoftware.resource.SparkRes;
import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.packet.StanzaError;
import org.jivesoftware.smackx.muc.MultiUserChatManager;
import org.jivesoftware.smackx.xdata.form.FillableForm;
import org.jivesoftware.smackx.bookmarks.BookmarkedConference;
Expand Down Expand Up @@ -78,6 +79,7 @@
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;

Expand Down Expand Up @@ -548,8 +550,13 @@ public void run() {
Log.error("Error setting up GroupChatTable", e);
}
}
} catch (XMPPException.XMPPErrorException e) {
StanzaError.Condition condition = e.getStanzaError().getCondition();
if (condition != StanzaError.Condition.feature_not_implemented && condition != StanzaError.Condition.service_unavailable) {
Log.error("Unable to retrieve list of rooms from " + serviceName, e);
}
} catch (Exception e) {
Log.error("Unable to retrieve list of rooms.", e);
Log.error("Unable to retrieve list of rooms from " + serviceName, e);
}
stopLoadingImg();
}
Expand Down Expand Up @@ -834,56 +841,54 @@ private void enterRoom() {
* Create a new room based on room table selection.
*/
private void createRoom() {
RoomCreationDialog mucRoomDialog = new RoomCreationDialog();
final MultiUserChat groupChat = mucRoomDialog.createGroupChat(
SparkManager.getMainWindow(), serviceName);
LocalPreferences pref = SettingsManager.getLocalPreferences();

if (null != groupChat) {

// Join Room
try {
GroupChatRoom room = UIComponentRegistry.createGroupChatRoom(groupChat);

Resourcepart nickname = pref.getNickname();
groupChat.create(nickname);
chatManager.getChatContainer().addChatRoom(room);
chatManager.getChatContainer().activateChatRoom(room);

// Send Form
FillableForm form = groupChat.getConfigurationForm().getFillableForm();
if (mucRoomDialog.isPasswordProtected()) {
String password = mucRoomDialog.getPassword();
room.setPassword(password);
form.setAnswer("muc#roomconfig_passwordprotectedroom", true);
form.setAnswer("muc#roomconfig_roomsecret", password);
}
form.setAnswer("muc#roomconfig_roomname",
mucRoomDialog.getRoomName());
form.setAnswer("muc#roomconfig_roomdesc",
mucRoomDialog.getRoomTopic());
RoomCreationDialog mucRoomDialog = new RoomCreationDialog();
final MultiUserChat groupChat = mucRoomDialog.createGroupChat(SparkManager.getMainWindow(), serviceName);
LocalPreferences pref = SettingsManager.getLocalPreferences();

if (mucRoomDialog.isPermanent()) {
form.setAnswer("muc#roomconfig_persistentroom", true);
}
if (groupChat == null) {
return;
}
// Join Room
try {
GroupChatRoom room = UIComponentRegistry.createGroupChatRoom(groupChat);

Resourcepart nickname = pref.getNickname();
groupChat.create(nickname);
chatManager.getChatContainer().addChatRoom(room);
chatManager.getChatContainer().activateChatRoom(room);

// Send Form
FillableForm form = groupChat.getConfigurationForm().getFillableForm();
if (mucRoomDialog.isPasswordProtected()) {
String password = mucRoomDialog.getPassword();
room.setPassword(password);
form.setAnswer("muc#roomconfig_passwordprotectedroom", true);
form.setAnswer("muc#roomconfig_roomsecret", password);
}
form.setAnswer("muc#roomconfig_roomname", mucRoomDialog.getRoomName());
form.setAnswer("muc#roomconfig_roomdesc", mucRoomDialog.getRoomTopic());

List<String> owners = new ArrayList<>();
owners.add(SparkManager.getSessionManager().getUserBareAddress().toString());
form.setAnswer("muc#roomconfig_roomowners", owners);

// new DataFormDialog(groupChat, form);
groupChat.sendConfigurationForm(form);
addRoomToTable(groupChat.getRoom(), groupChat.getRoom().getLocalpart(), 1);
} catch (XMPPException | SmackException | InterruptedException e1) {
Log.error("Error creating new room.", e1);
UIManager.put("OptionPane.okButtonText", Res.getString("ok"));
JOptionPane
.showMessageDialog(this,
Res.getString("message.room.creation.error"),
Res.getString("title.error"),
JOptionPane.ERROR_MESSAGE);
}
}
if (mucRoomDialog.isPermanent()) {
form.setAnswer("muc#roomconfig_persistentroom", true);
}

List<String> owners = new ArrayList<>(1);
owners.add(SparkManager.getSessionManager().getUserBareAddress().toString());
form.setAnswer("muc#roomconfig_roomowners", owners);

// new DataFormDialog(groupChat, form);
groupChat.sendConfigurationForm(form);
EntityBareJid groupChatRoom = groupChat.getRoom();
Localpart localpart = groupChatRoom.getLocalpart();
addRoomToTable(groupChatRoom, localpart.toString(), 1);
} catch (XMPPException | SmackException | InterruptedException e1) {
Log.error("Error creating new room.", e1);
UIManager.put("OptionPane.okButtonText", Res.getString("ok"));
JOptionPane.showMessageDialog(this,
Res.getString("message.room.creation.error"),
Res.getString("title.error"),
JOptionPane.ERROR_MESSAGE);
}
}

/**
Expand All @@ -897,7 +902,7 @@ private void createRoom() {
* the number of occupants in the conference room. If -1 is
* specified, the the occupant count will show as n/a.
*/
private void addRoomToTable(final EntityBareJid jid, final CharSequence roomName,
private void addRoomToTable(final EntityBareJid jid, final String roomName,
final int numberOfOccupants) {
SwingWorker addRoomThread = new SwingWorker() {

Expand Down Expand Up @@ -939,7 +944,7 @@ public Object construct() {
occupants = "n/a";
}

return new Object[] { iconLabel, roomName.toString(), jid.getLocalpart().toString(), occupants };
return new Object[] { iconLabel, roomName, jid.getLocalpart().toString(), occupants };
}

@Override
Expand Down
Loading