projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into next
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
notify
/
ListNotificationFilters.java
diff --git
a/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java
b/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java
index
6efee27
..
f431bb7
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java
+++ b/
src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java
@@
-1,5
+1,5
@@
/*
/*
- * Sone - ListNotificationFilters.java - Copyright © 2010–201
2
David Roden
+ * Sone - ListNotificationFilters.java - Copyright © 2010–201
3
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
*
* 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
@@
-17,6
+17,8
@@
package net.pterodactylus.sone.notify;
package net.pterodactylus.sone.notify;
+import static com.google.common.base.Preconditions.checkNotNull;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@
-28,7
+30,8
@@
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.freenet.wot.OwnIdentity;
import net.pterodactylus.sone.freenet.wot.Trust;
import net.pterodactylus.util.notify.Notification;
import net.pterodactylus.sone.freenet.wot.OwnIdentity;
import net.pterodactylus.sone.freenet.wot.Trust;
import net.pterodactylus.util.notify.Notification;
-import net.pterodactylus.util.validation.Validation;
+
+import com.google.common.base.Optional;
/**
* Filter for {@link ListNotification}s.
/**
* Filter for {@link ListNotification}s.
@@
-218,7
+221,7
@@
public class ListNotificationFilters {
* otherwise
*/
public static boolean isPostVisible(Sone sone, Post post) {
* otherwise
*/
public static boolean isPostVisible(Sone sone, Post post) {
-
Validation.begin().isNotNull("Post", post).check(
);
+
checkNotNull(post, "post must not be null"
);
Sone postSone = post.getSone();
if (postSone == null) {
return false;
Sone postSone = post.getSone();
if (postSone == null) {
return false;
@@
-240,9
+243,8
@@
public class ListNotificationFilters {
* received trust values. to prevent this we simply assume that
* posts are visible if there is no trust.
*/
* 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.
equals(post.getRecipient
())) {
+ if ((!postSone.equals(sone)) && !sone.hasFriend(postSone.getId()) && !sone.
getId().equals(post.getRecipientId().orNull
())) {
return false;
}
}
return false;
}
}
@@
-280,12
+282,12
@@
public class ListNotificationFilters {
* otherwise
*/
public static boolean isReplyVisible(Sone sone, PostReply reply) {
* otherwise
*/
public static boolean isReplyVisible(Sone sone, PostReply reply) {
-
Validation.begin().isNotNull("Reply", reply).check(
);
-
Post
post = reply.getPost();
- if (
post == null
) {
+
checkNotNull(reply, "reply must not be null"
);
+
Optional<Post>
post = reply.getPost();
+ if (
!post.isPresent()
) {
return false;
}
return false;
}
- if (!isPostVisible(sone, post)) {
+ if (!isPostVisible(sone, post
.get()
)) {
return false;
}
if (reply.getTime() > System.currentTimeMillis()) {
return false;
}
if (reply.getTime() > System.currentTimeMillis()) {