X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloader.java;h=decd574577beeceb3479c39c450f2d31ee9955fb;hb=3c4e92547343582aca1fde00f981f029027a1bb4;hp=cffc8d930615a23a91df97408862114f4654cb00;hpb=3d888e800617335535c1a4b2cbac3e02acfdde34;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
index cffc8d9..decd574 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -105,18 +105,6 @@ public class SoneDownloader extends AbstractService {
 	}
 
 	/**
-	 * Removes the given Sone from the downloader.
-	 *
-	 * @param sone
-	 *            The Sone to stop watching
-	 */
-	public void removeSone(Sone sone) {
-		if (sones.remove(sone)) {
-			freenetInterface.unregisterUsk(sone);
-		}
-	}
-
-	/**
 	 * Fetches the updated Sone. This method is a callback method for
 	 * {@link FreenetInterface#registerUsk(Sone, SoneDownloader)}.
 	 *
@@ -308,16 +296,8 @@ public class SoneDownloader extends AbstractService {
 			}
 		}
 
-		String soneInsertUri = soneXml.getValue("insert-uri", null);
-		if ((soneInsertUri != null) && (sone.getInsertUri() == null)) {
-			try {
-				sone.setInsertUri(new FreenetURI(soneInsertUri));
-				sone.setLatestEdition(Math.max(sone.getRequestUri().getEdition(), sone.getInsertUri().getEdition()));
-			} catch (MalformedURLException mue1) {
-				/* TODO - mark Sone as bad. */
-				logger.log(Level.WARNING, String.format("Downloaded Sone %s has invalid insert URI: %s", sone, soneInsertUri), mue1);
-				return null;
-			}
+		if (originalSone.getInsertUri() != null) {
+			sone.setInsertUri(originalSone.getInsertUri());
 		}
 
 		SimpleXML profileXml = soneXml.getNode("profile");
@@ -541,4 +521,34 @@ public class SoneDownloader extends AbstractService {
 		}
 	}
 
+	public class FetchSoneWithUri implements Runnable {
+
+		private final Sone sone;
+
+		public FetchSoneWithUri(Sone sone) {
+			this.sone = sone;
+		}
+
+		@Override
+		public void run() {
+			fetchSone(sone, sone.getRequestUri());
+		}
+
+	}
+
+	public class FetchSone implements Runnable {
+
+		private final Sone sone;
+
+		public FetchSone(Sone sone) {
+			this.sone = sone;
+		}
+
+		@Override
+		public void run() {
+			fetchSone(sone);
+		}
+
+	}
+
 }