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=e4814fea03c24d99f4896957830061674a4fdf11;hpb=bb29e8bdcfb1a9be26bb6bb40d73f019dccfebaf;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 e4814fe..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);
 			}
 		}
@@ -436,10 +436,6 @@ public class Core implements IdentityListener {
 			return null;
 		}
 		synchronized (localSones) {
-			if (localSones.containsKey(ownIdentity.getId())) {
-				logger.log(Level.FINE, "Tried to add known local Sone: %s", ownIdentity);
-				return localSones.get(ownIdentity.getId());
-			}
 			final Sone sone;
 			try {
 				sone = getLocalSone(ownIdentity.getId()).setIdentity(ownIdentity).setInsertUri(new FreenetURI(ownIdentity.getInsertUri())).setRequestUri(new FreenetURI(ownIdentity.getRequestUri()));
@@ -454,15 +450,7 @@ public class Core implements IdentityListener {
 			soneInserters.put(sone, soneInserter);
 			soneInserter.start();
 			setSoneStatus(sone, SoneStatus.idle);
-			new Thread(new Runnable() {
-
-				@Override
-				@SuppressWarnings("synthetic-access")
-				public void run() {
-					soneDownloader.fetchSone(sone);
-				}
-
-			}, "Sone Downloader").start();
+			loadSone(sone);
 			return sone;
 		}
 	}
@@ -497,14 +485,19 @@ public class Core implements IdentityListener {
 			return null;
 		}
 		synchronized (remoteSones) {
-			if (remoteSones.containsKey(identity.getId())) {
-				logger.log(Level.FINE, "Identity already exists: %s", identity);
-				return remoteSones.get(identity.getId());
-			}
-			Sone sone = new Sone(identity);
+			final Sone sone = getRemoteSone(identity.getId()).setIdentity(identity);
 			sone.setRequestUri(getSoneUri(identity.getRequestUri(), identity.getProperty("Sone.LatestEdition")));
 			remoteSones.put(identity.getId(), sone);
 			soneDownloader.addSone(sone);
+			new Thread(new Runnable() {
+
+				@Override
+				@SuppressWarnings("synthetic-access")
+				public void run() {
+					soneDownloader.fetchSone(sone);
+				}
+
+			}, "Sone Downloader").start();
 			setSoneStatus(sone, SoneStatus.idle);
 			return sone;
 		}
@@ -571,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);
+		}
 	}
 
 	/**
@@ -591,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. */