mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2026-02-04 10:35:45 +00:00
Code Issues Projects Releases Wiki Activity

SPARK-2355: Fix a couple of nullpointers after upgrading to Smack 4.5.0

Browse Source
This commit is contained in:
Guus der Kinderen
2026-01-06 11:59:45 +01:00
parent 65194c83b9
commit 75d2cf2f6c
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/src/main/java/org/jivesoftware/spark/ui/ChatContainer.java
View File

@ -1131,39 +1131,44 @@ public class ChatContainer extends SparkTabbedPane implements MessageListener, C
Jid mucNickNameT;
String finalRoomName = "";
if (size > 0) {
finalRoomName = chatRoom.getRoomTitle();
lastChatMessage = chatRoom.getTranscripts().get(size - 1);
mucNickNameT = lastChatMessage.getFrom();
String[] mucNickName = mucNickNameT.toString().split("/");
finalRoomName = chatRoom.getRoomTitle();
if (mucNickName.length < 2) { // We have no name after "/" in mucNickNameT (must be like: test@conference.jabber.kg/kos)
fromNickName = finalRoomName; //Res.getString("label.message");
if (mucNickNameT == null) {
fromNickName = finalRoomName;
} else {
fromNickName = mucNickName[1];
String[] mucNickName = mucNickNameT.toString().split("/");
if (mucNickName.length < 2) { // We have no name after "/" in mucNickNameT (must be like: test@conference.jabber.kg/kos)
fromNickName = finalRoomName; //Res.getString("label.message");
} else {
fromNickName = mucNickName[1];
}
}
} else {
lastChatMessage = StanzaBuilder.buildMessage().build();
}
String myNickName = chatRoom.getNickname().toString();
if (!myNickName.equals(fromNickName)) {
if (localPref.isMucHighToastEnabled()) {
final String lastMessageBody = lastChatMessage.getBody();
if (lastMessageBody != null && !lastMessageBody.isEmpty() && localPref.isMucHighToastEnabled()) {
// allowed to check for new messages containing name
String myUserName = SparkManager.getSessionManager().getUsername();
Pattern usernameMatch = Pattern.compile(myUserName, Pattern.CASE_INSENSITIVE);
Pattern nicknameMatch = Pattern.compile(myNickName, Pattern.CASE_INSENSITIVE);
if (usernameMatch.matcher(lastChatMessage.getBody()).find() || nicknameMatch.matcher(lastChatMessage.getBody()).find()) {
if (usernameMatch.matcher(lastMessageBody).find() || nicknameMatch.matcher(lastMessageBody).find()) {
// match, send new message
String customMsgTextS = Res.getString("group.chat.name.match") + " " + finalRoomName + " by " + fromNickName + " (" + lastChatMessage.getBody() + ")";
String customMsgTextS = Res.getString("group.chat.name.match") + " " + finalRoomName + " by " + fromNickName + " (" + lastMessageBody + ")";
String customMsgTitleS = Res.getString("group.chat.name.notification");
startFlashing(chatRoom, true, customMsgTextS, customMsgTitleS);
} else {
// regular group message
String customMsgTextS = fromNickName + " says: " + lastChatMessage.getBody();
String customMsgTextS = fromNickName + " says: " + lastMessageBody;
startFlashing(chatRoom, true, customMsgTextS, finalRoomName);
}
} else {
// regular group message
String customMsgTextS = fromNickName + " says: " + lastChatMessage.getBody();
String customMsgTextS = fromNickName + " says: " + lastMessageBody;
startFlashing(chatRoom, true, customMsgTextS, finalRoomName);
}
}