X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=d3f50a1e4fdee6634f541fc8b1cd5df8d5ea0ab6;hb=b767ceb6adea75829f9eeb417d2a3f3e3f445ba9;hp=8aac5d7b429c5c4ae6d21ecbb72de3f59812cd40;hpb=f46d58c2917d46095a31f6281cf8b7288a527cba;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 8aac5d7..b603eff 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -1,5 +1,5 @@
/*
- * Sone - Core.java - Copyright © 2010 David Roden
+ * Sone - Core.java - Copyright © 2010â2013 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
@@ -17,15 +17,19 @@
package net.pterodactylus.sone.core;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
import java.net.MalformedURLException;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
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;
@@ -34,35 +38,60 @@ import java.util.logging.Logger;
import net.pterodactylus.sone.core.Options.DefaultOption;
import net.pterodactylus.sone.core.Options.Option;
import net.pterodactylus.sone.core.Options.OptionWatcher;
+import net.pterodactylus.sone.core.event.ImageInsertFinishedEvent;
+import net.pterodactylus.sone.core.event.MarkPostKnownEvent;
+import net.pterodactylus.sone.core.event.MarkPostReplyKnownEvent;
+import net.pterodactylus.sone.core.event.MarkSoneKnownEvent;
+import net.pterodactylus.sone.core.event.NewPostFoundEvent;
+import net.pterodactylus.sone.core.event.NewPostReplyFoundEvent;
+import net.pterodactylus.sone.core.event.NewSoneFoundEvent;
+import net.pterodactylus.sone.core.event.PostRemovedEvent;
+import net.pterodactylus.sone.core.event.PostReplyRemovedEvent;
+import net.pterodactylus.sone.core.event.SoneLockedEvent;
+import net.pterodactylus.sone.core.event.SoneRemovedEvent;
+import net.pterodactylus.sone.core.event.SoneUnlockedEvent;
import net.pterodactylus.sone.data.Album;
import net.pterodactylus.sone.data.Client;
import net.pterodactylus.sone.data.Image;
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.Sone.ShowCustomAvatars;
+import net.pterodactylus.sone.data.Sone.SoneStatus;
import net.pterodactylus.sone.data.TemporaryImage;
-import net.pterodactylus.sone.data.Profile.Field;
+import net.pterodactylus.sone.data.impl.PostImpl;
+import net.pterodactylus.sone.data.impl.PostReplyImpl;
import net.pterodactylus.sone.fcp.FcpInterface;
import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired;
import net.pterodactylus.sone.freenet.wot.Identity;
-import net.pterodactylus.sone.freenet.wot.IdentityListener;
import net.pterodactylus.sone.freenet.wot.IdentityManager;
import net.pterodactylus.sone.freenet.wot.OwnIdentity;
-import net.pterodactylus.sone.freenet.wot.Trust;
-import net.pterodactylus.sone.freenet.wot.WebOfTrustException;
+import net.pterodactylus.sone.freenet.wot.event.IdentityAddedEvent;
+import net.pterodactylus.sone.freenet.wot.event.IdentityRemovedEvent;
+import net.pterodactylus.sone.freenet.wot.event.IdentityUpdatedEvent;
+import net.pterodactylus.sone.freenet.wot.event.OwnIdentityAddedEvent;
+import net.pterodactylus.sone.freenet.wot.event.OwnIdentityRemovedEvent;
import net.pterodactylus.sone.main.SonePlugin;
+import net.pterodactylus.sone.utils.IntegerRangePredicate;
import net.pterodactylus.util.config.Configuration;
import net.pterodactylus.util.config.ConfigurationException;
import net.pterodactylus.util.logging.Logging;
-import net.pterodactylus.util.number.Numbers;
import net.pterodactylus.util.service.AbstractService;
+import net.pterodactylus.util.thread.NamedThreadFactory;
import net.pterodactylus.util.thread.Ticker;
-import net.pterodactylus.util.validation.EqualityValidator;
-import net.pterodactylus.util.validation.IntegerRangeValidator;
-import net.pterodactylus.util.validation.OrValidator;
-import net.pterodactylus.util.validation.Validation;
-import net.pterodactylus.util.version.Version;
+
+import com.google.common.base.Optional;
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import com.google.common.collect.Collections2;
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+import com.google.common.primitives.Longs;
+import com.google.inject.Inject;
+
import freenet.keys.FreenetURI;
/**
@@ -70,39 +99,22 @@ import freenet.keys.FreenetURI;
*
* @author David âBombeâ Roden
*/
-public class Core extends AbstractService implements IdentityListener, UpdateListener, SoneProvider, PostProvider, SoneInsertListener, ImageInsertListener {
-
- /**
- * Enumeration for the possible states of a {@link Sone}.
- *
- * @author David âBombeâ Roden
- */
- public enum SoneStatus {
-
- /** The Sone is unknown, i.e. not yet downloaded. */
- unknown,
-
- /** The Sone is idle, i.e. not being downloaded or inserted. */
- idle,
-
- /** The Sone is currently being inserted. */
- inserting,
-
- /** The Sone is currently being downloaded. */
- downloading,
- }
+public class Core extends AbstractService implements SoneProvider, PostProvider {
/** The logger. */
private static final Logger logger = Logging.getLogger(Core.class);
+ /** The start time. */
+ private final long startupTime = System.currentTimeMillis();
+
/** The options. */
private final Options options = new Options();
/** The preferences. */
private final Preferences preferences = new Preferences(options);
- /** The core listener manager. */
- private final CoreListenerManager coreListenerManager = new CoreListenerManager(this);
+ /** The event bus. */
+ private final EventBus eventBus;
/** The configuration. */
private Configuration configuration;
@@ -123,82 +135,69 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
private final ImageInserter imageInserter;
/** Sone downloader thread-pool. */
- private final ExecutorService soneDownloaders = Executors.newFixedThreadPool(10);
+ private final ExecutorService soneDownloaders = Executors.newFixedThreadPool(10, new NamedThreadFactory("Sone Downloader %2$d"));
/** The update checker. */
private final UpdateChecker updateChecker;
+ /** The trust updater. */
+ private final WebOfTrustUpdater webOfTrustUpdater;
+
/** The FCP interface. */
private volatile FcpInterface fcpInterface;
- /** The Sonesâ statuses. */
- /* synchronize access on itself. */
- private final Map soneStatuses = new HashMap();
+ /** The times Sones were followed. */
+ private final Map soneFollowingTimes = new HashMap();
/** Locked local Sones. */
/* synchronize on itself. */
private final Set lockedSones = new HashSet();
/** Sone inserters. */
- /* synchronize access on this on localSones. */
+ /* synchronize access on this on sones. */
private final Map soneInserters = new HashMap();
/** Sone rescuers. */
- /* synchronize access on this on localSones. */
+ /* synchronize access on this on sones. */
private final Map soneRescuers = new HashMap();
- /** All local Sones. */
+ /** All Sones. */
/* synchronize access on this on itself. */
- private Map localSones = new HashMap();
-
- /** All remote Sones. */
- /* synchronize access on this on itself. */
- private Map remoteSones = new HashMap();
-
- /** All new Sones. */
- private Set newSones = new HashSet();
+ private final Map sones = new HashMap();
/** All known Sones. */
- /* synchronize access on {@link #newSones}. */
- private Set knownSones = new HashSet();
+ private final Set knownSones = new HashSet();
/** All posts. */
- private Map posts = new HashMap();
-
- /** All new posts. */
- private Set newPosts = new HashSet();
+ private final Map posts = new HashMap();
/** All known posts. */
- /* synchronize access on {@link #newPosts}. */
- private Set knownPosts = new HashSet();
+ private final Set knownPosts = new HashSet();
/** All replies. */
- private Map replies = new HashMap();
-
- /** All new replies. */
- private Set newReplies = new HashSet();
+ private final Map replies = new HashMap();
/** All known replies. */
- private Set knownReplies = new HashSet();
+ private final Set knownReplies = new HashSet();
/** All bookmarked posts. */
/* synchronize access on itself. */
- private Set bookmarkedPosts = new HashSet();
+ private final Set bookmarkedPosts = new HashSet();
/** Trusted identities, sorted by own identities. */
- private Map> trustedIdentities = Collections.synchronizedMap(new HashMap>());
+ private final Map> trustedIdentities = Collections.synchronizedMap(new HashMap>());
/** All known albums. */
- private Map albums = new HashMap();
+ private final Map albums = new HashMap();
/** All known images. */
- private Map images = new HashMap();
+ private final Map images = new HashMap();
/** All temporary images. */
- private Map temporaryImages = new HashMap();
+ private final Map temporaryImages = new HashMap();
/** 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;
@@ -212,46 +211,38 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The freenet interface
* @param identityManager
* The identity manager
+ * @param webOfTrustUpdater
+ * The WebOfTrust updater
+ * @param eventBus
+ * The event bus
*/
- public Core(Configuration configuration, FreenetInterface freenetInterface, IdentityManager identityManager) {
+ @Inject
+ public Core(Configuration configuration, FreenetInterface freenetInterface, IdentityManager identityManager, WebOfTrustUpdater webOfTrustUpdater, EventBus eventBus) {
super("Sone Core");
this.configuration = configuration;
this.freenetInterface = freenetInterface;
this.identityManager = identityManager;
this.soneDownloader = new SoneDownloader(this, freenetInterface);
- this.imageInserter = new ImageInserter(this, freenetInterface);
- this.updateChecker = new UpdateChecker(freenetInterface);
+ this.imageInserter = new ImageInserter(freenetInterface);
+ this.updateChecker = new UpdateChecker(eventBus, freenetInterface);
+ this.webOfTrustUpdater = webOfTrustUpdater;
+ this.eventBus = eventBus;
}
//
- // LISTENER MANAGEMENT
+ // ACCESSORS
//
/**
- * Adds a new core listener.
+ * Returns the time Sone was started.
*
- * @param coreListener
- * The listener to add
+ * @return The startup time (in milliseconds since Jan 1, 1970 UTC)
*/
- public void addCoreListener(CoreListener coreListener) {
- coreListenerManager.addListener(coreListener);
+ public long getStartupTime() {
+ return startupTime;
}
/**
- * Removes a core listener.
- *
- * @param coreListener
- * The listener to remove
- */
- public void removeCoreListener(CoreListener coreListener) {
- coreListenerManager.removeListener(coreListener);
- }
-
- //
- // ACCESSORS
- //
-
- /**
* Sets the configuration to use. This will automatically save the current
* configuration to the given configuration.
*
@@ -301,33 +292,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
}
/**
- * Returns the status of the given Sone.
- *
- * @param sone
- * The Sone to get the status for
- * @return The status of the Sone
- */
- public SoneStatus getSoneStatus(Sone sone) {
- synchronized (soneStatuses) {
- return soneStatuses.get(sone);
- }
- }
-
- /**
- * Sets the status of the given Sone.
- *
- * @param sone
- * The Sone to set the status of
- * @param soneStatus
- * The status to set
- */
- public void setSoneStatus(Sone sone, SoneStatus soneStatus) {
- synchronized (soneStatuses) {
- soneStatuses.put(sone, soneStatus);
- }
- }
-
- /**
* Returns the Sone rescuer for the given local Sone.
*
* @param sone
@@ -335,8 +299,9 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* @return The Sone rescuer for the given Sone
*/
public SoneRescuer getSoneRescuer(Sone sone) {
- Validation.begin().isNotNull("Sone", sone).check().is("Local Sone", isLocalSone(sone)).check();
- synchronized (localSones) {
+ checkNotNull(sone, "sone must not be null");
+ checkArgument(sone.isLocal(), "sone must be local");
+ synchronized (sones) {
SoneRescuer soneRescuer = soneRescuers.get(sone);
if (soneRescuer == null) {
soneRescuer = new SoneRescuer(this, soneDownloader, sone);
@@ -366,10 +331,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* @return All Sones
*/
public Set getSones() {
- Set allSones = new HashSet();
- allSones.addAll(getLocalSones());
- allSones.addAll(getRemoteSones());
- return allSones;
+ return new HashSet(sones.values());
}
/**
@@ -400,10 +362,13 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
@Override
public Sone getSone(String id, boolean create) {
- if (isLocalSone(id)) {
- return getLocalSone(id);
+ synchronized (sones) {
+ if (!sones.containsKey(id) && create) {
+ Sone sone = new Sone(id, false);
+ sones.put(id, sone);
+ }
+ return sones.get(id);
}
- return getRemoteSone(id, create);
}
/**
@@ -415,33 +380,8 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* otherwise
*/
public boolean hasSone(String id) {
- return isLocalSone(id) || isRemoteSone(id);
- }
-
- /**
- * Returns whether the given Sone is a local Sone.
- *
- * @param sone
- * The Sone to check for its locality
- * @return {@code true} if the given Sone is local, {@code false} otherwise
- */
- public boolean isLocalSone(Sone sone) {
- synchronized (localSones) {
- return localSones.containsKey(sone.getId());
- }
- }
-
- /**
- * Returns whether the given ID is the ID of a local Sone.
- *
- * @param id
- * The Sone ID to check for its locality
- * @return {@code true} if the given ID is a local Sone, {@code false}
- * otherwise
- */
- public boolean isLocalSone(String id) {
- synchronized (localSones) {
- return localSones.containsKey(id);
+ synchronized (sones) {
+ return sones.containsKey(id);
}
}
@@ -450,21 +390,16 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*
* @return All local Sones
*/
- public Set getLocalSones() {
- synchronized (localSones) {
- return new HashSet(localSones.values());
- }
- }
+ public Collection getLocalSones() {
+ synchronized (sones) {
+ return Collections2.filter(sones.values(), new Predicate() {
- /**
- * Returns the local Sone with the given ID.
- *
- * @param id
- * The ID of the Sone to get
- * @return The Sone with the given ID
- */
- public Sone getLocalSone(String id) {
- return getLocalSone(id, true);
+ @Override
+ public boolean apply(Sone sone) {
+ return sone.isLocal();
+ }
+ });
+ }
}
/**
@@ -478,12 +413,15 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* @return The Sone with the given ID, or {@code null}
*/
public Sone getLocalSone(String id, boolean create) {
- synchronized (localSones) {
- Sone sone = localSones.get(id);
+ synchronized (sones) {
+ Sone sone = sones.get(id);
if ((sone == null) && create) {
- sone = new Sone(id);
- localSones.put(id, sone);
- setSoneStatus(sone, SoneStatus.unknown);
+ sone = new Sone(id, true);
+ sones.put(id, sone);
+ }
+ if ((sone != null) && !sone.isLocal()) {
+ sone = new Sone(id, true);
+ sones.put(id, sone);
}
return sone;
}
@@ -494,21 +432,16 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*
* @return All remote Sones
*/
- public Set getRemoteSones() {
- synchronized (remoteSones) {
- return new HashSet(remoteSones.values());
- }
- }
+ public Collection getRemoteSones() {
+ synchronized (sones) {
+ return Collections2.filter(sones.values(), new Predicate() {
- /**
- * Returns the remote Sone with the given ID.
- *
- * @param id
- * The ID of the remote Sone to get
- * @return The Sone with the given ID
- */
- public Sone getRemoteSone(String id) {
- return getRemoteSone(id, true);
+ @Override
+ public boolean apply(Sone sone) {
+ return !sone.isLocal();
+ }
+ });
+ }
}
/**
@@ -522,68 +455,43 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* @return The Sone with the given ID
*/
public Sone getRemoteSone(String id, boolean create) {
- synchronized (remoteSones) {
- Sone sone = remoteSones.get(id);
- if ((sone == null) && create) {
- sone = new Sone(id);
- remoteSones.put(id, sone);
- setSoneStatus(sone, SoneStatus.unknown);
+ synchronized (sones) {
+ Sone sone = sones.get(id);
+ if ((sone == null) && create && (id != null) && (id.length() == 43)) {
+ sone = new Sone(id, false);
+ sones.put(id, sone);
}
return sone;
}
}
/**
- * Returns whether the given Sone is a remote Sone.
+ * Returns whether the given Sone has been modified.
*
* @param sone
- * The Sone to check
- * @return {@code true} if the given Sone is a remote Sone, {@code false}
- * otherwise
- */
- public boolean isRemoteSone(Sone sone) {
- synchronized (remoteSones) {
- return remoteSones.containsKey(sone.getId());
- }
- }
-
- /**
- * Returns whether the Sone with the given ID is a remote Sone.
- *
- * @param id
- * The ID of the Sone to check
- * @return {@code true} if the Sone with the given ID is a remote Sone,
+ * The Sone to check for modifications
+ * @return {@code true} if a modification has been detected in the Sone,
* {@code false} otherwise
*/
- public boolean isRemoteSone(String id) {
- synchronized (remoteSones) {
- return remoteSones.containsKey(id);
- }
- }
-
- /**
- * Returns whether the Sone with the given ID is a new Sone.
- *
- * @param soneId
- * The ID of the sone to check for
- * @return {@code true} if the given Sone is new, false otherwise
- */
- public boolean isNewSone(String soneId) {
- synchronized (newSones) {
- return !knownSones.contains(soneId) && newSones.contains(soneId);
- }
+ public boolean isModifiedSone(Sone sone) {
+ return (soneInserters.containsKey(sone)) ? soneInserters.get(sone).isModified() : false;
}
/**
- * Returns whether the given Sone has been modified.
+ * Returns the time when the given was first followed by any local Sone.
*
* @param sone
- * The Sone to check for modifications
- * @return {@code true} if a modification has been detected in the Sone,
- * {@code false} otherwise
+ * The Sone to get the time for
+ * @return The time (in milliseconds since Jan 1, 1970) the Sone has first
+ * been followed, or {@link Long#MAX_VALUE}
*/
- public boolean isModifiedSone(Sone sone) {
- return (soneInserters.containsKey(sone)) ? soneInserters.get(sone).isModified() : false;
+ public long getSoneFollowingTime(Sone sone) {
+ synchronized (soneFollowingTimes) {
+ if (soneFollowingTimes.containsKey(sone)) {
+ return soneFollowingTimes.get(sone);
+ }
+ return Long.MAX_VALUE;
+ }
}
/**
@@ -596,7 +504,9 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* @return {@code true} if the target Sone is trusted by the origin Sone
*/
public boolean isSoneTrusted(Sone origin, Sone target) {
- Validation.begin().isNotNull("Origin", origin).isNotNull("Target", target).check().isInstanceOf("Originâs OwnIdentity", origin.getIdentity(), OwnIdentity.class).check();
+ checkNotNull(origin, "origin must not be null");
+ checkNotNull(target, "target must not be null");
+ checkArgument(origin.getIdentity() instanceof OwnIdentity, "originâs identity must be an OwnIdentity");
return trustedIdentities.containsKey(origin.getIdentity()) && trustedIdentities.get(origin.getIdentity()).contains(target.getIdentity());
}
@@ -626,7 +536,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
synchronized (posts) {
Post post = posts.get(postId);
if ((post == null) && create) {
- post = new Post(postId);
+ post = new PostImpl(postId);
posts.put(postId, post);
}
return post;
@@ -634,20 +544,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
}
/**
- * Returns whether the given post ID is new.
- *
- * @param postId
- * The post ID
- * @return {@code true} if the post is considered to be new, {@code false}
- * otherwise
- */
- public boolean isNewPost(String postId) {
- synchronized (newPosts) {
- return !knownPosts.contains(postId) && newPosts.contains(postId);
- }
- }
-
- /**
* Returns all posts that have the given Sone as recipient.
*
* @see Post#getRecipient()
@@ -656,7 +552,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* @return All posts that have the given Sone as recipient
*/
public Set getDirectedPosts(Sone recipient) {
- Validation.begin().isNotNull("Recipient", recipient).check();
+ checkNotNull(recipient, "recipient must not be null");
Set directedPosts = new HashSet();
synchronized (posts) {
for (Post post : posts.values()) {
@@ -670,18 +566,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
/**
* Returns the reply with the given ID. If there is no reply with the given
- * ID yet, a new one is created.
- *
- * @param replyId
- * The ID of the reply to get
- * @return The reply
- */
- public Reply getReply(String replyId) {
- return getReply(replyId, true);
- }
-
- /**
- * Returns the reply with the given ID. If there is no reply with the given
* ID yet, a new one is created, unless {@code create} is false in which
* case {@code null} is returned.
*
@@ -692,11 +576,11 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* to return {@code null} if no reply can be found
* @return The reply, or {@code null} if there is no such reply
*/
- public Reply getReply(String replyId, boolean create) {
+ public PostReply getPostReply(String replyId, boolean create) {
synchronized (replies) {
- Reply reply = replies.get(replyId);
+ PostReply reply = replies.get(replyId);
if (create && (reply == null)) {
- reply = new Reply(replyId);
+ reply = new PostReplyImpl(replyId);
replies.put(replyId, reply);
}
return reply;
@@ -710,11 +594,11 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The post to get all replies for
* @return All replies for the given post
*/
- public List getReplies(Post post) {
+ public List getReplies(Post post) {
Set sones = getSones();
- List replies = new ArrayList();
+ List replies = new ArrayList();
for (Sone sone : sones) {
- for (Reply reply : sone.getReplies()) {
+ for (PostReply reply : sone.getReplies()) {
if (reply.getPost().equals(post)) {
replies.add(reply);
}
@@ -725,20 +609,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
}
/**
- * Returns whether the reply with the given ID is new.
- *
- * @param replyId
- * The ID of the reply to check
- * @return {@code true} if the reply is considered to be new, {@code false}
- * otherwise
- */
- public boolean isNewReply(String replyId) {
- synchronized (newReplies) {
- return !knownReplies.contains(replyId) && newReplies.contains(replyId);
- }
- }
-
- /**
* Returns all Sones that have liked the given post.
*
* @param post
@@ -762,7 +632,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The reply to get the liking Sones for
* @return The Sones that like the given reply
*/
- public Set getLikes(Reply reply) {
+ public Set getLikes(PostReply reply) {
Set sones = new HashSet();
for (Sone sone : getSones()) {
if (sone.getLikedReplyIds().contains(reply.getId())) {
@@ -914,7 +784,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
public void lockSone(Sone sone) {
synchronized (lockedSones) {
if (lockedSones.add(sone)) {
- coreListenerManager.fireSoneLocked(sone);
+ eventBus.post(new SoneLockedEvent(sone));
}
}
}
@@ -929,31 +799,8 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
public void unlockSone(Sone sone) {
synchronized (lockedSones) {
if (lockedSones.remove(sone)) {
- coreListenerManager.fireSoneUnlocked(sone);
- }
- }
- }
-
- /**
- * Adds a local Sone from the given ID which has to be the ID of an own
- * identity.
- *
- * @param id
- * The ID of an own identity to add a Sone for
- * @return The added (or already existing) Sone
- */
- public Sone addLocalSone(String id) {
- synchronized (localSones) {
- if (localSones.containsKey(id)) {
- logger.log(Level.FINE, "Tried to add known local Sone: %s", id);
- return localSones.get(id);
+ eventBus.post(new SoneUnlockedEvent(sone));
}
- OwnIdentity ownIdentity = identityManager.getOwnIdentity(id);
- if (ownIdentity == null) {
- logger.log(Level.INFO, "Invalid Sone ID: %s", id);
- return null;
- }
- return addLocalSone(ownIdentity);
}
}
@@ -969,22 +816,22 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
logger.log(Level.WARNING, "Given OwnIdentity is null!");
return null;
}
- synchronized (localSones) {
+ synchronized (sones) {
final Sone sone;
try {
- sone = getLocalSone(ownIdentity.getId()).setIdentity(ownIdentity).setInsertUri(new FreenetURI(ownIdentity.getInsertUri())).setRequestUri(new FreenetURI(ownIdentity.getRequestUri()));
+ sone = getLocalSone(ownIdentity.getId(), true).setIdentity(ownIdentity).setInsertUri(new FreenetURI(ownIdentity.getInsertUri())).setRequestUri(new FreenetURI(ownIdentity.getRequestUri()));
} catch (MalformedURLException mue1) {
- logger.log(Level.SEVERE, "Could not convert the Identityâs URIs to Freenet URIs: " + ownIdentity.getInsertUri() + ", " + ownIdentity.getRequestUri(), mue1);
+ logger.log(Level.SEVERE, String.format("Could not convert the Identityâs URIs to Freenet URIs: %s, %s", ownIdentity.getInsertUri(), ownIdentity.getRequestUri()), mue1);
return null;
}
- sone.setLatestEdition(Numbers.safeParseLong(ownIdentity.getProperty("Sone.LatestEdition"), (long) 0));
+ sone.setLatestEdition(Optional.fromNullable(Longs.tryParse(ownIdentity.getProperty("Sone.LatestEdition"))).or(0L));
sone.setClient(new Client("Sone", SonePlugin.VERSION.toString()));
+ sone.setKnown(true);
/* TODO - load posts ân stuff */
- localSones.put(ownIdentity.getId(), sone);
- final SoneInserter soneInserter = new SoneInserter(this, freenetInterface, sone);
- soneInserter.addSoneInsertListener(this);
+ sones.put(ownIdentity.getId(), sone);
+ final SoneInserter soneInserter = new SoneInserter(this, eventBus, freenetInterface, sone);
soneInserters.put(sone, soneInserter);
- setSoneStatus(sone, SoneStatus.idle);
+ sone.setStatus(SoneStatus.idle);
loadSone(sone);
soneInserter.start();
return sone;
@@ -999,15 +846,19 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* @return The created Sone
*/
public Sone createSone(OwnIdentity ownIdentity) {
- try {
- ownIdentity.addContext("Sone");
- } catch (WebOfTrustException wote1) {
- logger.log(Level.SEVERE, "Could not add âSoneâ context to own identity: " + ownIdentity, wote1);
+ if (!webOfTrustUpdater.addContextWait(ownIdentity, "Sone")) {
+ logger.log(Level.SEVERE, String.format("Could not add âSoneâ context to own identity: %s", ownIdentity));
return null;
}
Sone sone = addLocalSone(ownIdentity);
sone.getOptions().addBooleanOption("AutoFollow", new DefaultOption(false));
- sone.addFriend("nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI");
+ sone.getOptions().addBooleanOption("EnableSoneInsertNotifications", new DefaultOption(false));
+ sone.getOptions().addBooleanOption("ShowNotification/NewSones", new DefaultOption(true));
+ sone.getOptions().addBooleanOption("ShowNotification/NewPosts", new DefaultOption(true));
+ sone.getOptions().addBooleanOption("ShowNotification/NewReplies", new DefaultOption(true));
+ sone.getOptions().addEnumOption("ShowCustomAvatars", new DefaultOption(ShowCustomAvatars.NEVER));
+
+ followSone(sone, getSone("nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI"));
touchConfiguration();
return sone;
}
@@ -1024,31 +875,26 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
logger.log(Level.WARNING, "Given Identity is null!");
return null;
}
- synchronized (remoteSones) {
- final Sone sone = getRemoteSone(identity.getId()).setIdentity(identity);
+ synchronized (sones) {
+ final Sone sone = getRemoteSone(identity.getId(), true).setIdentity(identity);
boolean newSone = sone.getRequestUri() == null;
sone.setRequestUri(getSoneUri(identity.getRequestUri()));
- sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0));
+ sone.setLatestEdition(Optional.fromNullable(Longs.tryParse(identity.getProperty("Sone.LatestEdition"))).or(0L));
if (newSone) {
- synchronized (newSones) {
+ synchronized (knownSones) {
newSone = !knownSones.contains(sone.getId());
- if (newSone) {
- newSones.add(sone.getId());
- }
}
+ sone.setKnown(!newSone);
if (newSone) {
- coreListenerManager.fireNewSoneFound(sone);
+ eventBus.post(new NewSoneFoundEvent(sone));
for (Sone localSone : getLocalSones()) {
if (localSone.getOptions().getBooleanOption("AutoFollow").get()) {
- localSone.addFriend(sone.getId());
- touchConfiguration();
+ followSone(localSone, sone);
}
}
}
}
- remoteSones.put(identity.getId(), sone);
soneDownloader.addSone(sone);
- setSoneStatus(sone, SoneStatus.unknown);
soneDownloaders.execute(new Runnable() {
@Override
@@ -1063,22 +909,96 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
}
/**
- * Retrieves the trust relationship from the origin to the target. If the
- * trust relationship can not be retrieved, {@code null} is returned.
+ * Lets the given local Sone follow the Sone with the given ID.
*
- * @see Identity#getTrust(OwnIdentity)
- * @param origin
- * The origin of the trust tree
- * @param target
- * The target of the trust
- * @return The trust relationship
+ * @param sone
+ * The local Sone that should follow another Sone
+ * @param soneId
+ * The ID of the Sone to follow
+ */
+ public void followSone(Sone sone, String soneId) {
+ checkNotNull(sone, "sone must not be null");
+ checkNotNull(soneId, "soneId must not be null");
+ Sone followedSone = getSone(soneId, true);
+ if (followedSone == null) {
+ logger.log(Level.INFO, String.format("Ignored Sone with invalid ID: %s", soneId));
+ return;
+ }
+ followSone(sone, getSone(soneId));
+ }
+
+ /**
+ * Lets the given local Sone follow the other given Sone. If the given Sone
+ * was not followed by any local Sone before, this will mark all elements of
+ * the followed Sone as read that have been created before the current
+ * moment.
+ *
+ * @param sone
+ * The local Sone that should follow the other Sone
+ * @param followedSone
+ * The Sone that should be followed
+ */
+ public void followSone(Sone sone, Sone followedSone) {
+ checkNotNull(sone, "sone must not be null");
+ checkNotNull(followedSone, "followedSone must not be null");
+ sone.addFriend(followedSone.getId());
+ synchronized (soneFollowingTimes) {
+ if (!soneFollowingTimes.containsKey(followedSone)) {
+ long now = System.currentTimeMillis();
+ soneFollowingTimes.put(followedSone, now);
+ for (Post post : followedSone.getPosts()) {
+ if (post.getTime() < now) {
+ markPostKnown(post);
+ }
+ }
+ for (PostReply reply : followedSone.getReplies()) {
+ if (reply.getTime() < now) {
+ markReplyKnown(reply);
+ }
+ }
+ }
+ }
+ touchConfiguration();
+ }
+
+ /**
+ * Lets the given local Sone unfollow the Sone with the given ID.
+ *
+ * @param sone
+ * The local Sone that should unfollow another Sone
+ * @param soneId
+ * The ID of the Sone being unfollowed
*/
- public Trust getTrust(Sone origin, Sone target) {
- if (!isLocalSone(origin)) {
- logger.log(Level.WARNING, "Tried to get trust from remote Sone: %s", origin);
- return null;
+ public void unfollowSone(Sone sone, String soneId) {
+ checkNotNull(sone, "sone must not be null");
+ checkNotNull(soneId, "soneId must not be null");
+ unfollowSone(sone, getSone(soneId, false));
+ }
+
+ /**
+ * Lets the given local Sone unfollow the other given Sone. If the given
+ * local Sone is the last local Sone that followed the given Sone, its
+ * following time will be removed.
+ *
+ * @param sone
+ * The local Sone that should unfollow another Sone
+ * @param unfollowedSone
+ * The Sone being unfollowed
+ */
+ public void unfollowSone(Sone sone, Sone unfollowedSone) {
+ checkNotNull(sone, "sone must not be null");
+ checkNotNull(unfollowedSone, "unfollowedSone must not be null");
+ sone.removeFriend(unfollowedSone.getId());
+ boolean unfollowedSoneStillFollowed = false;
+ for (Sone localSone : getLocalSones()) {
+ unfollowedSoneStillFollowed |= localSone.hasFriend(unfollowedSone.getId());
+ }
+ if (!unfollowedSoneStillFollowed) {
+ synchronized (soneFollowingTimes) {
+ soneFollowingTimes.remove(unfollowedSone);
+ }
}
- return target.getIdentity().getTrust((OwnIdentity) origin.getIdentity());
+ touchConfiguration();
}
/**
@@ -1092,12 +1012,11 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The trust value (from {@code -100} to {@code 100})
*/
public void setTrust(Sone origin, Sone target, int trustValue) {
- Validation.begin().isNotNull("Trust Origin", origin).check().isInstanceOf("Trust Origin", origin.getIdentity(), OwnIdentity.class).isNotNull("Trust Target", target).isLessOrEqual("Trust Value", trustValue, 100).isGreaterOrEqual("Trust Value", trustValue, -100).check();
- try {
- ((OwnIdentity) origin.getIdentity()).setTrust(target.getIdentity(), trustValue, preferences.getTrustComment());
- } catch (WebOfTrustException wote1) {
- logger.log(Level.WARNING, "Could not set trust for Sone: " + target, wote1);
- }
+ checkNotNull(origin, "origin must not be null");
+ checkArgument(origin.getIdentity() instanceof OwnIdentity, "origin must be a local Sone");
+ checkNotNull(target, "target must not be null");
+ checkArgument((trustValue >= -100) && (trustValue <= 100), "trustValue must be within [-100, 100]");
+ webOfTrustUpdater.setTrust((OwnIdentity) origin.getIdentity(), target.getIdentity(), trustValue, preferences.getTrustComment());
}
/**
@@ -1109,12 +1028,10 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The trust target
*/
public void removeTrust(Sone origin, Sone target) {
- Validation.begin().isNotNull("Trust Origin", origin).isNotNull("Trust Target", target).check().isInstanceOf("Trust Origin Identity", origin.getIdentity(), OwnIdentity.class).check();
- try {
- ((OwnIdentity) origin.getIdentity()).removeTrust(target.getIdentity());
- } catch (WebOfTrustException wote1) {
- logger.log(Level.WARNING, "Could not remove trust for Sone: " + target, wote1);
- }
+ checkNotNull(origin, "origin must not be null");
+ checkNotNull(target, "target must not be null");
+ checkArgument(origin.getIdentity() instanceof OwnIdentity, "origin must be a local Sone");
+ webOfTrustUpdater.setTrust((OwnIdentity) origin.getIdentity(), target.getIdentity(), null, null);
}
/**
@@ -1178,7 +1095,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
if (hasSone(sone.getId())) {
Sone storedSone = getSone(sone.getId());
if (!soneRescueMode && !(sone.getTime() > storedSone.getTime())) {
- logger.log(Level.FINE, "Downloaded Sone %s is not newer than stored Sone %s.", new Object[] { sone, storedSone });
+ logger.log(Level.FINE, String.format("Downloaded Sone %s is not newer than stored Sone %s.", sone, storedSone));
return;
}
synchronized (posts) {
@@ -1186,17 +1103,21 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
for (Post post : storedSone.getPosts()) {
posts.remove(post.getId());
if (!sone.getPosts().contains(post)) {
- coreListenerManager.firePostRemoved(post);
+ eventBus.post(new PostRemovedEvent(post));
}
}
}
List storedPosts = storedSone.getPosts();
- synchronized (newPosts) {
+ synchronized (knownPosts) {
for (Post post : sone.getPosts()) {
- post.setSone(storedSone);
- if (!storedPosts.contains(post) && !knownPosts.contains(post.getId())) {
- newPosts.add(post.getId());
- coreListenerManager.fireNewPostFound(post);
+ post.setSone(storedSone).setKnown(knownPosts.contains(post.getId()));
+ if (!storedPosts.contains(post)) {
+ if (post.getTime() < getSoneFollowingTime(sone)) {
+ knownPosts.add(post.getId());
+ post.setKnown(true);
+ } else if (!knownPosts.contains(post.getId())) {
+ eventBus.post(new NewPostFoundEvent(post));
+ }
}
posts.put(post.getId(), post);
}
@@ -1204,20 +1125,24 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
}
synchronized (replies) {
if (!soneRescueMode) {
- for (Reply reply : storedSone.getReplies()) {
+ for (PostReply reply : storedSone.getReplies()) {
replies.remove(reply.getId());
if (!sone.getReplies().contains(reply)) {
- coreListenerManager.fireReplyRemoved(reply);
+ eventBus.post(new PostReplyRemovedEvent(reply));
}
}
}
- Set storedReplies = storedSone.getReplies();
- synchronized (newReplies) {
- for (Reply reply : sone.getReplies()) {
- reply.setSone(storedSone);
- if (!storedReplies.contains(reply) && !knownReplies.contains(reply.getId())) {
- newReplies.add(reply.getId());
- coreListenerManager.fireNewReplyFound(reply);
+ Set storedReplies = storedSone.getReplies();
+ synchronized (knownReplies) {
+ for (PostReply reply : sone.getReplies()) {
+ reply.setSone(storedSone).setKnown(knownReplies.contains(reply.getId()));
+ if (!storedReplies.contains(reply)) {
+ if (reply.getTime() < getSoneFollowingTime(sone)) {
+ knownReplies.add(reply.getId());
+ reply.setKnown(true);
+ } else if (!knownReplies.contains(reply.getId())) {
+ eventBus.post(new NewPostReplyFoundEvent(reply));
+ }
}
replies.put(reply.getId(), reply);
}
@@ -1249,7 +1174,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
for (Post post : sone.getPosts()) {
storedSone.addPost(post);
}
- for (Reply reply : sone.getReplies()) {
+ for (PostReply reply : sone.getReplies()) {
storedSone.addReply(reply);
}
for (String likedPostId : sone.getLikedPostIds()) {
@@ -1275,33 +1200,28 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
/**
* Deletes the given Sone. This will remove the Sone from the
- * {@link #getLocalSone(String) local Sones}, stops its {@link SoneInserter}
- * and remove the context from its identity.
+ * {@link #getLocalSones() local Sones}, stop its {@link SoneInserter} and
+ * remove the context from its identity.
*
* @param sone
* The Sone to delete
*/
public void deleteSone(Sone sone) {
if (!(sone.getIdentity() instanceof OwnIdentity)) {
- logger.log(Level.WARNING, "Tried to delete Sone of non-own identity: %s", sone);
+ logger.log(Level.WARNING, String.format("Tried to delete Sone of non-own identity: %s", sone));
return;
}
- synchronized (localSones) {
- if (!localSones.containsKey(sone.getId())) {
- logger.log(Level.WARNING, "Tried to delete non-local Sone: %s", sone);
+ synchronized (sones) {
+ if (!getLocalSones().contains(sone)) {
+ logger.log(Level.WARNING, String.format("Tried to delete non-local Sone: %s", sone));
return;
}
- localSones.remove(sone.getId());
+ sones.remove(sone.getId());
SoneInserter soneInserter = soneInserters.remove(sone);
- soneInserter.removeSoneInsertListener(this);
soneInserter.stop();
}
- try {
- ((OwnIdentity) sone.getIdentity()).removeContext("Sone");
- ((OwnIdentity) sone.getIdentity()).removeProperty("Sone.LatestEdition");
- } catch (WebOfTrustException wote1) {
- logger.log(Level.WARNING, "Could not remove context and properties from Sone: " + sone, wote1);
- }
+ webOfTrustUpdater.removeContext((OwnIdentity) sone.getIdentity(), "Sone");
+ webOfTrustUpdater.removeProperty((OwnIdentity) sone.getIdentity(), "Sone.LatestEdition");
try {
configuration.getLongValue("Sone/" + sone.getId() + "/Time").setValue(null);
} catch (ConfigurationException ce1) {
@@ -1310,19 +1230,20 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
}
/**
- * 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 MarkSoneKnownEvent} is fired.
*
* @param sone
* The Sone to mark as known
*/
public void markSoneKnown(Sone sone) {
- synchronized (newSones) {
- if (newSones.remove(sone.getId())) {
+ if (!sone.isKnown()) {
+ sone.setKnown(true);
+ synchronized (knownSones) {
knownSones.add(sone.getId());
- coreListenerManager.fireMarkSoneKnown(sone);
- touchConfiguration();
}
+ eventBus.post(new MarkSoneKnownEvent(sone));
+ touchConfiguration();
}
}
@@ -1334,14 +1255,18 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The Sone to load and update
*/
public void loadSone(Sone sone) {
- if (!isLocalSone(sone)) {
- logger.log(Level.FINE, "Tried to load non-local Sone: %s", sone);
+ if (!sone.isLocal()) {
+ logger.log(Level.FINE, String.format("Tried to load non-local Sone: %s", sone));
return;
}
/* initialize options. */
sone.getOptions().addBooleanOption("AutoFollow", new DefaultOption(false));
sone.getOptions().addBooleanOption("EnableSoneInsertNotifications", new DefaultOption(false));
+ sone.getOptions().addBooleanOption("ShowNotification/NewSones", new DefaultOption(true));
+ sone.getOptions().addBooleanOption("ShowNotification/NewPosts", new DefaultOption(true));
+ sone.getOptions().addBooleanOption("ShowNotification/NewReplies", new DefaultOption(true));
+ sone.getOptions().addEnumOption("ShowCustomAvatars", new DefaultOption(ShowCustomAvatars.NEVER));
/* load Sone. */
String sonePrefix = "Sone/" + sone.getId();
@@ -1353,7 +1278,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
String lastInsertFingerprint = configuration.getStringValue(sonePrefix + "/LastInsertFingerprint").getValue("");
/* load profile. */
- Profile profile = new Profile();
+ Profile profile = new Profile(sone);
profile.setFirstName(configuration.getStringValue(sonePrefix + "/Profile/FirstName").getValue(null));
profile.setMiddleName(configuration.getStringValue(sonePrefix + "/Profile/MiddleName").getValue(null));
profile.setLastName(configuration.getStringValue(sonePrefix + "/Profile/LastName").getValue(null));
@@ -1395,7 +1320,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
}
/* load replies. */
- Set replies = new HashSet();
+ Set replies = new HashSet();
while (true) {
String replyPrefix = sonePrefix + "/Replies/" + replies.size();
String replyId = configuration.getStringValue(replyPrefix + "/ID").getValue(null);
@@ -1409,7 +1334,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
logger.log(Level.WARNING, "Invalid reply found, aborting load!");
return;
}
- replies.add(getReply(replyId).setSone(sone).setPost(getPost(postId)).setTime(replyTime).setText(replyText));
+ replies.add(getPostReply(replyId, true).setSone(sone).setPost(getPost(postId)).setTime(replyTime).setText(replyText));
}
/* load post likes. */
@@ -1463,12 +1388,14 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
if (albumParentId != null) {
Album parentAlbum = getAlbum(albumParentId, false);
if (parentAlbum == null) {
- logger.log(Level.WARNING, "Invalid parent album ID: " + albumParentId);
+ logger.log(Level.WARNING, String.format("Invalid parent album ID: %s", albumParentId));
return;
}
parentAlbum.addAlbum(album);
} else {
- topLevelAlbums.add(album);
+ if (!topLevelAlbums.contains(album)) {
+ topLevelAlbums.add(album);
+ }
}
}
@@ -1501,9 +1428,19 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
album.addImage(image);
}
+ /* load avatar. */
+ String avatarId = configuration.getStringValue(sonePrefix + "/Profile/Avatar").getValue(null);
+ if (avatarId != null) {
+ profile.setAvatar(getImage(avatarId, false));
+ }
+
/* load options. */
sone.getOptions().getBooleanOption("AutoFollow").set(configuration.getBooleanValue(sonePrefix + "/Options/AutoFollow").getValue(null));
sone.getOptions().getBooleanOption("EnableSoneInsertNotifications").set(configuration.getBooleanValue(sonePrefix + "/Options/EnableSoneInsertNotifications").getValue(null));
+ sone.getOptions().getBooleanOption("ShowNotification/NewSones").set(configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewSones").getValue(null));
+ sone.getOptions().getBooleanOption("ShowNotification/NewPosts").set(configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewPosts").getValue(null));
+ sone.getOptions().getBooleanOption("ShowNotification/NewReplies").set(configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewReplies").getValue(null));
+ sone.getOptions(). getEnumOption("ShowCustomAvatars").set(ShowCustomAvatars.valueOf(configuration.getStringValue(sonePrefix + "/Options/ShowCustomAvatars").getValue(ShowCustomAvatars.NEVER.name())));
/* if weâre still here, Sone was loaded successfully. */
synchronized (sone) {
@@ -1513,22 +1450,24 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
sone.setReplies(replies);
sone.setLikePostIds(likedPostIds);
sone.setLikeReplyIds(likedReplyIds);
- sone.setFriends(friends);
+ for (String friendId : friends) {
+ followSone(sone, friendId);
+ }
sone.setAlbums(topLevelAlbums);
soneInserters.get(sone).setLastInsertFingerprint(lastInsertFingerprint);
}
- synchronized (newSones) {
+ synchronized (knownSones) {
for (String friend : friends) {
knownSones.add(friend);
}
}
- synchronized (newPosts) {
+ synchronized (knownPosts) {
for (Post post : posts) {
knownPosts.add(post.getId());
}
}
- synchronized (newReplies) {
- for (Reply reply : replies) {
+ synchronized (knownReplies) {
+ for (PostReply reply : replies) {
knownReplies.add(reply.getId());
}
}
@@ -1593,21 +1532,20 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* @return The created post
*/
public Post createPost(Sone sone, Sone recipient, long time, String text) {
- if (!isLocalSone(sone)) {
- logger.log(Level.FINE, "Tried to create post for non-local Sone: %s", sone);
+ checkNotNull(text, "text must not be null");
+ checkArgument(text.trim().length() > 0, "text must not be empty");
+ if (!sone.isLocal()) {
+ logger.log(Level.FINE, String.format("Tried to create post for non-local Sone: %s", sone));
return null;
}
- final Post post = new Post(sone, time, text);
+ final Post post = new PostImpl(sone, time, text.trim());
if (recipient != null) {
post.setRecipient(recipient);
}
synchronized (posts) {
posts.put(post.getId(), post);
}
- synchronized (newPosts) {
- newPosts.add(post.getId());
- coreListenerManager.fireNewPostFound(post);
- }
+ eventBus.post(new NewPostFoundEvent(post));
sone.addPost(post);
touchConfiguration();
localElementTicker.registerEvent(System.currentTimeMillis() + 10 * 1000, new Runnable() {
@@ -1630,37 +1568,37 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The post to delete
*/
public void deletePost(Post post) {
- if (!isLocalSone(post.getSone())) {
- logger.log(Level.WARNING, "Tried to delete post of non-local Sone: %s", post.getSone());
+ if (!post.getSone().isLocal()) {
+ logger.log(Level.WARNING, String.format("Tried to delete post of non-local Sone: %s", post.getSone()));
return;
}
post.getSone().removePost(post);
synchronized (posts) {
posts.remove(post.getId());
}
- coreListenerManager.firePostRemoved(post);
- synchronized (newPosts) {
- markPostKnown(post);
- knownPosts.remove(post.getId());
- }
+ eventBus.post(new PostRemovedEvent(post));
+ markPostKnown(post);
touchConfiguration();
}
/**
- * 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) {
- synchronized (newPosts) {
- if (newPosts.remove(post.getId())) {
- knownPosts.add(post.getId());
- coreListenerManager.fireMarkPostKnown(post);
+ post.setKnown(true);
+ synchronized (knownPosts) {
+ eventBus.post(new MarkPostKnownEvent(post));
+ if (knownPosts.add(post.getId())) {
touchConfiguration();
}
}
+ for (PostReply reply : getReplies(post)) {
+ markReplyKnown(reply);
+ }
}
/**
@@ -1718,7 +1656,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The text of the reply
* @return The created reply
*/
- public Reply createReply(Sone sone, Post post, String text) {
+ public PostReply createReply(Sone sone, Post post, String text) {
return createReply(sone, post, System.currentTimeMillis(), text);
}
@@ -1735,18 +1673,19 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The text of the reply
* @return The created reply
*/
- public Reply createReply(Sone sone, Post post, long time, String text) {
- if (!isLocalSone(sone)) {
- logger.log(Level.FINE, "Tried to create reply for non-local Sone: %s", sone);
+ public PostReply createReply(Sone sone, Post post, long time, String text) {
+ checkNotNull(text, "text must not be null");
+ checkArgument(text.trim().length() > 0, "text must not be empty");
+ if (!sone.isLocal()) {
+ logger.log(Level.FINE, String.format("Tried to create reply for non-local Sone: %s", sone));
return null;
}
- final Reply reply = new Reply(sone, post, System.currentTimeMillis(), text);
+ final PostReply reply = new PostReplyImpl(sone, post, System.currentTimeMillis(), text.trim());
synchronized (replies) {
replies.put(reply.getId(), reply);
}
- synchronized (newReplies) {
- newReplies.add(reply.getId());
- coreListenerManager.fireNewReplyFound(reply);
+ synchronized (knownReplies) {
+ eventBus.post(new NewPostReplyFoundEvent(reply));
}
sone.addReply(reply);
touchConfiguration();
@@ -1769,16 +1708,16 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* @param reply
* The reply to delete
*/
- public void deleteReply(Reply reply) {
+ public void deleteReply(PostReply reply) {
Sone sone = reply.getSone();
- if (!isLocalSone(sone)) {
- logger.log(Level.FINE, "Tried to delete non-local reply: %s", reply);
+ if (!sone.isLocal()) {
+ logger.log(Level.FINE, String.format("Tried to delete non-local reply: %s", reply));
return;
}
synchronized (replies) {
replies.remove(reply.getId());
}
- synchronized (newReplies) {
+ synchronized (knownReplies) {
markReplyKnown(reply);
knownReplies.remove(reply.getId());
}
@@ -1787,17 +1726,17 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
}
/**
- * 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(Reply reply) {
- synchronized (newReplies) {
- if (newReplies.remove(reply.getId())) {
- knownReplies.add(reply.getId());
- coreListenerManager.fireMarkReplyKnown(reply);
+ public void markReplyKnown(PostReply reply) {
+ reply.setKnown(true);
+ synchronized (knownReplies) {
+ eventBus.post(new MarkPostReplyKnownEvent(reply));
+ if (knownReplies.add(reply.getId())) {
touchConfiguration();
}
}
@@ -1846,7 +1785,8 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The album to remove
*/
public void deleteAlbum(Album album) {
- Validation.begin().isNotNull("Album", album).check().is("Local Sone", isLocalSone(album.getSone())).check();
+ checkNotNull(album, "album must not be null");
+ checkArgument(album.getSone().isLocal(), "albumâs Sone must be a local Sone");
if (!album.isEmpty()) {
return;
}
@@ -1858,7 +1798,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
synchronized (albums) {
albums.remove(album.getId());
}
- saveSone(album.getSone());
+ touchConfiguration();
}
/**
@@ -1873,7 +1813,11 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* @return The newly created image
*/
public Image createImage(Sone sone, Album album, TemporaryImage temporaryImage) {
- Validation.begin().isNotNull("Sone", sone).isNotNull("Album", album).isNotNull("Temporary Image", temporaryImage).check().is("Local Sone", isLocalSone(sone)).check().isEqual("Owner and Album Owner", sone, album.getSone()).check();
+ checkNotNull(sone, "sone must not be null");
+ checkNotNull(album, "album must not be null");
+ checkNotNull(temporaryImage, "temporaryImage must not be null");
+ checkArgument(sone.isLocal(), "sone must be a local Sone");
+ checkArgument(sone.equals(album.getSone()), "album must belong to the given Sone");
Image image = new Image(temporaryImage.getId()).setSone(sone).setCreationTime(System.currentTimeMillis());
album.addImage(image);
synchronized (images) {
@@ -1892,13 +1836,14 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The image to delete
*/
public void deleteImage(Image image) {
- Validation.begin().isNotNull("Image", image).check().is("Local Sone", isLocalSone(image.getSone())).check();
+ checkNotNull(image, "image must not be null");
+ checkArgument(image.getSone().isLocal(), "image must belong to a local Sone");
deleteTemporaryImage(image.getId());
image.getAlbum().removeImage(image);
synchronized (images) {
images.remove(image.getId());
}
- saveSone(image.getSone());
+ touchConfiguration();
}
/**
@@ -1926,7 +1871,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The temporary image to delete
*/
public void deleteTemporaryImage(TemporaryImage temporaryImage) {
- Validation.begin().isNotNull("Temporary Image", temporaryImage).check();
+ checkNotNull(temporaryImage, "temporaryImage must not be null");
deleteTemporaryImage(temporaryImage.getId());
}
@@ -1937,7 +1882,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The ID of the temporary image to delete
*/
public void deleteTemporaryImage(String imageId) {
- Validation.begin().isNotNull("Temporary Image ID", imageId).check();
+ checkNotNull(imageId, "imageId must not be null");
synchronized (temporaryImages) {
temporaryImages.remove(imageId);
}
@@ -1966,8 +1911,10 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
@Override
public void serviceStart() {
loadConfiguration();
- updateChecker.addUpdateListener(this);
updateChecker.start();
+ identityManager.start();
+ webOfTrustUpdater.init();
+ webOfTrustUpdater.start();
}
/**
@@ -1994,15 +1941,17 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
@Override
public void serviceStop() {
- synchronized (localSones) {
- for (SoneInserter soneInserter : soneInserters.values()) {
- soneInserter.removeSoneInsertListener(this);
- soneInserter.stop();
+ synchronized (sones) {
+ for (Entry soneInserter : soneInserters.entrySet()) {
+ soneInserter.getValue().stop();
+ saveSone(soneInserter.getKey());
}
}
+ saveConfiguration();
+ webOfTrustUpdater.stop();
updateChecker.stop();
- updateChecker.removeUpdateListener(this);
soneDownloader.stop();
+ identityManager.stop();
}
//
@@ -2017,19 +1966,17 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The Sone to save
*/
private synchronized void saveSone(Sone sone) {
- if (!isLocalSone(sone)) {
- logger.log(Level.FINE, "Tried to save non-local Sone: %s", sone);
+ if (!sone.isLocal()) {
+ logger.log(Level.FINE, String.format("Tried to save non-local Sone: %s", sone));
return;
}
if (!(sone.getIdentity() instanceof OwnIdentity)) {
- logger.log(Level.WARNING, "Local Sone without OwnIdentity found, refusing to save: %s", sone);
+ logger.log(Level.WARNING, String.format("Local Sone without OwnIdentity found, refusing to save: %s", sone));
return;
}
- logger.log(Level.INFO, "Saving Sone: %s", sone);
+ logger.log(Level.INFO, String.format("Saving Sone: %s", sone));
try {
- ((OwnIdentity) sone.getIdentity()).setProperty("Sone.LatestEdition", String.valueOf(sone.getLatestEdition()));
-
/* save Sone into configuration. */
String sonePrefix = "Sone/" + sone.getId();
configuration.getLongValue(sonePrefix + "/Time").setValue(sone.getTime());
@@ -2043,6 +1990,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
configuration.getIntValue(sonePrefix + "/Profile/BirthDay").setValue(profile.getBirthDay());
configuration.getIntValue(sonePrefix + "/Profile/BirthMonth").setValue(profile.getBirthMonth());
configuration.getIntValue(sonePrefix + "/Profile/BirthYear").setValue(profile.getBirthYear());
+ configuration.getStringValue(sonePrefix + "/Profile/Avatar").setValue(profile.getAvatar());
/* save profile fields. */
int fieldCounter = 0;
@@ -2066,7 +2014,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
/* save replies. */
int replyCounter = 0;
- for (Reply reply : sone.getReplies()) {
+ for (PostReply reply : sone.getReplies()) {
String replyPrefix = sonePrefix + "/Replies/" + replyCounter++;
configuration.getStringValue(replyPrefix + "/ID").setValue(reply.getId());
configuration.getStringValue(replyPrefix + "/Post/ID").setValue(reply.getPost().getId());
@@ -2097,7 +2045,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(null);
/* save albums. first, collect in a flat structure, top-level first. */
- List albums = Sone.flattenAlbums(sone.getAlbums());
+ List albums = sone.getAllAlbums();
int albumCounter = 0;
for (Album album : albums) {
@@ -2132,14 +2080,19 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
/* save options. */
configuration.getBooleanValue(sonePrefix + "/Options/AutoFollow").setValue(sone.getOptions().getBooleanOption("AutoFollow").getReal());
+ configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewSones").setValue(sone.getOptions().getBooleanOption("ShowNotification/NewSones").getReal());
+ configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewPosts").setValue(sone.getOptions().getBooleanOption("ShowNotification/NewPosts").getReal());
+ configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewReplies").setValue(sone.getOptions().getBooleanOption("ShowNotification/NewReplies").getReal());
configuration.getBooleanValue(sonePrefix + "/Options/EnableSoneInsertNotifications").setValue(sone.getOptions().getBooleanOption("EnableSoneInsertNotifications").getReal());
+ configuration.getStringValue(sonePrefix + "/Options/ShowCustomAvatars").setValue(sone.getOptions(). getEnumOption("ShowCustomAvatars").get().name());
configuration.save();
- logger.log(Level.INFO, "Sone %s saved.", sone);
+
+ webOfTrustUpdater.setProperty((OwnIdentity) sone.getIdentity(), "Sone.LatestEdition", String.valueOf(sone.getLatestEdition()));
+
+ logger.log(Level.INFO, String.format("Sone %s saved.", sone));
} catch (ConfigurationException ce1) {
- logger.log(Level.WARNING, "Could not save Sone: " + sone, ce1);
- } catch (WebOfTrustException wote1) {
- logger.log(Level.WARNING, "Could not set WoT property for Sone: " + sone, wote1);
+ logger.log(Level.WARNING, String.format("Could not save Sone: %s", sone), ce1);
}
}
@@ -2160,29 +2113,39 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
configuration.getIntValue("Option/ConfigurationVersion").setValue(0);
configuration.getIntValue("Option/InsertionDelay").setValue(options.getIntegerOption("InsertionDelay").getReal());
configuration.getIntValue("Option/PostsPerPage").setValue(options.getIntegerOption("PostsPerPage").getReal());
+ configuration.getIntValue("Option/ImagesPerPage").setValue(options.getIntegerOption("ImagesPerPage").getReal());
configuration.getIntValue("Option/CharactersPerPost").setValue(options.getIntegerOption("CharactersPerPost").getReal());
+ configuration.getIntValue("Option/PostCutOffLength").setValue(options.getIntegerOption("PostCutOffLength").getReal());
configuration.getBooleanValue("Option/RequireFullAccess").setValue(options.getBooleanOption("RequireFullAccess").getReal());
configuration.getIntValue("Option/PositiveTrust").setValue(options.getIntegerOption("PositiveTrust").getReal());
configuration.getIntValue("Option/NegativeTrust").setValue(options.getIntegerOption("NegativeTrust").getReal());
configuration.getStringValue("Option/TrustComment").setValue(options.getStringOption("TrustComment").getReal());
configuration.getBooleanValue("Option/ActivateFcpInterface").setValue(options.getBooleanOption("ActivateFcpInterface").getReal());
configuration.getIntValue("Option/FcpFullAccessRequired").setValue(options.getIntegerOption("FcpFullAccessRequired").getReal());
- configuration.getBooleanValue("Option/SoneRescueMode").setValue(options.getBooleanOption("SoneRescueMode").getReal());
- configuration.getBooleanValue("Option/ClearOnNextRestart").setValue(options.getBooleanOption("ClearOnNextRestart").getReal());
- configuration.getBooleanValue("Option/ReallyClearOnNextRestart").setValue(options.getBooleanOption("ReallyClearOnNextRestart").getReal());
/* save known Sones. */
int soneCounter = 0;
- synchronized (newSones) {
+ synchronized (knownSones) {
for (String knownSoneId : knownSones) {
configuration.getStringValue("KnownSone/" + soneCounter++ + "/ID").setValue(knownSoneId);
}
configuration.getStringValue("KnownSone/" + soneCounter + "/ID").setValue(null);
}
+ /* save Sone following times. */
+ soneCounter = 0;
+ synchronized (soneFollowingTimes) {
+ for (Entry soneFollowingTime : soneFollowingTimes.entrySet()) {
+ configuration.getStringValue("SoneFollowingTimes/" + soneCounter + "/Sone").setValue(soneFollowingTime.getKey().getId());
+ configuration.getLongValue("SoneFollowingTimes/" + soneCounter + "/Time").setValue(soneFollowingTime.getValue());
+ ++soneCounter;
+ }
+ configuration.getStringValue("SoneFollowingTimes/" + soneCounter + "/Sone").setValue(null);
+ }
+
/* save known posts. */
int postCounter = 0;
- synchronized (newPosts) {
+ synchronized (knownPosts) {
for (String knownPostId : knownPosts) {
configuration.getStringValue("KnownPosts/" + postCounter++ + "/ID").setValue(knownPostId);
}
@@ -2191,7 +2154,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
/* save known replies. */
int replyCounter = 0;
- synchronized (newReplies) {
+ synchronized (knownReplies) {
for (String knownReplyId : knownReplies) {
configuration.getStringValue("KnownReplies/" + replyCounter++ + "/ID").setValue(knownReplyId);
}
@@ -2225,7 +2188,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
@SuppressWarnings("unchecked")
private void loadConfiguration() {
/* create options. */
- options.addIntegerOption("InsertionDelay", new DefaultOption(60, new IntegerRangeValidator(0, Integer.MAX_VALUE), new OptionWatcher() {
+ options.addIntegerOption("InsertionDelay", new DefaultOption(60, new IntegerRangePredicate(0, Integer.MAX_VALUE), new OptionWatcher() {
@Override
public void optionChanged(Option option, Integer oldValue, Integer newValue) {
@@ -2233,11 +2196,13 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
}
}));
- options.addIntegerOption("PostsPerPage", new DefaultOption(10, new IntegerRangeValidator(1, Integer.MAX_VALUE)));
- options.addIntegerOption("CharactersPerPost", new DefaultOption(200, new OrValidator(new IntegerRangeValidator(50, Integer.MAX_VALUE), new EqualityValidator(-1))));
+ options.addIntegerOption("PostsPerPage", new DefaultOption(10, new IntegerRangePredicate(1, Integer.MAX_VALUE)));
+ options.addIntegerOption("ImagesPerPage", new DefaultOption(9, new IntegerRangePredicate(1, Integer.MAX_VALUE)));
+ options.addIntegerOption("CharactersPerPost", new DefaultOption(400, Predicates. or(new IntegerRangePredicate(50, Integer.MAX_VALUE), Predicates.equalTo(-1))));
+ options.addIntegerOption("PostCutOffLength", new DefaultOption(200, Predicates. or(new IntegerRangePredicate(50, Integer.MAX_VALUE), Predicates.equalTo(-1))));
options.addBooleanOption("RequireFullAccess", new DefaultOption(false));
- options.addIntegerOption("PositiveTrust", new DefaultOption(75, new IntegerRangeValidator(0, 100)));
- options.addIntegerOption("NegativeTrust", new DefaultOption(-25, new IntegerRangeValidator(-100, 100)));
+ options.addIntegerOption("PositiveTrust", new DefaultOption(75, new IntegerRangePredicate(0, 100)));
+ options.addIntegerOption("NegativeTrust", new DefaultOption(-25, new IntegerRangePredicate(-100, 100)));
options.addStringOption("TrustComment", new DefaultOption("Set from Sone Web Interface"));
options.addBooleanOption("ActivateFcpInterface", new DefaultOption(false, new OptionWatcher() {
@@ -2256,31 +2221,18 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
}
}));
- options.addBooleanOption("SoneRescueMode", new DefaultOption(false));
- options.addBooleanOption("ClearOnNextRestart", new DefaultOption(false));
- options.addBooleanOption("ReallyClearOnNextRestart", new DefaultOption(false));
-
- /* read options from configuration. */
- options.getBooleanOption("ClearOnNextRestart").set(configuration.getBooleanValue("Option/ClearOnNextRestart").getValue(null));
- options.getBooleanOption("ReallyClearOnNextRestart").set(configuration.getBooleanValue("Option/ReallyClearOnNextRestart").getValue(null));
- boolean clearConfiguration = options.getBooleanOption("ClearOnNextRestart").get() && options.getBooleanOption("ReallyClearOnNextRestart").get();
- options.getBooleanOption("ClearOnNextRestart").set(null);
- options.getBooleanOption("ReallyClearOnNextRestart").set(null);
- if (clearConfiguration) {
- /* stop loading the configuration. */
- return;
- }
loadConfigurationValue("InsertionDelay");
loadConfigurationValue("PostsPerPage");
+ loadConfigurationValue("ImagesPerPage");
loadConfigurationValue("CharactersPerPost");
+ loadConfigurationValue("PostCutOffLength");
options.getBooleanOption("RequireFullAccess").set(configuration.getBooleanValue("Option/RequireFullAccess").getValue(null));
loadConfigurationValue("PositiveTrust");
loadConfigurationValue("NegativeTrust");
options.getStringOption("TrustComment").set(configuration.getStringValue("Option/TrustComment").getValue(null));
options.getBooleanOption("ActivateFcpInterface").set(configuration.getBooleanValue("Option/ActivateFcpInterface").getValue(null));
options.getIntegerOption("FcpFullAccessRequired").set(configuration.getIntValue("Option/FcpFullAccessRequired").getValue(null));
- options.getBooleanOption("SoneRescueMode").set(configuration.getBooleanValue("Option/SoneRescueMode").getValue(null));
/* load known Sones. */
int soneCounter = 0;
@@ -2289,11 +2241,30 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
if (knownSoneId == null) {
break;
}
- synchronized (newSones) {
+ synchronized (knownSones) {
knownSones.add(knownSoneId);
}
}
+ /* load Sone following times. */
+ soneCounter = 0;
+ while (true) {
+ String soneId = configuration.getStringValue("SoneFollowingTimes/" + soneCounter + "/Sone").getValue(null);
+ if (soneId == null) {
+ break;
+ }
+ long time = configuration.getLongValue("SoneFollowingTimes/" + soneCounter + "/Time").getValue(Long.MAX_VALUE);
+ Sone followedSone = getSone(soneId);
+ if (followedSone == null) {
+ logger.log(Level.WARNING, String.format("Ignoring Sone with invalid ID: %s", soneId));
+ } else {
+ synchronized (soneFollowingTimes) {
+ soneFollowingTimes.put(getSone(soneId), time);
+ }
+ }
+ ++soneCounter;
+ }
+
/* load known posts. */
int postCounter = 0;
while (true) {
@@ -2301,7 +2272,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
if (knownPostId == null) {
break;
}
- synchronized (newPosts) {
+ synchronized (knownPosts) {
knownPosts.add(knownPostId);
}
}
@@ -2313,7 +2284,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
if (knownReplyId == null) {
break;
}
- synchronized (newReplies) {
+ synchronized (knownReplies) {
knownReplies.add(knownReplyId);
}
}
@@ -2343,7 +2314,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
try {
options.getIntegerOption(optionName).set(configuration.getIntValue("Option/" + optionName).getValue(null));
} catch (IllegalArgumentException iae1) {
- logger.log(Level.WARNING, "Invalid value for " + optionName + " in configuration, using default.");
+ logger.log(Level.WARNING, String.format("Invalid value for %s in configuration, using default.", optionName));
}
}
@@ -2354,26 +2325,26 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The URI to derive the Sone URI from
* @return The derived URI
*/
- private FreenetURI getSoneUri(String uriString) {
+ private static FreenetURI getSoneUri(String uriString) {
try {
FreenetURI uri = new FreenetURI(uriString).setDocName("Sone").setMetaString(new String[0]);
return uri;
} catch (MalformedURLException mue1) {
- logger.log(Level.WARNING, "Could not create Sone URI from URI: " + uriString, mue1);
+ logger.log(Level.WARNING, String.format("Could not create Sone URI from URI: %s", uriString), mue1);
return null;
}
}
- //
- // INTERFACE IdentityListener
- //
-
/**
- * {@inheritDoc}
+ * Notifies the core that a new {@link OwnIdentity} was added.
+ *
+ * @param ownIdentityAddedEvent
+ * The event
*/
- @Override
- public void ownIdentityAdded(OwnIdentity ownIdentity) {
- logger.log(Level.FINEST, "Adding OwnIdentity: " + ownIdentity);
+ @Subscribe
+ public void ownIdentityAdded(OwnIdentityAddedEvent ownIdentityAddedEvent) {
+ OwnIdentity ownIdentity = ownIdentityAddedEvent.ownIdentity();
+ logger.log(Level.FINEST, String.format("Adding OwnIdentity: %s", ownIdentity));
if (ownIdentity.hasContext("Sone")) {
trustedIdentities.put(ownIdentity, Collections.synchronizedSet(new HashSet()));
addLocalSone(ownIdentity);
@@ -2381,48 +2352,65 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
}
/**
- * {@inheritDoc}
+ * Notifies the core that an {@link OwnIdentity} was removed.
+ *
+ * @param ownIdentityRemovedEvent
+ * The event
*/
- @Override
- public void ownIdentityRemoved(OwnIdentity ownIdentity) {
- logger.log(Level.FINEST, "Removing OwnIdentity: " + ownIdentity);
+ @Subscribe
+ public void ownIdentityRemoved(OwnIdentityRemovedEvent ownIdentityRemovedEvent) {
+ OwnIdentity ownIdentity = ownIdentityRemovedEvent.ownIdentity();
+ logger.log(Level.FINEST, String.format("Removing OwnIdentity: %s", ownIdentity));
trustedIdentities.remove(ownIdentity);
}
/**
- * {@inheritDoc}
+ * Notifies the core that a new {@link Identity} was added.
+ *
+ * @param identityAddedEvent
+ * The event
*/
- @Override
- public void identityAdded(OwnIdentity ownIdentity, Identity identity) {
- logger.log(Level.FINEST, "Adding Identity: " + identity);
- trustedIdentities.get(ownIdentity).add(identity);
+ @Subscribe
+ public void identityAdded(IdentityAddedEvent identityAddedEvent) {
+ Identity identity = identityAddedEvent.identity();
+ logger.log(Level.FINEST, String.format("Adding Identity: %s", identity));
+ trustedIdentities.get(identityAddedEvent.ownIdentity()).add(identity);
addRemoteSone(identity);
}
/**
- * {@inheritDoc}
+ * Notifies the core that an {@link Identity} was updated.
+ *
+ * @param identityUpdatedEvent
+ * The event
*/
- @Override
- public void identityUpdated(OwnIdentity ownIdentity, final Identity identity) {
- new Thread(new Runnable() {
+ @Subscribe
+ public void identityUpdated(IdentityUpdatedEvent identityUpdatedEvent) {
+ final Identity identity = identityUpdatedEvent.identity();
+ soneDownloaders.execute(new Runnable() {
@Override
@SuppressWarnings("synthetic-access")
public void run() {
- Sone sone = getRemoteSone(identity.getId());
+ Sone sone = getRemoteSone(identity.getId(), false);
sone.setIdentity(identity);
- sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), sone.getLatestEdition()));
+ sone.setLatestEdition(Optional.fromNullable(Longs.tryParse(identity.getProperty("Sone.LatestEdition"))).or(sone.getLatestEdition()));
soneDownloader.addSone(sone);
soneDownloader.fetchSone(sone);
}
- }).start();
+ });
}
/**
- * {@inheritDoc}
+ * Notifies the core that an {@link Identity} was removed.
+ *
+ * @param identityRemovedEvent
+ * The event
*/
- @Override
- public void identityRemoved(OwnIdentity ownIdentity, Identity identity) {
+ @Subscribe
+ public void identityRemoved(IdentityRemovedEvent identityRemovedEvent) {
+ OwnIdentity ownIdentity = identityRemovedEvent.ownIdentity();
+ Identity identity = identityRemovedEvent.identity();
trustedIdentities.get(ownIdentity).remove(identity);
boolean foundIdentity = false;
for (Entry> trustedIdentity : trustedIdentities.entrySet()) {
@@ -2443,453 +2431,39 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
return;
}
synchronized (posts) {
- synchronized (newPosts) {
+ synchronized (knownPosts) {
for (Post post : sone.getPosts()) {
posts.remove(post.getId());
- newPosts.remove(post.getId());
- coreListenerManager.firePostRemoved(post);
+ eventBus.post(new PostRemovedEvent(post));
}
}
}
synchronized (replies) {
- synchronized (newReplies) {
- for (Reply reply : sone.getReplies()) {
+ synchronized (knownReplies) {
+ for (PostReply reply : sone.getReplies()) {
replies.remove(reply.getId());
- newReplies.remove(reply.getId());
- coreListenerManager.fireReplyRemoved(reply);
+ eventBus.post(new PostReplyRemovedEvent(reply));
}
}
}
- synchronized (remoteSones) {
- remoteSones.remove(identity.getId());
+ synchronized (sones) {
+ sones.remove(identity.getId());
}
- synchronized (newSones) {
- newSones.remove(identity.getId());
- coreListenerManager.fireSoneRemoved(sone);
- }
- }
-
- //
- // INTERFACE UpdateListener
- //
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void updateFound(Version version, long releaseTime, long latestEdition) {
- coreListenerManager.fireUpdateFound(version, releaseTime, latestEdition);
- }
-
- //
- // INTERFACE ImageInsertListener
- //
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void insertStarted(Sone sone) {
- coreListenerManager.fireSoneInserting(sone);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void insertFinished(Sone sone, long insertDuration) {
- coreListenerManager.fireSoneInserted(sone, insertDuration);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void insertAborted(Sone sone, Throwable cause) {
- coreListenerManager.fireSoneInsertAborted(sone, cause);
- }
-
- //
- // SONEINSERTLISTENER METHODS
- //
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void imageInsertStarted(Image image) {
- logger.log(Level.WARNING, "Image insert started for " + image);
- coreListenerManager.fireImageInsertStarted(image);
+ eventBus.post(new SoneRemovedEvent(sone));
}
/**
- * {@inheritDoc}
- */
- @Override
- public void imageInsertAborted(Image image) {
- logger.log(Level.WARNING, "Image insert aborted for " + image);
- coreListenerManager.fireImageInsertAborted(image);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void imageInsertFinished(Image image, FreenetURI key) {
- logger.log(Level.WARNING, "Image insert finished for " + image + ": " + key);
- image.setKey(key.toString());
- deleteTemporaryImage(image.getId());
- saveSone(image.getSone());
- coreListenerManager.fireImageInsertFinished(image);
- }
-
- /**
- * {@inheritDoc}
+ * Deletes the temporary image.
+ *
+ * @param imageInsertFinishedEvent
+ * The event
*/
- @Override
- public void imageInsertFailed(Image image, Throwable cause) {
- logger.log(Level.WARNING, "Image insert failed for " + image, cause);
- coreListenerManager.fireImageInsertFailed(image, cause);
- }
-
- /**
- * Convenience interface for external classes that want to access the coreâs
- * configuration.
- *
- * @author David âBombeâ Roden
- */
- public static class Preferences {
-
- /** The wrapped options. */
- private final Options options;
-
- /**
- * Creates a new preferences object wrapped around the given options.
- *
- * @param options
- * The options to wrap
- */
- public Preferences(Options options) {
- this.options = options;
- }
-
- /**
- * Returns the insertion delay.
- *
- * @return The insertion delay
- */
- public int getInsertionDelay() {
- return options.getIntegerOption("InsertionDelay").get();
- }
-
- /**
- * Validates the given insertion delay.
- *
- * @param insertionDelay
- * The insertion delay to validate
- * @return {@code true} if the given insertion delay was valid, {@code
- * false} otherwise
- */
- public boolean validateInsertionDelay(Integer insertionDelay) {
- return options.getIntegerOption("InsertionDelay").validate(insertionDelay);
- }
-
- /**
- * Sets the insertion delay
- *
- * @param insertionDelay
- * The new insertion delay, or {@code null} to restore it to
- * the default value
- * @return This preferences
- */
- public Preferences setInsertionDelay(Integer insertionDelay) {
- options.getIntegerOption("InsertionDelay").set(insertionDelay);
- return this;
- }
-
- /**
- * Returns the number of posts to show per page.
- *
- * @return The number of posts to show per page
- */
- public int getPostsPerPage() {
- return options.getIntegerOption("PostsPerPage").get();
- }
-
- /**
- * Validates the number of posts per page.
- *
- * @param postsPerPage
- * The number of posts per page
- * @return {@code true} if the number of posts per page was valid,
- * {@code false} otherwise
- */
- public boolean validatePostsPerPage(Integer postsPerPage) {
- return options.getIntegerOption("PostsPerPage").validate(postsPerPage);
- }
-
- /**
- * Sets the number of posts to show per page.
- *
- * @param postsPerPage
- * The number of posts to show per page
- * @return This preferences object
- */
- public Preferences setPostsPerPage(Integer postsPerPage) {
- options.getIntegerOption("PostsPerPage").set(postsPerPage);
- return this;
- }
-
- /**
- * Returns the number of characters per post, or -1
if the
- * posts should not be cut off.
- *
- * @return The numbers of characters per post
- */
- public int getCharactersPerPost() {
- return options.getIntegerOption("CharactersPerPost").get();
- }
-
- /**
- * Validates the number of characters per post.
- *
- * @param charactersPerPost
- * The number of characters per post
- * @return {@code true} if the number of characters per post was valid,
- * {@code false} otherwise
- */
- public boolean validateCharactersPerPost(Integer charactersPerPost) {
- return options.getIntegerOption("CharactersPerPost").validate(charactersPerPost);
- }
-
- /**
- * Sets the number of characters per post.
- *
- * @param charactersPerPost
- * The number of characters per post, or -1
to
- * not cut off the posts
- * @return This preferences objects
- */
- public Preferences setCharactersPerPost(Integer charactersPerPost) {
- options.getIntegerOption("CharactersPerPost").set(charactersPerPost);
- return this;
- }
-
- /**
- * Returns whether Sone requires full access to be even visible.
- *
- * @return {@code true} if Sone requires full access, {@code false}
- * otherwise
- */
- public boolean isRequireFullAccess() {
- return options.getBooleanOption("RequireFullAccess").get();
- }
-
- /**
- * Sets whether Sone requires full access to be even visible.
- *
- * @param requireFullAccess
- * {@code true} if Sone requires full access, {@code false}
- * otherwise
- */
- public void setRequireFullAccess(Boolean requireFullAccess) {
- options.getBooleanOption("RequireFullAccess").set(requireFullAccess);
- }
-
- /**
- * Returns the positive trust.
- *
- * @return The positive trust
- */
- public int getPositiveTrust() {
- return options.getIntegerOption("PositiveTrust").get();
- }
-
- /**
- * Validates the positive trust.
- *
- * @param positiveTrust
- * The positive trust to validate
- * @return {@code true} if the positive trust was valid, {@code false}
- * otherwise
- */
- public boolean validatePositiveTrust(Integer positiveTrust) {
- return options.getIntegerOption("PositiveTrust").validate(positiveTrust);
- }
-
- /**
- * Sets the positive trust.
- *
- * @param positiveTrust
- * The new positive trust, or {@code null} to restore it to
- * the default vlaue
- * @return This preferences
- */
- public Preferences setPositiveTrust(Integer positiveTrust) {
- options.getIntegerOption("PositiveTrust").set(positiveTrust);
- return this;
- }
-
- /**
- * Returns the negative trust.
- *
- * @return The negative trust
- */
- public int getNegativeTrust() {
- return options.getIntegerOption("NegativeTrust").get();
- }
-
- /**
- * Validates the negative trust.
- *
- * @param negativeTrust
- * The negative trust to validate
- * @return {@code true} if the negative trust was valid, {@code false}
- * otherwise
- */
- public boolean validateNegativeTrust(Integer negativeTrust) {
- return options.getIntegerOption("NegativeTrust").validate(negativeTrust);
- }
-
- /**
- * Sets the negative trust.
- *
- * @param negativeTrust
- * The negative trust, or {@code null} to restore it to the
- * default value
- * @return The preferences
- */
- public Preferences setNegativeTrust(Integer negativeTrust) {
- options.getIntegerOption("NegativeTrust").set(negativeTrust);
- return this;
- }
-
- /**
- * Returns the trust comment. This is the comment that is set in the web
- * of trust when a trust value is assigned to an identity.
- *
- * @return The trust comment
- */
- public String getTrustComment() {
- return options.getStringOption("TrustComment").get();
- }
-
- /**
- * Sets the trust comment.
- *
- * @param trustComment
- * The trust comment, or {@code null} to restore it to the
- * default value
- * @return This preferences
- */
- public Preferences setTrustComment(String trustComment) {
- options.getStringOption("TrustComment").set(trustComment);
- return this;
- }
-
- /**
- * Returns whether the {@link FcpInterface FCP interface} is currently
- * active.
- *
- * @see FcpInterface#setActive(boolean)
- * @return {@code true} if the FCP interface is currently active,
- * {@code false} otherwise
- */
- public boolean isFcpInterfaceActive() {
- return options.getBooleanOption("ActivateFcpInterface").get();
- }
-
- /**
- * Sets whether the {@link FcpInterface FCP interface} is currently
- * active.
- *
- * @see FcpInterface#setActive(boolean)
- * @param fcpInterfaceActive
- * {@code true} to activate the FCP interface, {@code false}
- * to deactivate the FCP interface
- * @return This preferences object
- */
- public Preferences setFcpInterfaceActive(boolean fcpInterfaceActive) {
- options.getBooleanOption("ActivateFcpInterface").set(fcpInterfaceActive);
- return this;
- }
-
- /**
- * Returns the action level for which full access to the FCP interface
- * is required.
- *
- * @return The action level for which full access to the FCP interface
- * is required
- */
- public FullAccessRequired getFcpFullAccessRequired() {
- return FullAccessRequired.values()[options.getIntegerOption("FcpFullAccessRequired").get()];
- }
-
- /**
- * Sets the action level for which full access to the FCP interface is
- * required
- *
- * @param fcpFullAccessRequired
- * The action level
- * @return This preferences
- */
- public Preferences setFcpFullAccessRequired(FullAccessRequired fcpFullAccessRequired) {
- options.getIntegerOption("FcpFullAccessRequired").set((fcpFullAccessRequired != null) ? fcpFullAccessRequired.ordinal() : null);
- return this;
- }
-
- /**
- * Returns whether Sone should clear its settings on the next restart.
- * In order to be effective, {@link #isReallyClearOnNextRestart()} needs
- * to return {@code true} as well!
- *
- * @return {@code true} if Sone should clear its settings on the next
- * restart, {@code false} otherwise
- */
- public boolean isClearOnNextRestart() {
- return options.getBooleanOption("ClearOnNextRestart").get();
- }
-
- /**
- * Sets whether Sone will clear its settings on the next restart.
- *
- * @param clearOnNextRestart
- * {@code true} if Sone should clear its settings on the next
- * restart, {@code false} otherwise
- * @return This preferences
- */
- public Preferences setClearOnNextRestart(Boolean clearOnNextRestart) {
- options.getBooleanOption("ClearOnNextRestart").set(clearOnNextRestart);
- return this;
- }
-
- /**
- * Returns whether Sone should really clear its settings on next
- * restart. This is a confirmation option that needs to be set in
- * addition to {@link #isClearOnNextRestart()} in order to clear Soneâs
- * settings on the next restart.
- *
- * @return {@code true} if Sone should really clear its settings on the
- * next restart, {@code false} otherwise
- */
- public boolean isReallyClearOnNextRestart() {
- return options.getBooleanOption("ReallyClearOnNextRestart").get();
- }
-
- /**
- * Sets whether Sone should really clear its settings on the next
- * restart.
- *
- * @param reallyClearOnNextRestart
- * {@code true} if Sone should really clear its settings on
- * the next restart, {@code false} otherwise
- * @return This preferences
- */
- public Preferences setReallyClearOnNextRestart(Boolean reallyClearOnNextRestart) {
- options.getBooleanOption("ReallyClearOnNextRestart").set(reallyClearOnNextRestart);
- return this;
- }
-
+ @Subscribe
+ public void imageInsertFinished(ImageInsertFinishedEvent imageInsertFinishedEvent) {
+ logger.log(Level.WARNING, String.format("Image insert finished for %s: %s", imageInsertFinishedEvent.image(), imageInsertFinishedEvent.resultingUri()));
+ imageInsertFinishedEvent.image().setKey(imageInsertFinishedEvent.resultingUri().toString());
+ deleteTemporaryImage(imageInsertFinishedEvent.image().getId());
+ touchConfiguration();
}
}