X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=3f010f642a1f93cb467ebfcf5a14fcd3407aa2c2;hb=8bd33b61d226641aad09285e97c156d4d6e25aed;hp=a3cb38502c9b6e36e941aad047025def177bc059;hpb=0d9ddd8ae192ab749c224a14e9420306b3e719ed;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index a3cb385..3f010f6 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -23,10 +23,12 @@ import java.util.logging.Logger;
 import java.util.logging.*;
 
 import net.pterodactylus.sone.core.*;
+import net.pterodactylus.sone.core.event.*;
 import net.pterodactylus.sone.fcp.*;
 import net.pterodactylus.sone.freenet.wot.*;
 import net.pterodactylus.sone.web.*;
 import net.pterodactylus.sone.web.notification.NotificationHandler;
+import net.pterodactylus.sone.web.notification.NotificationHandlerModule;
 
 import freenet.l10n.BaseL10n.*;
 import freenet.l10n.*;
@@ -197,16 +199,21 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 
 		/* create the web interface. */
 		webInterface = injector.getInstance(WebInterface.class);
-		NotificationHandler notificationHandler = injector.getInstance(NotificationHandler.class);
+
+		/* we need to request this to install all notification handlers. */
+		injector.getInstance(NotificationHandler.class);
 
 		/* start core! */
 		core.start();
 
 		/* start the web interface! */
 		webInterface.start();
-		webInterface.setFirstStart(injector.getInstance(Key.get(Boolean.class, Names.named("FirstStart"))));
 		webInterface.setNewConfig(injector.getInstance(Key.get(Boolean.class, Names.named("NewConfig"))));
-		notificationHandler.start();
+
+		/* first start? */
+		if (injector.getInstance(Key.get(Boolean.class, Names.named("FirstStart")))) {
+			injector.getInstance(EventBus.class).post(new FirstStart());
+		}
 	}
 
 	@VisibleForTesting
@@ -214,8 +221,9 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 		FreenetModule freenetModule = new FreenetModule(pluginRespirator);
 		AbstractModule soneModule = new SoneModule(this, new EventBus());
 		Module webInterfaceModule = new WebInterfaceModule();
+		Module notificationHandlerModule = new NotificationHandlerModule();
 
-		return createInjector(freenetModule, soneModule, webInterfaceModule);
+		return createInjector(freenetModule, soneModule, webInterfaceModule, notificationHandlerModule);
 	}
 
 	@VisibleForTesting