X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=1448ac813cc10da83efd6595ad38b8849d1f176c;hb=471c14dabae91b2012eecb2b63be5dccb1229ff7;hp=c9ac93bd6c33f912a83b0d8be6b65fa093a212a1;hpb=6282ab82c0e14ae7dea70ada2fa5e08570280f1a;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 c9ac93b..1448ac8 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -90,6 +90,7 @@ import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.service.AbstractService;
 import net.pterodactylus.util.thread.NamedThreadFactory;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Optional;
 import com.google.common.base.Predicates;
 import com.google.common.collect.FluentIterable;
@@ -218,8 +219,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		this.configuration = configuration;
 		this.freenetInterface = freenetInterface;
 		this.identityManager = identityManager;
-		this.soneDownloader = new SoneDownloader(this, freenetInterface);
-		this.imageInserter = new ImageInserter(freenetInterface);
+		this.soneDownloader = new SoneDownloaderImpl(this, freenetInterface);
+		this.imageInserter = new ImageInserter(freenetInterface, freenetInterface.new InsertTokenSupplier());
 		this.updateChecker = new UpdateChecker(eventBus, freenetInterface);
 		this.webOfTrustUpdater = webOfTrustUpdater;
 		this.eventBus = eventBus;
@@ -799,15 +800,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				}
 			}
 			soneDownloader.addSone(sone);
-			soneDownloaders.execute(new Runnable() {
-
-				@Override
-				@SuppressWarnings("synthetic-access")
-				public void run() {
-					soneDownloader.fetchSone(sone, sone.getRequestUri());
-				}
-
-			});
+			soneDownloaders.execute(soneDownloader.fetchSoneWithUriAction(sone));
 			return sone;
 		}
 	}
@@ -1404,16 +1397,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		eventBus.post(new NewPostFoundEvent(post));
 		sone.addPost(post);
 		touchConfiguration();
-		localElementTicker.schedule(new Runnable() {
-
-			/**
-			 * {@inheritDoc}
-			 */
-			@Override
-			public void run() {
-				markPostKnown(post);
-			}
-		}, 10, TimeUnit.SECONDS);
+		localElementTicker.schedule(new MarkPostKnown(post), 10, TimeUnit.SECONDS);
 		return post;
 	}
 
@@ -1519,16 +1503,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		eventBus.post(new NewPostReplyFoundEvent(reply));
 		sone.addReply(reply);
 		touchConfiguration();
-		localElementTicker.schedule(new Runnable() {
-
-			/**
-			 * {@inheritDoc}
-			 */
-			@Override
-			public void run() {
-				markReplyKnown(reply);
-			}
-		}, 10, TimeUnit.SECONDS);
+		localElementTicker.schedule(new MarkReplyKnown(reply), 10, TimeUnit.SECONDS);
 		return reply;
 	}
 
@@ -2115,22 +2090,15 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 */
 	@Subscribe
 	public void identityUpdated(IdentityUpdatedEvent identityUpdatedEvent) {
-		final Identity identity = identityUpdatedEvent.identity();
-		soneDownloaders.execute(new Runnable() {
-
-			@Override
-			@SuppressWarnings("synthetic-access")
-			public void run() {
-				Sone sone = getRemoteSone(identity.getId(), false);
-				if (sone.isLocal()) {
-					return;
-				}
-				sone.setIdentity(identity);
-				sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), sone.getLatestEdition()));
-				soneDownloader.addSone(sone);
-				soneDownloader.fetchSone(sone);
-			}
-		});
+		Identity identity = identityUpdatedEvent.identity();
+		final Sone sone = getRemoteSone(identity.getId(), false);
+		if (sone.isLocal()) {
+			return;
+		}
+		sone.setIdentity(identity);
+		sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), sone.getLatestEdition()));
+		soneDownloader.addSone(sone);
+		soneDownloaders.execute(soneDownloader.fetchSoneAction(sone));
 	}
 
 	/**
@@ -2190,4 +2158,36 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		touchConfiguration();
 	}
 
+	@VisibleForTesting
+	class MarkPostKnown implements Runnable {
+
+		private final Post post;
+
+		public MarkPostKnown(Post post) {
+			this.post = post;
+		}
+
+		@Override
+		public void run() {
+			markPostKnown(post);
+		}
+
+	}
+
+	@VisibleForTesting
+	class MarkReplyKnown implements Runnable {
+
+		private final PostReply postReply;
+
+		public MarkReplyKnown(PostReply postReply) {
+			this.postReply = postReply;
+		}
+
+		@Override
+		public void run() {
+			markReplyKnown(postReply);
+		}
+
+	}
+
 }