X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=82fb4c5b004328db135fe3942551f23284b75fed;hp=57913b2670d0bb0d9188e67ee5de383ad89a1cd5;hb=8c1a4ad1d3f11ba0a11a077c47df48425360e0ac;hpb=4276233daae926e02a1bbb8939645242f99918c7

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 57913b2..82fb4c5 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -47,7 +47,6 @@ import net.pterodactylus.sone.core.event.PostReplyRemovedEvent;
 import net.pterodactylus.sone.core.event.SoneLockedEvent;
 import net.pterodactylus.sone.core.event.SoneRemovedEvent;
 import net.pterodactylus.sone.core.event.SoneUnlockedEvent;
-import net.pterodactylus.sone.core.event.UpdateFoundEvent;
 import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Client;
 import net.pterodactylus.sone.data.Image;
@@ -64,9 +63,13 @@ import net.pterodactylus.sone.data.impl.PostImpl;
 import net.pterodactylus.sone.fcp.FcpInterface;
 import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired;
 import net.pterodactylus.sone.freenet.wot.Identity;
-import net.pterodactylus.sone.freenet.wot.IdentityListener;
 import net.pterodactylus.sone.freenet.wot.IdentityManager;
 import net.pterodactylus.sone.freenet.wot.OwnIdentity;
+import net.pterodactylus.sone.freenet.wot.event.IdentityAddedEvent;
+import net.pterodactylus.sone.freenet.wot.event.IdentityRemovedEvent;
+import net.pterodactylus.sone.freenet.wot.event.IdentityUpdatedEvent;
+import net.pterodactylus.sone.freenet.wot.event.OwnIdentityAddedEvent;
+import net.pterodactylus.sone.freenet.wot.event.OwnIdentityRemovedEvent;
 import net.pterodactylus.sone.main.SonePlugin;
 import net.pterodactylus.util.config.Configuration;
 import net.pterodactylus.util.config.ConfigurationException;
@@ -79,7 +82,6 @@ import net.pterodactylus.util.validation.EqualityValidator;
 import net.pterodactylus.util.validation.IntegerRangeValidator;
 import net.pterodactylus.util.validation.OrValidator;
 import net.pterodactylus.util.validation.Validation;
-import net.pterodactylus.util.version.Version;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
@@ -94,7 +96,7 @@ import freenet.keys.FreenetURI;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class Core extends AbstractService implements IdentityListener, UpdateListener, SoneProvider, PostProvider {
+public class Core extends AbstractService implements SoneProvider, PostProvider {
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(Core.class);
@@ -219,7 +221,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		this.identityManager = identityManager;
 		this.soneDownloader = new SoneDownloader(this, freenetInterface);
 		this.imageInserter = new ImageInserter(freenetInterface);
-		this.updateChecker = new UpdateChecker(freenetInterface);
+		this.updateChecker = new UpdateChecker(eventBus, freenetInterface);
 		this.webOfTrustUpdater = webOfTrustUpdater;
 		this.eventBus = eventBus;
 	}
@@ -1886,9 +1888,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	@Override
 	public void serviceStart() {
 		loadConfiguration();
-		updateChecker.addUpdateListener(this);
 		updateChecker.start();
-		identityManager.addIdentityListener(this);
 		identityManager.start();
 		webOfTrustUpdater.init();
 		webOfTrustUpdater.start();
@@ -1927,9 +1927,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		saveConfiguration();
 		webOfTrustUpdater.stop();
 		updateChecker.stop();
-		updateChecker.removeUpdateListener(this);
 		soneDownloader.stop();
-		identityManager.removeIdentityListener(this);
 		identityManager.stop();
 	}
 
@@ -2314,15 +2312,15 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		}
 	}
 
-	//
-	// INTERFACE IdentityListener
-	//
-
 	/**
-	 * {@inheritDoc}
+	 * Notifies the core that a new {@link OwnIdentity} was added.
+	 *
+	 * @param ownIdentityAddedEvent
+	 *            The event
 	 */
-	@Override
-	public void ownIdentityAdded(OwnIdentity ownIdentity) {
+	@Subscribe
+	public void ownIdentityAdded(OwnIdentityAddedEvent ownIdentityAddedEvent) {
+		OwnIdentity ownIdentity = ownIdentityAddedEvent.ownIdentity();
 		logger.log(Level.FINEST, String.format("Adding OwnIdentity: %s", ownIdentity));
 		if (ownIdentity.hasContext("Sone")) {
 			trustedIdentities.put(ownIdentity, Collections.synchronizedSet(new HashSet<Identity>()));
@@ -2331,29 +2329,41 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	}
 
 	/**
-	 * {@inheritDoc}
+	 * Notifies the core that an {@link OwnIdentity} was removed.
+	 *
+	 * @param ownIdentityRemovedEvent
+	 *            The event
 	 */
-	@Override
-	public void ownIdentityRemoved(OwnIdentity ownIdentity) {
+	@Subscribe
+	public void ownIdentityRemoved(OwnIdentityRemovedEvent ownIdentityRemovedEvent) {
+		OwnIdentity ownIdentity = ownIdentityRemovedEvent.ownIdentity();
 		logger.log(Level.FINEST, String.format("Removing OwnIdentity: %s", ownIdentity));
 		trustedIdentities.remove(ownIdentity);
 	}
 
 	/**
-	 * {@inheritDoc}
+	 * Notifies the core that a new {@link Identity} was added.
+	 *
+	 * @param identityAddedEvent
+	 *            The event
 	 */
-	@Override
-	public void identityAdded(OwnIdentity ownIdentity, Identity identity) {
+	@Subscribe
+	public void identityAdded(IdentityAddedEvent identityAddedEvent) {
+		Identity identity = identityAddedEvent.identity();
 		logger.log(Level.FINEST, String.format("Adding Identity: %s", identity));
-		trustedIdentities.get(ownIdentity).add(identity);
+		trustedIdentities.get(identityAddedEvent.ownIdentity()).add(identity);
 		addRemoteSone(identity);
 	}
 
 	/**
-	 * {@inheritDoc}
+	 * Notifies the core that an {@link Identity} was updated.
+	 *
+	 * @param identityUpdatedEvent
+	 *            The event
 	 */
-	@Override
-	public void identityUpdated(OwnIdentity ownIdentity, final Identity identity) {
+	@Subscribe
+	public void identityUpdated(IdentityUpdatedEvent identityUpdatedEvent) {
+		final Identity identity = identityUpdatedEvent.identity();
 		soneDownloaders.execute(new Runnable() {
 
 			@Override
@@ -2369,10 +2379,15 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	}
 
 	/**
-	 * {@inheritDoc}
+	 * Notifies the core that an {@link Identity} was removed.
+	 *
+	 * @param identityRemovedEvent
+	 *            The event
 	 */
-	@Override
-	public void identityRemoved(OwnIdentity ownIdentity, Identity identity) {
+	@Subscribe
+	public void identityRemoved(IdentityRemovedEvent identityRemovedEvent) {
+		OwnIdentity ownIdentity = identityRemovedEvent.ownIdentity();
+		Identity identity = identityRemovedEvent.identity();
 		trustedIdentities.get(ownIdentity).remove(identity);
 		boolean foundIdentity = false;
 		for (Entry<OwnIdentity, Set<Identity>> trustedIdentity : trustedIdentities.entrySet()) {
@@ -2414,18 +2429,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		eventBus.post(new SoneRemovedEvent(sone));
 	}
 
-	//
-	// INTERFACE UpdateListener
-	//
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void updateFound(Version version, long releaseTime, long latestEdition) {
-		eventBus.post(new UpdateFoundEvent(version, releaseTime, latestEdition));
-	}
-
 	/**
 	 * Deletes the temporary image.
 	 *