X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=a1282cc2f8706dbb3470034f7719a6c71685711a;hb=043b045d6e3f3908597d789606368d0b08ef6a59;hp=450e996b383cd4e501021829cd9d08185581081f;hpb=62ebf3da00001abb841c92128c4fdb57d0795ee2;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 450e996..a1282cc 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -31,18 +31,22 @@ 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.Profile.Field;
 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;
 import net.pterodactylus.util.number.Numbers;
+import net.pterodactylus.util.version.Version;
 import freenet.keys.FreenetURI;
 
 /**
@@ -50,7 +54,7 @@ import freenet.keys.FreenetURI;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class Core implements IdentityListener {
+public class Core implements IdentityListener, UpdateListener {
 
 	/**
 	 * Enumeration for the possible states of a {@link Sone}.
@@ -78,8 +82,14 @@ 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;
+
+	/** Whether we’re currently saving the configuration. */
+	private boolean storingConfiguration = false;
 
 	/** The identity manager. */
 	private final IdentityManager identityManager;
@@ -90,10 +100,20 @@ public class Core implements IdentityListener {
 	/** The Sone downloader. */
 	private final SoneDownloader soneDownloader;
 
+	/** The update checker. */
+	private final UpdateChecker updateChecker;
+
+	/** 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>();
@@ -116,9 +136,22 @@ public class Core implements IdentityListener {
 	/** 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.
 	 *
@@ -134,6 +167,31 @@ public class Core implements IdentityListener {
 		this.freenetInterface = freenetInterface;
 		this.identityManager = identityManager;
 		this.soneDownloader = new SoneDownloader(this, freenetInterface);
+		this.updateChecker = new UpdateChecker(freenetInterface);
+	}
+
+	//
+	// 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);
 	}
 
 	//
@@ -141,6 +199,18 @@ public class Core implements IdentityListener {
 	//
 
 	/**
+	 * 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
@@ -150,6 +220,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
@@ -159,6 +239,15 @@ public class Core implements IdentityListener {
 	}
 
 	/**
+	 * Returns the update checker.
+	 *
+	 * @return The update checker
+	 */
+	public UpdateChecker getUpdateChecker() {
+		return updateChecker;
+	}
+
+	/**
 	 * Returns the status of the given Sone.
 	 *
 	 * @param sone
@@ -186,6 +275,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
@@ -288,9 +390,23 @@ public class Core implements IdentityListener {
 	 * @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) {
 			Sone sone = localSones.get(id);
-			if (sone == null) {
+			if ((sone == null) && create) {
 				sone = new Sone(id);
 				localSones.put(id, sone);
 			}
@@ -382,11 +498,26 @@ public class Core implements IdentityListener {
 		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
@@ -394,9 +525,23 @@ 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) {
 			Post post = posts.get(postId);
-			if (post == null) {
+			if ((post == null) && create) {
 				post = new Post(postId);
 				posts.put(postId, post);
 			}
@@ -405,16 +550,72 @@ public class Core implements IdentityListener {
 	}
 
 	/**
-	 * Returns the reply with the given ID.
+	 * 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) {
+				Post post = getPost(postId, false);
+				if (post != null) {
+					markPostKnown(post);
+				}
+			}
+			return isNew;
+		}
+	}
+
+	/**
+	 * 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, or {@code null} if there is no such reply
+	 * @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.
+	 *
+	 * @param replyId
+	 *            The ID of the reply to get
+	 * @param create
+	 *            {@code true} to always return a {@link Reply}, {@code false}
+	 *            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) {
 		synchronized (replies) {
 			Reply reply = replies.get(replyId);
-			if (reply == null) {
+			if (create && (reply == null)) {
 				reply = new Reply(replyId);
 				replies.put(replyId, reply);
 			}
@@ -444,6 +645,42 @@ 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) {
+				Reply reply = getReply(replyId, false);
+				if (reply != null) {
+					markReplyKnown(reply);
+				}
+			}
+			return isNew;
+		}
+	}
+
+	/**
 	 * Returns all Sones that have liked the given post.
 	 *
 	 * @param post
@@ -482,6 +719,37 @@ 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) {
+			if (lockedSones.add(sone)) {
+				coreListenerManager.fireSoneLocked(sone);
+			}
+		}
+	}
+
+	/**
+	 * Unlocks the given Sone.
+	 *
+	 * @see #lockSone(Sone)
+	 * @param sone
+	 *            The sone to unlock
+	 */
+	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.
 	 *
@@ -520,24 +788,43 @@ public class Core implements IdentityListener {
 			final Sone sone;
 			try {
 				sone = getLocalSone(ownIdentity.getId()).setIdentity(ownIdentity).setInsertUri(new FreenetURI(ownIdentity.getInsertUri())).setRequestUri(new FreenetURI(ownIdentity.getRequestUri()));
-				sone.setLatestEdition(Numbers.safeParseLong(ownIdentity.getProperty("Sone.LatestEdition"), (long) 0));
 			} catch (MalformedURLException mue1) {
 				logger.log(Level.SEVERE, "Could not convert the Identity’s URIs to Freenet URIs: " + ownIdentity.getInsertUri() + ", " + ownIdentity.getRequestUri(), mue1);
 				return null;
 			}
+			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() {
-					soneDownloader.fetchSone(sone);
+					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();
@@ -555,10 +842,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;
 	}
 
@@ -581,7 +864,13 @@ public class Core implements IdentityListener {
 			sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0));
 			if (newSone) {
 				synchronized (newSones) {
-					newSones.add(sone.getId());
+					newSone = !knownSones.contains(sone.getId());
+					if (newSone) {
+						newSones.add(sone.getId());
+					}
+				}
+				if (newSone) {
+					coreListenerManager.fireNewSoneFound(sone);
 				}
 			}
 			remoteSones.put(identity.getId(), sone);
@@ -607,37 +896,79 @@ 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());
+						if (!sone.getPosts().contains(post)) {
+							coreListenerManager.firePostRemoved(post);
+						}
+					}
 				}
-				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());
+						if (!sone.getReplies().contains(reply)) {
+							coreListenerManager.fireReplyRemoved(reply);
+						}
+					}
 				}
-				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.setLatestEdition(sone.getRequestUri().getEdition());
-				storedSone.setModificationCounter(0);
+				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());
 			}
 		}
 	}
@@ -692,7 +1023,7 @@ public class Core implements IdentityListener {
 			logger.log(Level.INFO, "Could not load Sone because no Sone has been saved.");
 			return;
 		}
-		long soneModificationCounter = configuration.getLongValue(sonePrefix + "/ModificationCounter").getValue((long) 0);
+		String lastInsertFingerprint = configuration.getStringValue(sonePrefix + "/LastInsertFingerprint").getValue("");
 
 		/* load profile. */
 		Profile profile = new Profile();
@@ -703,6 +1034,17 @@ public class Core implements IdentityListener {
 		profile.setBirthMonth(configuration.getIntValue(sonePrefix + "/Profile/BirthMonth").getValue(null));
 		profile.setBirthYear(configuration.getIntValue(sonePrefix + "/Profile/BirthYear").getValue(null));
 
+		/* load profile fields. */
+		while (true) {
+			String fieldPrefix = sonePrefix + "/Profile/Fields/" + profile.getFields().size();
+			String fieldName = configuration.getStringValue(fieldPrefix + "/Name").getValue(null);
+			if (fieldName == null) {
+				break;
+			}
+			String fieldValue = configuration.getStringValue(fieldPrefix + "/Value").getValue("");
+			profile.addField(fieldName).setValue(fieldValue);
+		}
+
 		/* load posts. */
 		Set<Post> posts = new HashSet<Post>();
 		while (true) {
@@ -711,13 +1053,18 @@ public class Core implements IdentityListener {
 			if (postId == null) {
 				break;
 			}
+			String postRecipientId = configuration.getStringValue(postPrefix + "/Recipient").getValue(null);
 			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));
+			Post post = getPost(postId).setSone(sone).setTime(postTime).setText(postText);
+			if ((postRecipientId != null) && (postRecipientId.length() == 43)) {
+				post.setRecipient(getSone(postRecipientId));
+			}
+			posts.add(post);
 		}
 
 		/* load replies. */
@@ -777,13 +1124,23 @@ public class Core implements IdentityListener {
 			sone.setLikePostIds(likedPostIds);
 			sone.setLikeReplyIds(likedReplyIds);
 			sone.setFriends(friends);
-			sone.setModificationCounter(soneModificationCounter);
+			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());
+			}
+		}
 	}
 
 	/**
@@ -793,7 +1150,7 @@ public class Core implements IdentityListener {
 	 * @param sone
 	 *            The Sone to save
 	 */
-	public void saveSone(Sone sone) {
+	public synchronized void saveSone(Sone sone) {
 		if (!isLocalSone(sone)) {
 			logger.log(Level.FINE, "Tried to save non-local Sone: %s", sone);
 			return;
@@ -809,7 +1166,7 @@ public class Core implements IdentityListener {
 			/* save Sone into configuration. */
 			String sonePrefix = "Sone/" + sone.getId();
 			configuration.getLongValue(sonePrefix + "/Time").setValue(sone.getTime());
-			configuration.getLongValue(sonePrefix + "/ModificationCounter").setValue(sone.getModificationCounter());
+			configuration.getStringValue(sonePrefix + "/LastInsertFingerprint").setValue(soneInserters.get(sone).getLastInsertFingerprint());
 
 			/* save profile. */
 			Profile profile = sone.getProfile();
@@ -820,11 +1177,21 @@ public class Core implements IdentityListener {
 			configuration.getIntValue(sonePrefix + "/Profile/BirthMonth").setValue(profile.getBirthMonth());
 			configuration.getIntValue(sonePrefix + "/Profile/BirthYear").setValue(profile.getBirthYear());
 
+			/* save profile fields. */
+			int fieldCounter = 0;
+			for (Field profileField : profile.getFields()) {
+				String fieldPrefix = sonePrefix + "/Profile/Fields/" + fieldCounter++;
+				configuration.getStringValue(fieldPrefix + "/Name").setValue(profileField.getName());
+				configuration.getStringValue(fieldPrefix + "/Value").setValue(profileField.getValue());
+			}
+			configuration.getStringValue(sonePrefix + "/Profile/Fields/" + fieldCounter + "/Name").setValue(null);
+
 			/* save posts. */
 			int postCounter = 0;
 			for (Post post : sone.getPosts()) {
 				String postPrefix = sonePrefix + "/Posts/" + postCounter++;
 				configuration.getStringValue(postPrefix + "/ID").setValue(post.getId());
+				configuration.getStringValue(postPrefix + "/Recipient").setValue((post.getRecipient() != null) ? post.getRecipient().getId() : null);
 				configuration.getLongValue(postPrefix + "/Time").setValue(post.getTime());
 				configuration.getStringValue(postPrefix + "/Text").setValue(post.getText());
 			}
@@ -857,11 +1224,12 @@ public class Core implements IdentityListener {
 
 			/* save friends. */
 			int friendCounter = 0;
-			for (String friend : sone.getFriends()) {
-				configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(friend);
+			for (String friendId : sone.getFriends()) {
+				configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter++ + "/ID").setValue(friendId);
 			}
 			configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(null);
 
+			configuration.save();
 			logger.log(Level.INFO, "Sone %s saved.", sone);
 		} catch (ConfigurationException ce1) {
 			logger.log(Level.WARNING, "Could not save Sone: " + sone, ce1);
@@ -875,9 +1243,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);
 	}
 
 	/**
@@ -889,18 +1258,60 @@ 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) {
+		return createPost(sone, null, time, text);
+	}
+
+	/**
+	 * Creates a new post.
+	 *
+	 * @param sone
+	 *            The Sone that creates the post
+	 * @param recipient
+	 *            The recipient Sone, or {@code null} if this post does not have
+	 *            a recipient
+	 * @param text
+	 *            The text of the post
+	 * @return The created post
+	 */
+	public Post createPost(Sone sone, Sone recipient, String text) {
+		return createPost(sone, recipient, System.currentTimeMillis(), text);
+	}
+
+	/**
+	 * Creates a new post.
+	 *
+	 * @param sone
+	 *            The Sone that creates the post
+	 * @param recipient
+	 *            The recipient Sone, or {@code null} if this post does not have
+	 *            a recipient
+	 * @param time
+	 *            The time of the post
+	 * @param text
+	 *            The text of the post
+	 * @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);
-			return;
+			return null;
 		}
 		Post post = new Post(sone, time, text);
+		if (recipient != null) {
+			post.setRecipient(recipient);
+		}
 		synchronized (posts) {
 			posts.put(post.getId(), post);
 		}
+		synchronized (newPosts) {
+			knownPosts.add(post.getId());
+		}
 		sone.addPost(post);
 		saveSone(sone);
+		return post;
 	}
 
 	/**
@@ -922,6 +1333,23 @@ public class Core implements IdentityListener {
 	}
 
 	/**
+	 * 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);
+				saveConfiguration();
+			}
+		}
+	}
+
+	/**
 	 * Creates a new reply.
 	 *
 	 * @param sone
@@ -930,9 +1358,10 @@ 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);
 	}
 
 	/**
@@ -946,18 +1375,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;
 	}
 
 	/**
@@ -980,10 +1414,29 @@ 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);
+				saveConfiguration();
+			}
+		}
+	}
+
+	/**
 	 * Starts the core.
 	 */
 	public void start() {
 		loadConfiguration();
+		updateChecker.addUpdateListener(this);
+		updateChecker.start();
 	}
 
 	/**
@@ -995,7 +1448,70 @@ public class Core implements IdentityListener {
 				soneInserter.stop();
 			}
 		}
+		updateChecker.stop();
+		updateChecker.removeUpdateListener(this);
+		soneDownloader.stop();
 		saveConfiguration();
+		stopped = true;
+	}
+
+	/**
+	 * Saves the current options.
+	 */
+	public void saveConfiguration() {
+		synchronized (configuration) {
+			if (storingConfiguration) {
+				logger.log(Level.FINE, "Already storing configuration…");
+				return;
+			}
+			storingConfiguration = true;
+		}
+
+		/* store the options first. */
+		try {
+			configuration.getIntValue("Option/ConfigurationVersion").setValue(0);
+			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);
+		} finally {
+			synchronized (configuration) {
+				storingConfiguration = false;
+			}
+		}
 	}
 
 	//
@@ -1016,6 +1532,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));
 
@@ -1031,6 +1548,7 @@ 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;
@@ -1043,30 +1561,31 @@ public class Core implements IdentityListener {
 				knownSones.add(knownSoneId);
 			}
 		}
-	}
-
-	/**
-	 * 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());
 
-			/* 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);
+		/* 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);
 			}
+		}
 
-		} 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);
+			}
 		}
+
 	}
 
 	/**
@@ -1142,4 +1661,16 @@ public class Core implements IdentityListener {
 		/* TODO */
 	}
 
+	//
+	// INTERFACE UpdateListener
+	//
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void updateFound(Version version, long releaseTime) {
+		coreListenerManager.fireUpdateFound(version, releaseTime);
+	}
+
 }