X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=d5625c905a9dd075b5167587c3536d8f3c3cda53;hb=ca3084f361acdab99b0e19e872302abd222708ae;hp=a7623b90a7e49418f092273c908ce179617aa553;hpb=f3cb07daf85e263e2bed9e0bcab3e61cddc17be3;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 a7623b9..d5625c9 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -389,7 +389,7 @@ public class Core implements IdentityListener {
 	public Set<Sone> getLikes(Reply reply) {
 		Set<Sone> sones = new HashSet<Sone>();
 		for (Sone sone : getSones()) {
-			if (sone.getLikedPostIds().contains(reply.getId())) {
+			if (sone.getLikedReplyIds().contains(reply.getId())) {
 				sones.add(sone);
 			}
 		}
@@ -564,9 +564,15 @@ public class Core implements IdentityListener {
 				return;
 			}
 			localSones.remove(sone.getId());
-			soneInserters.remove(sone.getId()).stop();
+			soneInserters.remove(sone).stop();
 		}
 		identityManager.removeContext((OwnIdentity) sone.getIdentity(), "Sone");
+		identityManager.removeProperty((OwnIdentity) sone.getIdentity(), "Sone.LatestEdition");
+		try {
+			configuration.getLongValue("Sone/" + sone.getId() + "/Time").setValue(null);
+		} catch (ConfigurationException ce1) {
+			logger.log(Level.WARNING, "Could not remove Sone from configuration!", ce1);
+		}
 	}
 
 	/**
@@ -584,7 +590,11 @@ public class Core implements IdentityListener {
 
 		/* load Sone. */
 		String sonePrefix = "Sone/" + sone.getId();
-		long soneTime = configuration.getLongValue(sonePrefix + "/Time").getValue((long) 0);
+		Long soneTime = configuration.getLongValue(sonePrefix + "/Time").getValue(null);
+		if (soneTime == null) {
+			logger.log(Level.INFO, "Could not load Sone because no Sone has been saved.");
+			return;
+		}
 		long soneModificationCounter = configuration.getLongValue(sonePrefix + "/ModificationCounter").getValue((long) 0);
 
 		/* load profile. */