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=7cbce1bb1edfa2ada4c7064ade2ae412baad3bdc;hpb=110f9baa87db5758cc6fee3951d8096f569e6166;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 7cbce1b..a1282cc 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -24,7 +24,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -35,6 +34,7 @@ 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;
@@ -1036,18 +1036,13 @@ public class Core implements IdentityListener, UpdateListener {
 
 		/* load profile fields. */
 		while (true) {
-			String fieldPrefix = sonePrefix + "/Profile/Fields/" + profile.getFieldNames().size();
+			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(null);
-			if (fieldValue == null) {
-				logger.log(Level.WARNING, "Invalid profile field found, aborting load!");
-				return;
-			}
-			profile.addField(fieldName);
-			profile.setField(fieldName, fieldValue);
+			String fieldValue = configuration.getStringValue(fieldPrefix + "/Value").getValue("");
+			profile.addField(fieldName).setValue(fieldValue);
 		}
 
 		/* load posts. */
@@ -1184,9 +1179,9 @@ public class Core implements IdentityListener, UpdateListener {
 
 			/* save profile fields. */
 			int fieldCounter = 0;
-			for (Entry<String, String> profileField : profile.getFields().entrySet()) {
+			for (Field profileField : profile.getFields()) {
 				String fieldPrefix = sonePrefix + "/Profile/Fields/" + fieldCounter++;
-				configuration.getStringValue(fieldPrefix + "/Name").setValue(profileField.getKey());
+				configuration.getStringValue(fieldPrefix + "/Name").setValue(profileField.getName());
 				configuration.getStringValue(fieldPrefix + "/Value").setValue(profileField.getValue());
 			}
 			configuration.getStringValue(sonePrefix + "/Profile/Fields/" + fieldCounter + "/Name").setValue(null);