aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-08-07 11:02:41 +0200
committeriNPUTmice <daniel@gultsch.de>2014-08-07 11:02:41 +0200
commit6536c1aeb143ffaf4250c146c574ab25e1e178c2 (patch)
treee1a028b0e8159a3703ea65c331b20d6105ea2b21 /src
parent313f9db1ec68448bd7abb303922c8228ac9c128c (diff)
bug fix for not working notification grace period in muc
Diffstat (limited to 'src')
-rw-r--r--src/eu/siacs/conversations/utils/UIHelper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java
index 5d959b17..81b356f7 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_in_conversation_when_highlighted", false) && notify;
if (!showNofifications) {
mNotificationManager.cancel(2342);