X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=7384eda95b035f8d9dd5d32e06017ca40f8d7f2a;hb=d127c36ae1d62d93c718117506966ced68854d87;hp=a2a400b8ef97f0670abcfafcb13c328f6e59ef03;hpb=8e313509a42a8c638fcac018dd73dd975bf9cb68;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 a2a400b..7384eda 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -51,6 +51,7 @@ import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidPostReplyFound
 import net.pterodactylus.sone.core.SoneChangeDetector.PostProcessor;
 import net.pterodactylus.sone.core.SoneChangeDetector.PostReplyProcessor;
 import net.pterodactylus.sone.core.event.ImageInsertFinishedEvent;
+import net.pterodactylus.sone.core.event.InsertionDelayChangedEvent;
 import net.pterodactylus.sone.core.event.MarkPostKnownEvent;
 import net.pterodactylus.sone.core.event.MarkPostReplyKnownEvent;
 import net.pterodactylus.sone.core.event.MarkSoneKnownEvent;
@@ -422,11 +423,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		return database.newPostBuilder();
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
+	@Nullable
 	@Override
-	public Optional<Post> getPost(String postId) {
+	public Post getPost(@Nonnull String postId) {
 		return database.getPost(postId);
 	}
 
@@ -459,8 +458,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	/**
 	 * {@inheritDoc}
 	 */
+	@Nullable
 	@Override
-	public Optional<PostReply> getPostReply(String replyId) {
+	public PostReply getPostReply(String replyId) {
 		return database.getPostReply(replyId);
 	}
 
@@ -542,7 +542,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 */
 	@Nullable
 	public Album getAlbum(@Nonnull String albumId) {
-		return database.getAlbum(albumId).orNull();
+		return database.getAlbum(albumId);
 	}
 
 	public ImageBuilder imageBuilder() {
@@ -575,9 +575,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 */
 	@Nullable
 	public Image getImage(String imageId, boolean create) {
-		Optional<Image> image = database.getImage(imageId);
-		if (image.isPresent()) {
-			return image.get();
+		Image image = database.getImage(imageId);
+		if (image != null) {
+			return image;
 		}
 		if (!create) {
 			return null;
@@ -655,6 +655,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		sone.setClient(new Client("Sone", SonePlugin.getPluginVersion()));
 		sone.setKnown(true);
 		SoneInserter soneInserter = new SoneInserter(this, eventBus, freenetInterface, ownIdentity.getId());
+		soneInserter.insertionDelayChanged(new InsertionDelayChangedEvent(preferences.getInsertionDelay()));
 		eventBus.register(soneInserter);
 		synchronized (soneInserters) {
 			soneInserters.put(sone, soneInserter);
@@ -1711,7 +1712,13 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		if (sone.isLocal()) {
 			return;
 		}
-		sone.setLatestEdition(fromNullable(tryParse(identity.getProperty("Sone.LatestEdition"))).or(sone.getLatestEdition()));
+		String newLatestEdition = identity.getProperty("Sone.LatestEdition");
+		if (newLatestEdition != null) {
+			Long parsedNewLatestEdition = tryParse(newLatestEdition);
+			if (parsedNewLatestEdition != null) {
+				sone.setLatestEdition(parsedNewLatestEdition);
+			}
+		}
 		soneDownloader.addSone(sone);
 		soneDownloaders.execute(soneDownloader.fetchSoneAction(sone));
 	}