diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-08-09 09:37:37 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-08-09 09:37:37 +0200 |
| commit | de2964cd2555e59ba60373e34765250f8aae35a6 (patch) | |
| tree | 0597d54e26ec46eb0870ed2ffb04c9675cac8f8f | |
| parent | 98a80ffc61f1770214f5e7cff51ac94e16bfaa27 (diff) | |
more fixes for notfication in conferences
| -rw-r--r-- | src/eu/siacs/conversations/utils/UIHelper.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java index 81b356f7..46a91154 100644 --- a/src/eu/siacs/conversations/utils/UIHelper.java +++ b/src/eu/siacs/conversations/utils/UIHelper.java @@ -334,7 +334,7 @@ public class UIHelper { boolean vibrate = preferences.getBoolean("vibrate_on_notification", true); boolean alwaysNotify = preferences.getBoolean( - "notify_in_conversation_when_highlighted", false) && notify; + "notify_in_conversation_when_highlighted", false); if (!showNofifications) { mNotificationManager.cancel(2342); @@ -345,7 +345,7 @@ public class UIHelper { if ((currentCon != null) && (currentCon.getMode() == Conversation.MODE_MULTI) - && (!alwaysNotify)) { + && (!alwaysNotify) && notify) { String nick = currentCon.getMucOptions().getActualNick(); Pattern highlight = generateNickHighlightPattern(nick); Matcher m = highlight.matcher(currentCon.getLatestMessage() |