From 01658cc454874e0a644d2a0b11d8a22ad7930b16 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Mon, 6 May 2013 14:07:28 -0700 Subject: [PATCH] Fix for notification preference regression --- .../securesms/notifications/MessageNotifier.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java index 383b8bfebf..c0d1f8d3d0 100644 --- a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java +++ b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java @@ -97,10 +97,22 @@ public class MessageNotifier { public static void updateNotification(Context context, MasterSecret masterSecret) { + if (!PreferenceManager.getDefaultSharedPreferences(context) + .getBoolean(ApplicationPreferencesActivity.NOTIFICATION_PREF, true)) + { + return; + } + updateNotification(context, masterSecret, false); } public static void updateNotification(Context context, MasterSecret masterSecret, long threadId) { + if (!PreferenceManager.getDefaultSharedPreferences(context) + .getBoolean(ApplicationPreferencesActivity.NOTIFICATION_PREF, true)) + { + return; + } + if (visibleThread == threadId) { DatabaseFactory.getThreadDatabase(context).setRead(threadId); sendInThreadNotification(context);