X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=52b885e011ce4e840db70a95a3316824152b48f7;hb=d1c7f645f187884df0171309ecb63617373afb59;hp=dc6516d8e61096d7213c6df48b363706e8caca52;hpb=f0475af7553655310d1a5076603e3288168183f8;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 dc6516d..52b885e 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);
 			}
 		}
@@ -451,6 +451,15 @@ public class Core implements IdentityListener {
 			soneInserter.start();
 			setSoneStatus(sone, SoneStatus.idle);
 			loadSone(sone);
+			new Thread(new Runnable() {
+
+				@Override
+				@SuppressWarnings("synthetic-access")
+				public void run() {
+					soneDownloader.fetchSone(sone);
+				}
+
+			}, "Sone Downloader").start();
 			return sone;
 		}
 	}
@@ -486,7 +495,8 @@ public class Core implements IdentityListener {
 		}
 		synchronized (remoteSones) {
 			final Sone sone = getRemoteSone(identity.getId()).setIdentity(identity);
-			sone.setRequestUri(getSoneUri(identity.getRequestUri(), identity.getProperty("Sone.LatestEdition")));
+			sone.setRequestUri(getSoneUri(identity.getRequestUri()));
+			sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0));
 			remoteSones.put(identity.getId(), sone);
 			soneDownloader.addSone(sone);
 			new Thread(new Runnable() {
@@ -540,8 +550,8 @@ public class Core implements IdentityListener {
 				storedSone.setLikePostIds(sone.getLikedPostIds());
 				storedSone.setLikeReplyIds(sone.getLikedReplyIds());
 				storedSone.setLatestEdition(sone.getRequestUri().getEdition());
+				storedSone.setModificationCounter(0);
 			}
-			saveSone(storedSone);
 		}
 	}
 
@@ -567,6 +577,12 @@ public class Core implements IdentityListener {
 			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 +600,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. */
@@ -947,13 +967,11 @@ public class Core implements IdentityListener {
 	 *
 	 * @param uriString
 	 *            The URI to derive the Sone URI from
-	 * @param latestEditionString
-	 *            The latest edition as a {@link String}, or {@code null}
 	 * @return The derived URI
 	 */
-	private FreenetURI getSoneUri(String uriString, String latestEditionString) {
+	private FreenetURI getSoneUri(String uriString) {
 		try {
-			FreenetURI uri = new FreenetURI(uriString).setDocName("Sone").setMetaString(new String[0]).setSuggestedEdition(Numbers.safeParseLong(latestEditionString, (long) 0));
+			FreenetURI uri = new FreenetURI(uriString).setDocName("Sone").setMetaString(new String[0]);
 			return uri;
 		} catch (MalformedURLException mue1) {
 			logger.log(Level.WARNING, "Could not create Sone URI from URI: " + uriString, mue1);
@@ -981,7 +999,7 @@ public class Core implements IdentityListener {
 	 */
 	@Override
 	public void ownIdentityRemoved(OwnIdentity ownIdentity) {
-		/* TODO */
+		logger.log(Level.FINEST, "Removing OwnIdentity: " + ownIdentity);
 	}
 
 	/**
@@ -997,8 +1015,16 @@ public class Core implements IdentityListener {
 	 * {@inheritDoc}
 	 */
 	@Override
-	public void identityUpdated(Identity identity) {
-		/* TODO */
+	public void identityUpdated(final Identity identity) {
+		new Thread(new Runnable() {
+
+			@Override
+			@SuppressWarnings("synthetic-access")
+			public void run() {
+				Sone sone = getRemoteSone(identity.getId());
+				soneDownloader.fetchSone(sone);
+			}
+		}).start();
 	}
 
 	/**