Fix annotations and possible NPEs

diff --git a/src/main/java/net/pterodactylus/sone/notify/PostVisibilityFilter.java b/src/main/java/net/pterodactylus/sone/notify/PostVisibilityFilter.java
index edcd148..3582e3d 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/notify/PostVisibilityFilter.java
+++ b/src/main/java/net/pterodactylus/sone/notify/PostVisibilityFilter.java
@@ -87,10 +87,9 @@ public class PostVisibilityFilter {
        @Nonnull
        public Predicate<Post> isVisible(@Nullable final Sone currentSone) {
                return new Predicate<Post>() {
-                       @Nonnull
                        @Override
                        public boolean apply(@Nullable Post post) {
-                               return isPostVisible(currentSone, post);
+                               return (post != null) && isPostVisible(currentSone, post);
                        }
                };
        }

diff --git a/src/main/java/net/pterodactylus/sone/notify/ReplyVisibilityFilter.java b/src/main/java/net/pterodactylus/sone/notify/ReplyVisibilityFilter.java
index a76ae25..fd13779 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/notify/ReplyVisibilityFilter.java
+++ b/src/main/java/net/pterodactylus/sone/notify/ReplyVisibilityFilter.java
@@ -62,10 +62,9 @@ public class ReplyVisibilityFilter {
        @Nonnull
        public Predicate<PostReply> isVisible(@Nullable final Sone currentSone) {
                return new Predicate<PostReply>() {
-                       @Nonnull
                        @Override
                        public boolean apply(@Nullable PostReply postReply) {
-                               return isReplyVisible(currentSone, postReply);
+                               return (postReply != null) && isReplyVisible(currentSone, postReply);
                        }
                };
        }