narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

Merge pull request #447 from betheg/private_notify

Browse source 
MUC: notify also on private messages
This commit is contained in:
Daniel Gultsch 2014-09-19 10:32:24 +02:00
parent d5b58449a0 00ff5c2dbd
commit 96e2dfa246
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/eu/siacs/conversations/utils/UIHelper.java
View file

@ -353,14 +353,15 @@ public class UIHelper {
Pattern highlight = generateNickHighlightPattern(nick); Pattern highlight = generateNickHighlightPattern(nick);
Matcher m = highlight.matcher(currentCon.getLatestMessage() Matcher m = highlight.matcher(currentCon.getLatestMessage()
.getBody()); .getBody());
notify = m.find(); notify = m.find()
|| (currentCon.getLatestMessage().getType() == Message.TYPE_PRIVATE);
} }
List<Conversation> unread = new ArrayList<Conversation>(); List<Conversation> unread = new ArrayList<Conversation>();
for (Conversation conversation : conversations) { for (Conversation conversation : conversations) {
if (conversation.getMode() == Conversation.MODE_MULTI) { if (conversation.getMode() == Conversation.MODE_MULTI) {
if ((!conversation.isRead()) if ((!conversation.isRead())
&& ((wasHighlighted(conversation) || (alwaysNotify)))) { && ((wasHighlightedOrPrivate(conversation) || (alwaysNotify)))) {
unread.add(conversation); unread.add(conversation);
} }
} else { } else {
@ -466,7 +467,7 @@ public class UIHelper {
} }
} }
private static boolean wasHighlighted(Conversation conversation) { private static boolean wasHighlightedOrPrivate(Conversation conversation) {
List<Message> messages = conversation.getMessages(); List<Message> messages = conversation.getMessages();
String nick = conversation.getMucOptions().getActualNick(); String nick = conversation.getMucOptions().getActualNick();
Pattern highlight = generateNickHighlightPattern(nick); Pattern highlight = generateNickHighlightPattern(nick);
@ -475,7 +476,8 @@ public class UIHelper {
break; break;
} else { } else {
Matcher m = highlight.matcher(messages.get(i).getBody()); Matcher m = highlight.matcher(messages.get(i).getBody());
if (m.find()) { if (m.find()
|| messages.get(i).getType() == Message.TYPE_PRIVATE) {
return true; return true;
} }
} }