/*
- * Sone - ListNotificationFilters.java - Copyright © 2010–2013 David Roden
+ * Sone - ListNotificationFilters.java - Copyright © 2010–2015 David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
List<Notification> filteredNotifications = new ArrayList<Notification>();
for (Notification notification : notifications) {
if (notification.getId().equals("new-sone-notification")) {
- if ((currentSone != null) && (!currentSone.getOptions().getBooleanOption("ShowNotification/NewSones").get())) {
+ if ((currentSone != null) && !currentSone.getOptions().isShowNewSoneNotifications()) {
continue;
}
filteredNotifications.add(notification);
} else if (notification.getId().equals("new-post-notification")) {
- if ((currentSone != null) && (!currentSone.getOptions().getBooleanOption("ShowNotification/NewPosts").get())) {
+ if ((currentSone != null) && !currentSone.getOptions().isShowNewPostNotifications()) {
continue;
}
- ListNotification<Post> filteredNotification = filterNewPostNotification((ListNotification<Post>) notification, currentSone, true);
- if (filteredNotification != null) {
- filteredNotifications.add(filteredNotification);
+ Optional<ListNotification<Post>> filteredNotification = filterNewPostNotification((ListNotification<Post>) notification, currentSone, true);
+ if (filteredNotification.isPresent()) {
+ filteredNotifications.add(filteredNotification.get());
}
} else if (notification.getId().equals("new-reply-notification")) {
- if ((currentSone != null) && (!currentSone.getOptions().getBooleanOption("ShowNotification/NewReplies").get())) {
+ if ((currentSone != null) && !currentSone.getOptions().isShowNewReplyNotifications()) {
continue;
}
- ListNotification<PostReply> filteredNotification = filterNewReplyNotification((ListNotification<PostReply>) notification, currentSone);
- if (filteredNotification != null) {
- filteredNotifications.add(filteredNotification);
+ Optional<ListNotification<PostReply>> filteredNotification = filterNewReplyNotification((ListNotification<PostReply>) notification, currentSone);
+ if (filteredNotification.isPresent()) {
+ filteredNotifications.add(filteredNotification.get());
}
} else if (notification.getId().equals("mention-notification")) {
- ListNotification<Post> filteredNotification = filterNewPostNotification((ListNotification<Post>) notification, null, false);
- if (filteredNotification != null) {
- filteredNotifications.add(filteredNotification);
+ Optional<ListNotification<Post>> filteredNotification = filterNewPostNotification((ListNotification<Post>) notification, null, false);
+ if (filteredNotification.isPresent()) {
+ filteredNotifications.add(filteredNotification.get());
}
} else {
filteredNotifications.add(notification);
* @return The filtered new-post notification, or {@code null} if the
* notification should be removed
*/
- public static ListNotification<Post> filterNewPostNotification(ListNotification<Post> newPostNotification, Sone currentSone, boolean soneRequired) {
+ private static Optional<ListNotification<Post>> filterNewPostNotification(ListNotification<Post> newPostNotification, Sone currentSone, boolean soneRequired) {
if (soneRequired && (currentSone == null)) {
- return null;
+ return Optional.absent();
}
List<Post> newPosts = new ArrayList<Post>();
for (Post post : newPostNotification.getElements()) {
}
}
if (newPosts.isEmpty()) {
- return null;
+ return Optional.absent();
}
if (newPosts.size() == newPostNotification.getElements().size()) {
- return newPostNotification;
+ return Optional.of(newPostNotification);
}
ListNotification<Post> filteredNotification = new ListNotification<Post>(newPostNotification);
filteredNotification.setElements(newPosts);
filteredNotification.setLastUpdateTime(newPostNotification.getLastUpdatedTime());
- return filteredNotification;
+ return Optional.of(filteredNotification);
}
/**
* @return The filtered new-reply notification, or {@code null} if the
* notification should be removed
*/
- public static ListNotification<PostReply> filterNewReplyNotification(ListNotification<PostReply> newReplyNotification, Sone currentSone) {
+ private static Optional<ListNotification<PostReply>> filterNewReplyNotification(ListNotification<PostReply> newReplyNotification, Sone currentSone) {
if (currentSone == null) {
- return null;
+ return Optional.absent();
}
List<PostReply> newReplies = new ArrayList<PostReply>();
for (PostReply reply : newReplyNotification.getElements()) {
}
}
if (newReplies.isEmpty()) {
- return null;
+ return Optional.absent();
}
if (newReplies.size() == newReplyNotification.getElements().size()) {
- return newReplyNotification;
+ return Optional.of(newReplyNotification);
}
ListNotification<PostReply> filteredNotification = new ListNotification<PostReply>(newReplyNotification);
filteredNotification.setElements(newReplies);
filteredNotification.setLastUpdateTime(newReplyNotification.getLastUpdatedTime());
- return filteredNotification;
+ return Optional.of(filteredNotification);
}
/**
*/
public static boolean isPostVisible(Sone sone, Post post) {
checkNotNull(post, "post must not be null");
- Sone postSone = post.getSone();
- if (postSone == null) {
+ if (!post.isLoaded()) {
return false;
}
+ Sone postSone = post.getSone();
if (sone != null) {
Trust trust = postSone.getIdentity().getTrust((OwnIdentity) sone.getIdentity());
if (trust != null) {
* received trust values. to prevent this we simply assume that
* posts are visible if there is no trust.
*/
- return true;
}
if ((!postSone.equals(sone)) && !sone.hasFriend(postSone.getId()) && !sone.getId().equals(post.getRecipientId().orNull())) {
return false;
}
}
- if (post.getTime() > System.currentTimeMillis()) {
- return false;
- }
- return true;
+ return post.getTime() <= System.currentTimeMillis();
}
/**
if (!isPostVisible(sone, post.get())) {
return false;
}
- if (reply.getTime() > System.currentTimeMillis()) {
- return false;
- }
- return true;
+ return reply.getTime() <= System.currentTimeMillis();
}
}