X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=be4ce4ea84055d4eab01d2834040434fe539bce1;hb=77afa5ded755aa37ad160f2a054d986f3745f525;hp=0bc64bf067cf9968db34602292d556098f634278;hpb=179e7da4d8d8a474d0b622d60b5f5d32d6ab4052;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 0bc64bf..be4ce4e 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -98,7 +98,6 @@ 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.collect.FluentIterable;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
@@ -121,6 +120,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	/** The start time. */
 	private final long startupTime = System.currentTimeMillis();
 
+	private final DebugInformation debugInformation = new DebugInformation();
+
 	/** The preferences. */
 	private final Preferences preferences;
 
@@ -228,6 +229,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		return startupTime;
 	}
 
+	@Nonnull
+	public DebugInformation getDebugInformation() {
+		return debugInformation;
+	}
+
 	/**
 	 * Returns the options used by the core.
 	 *
@@ -1063,7 +1069,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 *            The text of the post
 	 * @return The created post
 	 */
-	public Post createPost(Sone sone, Optional<Sone> recipient, String text) {
+	public Post createPost(Sone sone, @Nullable Sone recipient, String text) {
 		checkNotNull(text, "text must not be null");
 		checkArgument(text.trim().length() > 0, "text must not be empty");
 		if (!sone.isLocal()) {
@@ -1072,8 +1078,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		}
 		PostBuilder postBuilder = database.newPostBuilder();
 		postBuilder.from(sone.getId()).randomId().currentTime().withText(text.trim());
-		if (recipient.isPresent()) {
-			postBuilder.to(recipient.get().getId());
+		if (recipient != null) {
+			postBuilder.to(recipient.getId());
 		}
 		final Post post = postBuilder.build();
 		database.storePost(post);
@@ -1328,7 +1334,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		identityManager.start();
 		webOfTrustUpdater.init();
 		webOfTrustUpdater.start();
-		database.start();
+		database.startAsync();
 	}
 
 	/**
@@ -1368,7 +1374,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			}
 		}
 		saveConfiguration();
-		database.stop();
+		database.stopAsync();
 		webOfTrustUpdater.stop();
 		updateChecker.stop();
 		soneDownloader.stop();
@@ -1501,8 +1507,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			configuration.getStringValue(sonePrefix + "/Options/ShowCustomAvatars").setValue(sone.getOptions().getShowCustomAvatars().name());
 			configuration.getStringValue(sonePrefix + "/Options/LoadLinkedImages").setValue(sone.getOptions().getLoadLinkedImages().name());
 
-			configuration.save();
-
 			webOfTrustUpdater.setProperty((OwnIdentity) sone.getIdentity(), "Sone.LatestEdition", String.valueOf(sone.getLatestEdition()));
 
 			logger.log(Level.INFO, String.format("Sone %s saved.", sone));
@@ -1680,9 +1684,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 */
 	@Subscribe
 	public void imageInsertFinished(ImageInsertFinishedEvent imageInsertFinishedEvent) {
-		logger.log(Level.WARNING, String.format("Image insert finished for %s: %s", imageInsertFinishedEvent.image(), imageInsertFinishedEvent.resultingUri()));
-		imageInsertFinishedEvent.image().modify().setKey(imageInsertFinishedEvent.resultingUri().toString()).update();
-		deleteTemporaryImage(imageInsertFinishedEvent.image().getId());
+		logger.log(Level.WARNING, String.format("Image insert finished for %s: %s", imageInsertFinishedEvent.getImage(), imageInsertFinishedEvent.getResultingUri()));
+		imageInsertFinishedEvent.getImage().modify().setKey(imageInsertFinishedEvent.getResultingUri().toString()).update();
+		deleteTemporaryImage(imageInsertFinishedEvent.getImage().getId());
 		touchConfiguration();
 	}