From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Fri, 11 Nov 2011 10:01:56 +0000 (+0100)
Subject: Fix notification filters.
X-Git-Tag: 0.7.3^2~14^2~3
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=db18d6702f5988236b26d99829d55171dfd16785;p=Sone.git

Fix notification filters.
---

diff --git a/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java b/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java
index 7175519..7b9eb49 100644
--- a/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java
+++ b/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java
@@ -55,14 +55,23 @@ public class ListNotificationFilters {
 	public static List<Notification> filterNotifications(Collection<? extends Notification> notifications, Sone currentSone) {
 		List<Notification> filteredNotifications = new ArrayList<Notification>();
 		for (Notification notification : notifications) {
-			if (notification.getId().equals("new-sone-notification") && ((currentSone == null) || (currentSone.getOptions().getBooleanOption("ShowNotification/NewSones").get()))) {
+			if (notification.getId().equals("new-sone-notification")) {
+				if ((currentSone != null) && (!currentSone.getOptions().getBooleanOption("ShowNotification/NewSones").get())) {
+					continue;
+				}
 				filteredNotifications.add(notification);
-			} else if (notification.getId().equals("new-post-notification") && ((currentSone == null) || (currentSone.getOptions().getBooleanOption("ShowNotification/NewPosts").get()))) {
+			} else if (notification.getId().equals("new-post-notification")) {
+				if ((currentSone != null) && (!currentSone.getOptions().getBooleanOption("ShowNotification/NewPosts").get())) {
+					continue;
+				}
 				ListNotification<Post> filteredNotification = filterNewPostNotification((ListNotification<Post>) notification, currentSone, true);
 				if (filteredNotification != null) {
 					filteredNotifications.add(filteredNotification);
 				}
-			} else if (notification.getId().equals("new-reply-notification") && ((currentSone == null) || (currentSone.getOptions().getBooleanOption("ShowNotification/NewReplies").get()))) {
+			} else if (notification.getId().equals("new-reply-notification")) {
+				if ((currentSone != null) && (!currentSone.getOptions().getBooleanOption("ShowNotification/NewReplies").get())) {
+					continue;
+				}
 				ListNotification<PostReply> filteredNotification = filterNewReplyNotification((ListNotification<PostReply>) notification, currentSone);
 				if (filteredNotification != null) {
 					filteredNotifications.add(filteredNotification);