X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=0ae720689bdaf6bf1066a4b456ff21c7300b332b;hp=ea4fef78a280e9ea667b291ace282218520d6093;hb=63df577f7ced52acfa93e4a7f329292069d8ba9d;hpb=8b00671178fda30725538696e60ca9674d259fa0

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index ea4fef7..0ae7206 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -945,29 +945,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	}
 
 	/**
-	 * Adds a local Sone from the given ID which has to be the ID of an own
-	 * identity.
-	 *
-	 * @param id
-	 *            The ID of an own identity to add a Sone for
-	 * @return The added (or already existing) Sone
-	 */
-	public Sone addLocalSone(String id) {
-		synchronized (localSones) {
-			if (localSones.containsKey(id)) {
-				logger.log(Level.FINE, "Tried to add known local Sone: %s", id);
-				return localSones.get(id);
-			}
-			OwnIdentity ownIdentity = identityManager.getOwnIdentity(id);
-			if (ownIdentity == null) {
-				logger.log(Level.INFO, "Invalid Sone ID: %s", id);
-				return null;
-			}
-			return addLocalSone(ownIdentity);
-		}
-	}
-
-	/**
 	 * Adds a local Sone from the given own identity.
 	 *
 	 * @param ownIdentity
@@ -1084,6 +1061,11 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 */
 	public void followSone(Sone sone, String soneId) {
 		Validation.begin().isNotNull("Sone", sone).isNotNull("Sone ID", soneId).check();
+		Sone followedSone = getSone(soneId, true);
+		if (followedSone == null) {
+			logger.log(Level.INFO, String.format("Ignored Sone with invalid ID: %s", soneId));
+			return;
+		}
 		followSone(sone, getSone(soneId));
 	}
 
@@ -1460,7 +1442,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		String lastInsertFingerprint = configuration.getStringValue(sonePrefix + "/LastInsertFingerprint").getValue("");
 
 		/* load profile. */
-		Profile profile = new Profile();
+		Profile profile = new Profile(sone);
 		profile.setFirstName(configuration.getStringValue(sonePrefix + "/Profile/FirstName").getValue(null));
 		profile.setMiddleName(configuration.getStringValue(sonePrefix + "/Profile/MiddleName").getValue(null));
 		profile.setLastName(configuration.getStringValue(sonePrefix + "/Profile/LastName").getValue(null));
@@ -1608,6 +1590,12 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			album.addImage(image);
 		}
 
+		/* load avatar. */
+		String avatarId = configuration.getStringValue(sonePrefix + "/Profile/Avatar").getValue(null);
+		if (avatarId != null) {
+			profile.setAvatar(getImage(avatarId, false));
+		}
+
 		/* load options. */
 		sone.getOptions().getBooleanOption("AutoFollow").set(configuration.getBooleanValue(sonePrefix + "/Options/AutoFollow").getValue(null));
 		sone.getOptions().getBooleanOption("EnableSoneInsertNotifications").set(configuration.getBooleanValue(sonePrefix + "/Options/EnableSoneInsertNotifications").getValue(null));
@@ -2153,6 +2141,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			configuration.getIntValue(sonePrefix + "/Profile/BirthDay").setValue(profile.getBirthDay());
 			configuration.getIntValue(sonePrefix + "/Profile/BirthMonth").setValue(profile.getBirthMonth());
 			configuration.getIntValue(sonePrefix + "/Profile/BirthYear").setValue(profile.getBirthYear());
+			configuration.getStringValue(sonePrefix + "/Profile/Avatar").setValue(profile.getAvatar());
 
 			/* save profile fields. */
 			int fieldCounter = 0;
@@ -2432,8 +2421,13 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 				break;
 			}
 			long time = configuration.getLongValue("SoneFollowingTimes/" + soneCounter + "/Time").getValue(Long.MAX_VALUE);
-			synchronized (soneFollowingTimes) {
-				soneFollowingTimes.put(getSone(soneId), time);
+			Sone followedSone = getSone(soneId);
+			if (followedSone == null) {
+				logger.log(Level.WARNING, String.format("Ignoring Sone with invalid ID: %s", soneId));
+			} else {
+				synchronized (soneFollowingTimes) {
+					soneFollowingTimes.put(getSone(soneId), time);
+				}
 			}
 			++soneCounter;
 		}