diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java index 0c702b87..0103fd57 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java @@ -44,6 +44,15 @@ public class BlockedConversationHelper { prefs.edit().putStringSet(SettingsFragment.BLOCKED_SENDERS, idStrings2).apply(); } + public static Set getBlockedConversationIds(SharedPreferences prefs) { + Set conversations = getBlockedConversations(prefs); + Set ids = new HashSet<>(); + for (String id : conversations) { + ids.add(Long.parseLong(id)); + } + return ids; + } + public static Set getBlockedConversations(SharedPreferences prefs) { return prefs.getStringSet(SettingsFragment.BLOCKED_SENDERS, new HashSet()); } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java b/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java index e286b771..a77413a6 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java @@ -5,8 +5,10 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.PowerManager; +import android.preference.PreferenceManager; import android.telephony.SmsMessage; import android.util.Log; +import com.moez.QKSMS.common.BlockedConversationHelper; import com.moez.QKSMS.common.ConversationPrefsHelper; import com.moez.QKSMS.data.Message; import com.moez.QKSMS.service.NotificationService; @@ -54,7 +56,8 @@ public class MessagingReceiver extends BroadcastReceiver { Message message = new Message(context, uri); ConversationPrefsHelper prefs = new ConversationPrefsHelper(context, message.getThreadId()); - if (prefs.getNotificationsEnabled()) { + if (prefs.getNotificationsEnabled() && !BlockedConversationHelper.getBlockedConversationIds( + PreferenceManager.getDefaultSharedPreferences(context)).contains(message.getThreadId())) { Intent messageHandlerIntent = new Intent(context, NotificationService.class); messageHandlerIntent.putExtra(NotificationService.EXTRA_POPUP, true); messageHandlerIntent.putExtra(NotificationService.EXTRA_URI, uri.toString());