import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.Map.Entry;
+import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.logging.Level;
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Profile;
+import net.pterodactylus.sone.data.Profile.Field;
import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.data.TemporaryImage;
-import net.pterodactylus.sone.data.Profile.Field;
import net.pterodactylus.sone.data.Sone.ShowCustomAvatars;
import net.pterodactylus.sone.data.Sone.SoneStatus;
+import net.pterodactylus.sone.data.TemporaryImage;
import net.pterodactylus.sone.fcp.FcpInterface;
import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired;
import net.pterodactylus.sone.freenet.wot.Identity;
/** All local Sones. */
/* synchronize access on this on itself. */
- private Map<String, Sone> localSones = new HashMap<String, Sone>();
+ private final Map<String, Sone> localSones = new HashMap<String, Sone>();
/** All remote Sones. */
/* synchronize access on this on itself. */
- private Map<String, Sone> remoteSones = new HashMap<String, Sone>();
+ private final Map<String, Sone> remoteSones = new HashMap<String, Sone>();
/** All known Sones. */
- private Set<String> knownSones = new HashSet<String>();
+ private final Set<String> knownSones = new HashSet<String>();
/** All posts. */
- private Map<String, Post> posts = new HashMap<String, Post>();
+ private final Map<String, Post> posts = new HashMap<String, Post>();
/** All known posts. */
- private Set<String> knownPosts = new HashSet<String>();
+ private final Set<String> knownPosts = new HashSet<String>();
/** All replies. */
- private Map<String, PostReply> replies = new HashMap<String, PostReply>();
+ private final Map<String, PostReply> replies = new HashMap<String, PostReply>();
/** All known replies. */
- private Set<String> knownReplies = new HashSet<String>();
+ private final Set<String> knownReplies = new HashSet<String>();
/** All bookmarked posts. */
/* synchronize access on itself. */
- private Set<String> bookmarkedPosts = new HashSet<String>();
+ private final Set<String> bookmarkedPosts = new HashSet<String>();
/** Trusted identities, sorted by own identities. */
- private Map<OwnIdentity, Set<Identity>> trustedIdentities = Collections.synchronizedMap(new HashMap<OwnIdentity, Set<Identity>>());
+ private final Map<OwnIdentity, Set<Identity>> trustedIdentities = Collections.synchronizedMap(new HashMap<OwnIdentity, Set<Identity>>());
/** All known albums. */
- private Map<String, Album> albums = new HashMap<String, Album>();
+ private final Map<String, Album> albums = new HashMap<String, Album>();
/** All known images. */
- private Map<String, Image> images = new HashMap<String, Image>();
+ private final Map<String, Image> images = new HashMap<String, Image>();
/** All temporary images. */
- private Map<String, TemporaryImage> temporaryImages = new HashMap<String, TemporaryImage>();
+ private final Map<String, TemporaryImage> temporaryImages = new HashMap<String, TemporaryImage>();
/** Ticker for threads that mark own elements as known. */
- private Ticker localElementTicker = new Ticker();
+ private final Ticker localElementTicker = new Ticker();
/** The time the configuration was last touched. */
private volatile long lastConfigurationUpdate;
List<Post> storedPosts = storedSone.getPosts();
synchronized (knownPosts) {
for (Post post : sone.getPosts()) {
- post.setSone(storedSone);
+ post.setSone(storedSone).setKnown(knownPosts.contains(post.getId()));
if (!storedPosts.contains(post)) {
if (post.getTime() < getSoneFollowingTime(sone)) {
- sone.setKnown(true);
knownPosts.add(post.getId());
} else if (!knownPosts.contains(post.getId())) {
+ sone.setKnown(false);
coreListenerManager.fireNewPostFound(post);
- } else {
- sone.setKnown(true);
}
}
posts.put(post.getId(), post);
Set<PostReply> storedReplies = storedSone.getReplies();
synchronized (knownReplies) {
for (PostReply reply : sone.getReplies()) {
- reply.setSone(storedSone);
+ reply.setSone(storedSone).setKnown(knownReplies.contains(reply.getId()));
if (!storedReplies.contains(reply)) {
if (reply.getTime() < getSoneFollowingTime(sone)) {
- reply.setKnown(true);
knownReplies.add(reply.getId());
} else if (!knownReplies.contains(reply.getId())) {
+ reply.setKnown(false);
coreListenerManager.fireNewReplyFound(reply);
- } else {
- reply.setKnown(true);
}
}
replies.put(reply.getId(), reply);
}
/**
- * Marks the given Sone as known. If the Sone was {@link #isNewPost(String)
- * new} before, a {@link CoreListener#markSoneKnown(Sone)} event is fired.
+ * Marks the given Sone as known. If the Sone was not {@link Post#isKnown()
+ * known} before, a {@link CoreListener#markSoneKnown(Sone)} event is fired.
*
* @param sone
* The Sone to mark as known
}
parentAlbum.addAlbum(album);
} else {
- topLevelAlbums.add(album);
+ if (!topLevelAlbums.contains(album)) {
+ topLevelAlbums.add(album);
+ }
}
}
}
/**
- * Marks the given post as known, if it is currently a new post (according
- * to {@link #isNewPost(String)}).
+ * Marks the given post as known, if it is currently not a known post
+ * (according to {@link Post#isKnown()}).
*
* @param post
* The post to mark as known
public void markPostKnown(Post post) {
post.setKnown(true);
synchronized (knownPosts) {
+ coreListenerManager.fireMarkPostKnown(post);
if (knownPosts.add(post.getId())) {
- coreListenerManager.fireMarkPostKnown(post);
touchConfiguration();
}
}
+ for (PostReply reply : getReplies(post)) {
+ markReplyKnown(reply);
+ }
}
/**
}
/**
- * Marks the given reply as known, if it is currently a new reply (according
- * to {@link #isNewReply(String)}).
+ * Marks the given reply as known, if it is currently not a known reply
+ * (according to {@link Reply#isKnown()}).
*
* @param reply
* The reply to mark as known
public void markReplyKnown(PostReply reply) {
reply.setKnown(true);
synchronized (knownReplies) {
+ coreListenerManager.fireMarkReplyKnown(reply);
if (knownReplies.add(reply.getId())) {
- coreListenerManager.fireMarkReplyKnown(reply);
touchConfiguration();
}
}
projects / Sone.git / blobdiff