Skip to content

Improve error message when failing to join MUC #841

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

Open
guusdk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve error message when failing to join MUC #841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,9 @@ public static List<String> joinRoom(MultiUserChat groupChat, Resourcepart nickna
error = ( (XMPPException.XMPPErrorException) ex ).getStanzaError();
}

final String errorText = ConferenceUtils.getReason( error );
String errorText = Res.getString("title.join.conference.room");
if (groupChat.getRoom() != null) { errorText += " " + groupChat.getRoom(); }
errorText += ": " + ConferenceUtils.getReason( error );
errors.add( errorText );
}
}
Expand Down
5 changes: 4 additions & 1 deletion core/src/main/java/org/jivesoftware/spark/ui/conferences/JoinRoomSwingWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,10 @@ public Object construct()
}
}

final String errorText = ConferenceUtils.getReason( error );
String errorText = Res.getString("title.join.conference.room");
errorText += " " + roomJID;
errorText += ": " + ConferenceUtils.getReason( error );

errors.add( errorText );
return null;
}
Expand Down