X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloader.java;h=7022f5ea088be792fbf51c353846645b078fef45;hb=52a60b132ce14180b0d614bbccb1137b09a78eae;hp=9b80438b948a53104ef8d1e83429bb862a00a5ff;hpb=bc29afc8fdd96b8c80c767148a917034c124d93e;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
index 9b80438..7022f5e 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -25,6 +25,7 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.pterodactylus.sone.core.Core.Preferences;
 import net.pterodactylus.sone.core.Core.SoneStatus;
 import net.pterodactylus.sone.data.Client;
 import net.pterodactylus.sone.data.Post;
@@ -92,9 +93,10 @@ public class SoneDownloader extends AbstractService {
 	 *            The Sone to add
 	 */
 	public void addSone(Sone sone) {
-		if (sones.add(sone)) {
-			freenetInterface.registerUsk(sone, this);
+		if (!sones.add(sone)) {
+			freenetInterface.unregisterUsk(sone);
 		}
+		freenetInterface.registerUsk(sone, this);
 	}
 
 	/**
@@ -122,8 +124,8 @@ public class SoneDownloader extends AbstractService {
 
 	/**
 	 * Fetches the updated Sone. This method can be used to fetch a Sone from a
-	 * specific URI (which happens when {@link Core#isSoneRescueMode() „Sone
-	 * rescue mode“} is active).
+	 * specific URI (which happens when {@link Preferences#isSoneRescueMode()
+	 * „Sone rescue mode“} is active).
 	 *
 	 * @param sone
 	 *            The Sone to fetch
@@ -131,9 +133,6 @@ public class SoneDownloader extends AbstractService {
 	 *            The URI to fetch the Sone from
 	 */
 	public void fetchSone(Sone sone, FreenetURI soneUri) {
-		if (core.getSoneStatus(sone) == SoneStatus.downloading) {
-			return;
-		}
 		logger.log(Level.FINE, "Starting fetch for Sone “%s” from %s…", new Object[] { sone, soneUri });
 		FreenetURI requestUri = soneUri.setMetaString(new String[] { "sone.xml" });
 		core.setSoneStatus(sone, SoneStatus.downloading);
@@ -146,6 +145,7 @@ public class SoneDownloader extends AbstractService {
 			logger.log(Level.FINEST, "Got %d bytes back.", fetchResults.getRight().size());
 			Sone parsedSone = parseSone(sone, fetchResults.getRight(), fetchResults.getLeft());
 			if (parsedSone != null) {
+				addSone(parsedSone);
 				core.updateSone(parsedSone);
 			}
 		} finally {
@@ -285,7 +285,7 @@ public class SoneDownloader extends AbstractService {
 		if ((soneInsertUri != null) && (sone.getInsertUri() == null)) {
 			try {
 				sone.setInsertUri(new FreenetURI(soneInsertUri));
-				sone.setLatestEdition(Math.max(sone.getRequestUri().getSuggestedEdition(), sone.getInsertUri().getSuggestedEdition()));
+				sone.setLatestEdition(Math.max(sone.getRequestUri().getEdition(), sone.getInsertUri().getEdition()));
 			} catch (MalformedURLException mue1) {
 				/* TODO - mark Sone as bad. */
 				logger.log(Level.WARNING, "Downloaded Sone " + sone + " has invalid insert URI: " + soneInsertUri, mue1);
@@ -321,12 +321,11 @@ public class SoneDownloader extends AbstractService {
 					return null;
 				}
 				try {
-					profile.addField(fieldName);
+					profile.addField(fieldName).setValue(fieldValue);
 				} catch (IllegalArgumentException iae1) {
 					logger.log(Level.WARNING, "Duplicate field: " + fieldName, iae1);
 					return null;
 				}
-				profile.setField(fieldName, fieldValue);
 			}
 		}