mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

SPARK-2337 ContactList.sendMessages(): early return

Browse Source 
Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
This commit is contained in:
Sergey Ponomarev
2024-08-24 21:54:55 +03:00
parent b4a355f83b
commit d09964ca3c
1 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
core/src/main/java/org/jivesoftware/spark/ui/ContactList.java
View File

@ -1705,37 +1705,35 @@ public class ContactList extends JPanel implements ActionListener,
private void sendMessages(Collection<ContactItem> items) {
StringBuilder buf = new StringBuilder();
InputDialog dialog = new InputDialog();
final String messageText = dialog.getInput(Res.getString("title.broadcast.message"), Res.getString("message.enter.broadcast.message"), SparkRes.getImageIcon(SparkRes.BLANK_IMAGE), SparkManager.getMainWindow());
if (ModelUtil.hasLength(messageText)) {
final Map<String, Message> broadcastMessages = new HashMap<>();
for (ContactItem item : items) {
final Message message = new Message();
message.setTo(item.getJid());
final Map<String, Object> properties = new HashMap<>();
properties.put("broadcast", true);
message.addExtension(new JivePropertiesExtension(properties));
message.setBody(messageText);
if (!broadcastMessages.containsKey(item.getJid().toString())) {
buf.append(item.getDisplayName()).append("\n");
broadcastMessages.put(item.getJid().toString(), message);
}
if (!ModelUtil.hasLength(messageText)) {
return;
}
StringBuilder buf = new StringBuilder();
final Map<String, Message> broadcastMessages = new HashMap<>();
for (ContactItem item : items) {
final Message message = new Message();
message.setTo(item.getJid());
final Map<String, Object> properties = new HashMap<>();
properties.put("broadcast", true);
message.addExtension(new JivePropertiesExtension(properties));
message.setBody(messageText);
if (!broadcastMessages.containsKey(item.getJid().toString())) {
buf.append(item.getDisplayName()).append('\n');
broadcastMessages.put(item.getJid().toString(), message);
}
for (Message message : broadcastMessages.values()) {
try {
SparkManager.getConnection().sendStanza(message);
} catch (SmackException.NotConnectedException | InterruptedException e) {
Log.warning("Unable to send broadcast to " + message.getTo(), e);
}
}
UIManager.put("OptionPane.okButtonText", Res.getString("ok"));
JOptionPane.showMessageDialog(SparkManager.getMainWindow(), Res.getString("message.hasbeenbroadcast.to", buf.toString()), Res.getString("title.notification"), JOptionPane.INFORMATION_MESSAGE);
}
for (Message message : broadcastMessages.values()) {
try {
SparkManager.getConnection().sendStanza(message);
} catch (SmackException.NotConnectedException | InterruptedException e) {
Log.warning("Unable to send broadcast to " + message.getTo(), e);
}
}
UIManager.put("OptionPane.okButtonText", Res.getString("ok"));
JOptionPane.showMessageDialog(SparkManager.getMainWindow(), Res.getString("message.hasbeenbroadcast.to", buf.toString()), Res.getString("title.notification"), JOptionPane.INFORMATION_MESSAGE);
}
// For plugin use only