X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloader.java;h=5024ab99ab9acf85ca1c3190ed7f19aabdc29329;hp=9c8bbf07f6aa55edf6795fd2fb2b5200fa80ce74;hb=63df577f7ced52acfa93e4a7f329292069d8ba9d;hpb=c8944bfc100b1dde9d57de005b6d3387d62afa8b

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
index 9c8bbf0..5024ab9 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -219,6 +219,8 @@ public class SoneDownloader extends AbstractService {
 	 * @param soneInputStream
 	 *            The input stream to parse the Sone from
 	 * @return The parsed Sone
+	 * @throws SoneException
+	 *             if a parse error occurs, or the protocol is invalid
 	 */
 	public Sone parseSone(Sone originalSone, InputStream soneInputStream) throws SoneException {
 		/* TODO - impose a size limit? */
@@ -328,8 +330,10 @@ public class SoneDownloader extends AbstractService {
 		Integer profileBirthDay = Numbers.safeParseInteger(profileXml.getValue("birth-day", null));
 		Integer profileBirthMonth = Numbers.safeParseInteger(profileXml.getValue("birth-month", null));
 		Integer profileBirthYear = Numbers.safeParseInteger(profileXml.getValue("birth-year", null));
-		Profile profile = new Profile().setFirstName(profileFirstName).setMiddleName(profileMiddleName).setLastName(profileLastName);
+		Profile profile = new Profile(sone).setFirstName(profileFirstName).setMiddleName(profileMiddleName).setLastName(profileLastName);
 		profile.setBirthDay(profileBirthDay).setBirthMonth(profileBirthMonth).setBirthYear(profileBirthYear);
+		/* avatar is processed after images are loaded. */
+		String avatarId = profileXml.getValue("avatar", null);
 
 		/* parse profile fields. */
 		SimpleXML profileFieldsXml = profileXml.getNode("fields");
@@ -493,6 +497,11 @@ public class SoneDownloader extends AbstractService {
 			}
 		}
 
+		/* process avatar. */
+		if (avatarId != null) {
+			profile.setAvatar(core.getImage(avatarId, false));
+		}
+
 		/* okay, apparently everything was parsed correctly. Now import. */
 		/* atomic setter operation on the Sone. */
 		synchronized (sone) {