From 00ff5c2dbd70174d52797d598c3c2d59a5b8e6a9 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 13 Sep 2014 14:02:14 +0200 Subject: MUC: notify also on private messages --- src/eu/siacs/conversations/utils/UIHelper.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/eu/siacs/conversations/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java index 54c370ef..56248234 100644 --- a/src/eu/siacs/conversations/utils/UIHelper.java +++ b/src/eu/siacs/conversations/utils/UIHelper.java @@ -353,14 +353,15 @@ public class UIHelper { Pattern highlight = generateNickHighlightPattern(nick); Matcher m = highlight.matcher(currentCon.getLatestMessage() .getBody()); - notify = m.find(); + notify = m.find() + || (currentCon.getLatestMessage().getType() == Message.TYPE_PRIVATE); } List unread = new ArrayList(); for (Conversation conversation : conversations) { if (conversation.getMode() == Conversation.MODE_MULTI) { if ((!conversation.isRead()) - && ((wasHighlighted(conversation) || (alwaysNotify)))) { + && ((wasHighlightedOrPrivate(conversation) || (alwaysNotify)))) { unread.add(conversation); } } else { @@ -466,7 +467,7 @@ public class UIHelper { } } - private static boolean wasHighlighted(Conversation conversation) { + private static boolean wasHighlightedOrPrivate(Conversation conversation) { List messages = conversation.getMessages(); String nick = conversation.getMucOptions().getActualNick(); Pattern highlight = generateNickHighlightPattern(nick); @@ -475,7 +476,8 @@ public class UIHelper { break; } else { Matcher m = highlight.matcher(messages.get(i).getBody()); - if (m.find()) { + if (m.find() + || messages.get(i).getType() == Message.TYPE_PRIVATE) { return true; } } -- cgit v1.2.3