X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloader.java;h=177b4626e4fad03b8a9446f202973b7dfe249436;hb=0521aa52048c343e9f2ea2920d5f9ac65d724272;hp=4328f02078ec45a6d29370cf68b52288c8568421;hpb=2c68e00705b85174b25133c6544f65d8c0b18621;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 4328f02..177b462 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;
@@ -93,6 +94,7 @@ public class SoneDownloader extends AbstractService {
 	 */
 	public void addSone(Sone sone) {
 		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
@@ -285,7 +287,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);
@@ -310,6 +312,25 @@ public class SoneDownloader extends AbstractService {
 		Profile profile = new Profile().setFirstName(profileFirstName).setMiddleName(profileMiddleName).setLastName(profileLastName);
 		profile.setBirthDay(profileBirthDay).setBirthMonth(profileBirthMonth).setBirthYear(profileBirthYear);
 
+		/* parse profile fields. */
+		SimpleXML profileFieldsXml = profileXml.getNode("fields");
+		if (profileFieldsXml != null) {
+			for (SimpleXML fieldXml : profileFieldsXml.getNodes("field")) {
+				String fieldName = fieldXml.getValue("field-name", null);
+				String fieldValue = fieldXml.getValue("field-value", null);
+				if ((fieldName == null) || (fieldValue == null)) {
+					logger.log(Level.WARNING, "Downloaded profile field for Sone %s with missing data! Name: %s, Value: %s", new Object[] { sone, fieldName, fieldValue });
+					return null;
+				}
+				try {
+					profile.addField(fieldName).setValue(fieldValue);
+				} catch (IllegalArgumentException iae1) {
+					logger.log(Level.WARNING, "Duplicate field: " + fieldName, iae1);
+					return null;
+				}
+			}
+		}
+
 		/* parse posts. */
 		SimpleXML postsXml = soneXml.getNode("posts");
 		Set<Post> posts = new HashSet<Post>();