X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=132e4a605249c1c826e7f148eeb8eeb480d1c4ad;hb=6fa3e26eb2deda14bd56dd343011b5735d449104;hp=d5625c905a9dd075b5167587c3536d8f3c3cda53;hpb=ca3084f361acdab99b0e19e872302abd222708ae;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 d5625c9..132e4a6 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -106,6 +106,9 @@ public class Core implements IdentityListener {
 	/* synchronize access on this on itself. */
 	private Map<String, Sone> remoteSones = new HashMap<String, Sone>();
 
+	/** All new Sones. */
+	private Set<Sone> newSones = new HashSet<Sone>();
+
 	/** All posts. */
 	private Map<String, Post> posts = new HashMap<String, Post>();
 
@@ -306,6 +309,20 @@ public class Core implements IdentityListener {
 	}
 
 	/**
+	 * Returns whether the Sone with the given ID is a remote Sone.
+	 *
+	 * @param id
+	 *            The ID of the Sone to check
+	 * @return {@code true} if the Sone with the given ID is a remote Sone,
+	 *         {@code false} otherwise
+	 */
+	public boolean isRemoteSone(String id) {
+		synchronized (remoteSones) {
+			return remoteSones.containsKey(id);
+		}
+	}
+
+	/**
 	 * Returns the post with the given ID.
 	 *
 	 * @param postId
@@ -451,6 +468,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;
 		}
 	}
@@ -485,10 +511,18 @@ public class Core implements IdentityListener {
 			return null;
 		}
 		synchronized (remoteSones) {
+			boolean newSone = !isRemoteSone(identity.getId());
 			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));
+			if (newSone) {
+				synchronized (newSones) {
+					newSones.add(sone);
+				}
+			}
 			remoteSones.put(identity.getId(), sone);
 			soneDownloader.addSone(sone);
+			setSoneStatus(sone, SoneStatus.unknown);
 			new Thread(new Runnable() {
 
 				@Override
@@ -498,7 +532,6 @@ public class Core implements IdentityListener {
 				}
 
 			}, "Sone Downloader").start();
-			setSoneStatus(sone, SoneStatus.idle);
 			return sone;
 		}
 	}
@@ -540,8 +573,8 @@ public class Core implements IdentityListener {
 				storedSone.setLikePostIds(sone.getLikedPostIds());
 				storedSone.setLikeReplyIds(sone.getLikedReplyIds());
 				storedSone.setLatestEdition(sone.getRequestUri().getEdition());
+				storedSone.setModificationCounter(0);
 			}
-			saveSone(storedSone);
 		}
 	}
 
@@ -957,13 +990,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);
@@ -991,7 +1022,7 @@ public class Core implements IdentityListener {
 	 */
 	@Override
 	public void ownIdentityRemoved(OwnIdentity ownIdentity) {
-		/* TODO */
+		logger.log(Level.FINEST, "Removing OwnIdentity: " + ownIdentity);
 	}
 
 	/**
@@ -1007,8 +1038,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();
 	}
 
 	/**