moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-12-25 08:58:55 -05:00
Code Issues Releases Wiki Activity

fixed possible npe

Browse Source
This commit is contained in:
iNPUTmice 2014-10-03 11:55:38 +02:00
parent facd15f037
commit 0e56ff93e9
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/eu/siacs/conversations/services/NotificationService.java
View File

@ -57,7 +57,8 @@ public class NotificationService {
mList.add(message); mList.add(message);
notifications.put(conversationUuid, mList); notifications.put(conversationUuid, mList);
} }
updateNotification(!(this.mIsInForeground && this.mOpenConversation == null) || !isScreenOn); updateNotification(!(this.mIsInForeground && this.mOpenConversation == null)
|| !isScreenOn);
} }
public void clear() { public void clear() {
@ -195,6 +196,9 @@ public class NotificationService {
public static boolean wasHighlightedOrPrivate(Message message) { public static boolean wasHighlightedOrPrivate(Message message) {
String nick = message.getConversation().getMucOptions().getActualNick(); String nick = message.getConversation().getMucOptions().getActualNick();
Pattern highlight = generateNickHighlightPattern(nick); Pattern highlight = generateNickHighlightPattern(nick);
if (message.getBody() == null || nick == null) {
return false;
}
Matcher m = highlight.matcher(message.getBody()); Matcher m = highlight.matcher(message.getBody());
return (m.find() || message.getType() == Message.TYPE_PRIVATE); return (m.find() || message.getType() == Message.TYPE_PRIVATE);
} }