X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=8c1aeedc2374259804743312639860b84e9162aa;hb=066c47675194a5295a9861b1c9c289c44219a740;hp=91bd0cc00430e7fe7fe3c0244b2eb89dc0fb8295;hpb=f90d92147c4cff4abe4ae904c6e89d7382b5921e;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 91bd0cc..8c1aeed 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -17,9 +17,11 @@
 
 package net.pterodactylus.sone.core;
 
+import static com.google.common.base.Optional.fromNullable;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Predicates.not;
+import static com.google.common.primitives.Longs.tryParse;
 import static java.lang.String.format;
 import static java.util.logging.Level.WARNING;
 import static net.pterodactylus.sone.data.Sone.LOCAL_SONE_FILTER;
@@ -758,6 +760,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			logger.log(Level.WARNING, "Given Identity is null!");
 			return null;
 		}
+		final Long latestEdition = fromNullable(tryParse(
+				identity.getProperty("Sone.LatestEdition"))).or(0L);
 		synchronized (sones) {
 			final Sone sone = getRemoteSone(identity.getId(), true);
 			if (sone.isLocal()) {
@@ -766,7 +770,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			sone.setIdentity(identity);
 			boolean newSone = sone.getRequestUri() == null;
 			sone.setRequestUri(SoneUri.create(identity.getRequestUri()));
-			sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0));
+			sone.setLatestEdition(latestEdition);
 			if (newSone) {
 				synchronized (knownSones) {
 					newSone = !knownSones.contains(sone.getId());
@@ -1158,7 +1162,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		/* load avatar. */
 		String avatarId = configuration.getStringValue(sonePrefix + "/Profile/Avatar").getValue(null);
 		if (avatarId != null) {
-			profile.setAvatar(getImage(avatarId, false));
+			final Map<String, Image> images =
+					configurationSoneParser.getImages();
+			profile.setAvatar(images.get(avatarId));
 		}
 
 		/* load options. */