From 4784980e7b74f7df38bed91a1651fbedc3822ed4 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 7 Nov 2018 14:31:37 +0000 Subject: [PATCH] No need to broadcast network status at startup. --- .../bramble/network/JavaNetworkManager.java | 19 ++----------------- .../bramble/network/JavaNetworkModule.java | 5 +---- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/bramble-java/src/main/java/org/briarproject/bramble/network/JavaNetworkManager.java b/bramble-java/src/main/java/org/briarproject/bramble/network/JavaNetworkManager.java index 3eccaebf5..75bd3f969 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/network/JavaNetworkManager.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/network/JavaNetworkManager.java @@ -1,10 +1,7 @@ package org.briarproject.bramble.network; -import org.briarproject.bramble.api.event.EventBus; -import org.briarproject.bramble.api.lifecycle.Service; import org.briarproject.bramble.api.network.NetworkManager; import org.briarproject.bramble.api.network.NetworkStatus; -import org.briarproject.bramble.api.network.event.NetworkStatusEvent; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; @@ -23,25 +20,13 @@ import static org.briarproject.bramble.util.LogUtils.logException; @MethodsNotNullByDefault @ParametersNotNullByDefault -class JavaNetworkManager implements NetworkManager, Service { +class JavaNetworkManager implements NetworkManager { private static final Logger LOG = Logger.getLogger(JavaNetworkManager.class.getName()); - private final EventBus eventBus; - @Inject - JavaNetworkManager(EventBus eventBus) { - this.eventBus = eventBus; - } - - @Override - public void startService() { - eventBus.broadcast(new NetworkStatusEvent(getNetworkStatus())); - } - - @Override - public void stopService() { + JavaNetworkManager() { } @Override diff --git a/bramble-java/src/main/java/org/briarproject/bramble/network/JavaNetworkModule.java b/bramble-java/src/main/java/org/briarproject/bramble/network/JavaNetworkModule.java index 3c1b1e279..308f56cc2 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/network/JavaNetworkModule.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/network/JavaNetworkModule.java @@ -1,6 +1,5 @@ package org.briarproject.bramble.network; -import org.briarproject.bramble.api.lifecycle.LifecycleManager; import org.briarproject.bramble.api.network.NetworkManager; import javax.inject.Singleton; @@ -13,9 +12,7 @@ public class JavaNetworkModule { @Provides @Singleton - NetworkManager provideNetworkManager(LifecycleManager lifecycleManager, - JavaNetworkManager networkManager) { - lifecycleManager.registerService(networkManager); + NetworkManager provideNetworkManager(JavaNetworkManager networkManager) { return networkManager; } }