X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=096f192746f7f3dd844e8f0198bfdfe7e9049c3c;hb=655472c7aecc8683e127e0930297202ecd195d64;hp=284c6fb97ab803a8b31110c6d5b3366ef88b3f28;hpb=2c5b76a2fbce16ef33f079a3de9ae9fc9a9d30b8;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 284c6fb..096f192 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -31,13 +31,16 @@ 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.data.Client;
 import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.Profile;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 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.main.SonePlugin;
 import net.pterodactylus.util.config.Configuration;
 import net.pterodactylus.util.config.ConfigurationException;
 import net.pterodactylus.util.logging.Logging;
@@ -77,8 +80,11 @@ public class Core implements IdentityListener {
 	/** The options. */
 	private final Options options = new Options();
 
+	/** The core listener manager. */
+	private final CoreListenerManager coreListenerManager = new CoreListenerManager(this);
+
 	/** The configuration. */
-	private final Configuration configuration;
+	private Configuration configuration;
 
 	/** The identity manager. */
 	private final IdentityManager identityManager;
@@ -89,10 +95,17 @@ public class Core implements IdentityListener {
 	/** The Sone downloader. */
 	private final SoneDownloader soneDownloader;
 
+	/** Whether the core has been stopped. */
+	private volatile boolean stopped;
+
 	/** The Sones’ statuses. */
 	/* synchronize access on itself. */
 	private final Map<Sone, SoneStatus> soneStatuses = new HashMap<Sone, SoneStatus>();
 
+	/** Locked local Sones. */
+	/* synchronize on itself. */
+	private final Set<Sone> lockedSones = new HashSet<Sone>();
+
 	/** Sone inserters. */
 	/* synchronize access on this on localSones. */
 	private final Map<Sone, SoneInserter> soneInserters = new HashMap<Sone, SoneInserter>();
@@ -105,12 +118,32 @@ public class Core implements IdentityListener {
 	/* synchronize access on this on itself. */
 	private Map<String, Sone> remoteSones = new HashMap<String, Sone>();
 
+	/** All new Sones. */
+	private Set<String> newSones = new HashSet<String>();
+
+	/** All known Sones. */
+	/* synchronize access on {@link #newSones}. */
+	private Set<String> knownSones = new HashSet<String>();
+
 	/** All posts. */
 	private Map<String, Post> posts = new HashMap<String, Post>();
 
+	/** All new posts. */
+	private Set<String> newPosts = new HashSet<String>();
+
+	/** All known posts. */
+	/* synchronize access on {@link #newPosts}. */
+	private Set<String> knownPosts = new HashSet<String>();
+
 	/** All replies. */
 	private Map<String, Reply> replies = new HashMap<String, Reply>();
 
+	/** All new replies. */
+	private Set<String> newReplies = new HashSet<String>();
+
+	/** All known replies. */
+	private Set<String> knownReplies = new HashSet<String>();
+
 	/**
 	 * Creates a new core.
 	 *
@@ -129,10 +162,46 @@ public class Core implements IdentityListener {
 	}
 
 	//
+	// LISTENER MANAGEMENT
+	//
+
+	/**
+	 * Adds a new core listener.
+	 *
+	 * @param coreListener
+	 *            The listener to add
+	 */
+	public void addCoreListener(CoreListener coreListener) {
+		coreListenerManager.addListener(coreListener);
+	}
+
+	/**
+	 * 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.
+	 *
+	 * @param configuration
+	 *            The new configuration to use
+	 */
+	public void setConfiguration(Configuration configuration) {
+		this.configuration = configuration;
+		saveConfiguration();
+	}
+
+	/**
 	 * Returns the options used by the core.
 	 *
 	 * @return The options of the core
@@ -142,6 +211,16 @@ public class Core implements IdentityListener {
 	}
 
 	/**
+	 * Returns whether the “Sone rescue mode” is currently activated.
+	 *
+	 * @return {@code true} if the “Sone rescue mode” is currently activated,
+	 *         {@code false} if it is not
+	 */
+	public boolean isSoneRescueMode() {
+		return options.getBooleanOption("SoneRescueMode").get();
+	}
+
+	/**
 	 * Returns the identity manager used by the core.
 	 *
 	 * @return The identity manager
@@ -178,6 +257,19 @@ public class Core implements IdentityListener {
 	}
 
 	/**
+	 * Returns whether the given Sone is currently locked.
+	 *
+	 * @param sone
+	 *            The sone to check
+	 * @return {@code true} if the Sone is locked, {@code false} if it is not
+	 */
+	public boolean isLocked(Sone sone) {
+		synchronized (lockedSones) {
+			return lockedSones.contains(sone);
+		}
+	}
+
+	/**
 	 * Returns all Sones, remote and local.
 	 *
 	 * @return All Sones
@@ -199,12 +291,39 @@ public class Core implements IdentityListener {
 	 *         Sone
 	 */
 	public Sone getSone(String id) {
-		Sone sone = getRemoteSone(id);
-		if (sone != null) {
-			return sone;
+		return getSone(id, true);
+	}
+
+	/**
+	 * Returns the Sone with the given ID, regardless whether it’s local or
+	 * remote.
+	 *
+	 * @param id
+	 *            The ID of the Sone to get
+	 * @param create
+	 *            {@code true} to create a new Sone if none exists,
+	 *            {@code false} to return {@code null} if a Sone with the given
+	 *            ID does not exist
+	 * @return The Sone with the given ID, or {@code null} if there is no such
+	 *         Sone
+	 */
+	public Sone getSone(String id, boolean create) {
+		if (isLocalSone(id)) {
+			return getLocalSone(id);
 		}
-		sone = getLocalSone(id);
-		return sone;
+		return getRemoteSone(id, create);
+	}
+
+	/**
+	 * Checks whether the core knows a Sone with the given ID.
+	 *
+	 * @param id
+	 *            The ID of the Sone
+	 * @return {@code true} if there is a Sone with the given ID, {@code false}
+	 *         otherwise
+	 */
+	public boolean hasSone(String id) {
+		return isLocalSone(id) || isRemoteSone(id);
 	}
 
 	/**
@@ -221,6 +340,20 @@ public class Core implements IdentityListener {
 	}
 
 	/**
+	 * 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);
+		}
+	}
+
+	/**
 	 * Returns all local Sones.
 	 *
 	 * @return All local Sones
@@ -236,11 +369,30 @@ public class Core implements IdentityListener {
 	 *
 	 * @param id
 	 *            The ID of the Sone to get
-	 * @return The Sone, or {@code null} if there is no Sone with the given ID
+	 * @return The Sone with the given ID
 	 */
 	public Sone getLocalSone(String id) {
+		return getLocalSone(id, true);
+	}
+
+	/**
+	 * Returns the local Sone with the given ID, optionally creating a new Sone.
+	 *
+	 * @param id
+	 *            The ID of the Sone
+	 * @param create
+	 *            {@code true} to create a new Sone if none exists,
+	 *            {@code false} to return null if none exists
+	 * @return The Sone with the given ID, or {@code null}
+	 */
+	public Sone getLocalSone(String id, boolean create) {
 		synchronized (localSones) {
-			return localSones.get(id);
+			Sone sone = localSones.get(id);
+			if ((sone == null) && create) {
+				sone = new Sone(id);
+				localSones.put(id, sone);
+			}
+			return sone;
 		}
 	}
 
@@ -260,11 +412,30 @@ public class Core implements IdentityListener {
 	 *
 	 * @param id
 	 *            The ID of the remote Sone to get
-	 * @return The Sone, or {@code null} if there is no such Sone
+	 * @return The Sone with the given ID
 	 */
 	public Sone getRemoteSone(String id) {
+		return getRemoteSone(id, true);
+	}
+
+	/**
+	 * Returns the remote Sone with the given ID.
+	 *
+	 * @param id
+	 *            The ID of the remote Sone to get
+	 * @param create
+	 *            {@code true} to always create a Sone, {@code false} to return
+	 *            {@code null} if no Sone with the given ID exists
+	 * @return The Sone with the given ID
+	 */
+	public Sone getRemoteSone(String id, boolean create) {
 		synchronized (remoteSones) {
-			return remoteSones.get(id);
+			Sone sone = remoteSones.get(id);
+			if ((sone == null) && create) {
+				sone = new Sone(id);
+				remoteSones.put(id, sone);
+			}
+			return sone;
 		}
 	}
 
@@ -283,6 +454,52 @@ public class Core implements IdentityListener {
 	}
 
 	/**
+	 * 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,
+	 *         {@code false} otherwise
+	 */
+	public boolean isRemoteSone(String id) {
+		synchronized (remoteSones) {
+			return remoteSones.containsKey(id);
+		}
+	}
+
+	/**
+	 * Returns whether the given Sone is a new Sone. After this check, the Sone
+	 * is marked as known, i.e. a second call with the same parameters will
+	 * always yield {@code false}.
+	 *
+	 * @param sone
+	 *            The sone to check for
+	 * @return {@code true} if the given Sone is new, false otherwise
+	 */
+	public boolean isNewSone(Sone sone) {
+		synchronized (newSones) {
+			boolean isNew = !knownSones.contains(sone.getId()) && newSones.remove(sone.getId());
+			knownSones.add(sone.getId());
+			if (isNew) {
+				coreListenerManager.fireMarkSoneKnown(sone);
+			}
+			return isNew;
+		}
+	}
+
+	/**
+	 * Returns whether the given Sone has been modified.
+	 *
+	 * @param sone
+	 *            The Sone to check for modifications
+	 * @return {@code true} if a modification has been detected in the Sone,
+	 *         {@code false} otherwise
+	 */
+	public boolean isModifiedSone(Sone sone) {
+		return (soneInserters.containsKey(sone)) ? soneInserters.get(sone).isModified() : false;
+	}
+
+	/**
 	 * Returns the post with the given ID.
 	 *
 	 * @param postId
@@ -290,8 +507,67 @@ public class Core implements IdentityListener {
 	 * @return The post, or {@code null} if there is no such post
 	 */
 	public Post getPost(String postId) {
+		return getPost(postId, true);
+	}
+
+	/**
+	 * Returns the post with the given ID, optionally creating a new post.
+	 *
+	 * @param postId
+	 *            The ID of the post to get
+	 * @param create
+	 *            {@code true} it create a new post if no post with the given ID
+	 *            exists, {@code false} to return {@code null}
+	 * @return The post, or {@code null} if there is no such post
+	 */
+	public Post getPost(String postId, boolean create) {
 		synchronized (posts) {
-			return posts.get(postId);
+			Post post = posts.get(postId);
+			if ((post == null) && create) {
+				post = new Post(postId);
+				posts.put(postId, post);
+			}
+			return post;
+		}
+	}
+
+	/**
+	 * Returns whether the given post ID is new. After this method returns it is
+	 * marked a known post ID.
+	 *
+	 * @param postId
+	 *            The post ID
+	 * @return {@code true} if the post is considered to be new, {@code false}
+	 *         otherwise
+	 */
+	public boolean isNewPost(String postId) {
+		return isNewPost(postId, true);
+	}
+
+	/**
+	 * Returns whether the given post ID is new. If {@code markAsKnown} is
+	 * {@code true} then after this method returns the post ID is marked a known
+	 * post ID.
+	 *
+	 * @param postId
+	 *            The post ID
+	 * @param markAsKnown
+	 *            {@code true} to mark the post ID as known, {@code false} to
+	 *            not to mark it as known
+	 * @return {@code true} if the post is considered to be new, {@code false}
+	 *         otherwise
+	 */
+	public boolean isNewPost(String postId, boolean markAsKnown) {
+		synchronized (newPosts) {
+			boolean isNew = !knownPosts.contains(postId) && newPosts.contains(postId);
+			if (markAsKnown) {
+				newPosts.remove(postId);
+				knownPosts.add(postId);
+				if (isNew) {
+					coreListenerManager.fireMarkPostKnown(getPost(postId));
+				}
+			}
+			return isNew;
 		}
 	}
 
@@ -304,7 +580,12 @@ public class Core implements IdentityListener {
 	 */
 	public Reply getReply(String replyId) {
 		synchronized (replies) {
-			return replies.get(replyId);
+			Reply reply = replies.get(replyId);
+			if (reply == null) {
+				reply = new Reply(replyId);
+				replies.put(replyId, reply);
+			}
+			return reply;
 		}
 	}
 
@@ -330,6 +611,43 @@ public class Core implements IdentityListener {
 	}
 
 	/**
+	 * 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) {
+		return isNewReply(replyId, true);
+	}
+
+	/**
+	 * Returns whether the reply with the given ID is new.
+	 *
+	 * @param replyId
+	 *            The ID of the reply to check
+	 * @param markAsKnown
+	 *            {@code true} to mark the reply as known, {@code false} to not
+	 *            to mark it as known
+	 * @return {@code true} if the reply is considered to be new, {@code false}
+	 *         otherwise
+	 */
+	public boolean isNewReply(String replyId, boolean markAsKnown) {
+		synchronized (newReplies) {
+			boolean isNew = !knownReplies.contains(replyId) && newReplies.contains(replyId);
+			if (markAsKnown) {
+				newReplies.remove(replyId);
+				knownReplies.add(replyId);
+				if (isNew) {
+					coreListenerManager.fireMarkReplyKnown(getReply(replyId));
+				}
+			}
+			return isNew;
+		}
+	}
+
+	/**
 	 * Returns all Sones that have liked the given post.
 	 *
 	 * @param post
@@ -356,7 +674,7 @@ public class Core implements IdentityListener {
 	public Set<Sone> getLikes(Reply reply) {
 		Set<Sone> sones = new HashSet<Sone>();
 		for (Sone sone : getSones()) {
-			if (sone.getLikedPostIds().contains(reply.getId())) {
+			if (sone.getLikedReplyIds().contains(reply.getId())) {
 				sones.add(sone);
 			}
 		}
@@ -368,6 +686,33 @@ public class Core implements IdentityListener {
 	//
 
 	/**
+	 * Locks the given Sone. A locked Sone will not be inserted by
+	 * {@link SoneInserter} until it is {@link #unlockSone(Sone) unlocked}
+	 * again.
+	 *
+	 * @param sone
+	 *            The sone to lock
+	 */
+	public void lockSone(Sone sone) {
+		synchronized (lockedSones) {
+			lockedSones.add(sone);
+		}
+	}
+
+	/**
+	 * Unlocks the given Sone.
+	 *
+	 * @see #lockSone(Sone)
+	 * @param sone
+	 *            The sone to unlock
+	 */
+	public void unlockSone(Sone sone) {
+		synchronized (lockedSones) {
+			lockedSones.remove(sone);
+		}
+	}
+
+	/**
 	 * Adds a local Sone from the given ID which has to be the ID of an own
 	 * identity.
 	 *
@@ -403,18 +748,49 @@ public class Core implements IdentityListener {
 			return null;
 		}
 		synchronized (localSones) {
-			if (localSones.containsKey(ownIdentity.getId())) {
-				logger.log(Level.FINE, "Tried to add known local Sone: %s", ownIdentity);
-				return localSones.get(ownIdentity.getId());
+			final Sone sone;
+			try {
+				sone = getLocalSone(ownIdentity.getId()).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);
+				return null;
 			}
-			String latestEdition = ownIdentity.getProperty("Sone.LatestEdition");
-			Sone sone = new Sone(ownIdentity).setInsertUri(getSoneUri(ownIdentity.getInsertUri(), latestEdition)).setRequestUri(getSoneUri(ownIdentity.getRequestUri(), latestEdition));
+			sone.setLatestEdition(Numbers.safeParseLong(ownIdentity.getProperty("Sone.LatestEdition"), (long) 0));
+			sone.setClient(new Client("Sone", SonePlugin.VERSION.toString()));
 			/* TODO - load posts ’n stuff */
 			localSones.put(ownIdentity.getId(), sone);
-			SoneInserter soneInserter = new SoneInserter(this, freenetInterface, sone);
+			final SoneInserter soneInserter = new SoneInserter(this, freenetInterface, sone);
 			soneInserters.put(sone, soneInserter);
-			soneInserter.start();
 			setSoneStatus(sone, SoneStatus.idle);
+			loadSone(sone);
+			if (!isSoneRescueMode()) {
+				soneInserter.start();
+			}
+			new Thread(new Runnable() {
+
+				@Override
+				@SuppressWarnings("synthetic-access")
+				public void run() {
+					if (!isSoneRescueMode()) {
+						soneDownloader.fetchSone(sone);
+						return;
+					}
+					logger.log(Level.INFO, "Trying to restore Sone from Freenet…");
+					coreListenerManager.fireRescuingSone(sone);
+					lockSone(sone);
+					long edition = sone.getLatestEdition();
+					while (!stopped && (edition >= 0) && isSoneRescueMode()) {
+						logger.log(Level.FINE, "Downloading edition " + edition + "…");
+						soneDownloader.fetchSone(sone, sone.getRequestUri().setKeyType("SSK").setDocName("Sone-" + edition));
+						--edition;
+					}
+					logger.log(Level.INFO, "Finished restoring Sone from Freenet, starting Inserter…");
+					saveSone(sone);
+					coreListenerManager.fireRescuedSone(sone);
+					soneInserter.start();
+				}
+
+			}, "Sone Downloader").start();
 			return sone;
 		}
 	}
@@ -429,10 +805,6 @@ public class Core implements IdentityListener {
 	public Sone createSone(OwnIdentity ownIdentity) {
 		identityManager.addContext(ownIdentity, "Sone");
 		Sone sone = addLocalSone(ownIdentity);
-		synchronized (sone) {
-			/* mark as modified so that it gets inserted immediately. */
-			sone.setModificationCounter(sone.getModificationCounter() + 1);
-		}
 		return sone;
 	}
 
@@ -449,15 +821,33 @@ public class Core implements IdentityListener {
 			return null;
 		}
 		synchronized (remoteSones) {
-			if (remoteSones.containsKey(identity.getId())) {
-				logger.log(Level.FINE, "Identity already exists: %s", identity);
-				return remoteSones.get(identity.getId());
+			final Sone sone = getRemoteSone(identity.getId()).setIdentity(identity);
+			boolean newSone = sone.getRequestUri() == null;
+			sone.setRequestUri(getSoneUri(identity.getRequestUri()));
+			sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0));
+			if (newSone) {
+				synchronized (newSones) {
+					newSone = !knownSones.contains(sone.getId());
+					if (newSone) {
+						newSones.add(sone.getId());
+					}
+				}
+				if (newSone) {
+					coreListenerManager.fireNewSoneFound(sone);
+				}
 			}
-			Sone sone = new Sone(identity);
-			sone.setRequestUri(getSoneUri(identity.getRequestUri(), identity.getProperty("Sone.LatestEdition")));
 			remoteSones.put(identity.getId(), sone);
 			soneDownloader.addSone(sone);
-			setSoneStatus(sone, SoneStatus.idle);
+			setSoneStatus(sone, SoneStatus.unknown);
+			new Thread(new Runnable() {
+
+				@Override
+				@SuppressWarnings("synthetic-access")
+				public void run() {
+					soneDownloader.fetchSone(sone);
+				}
+
+			}, "Sone Downloader").start();
 			return sone;
 		}
 	}
@@ -469,38 +859,74 @@ public class Core implements IdentityListener {
 	 *            The updated Sone
 	 */
 	public void updateSone(Sone sone) {
-		if (isRemoteSone(sone)) {
-			Sone storedSone = getRemoteSone(sone.getId());
-			if (!(sone.getTime() > storedSone.getTime())) {
+		if (hasSone(sone.getId())) {
+			boolean soneRescueMode = isLocalSone(sone) && isSoneRescueMode();
+			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 });
 				return;
 			}
 			synchronized (posts) {
-				for (Post post : storedSone.getPosts()) {
-					posts.remove(post.getId());
+				if (!soneRescueMode) {
+					for (Post post : storedSone.getPosts()) {
+						posts.remove(post.getId());
+					}
 				}
-				for (Post post : sone.getPosts()) {
-					posts.put(post.getId(), post);
+				synchronized (newPosts) {
+					for (Post post : sone.getPosts()) {
+						post.setSone(getSone(post.getSone().getId()));
+						if (!storedSone.getPosts().contains(post) && !knownPosts.contains(post.getId())) {
+							newPosts.add(post.getId());
+							coreListenerManager.fireNewPostFound(post);
+						}
+						posts.put(post.getId(), post);
+					}
 				}
 			}
 			synchronized (replies) {
-				for (Reply reply : storedSone.getReplies()) {
-					replies.remove(reply.getId());
+				if (!soneRescueMode) {
+					for (Reply reply : storedSone.getReplies()) {
+						replies.remove(reply.getId());
+					}
 				}
-				for (Reply reply : sone.getReplies()) {
-					replies.put(reply.getId(), reply);
+				synchronized (newReplies) {
+					for (Reply reply : sone.getReplies()) {
+						reply.setSone(getSone(reply.getSone().getId()));
+						if (!storedSone.getReplies().contains(reply) && !knownReplies.contains(reply.getId())) {
+							newReplies.add(reply.getId());
+							coreListenerManager.fireNewReplyFound(reply);
+						}
+						replies.put(reply.getId(), reply);
+					}
 				}
 			}
 			synchronized (storedSone) {
-				storedSone.setTime(sone.getTime());
+				if (!soneRescueMode || (sone.getTime() > storedSone.getTime())) {
+					storedSone.setTime(sone.getTime());
+				}
+				storedSone.setClient(sone.getClient());
 				storedSone.setProfile(sone.getProfile());
-				storedSone.setPosts(sone.getPosts());
-				storedSone.setReplies(sone.getReplies());
-				storedSone.setLikePostIds(sone.getLikedPostIds());
-				storedSone.setLikeReplyIds(sone.getLikedReplyIds());
-				storedSone.updateUris(sone.getRequestUri().getEdition());
+				if (soneRescueMode) {
+					for (Post post : sone.getPosts()) {
+						storedSone.addPost(post);
+					}
+					for (Reply reply : sone.getReplies()) {
+						storedSone.addReply(reply);
+					}
+					for (String likedPostId : sone.getLikedPostIds()) {
+						storedSone.addLikedPostId(likedPostId);
+					}
+					for (String likedReplyId : sone.getLikedReplyIds()) {
+						storedSone.addLikedReplyId(likedReplyId);
+					}
+				} else {
+					storedSone.setPosts(sone.getPosts());
+					storedSone.setReplies(sone.getReplies());
+					storedSone.setLikePostIds(sone.getLikedPostIds());
+					storedSone.setLikeReplyIds(sone.getLikedReplyIds());
+				}
+				storedSone.setLatestEdition(sone.getLatestEdition());
 			}
-			saveSone(storedSone);
 		}
 	}
 
@@ -523,9 +949,139 @@ public class Core implements IdentityListener {
 				return;
 			}
 			localSones.remove(sone.getId());
-			soneInserters.remove(sone.getId()).stop();
+			soneInserters.remove(sone).stop();
 		}
 		identityManager.removeContext((OwnIdentity) sone.getIdentity(), "Sone");
+		identityManager.removeProperty((OwnIdentity) sone.getIdentity(), "Sone.LatestEdition");
+		try {
+			configuration.getLongValue("Sone/" + sone.getId() + "/Time").setValue(null);
+		} catch (ConfigurationException ce1) {
+			logger.log(Level.WARNING, "Could not remove Sone from configuration!", ce1);
+		}
+	}
+
+	/**
+	 * Loads and updates the given Sone from the configuration. If any error is
+	 * encountered, loading is aborted and the given Sone is not changed.
+	 *
+	 * @param sone
+	 *            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);
+			return;
+		}
+
+		/* load Sone. */
+		String sonePrefix = "Sone/" + sone.getId();
+		Long soneTime = configuration.getLongValue(sonePrefix + "/Time").getValue(null);
+		if (soneTime == null) {
+			logger.log(Level.INFO, "Could not load Sone because no Sone has been saved.");
+			return;
+		}
+		String lastInsertFingerprint = configuration.getStringValue(sonePrefix + "/LastInsertFingerprint").getValue("");
+
+		/* load profile. */
+		Profile profile = new Profile();
+		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));
+		profile.setBirthDay(configuration.getIntValue(sonePrefix + "/Profile/BirthDay").getValue(null));
+		profile.setBirthMonth(configuration.getIntValue(sonePrefix + "/Profile/BirthMonth").getValue(null));
+		profile.setBirthYear(configuration.getIntValue(sonePrefix + "/Profile/BirthYear").getValue(null));
+
+		/* load posts. */
+		Set<Post> posts = new HashSet<Post>();
+		while (true) {
+			String postPrefix = sonePrefix + "/Posts/" + posts.size();
+			String postId = configuration.getStringValue(postPrefix + "/ID").getValue(null);
+			if (postId == null) {
+				break;
+			}
+			long postTime = configuration.getLongValue(postPrefix + "/Time").getValue((long) 0);
+			String postText = configuration.getStringValue(postPrefix + "/Text").getValue(null);
+			if ((postTime == 0) || (postText == null)) {
+				logger.log(Level.WARNING, "Invalid post found, aborting load!");
+				return;
+			}
+			posts.add(getPost(postId).setSone(sone).setTime(postTime).setText(postText));
+		}
+
+		/* load replies. */
+		Set<Reply> replies = new HashSet<Reply>();
+		while (true) {
+			String replyPrefix = sonePrefix + "/Replies/" + replies.size();
+			String replyId = configuration.getStringValue(replyPrefix + "/ID").getValue(null);
+			if (replyId == null) {
+				break;
+			}
+			String postId = configuration.getStringValue(replyPrefix + "/Post/ID").getValue(null);
+			long replyTime = configuration.getLongValue(replyPrefix + "/Time").getValue((long) 0);
+			String replyText = configuration.getStringValue(replyPrefix + "/Text").getValue(null);
+			if ((postId == null) || (replyTime == 0) || (replyText == null)) {
+				logger.log(Level.WARNING, "Invalid reply found, aborting load!");
+				return;
+			}
+			replies.add(getReply(replyId).setSone(sone).setPost(getPost(postId)).setTime(replyTime).setText(replyText));
+		}
+
+		/* load post likes. */
+		Set<String> likedPostIds = new HashSet<String>();
+		while (true) {
+			String likedPostId = configuration.getStringValue(sonePrefix + "/Likes/Post/" + likedPostIds.size() + "/ID").getValue(null);
+			if (likedPostId == null) {
+				break;
+			}
+			likedPostIds.add(likedPostId);
+		}
+
+		/* load reply likes. */
+		Set<String> likedReplyIds = new HashSet<String>();
+		while (true) {
+			String likedReplyId = configuration.getStringValue(sonePrefix + "/Likes/Reply/" + likedReplyIds.size() + "/ID").getValue(null);
+			if (likedReplyId == null) {
+				break;
+			}
+			likedReplyIds.add(likedReplyId);
+		}
+
+		/* load friends. */
+		Set<String> friends = new HashSet<String>();
+		while (true) {
+			String friendId = configuration.getStringValue(sonePrefix + "/Friends/" + friends.size() + "/ID").getValue(null);
+			if (friendId == null) {
+				break;
+			}
+			friends.add(friendId);
+		}
+
+		/* if we’re still here, Sone was loaded successfully. */
+		synchronized (sone) {
+			sone.setTime(soneTime);
+			sone.setProfile(profile);
+			sone.setPosts(posts);
+			sone.setReplies(replies);
+			sone.setLikePostIds(likedPostIds);
+			sone.setLikeReplyIds(likedReplyIds);
+			sone.setFriends(friends);
+			soneInserters.get(sone).setLastInsertFingerprint(lastInsertFingerprint);
+		}
+		synchronized (newSones) {
+			for (String friend : friends) {
+				knownSones.add(friend);
+			}
+		}
+		synchronized (newPosts) {
+			for (Post post : posts) {
+				knownPosts.add(post.getId());
+			}
+		}
+		synchronized (newReplies) {
+			for (Reply reply : replies) {
+				knownReplies.add(reply.getId());
+			}
+		}
 	}
 
 	/**
@@ -538,8 +1094,76 @@ public class Core implements IdentityListener {
 	public void saveSone(Sone sone) {
 		if (!isLocalSone(sone)) {
 			logger.log(Level.FINE, "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);
+			return;
+		}
+
+		logger.log(Level.INFO, "Saving Sone: %s", sone);
+		identityManager.setProperty((OwnIdentity) sone.getIdentity(), "Sone.LatestEdition", String.valueOf(sone.getLatestEdition()));
+		try {
+			/* save Sone into configuration. */
+			String sonePrefix = "Sone/" + sone.getId();
+			configuration.getLongValue(sonePrefix + "/Time").setValue(sone.getTime());
+			configuration.getStringValue(sonePrefix + "/LastInsertFingerprint").setValue(soneInserters.get(sone).getLastInsertFingerprint());
+
+			/* save profile. */
+			Profile profile = sone.getProfile();
+			configuration.getStringValue(sonePrefix + "/Profile/FirstName").setValue(profile.getFirstName());
+			configuration.getStringValue(sonePrefix + "/Profile/MiddleName").setValue(profile.getMiddleName());
+			configuration.getStringValue(sonePrefix + "/Profile/LastName").setValue(profile.getLastName());
+			configuration.getIntValue(sonePrefix + "/Profile/BirthDay").setValue(profile.getBirthDay());
+			configuration.getIntValue(sonePrefix + "/Profile/BirthMonth").setValue(profile.getBirthMonth());
+			configuration.getIntValue(sonePrefix + "/Profile/BirthYear").setValue(profile.getBirthYear());
+
+			/* save posts. */
+			int postCounter = 0;
+			for (Post post : sone.getPosts()) {
+				String postPrefix = sonePrefix + "/Posts/" + postCounter++;
+				configuration.getStringValue(postPrefix + "/ID").setValue(post.getId());
+				configuration.getLongValue(postPrefix + "/Time").setValue(post.getTime());
+				configuration.getStringValue(postPrefix + "/Text").setValue(post.getText());
+			}
+			configuration.getStringValue(sonePrefix + "/Posts/" + postCounter + "/ID").setValue(null);
+
+			/* save replies. */
+			int replyCounter = 0;
+			for (Reply reply : sone.getReplies()) {
+				String replyPrefix = sonePrefix + "/Replies/" + replyCounter++;
+				configuration.getStringValue(replyPrefix + "/ID").setValue(reply.getId());
+				configuration.getStringValue(replyPrefix + "/Post/ID").setValue(reply.getPost().getId());
+				configuration.getLongValue(replyPrefix + "/Time").setValue(reply.getTime());
+				configuration.getStringValue(replyPrefix + "/Text").setValue(reply.getText());
+			}
+			configuration.getStringValue(sonePrefix + "/Replies/" + replyCounter + "/ID").setValue(null);
+
+			/* save post likes. */
+			int postLikeCounter = 0;
+			for (String postId : sone.getLikedPostIds()) {
+				configuration.getStringValue(sonePrefix + "/Likes/Post/" + postLikeCounter++ + "/ID").setValue(postId);
+			}
+			configuration.getStringValue(sonePrefix + "/Likes/Post/" + postLikeCounter + "/ID").setValue(null);
+
+			/* save reply likes. */
+			int replyLikeCounter = 0;
+			for (String replyId : sone.getLikedReplyIds()) {
+				configuration.getStringValue(sonePrefix + "/Likes/Reply/" + replyLikeCounter++ + "/ID").setValue(replyId);
+			}
+			configuration.getStringValue(sonePrefix + "/Likes/Reply/" + replyLikeCounter + "/ID").setValue(null);
+
+			/* save friends. */
+			int friendCounter = 0;
+			for (String friendId : sone.getFriends()) {
+				configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter++ + "/ID").setValue(friendId);
+			}
+			configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(null);
+
+			logger.log(Level.INFO, "Sone %s saved.", sone);
+		} catch (ConfigurationException ce1) {
+			logger.log(Level.WARNING, "Could not save Sone: " + sone, ce1);
 		}
-		/* TODO - implement saving. */
 	}
 
 	/**
@@ -549,9 +1173,10 @@ public class Core implements IdentityListener {
 	 *            The Sone that creates the post
 	 * @param text
 	 *            The text of the post
+	 * @return The created post
 	 */
-	public void createPost(Sone sone, String text) {
-		createPost(sone, System.currentTimeMillis(), text);
+	public Post createPost(Sone sone, String text) {
+		return createPost(sone, System.currentTimeMillis(), text);
 	}
 
 	/**
@@ -563,18 +1188,23 @@ public class Core implements IdentityListener {
 	 *            The time of the post
 	 * @param text
 	 *            The text of the post
+	 * @return The created post
 	 */
-	public void createPost(Sone sone, long time, String text) {
+	public Post createPost(Sone sone, long time, String text) {
 		if (!isLocalSone(sone)) {
 			logger.log(Level.FINE, "Tried to create post for non-local Sone: %s", sone);
-			return;
+			return null;
 		}
 		Post post = new Post(sone, time, text);
 		synchronized (posts) {
 			posts.put(post.getId(), post);
 		}
+		synchronized (newPosts) {
+			knownPosts.add(post.getId());
+		}
 		sone.addPost(post);
 		saveSone(sone);
+		return post;
 	}
 
 	/**
@@ -604,9 +1234,26 @@ public class Core implements IdentityListener {
 	 *            The post that this reply refers to
 	 * @param text
 	 *            The text of the reply
+	 * @return The created reply
 	 */
-	public void createReply(Sone sone, Post post, String text) {
-		createReply(sone, post, System.currentTimeMillis(), text);
+	public Reply createReply(Sone sone, Post post, String text) {
+		return createReply(sone, post, System.currentTimeMillis(), text);
+	}
+
+	/**
+	 * Marks the given post as known, if it is currently a new post (according
+	 * to {@link #isNewPost(String)}).
+	 *
+	 * @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);
+			}
+		}
 	}
 
 	/**
@@ -620,18 +1267,23 @@ public class Core implements IdentityListener {
 	 *            The time of the reply
 	 * @param text
 	 *            The text of the reply
+	 * @return The created reply
 	 */
-	public void createReply(Sone sone, Post post, long time, String text) {
+	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);
-			return;
+			return null;
 		}
 		Reply reply = new Reply(sone, post, System.currentTimeMillis(), text);
 		synchronized (replies) {
 			replies.put(reply.getId(), reply);
 		}
+		synchronized (newReplies) {
+			knownReplies.add(reply.getId());
+		}
 		sone.addReply(reply);
 		saveSone(sone);
+		return reply;
 	}
 
 	/**
@@ -654,6 +1306,22 @@ public class Core implements IdentityListener {
 	}
 
 	/**
+	 * Marks the given reply as known, if it is currently a new reply (according
+	 * to {@link #isNewReply(String)}).
+	 *
+	 * @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);
+			}
+		}
+	}
+
+	/**
 	 * Starts the core.
 	 */
 	public void start() {
@@ -670,6 +1338,53 @@ public class Core implements IdentityListener {
 			}
 		}
 		saveConfiguration();
+		stopped = true;
+	}
+
+	/**
+	 * Saves the current options.
+	 */
+	public void saveConfiguration() {
+		/* store the options first. */
+		try {
+			configuration.getIntValue("Option/InsertionDelay").setValue(options.getIntegerOption("InsertionDelay").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) {
+				for (String knownSoneId : knownSones) {
+					configuration.getStringValue("KnownSone/" + soneCounter++ + "/ID").setValue(knownSoneId);
+				}
+				configuration.getStringValue("KnownSone/" + soneCounter + "/ID").setValue(null);
+			}
+
+			/* save known posts. */
+			int postCounter = 0;
+			synchronized (newPosts) {
+				for (String knownPostId : knownPosts) {
+					configuration.getStringValue("KnownPosts/" + postCounter++ + "/ID").setValue(knownPostId);
+				}
+				configuration.getStringValue("KnownPosts/" + postCounter + "/ID").setValue(null);
+			}
+
+			/* save known replies. */
+			int replyCounter = 0;
+			synchronized (newReplies) {
+				for (String knownReplyId : knownReplies) {
+					configuration.getStringValue("KnownReplies/" + replyCounter++ + "/ID").setValue(knownReplyId);
+				}
+				configuration.getStringValue("KnownReplies/" + replyCounter + "/ID").setValue(null);
+			}
+
+			/* now save it. */
+			configuration.save();
+
+		} catch (ConfigurationException ce1) {
+			logger.log(Level.SEVERE, "Could not store configuration!", ce1);
+		}
 	}
 
 	//
@@ -690,6 +1405,7 @@ public class Core implements IdentityListener {
 			}
 
 		}));
+		options.addBooleanOption("SoneRescueMode", new DefaultOption<Boolean>(false));
 		options.addBooleanOption("ClearOnNextRestart", new DefaultOption<Boolean>(false));
 		options.addBooleanOption("ReallyClearOnNextRestart", new DefaultOption<Boolean>(false));
 
@@ -705,21 +1421,44 @@ public class Core implements IdentityListener {
 		}
 
 		options.getIntegerOption("InsertionDelay").set(configuration.getIntValue("Option/InsertionDelay").getValue(null));
+		options.getBooleanOption("SoneRescueMode").set(configuration.getBooleanValue("Option/SoneRescueMode").getValue(null));
+
+		/* load known Sones. */
+		int soneCounter = 0;
+		while (true) {
+			String knownSoneId = configuration.getStringValue("KnownSone/" + soneCounter++ + "/ID").getValue(null);
+			if (knownSoneId == null) {
+				break;
+			}
+			synchronized (newSones) {
+				knownSones.add(knownSoneId);
+			}
+		}
 
-	}
+		/* load known posts. */
+		int postCounter = 0;
+		while (true) {
+			String knownPostId = configuration.getStringValue("KnownPosts/" + postCounter++ + "/ID").getValue(null);
+			if (knownPostId == null) {
+				break;
+			}
+			synchronized (newPosts) {
+				knownPosts.add(knownPostId);
+			}
+		}
 
-	/**
-	 * Saves the current options.
-	 */
-	private void saveConfiguration() {
-		/* store the options first. */
-		try {
-			configuration.getIntValue("Option/InsertionDelay").setValue(options.getIntegerOption("InsertionDelay").getReal());
-			configuration.getBooleanValue("Option/ClearOnNextRestart").setValue(options.getBooleanOption("ClearOnNextRestart").getReal());
-			configuration.getBooleanValue("Option/ReallyClearOnNextRestart").setValue(options.getBooleanOption("ReallyClearOnNextRestart").getReal());
-		} catch (ConfigurationException ce1) {
-			logger.log(Level.SEVERE, "Could not store configuration!", ce1);
+		/* load known replies. */
+		int replyCounter = 0;
+		while (true) {
+			String knownReplyId = configuration.getStringValue("KnownReplies/" + replyCounter++ + "/ID").getValue(null);
+			if (knownReplyId == null) {
+				break;
+			}
+			synchronized (newReplies) {
+				knownReplies.add(knownReplyId);
+			}
 		}
+
 	}
 
 	/**
@@ -727,13 +1466,11 @@ public class Core implements IdentityListener {
 	 *
 	 * @param uriString
 	 *            The URI to derive the Sone URI from
-	 * @param latestEditionString
-	 *            The latest edition as a {@link String}, or {@code null}
 	 * @return The derived URI
 	 */
-	private FreenetURI getSoneUri(String uriString, String latestEditionString) {
+	private FreenetURI getSoneUri(String uriString) {
 		try {
-			FreenetURI uri = new FreenetURI(uriString).setDocName("Sone").setMetaString(new String[0]).setSuggestedEdition(Numbers.safeParseLong(latestEditionString, (long) 0));
+			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);
@@ -761,7 +1498,7 @@ public class Core implements IdentityListener {
 	 */
 	@Override
 	public void ownIdentityRemoved(OwnIdentity ownIdentity) {
-		/* TODO */
+		logger.log(Level.FINEST, "Removing OwnIdentity: " + ownIdentity);
 	}
 
 	/**
@@ -777,8 +1514,16 @@ public class Core implements IdentityListener {
 	 * {@inheritDoc}
 	 */
 	@Override
-	public void identityUpdated(Identity identity) {
-		/* TODO */
+	public void identityUpdated(final Identity identity) {
+		new Thread(new Runnable() {
+
+			@Override
+			@SuppressWarnings("synthetic-access")
+			public void run() {
+				Sone sone = getRemoteSone(identity.getId());
+				soneDownloader.fetchSone(sone);
+			}
+		}).start();
 	}
 
 	/**