X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=16d4a2c1e599c3bf0c2339aa2fbe170ca33e4bc5;hb=ad5654be1d1df30543c40bc01ccab9f143cdc852;hp=adf580b458f5e144b5b653a1955e594585f949d2;hpb=8469b16d207317c53a88de915e1ee6a8a648a114;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 adf580b..16d4a2c 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -200,12 +200,10 @@ public class Core implements IdentityListener {
 	 *         Sone
 	 */
 	public Sone getSone(String id) {
-		Sone sone = getRemoteSone(id);
-		if (sone != null) {
-			return sone;
+		if (isLocalSone(id)) {
+			return getLocalSone(id);
 		}
-		sone = getLocalSone(id);
-		return sone;
+		return getRemoteSone(id);
 	}
 
 	/**
@@ -222,6 +220,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
@@ -237,11 +249,16 @@ 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) {
 		synchronized (localSones) {
-			return localSones.get(id);
+			Sone sone = localSones.get(id);
+			if (sone == null) {
+				sone = new Sone(id);
+				localSones.put(id, sone);
+			}
+			return sone;
 		}
 	}
 
@@ -261,11 +278,16 @@ 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) {
 		synchronized (remoteSones) {
-			return remoteSones.get(id);
+			Sone sone = remoteSones.get(id);
+			if (sone == null) {
+				sone = new Sone(id);
+				remoteSones.put(id, sone);
+			}
+			return sone;
 		}
 	}
 
@@ -420,7 +442,7 @@ public class Core implements IdentityListener {
 			}
 			final Sone sone;
 			try {
-				sone = new Sone(ownIdentity).setInsertUri(new FreenetURI(ownIdentity.getInsertUri())).setRequestUri(new FreenetURI(ownIdentity.getRequestUri()));
+				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);
@@ -577,6 +599,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());
 
 			/* save profile. */
 			Profile profile = sone.getProfile();
@@ -622,6 +645,14 @@ public class Core implements IdentityListener {
 			}
 			configuration.getStringValue(sonePrefix + "/Likes/Reply/" + replyLikeCounter + "/ID").setValue(null);
 
+			/* save friends. */
+			int friendCounter = 0;
+			for (Sone friend : sone.getFriends()) {
+				configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(friend.getId());
+				configuration.getBooleanValue(sonePrefix + "/Friends/" + friendCounter++ + "/Local").setValue(friend.getInsertUri() != null);
+			}
+			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);