From 6a9dbcf4825da0dcb3098bdbfaf5644d0ebe6913 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Thu, 16 Jan 2020 11:54:28 +0000 Subject: [PATCH] Add TransportStateEvent, rename existing events. --- ...edEvent.java => TransportActiveEvent.java} | 8 +++-- ...Event.java => TransportInactiveEvent.java} | 8 +++-- .../api/plugin/event/TransportStateEvent.java | 32 +++++++++++++++++++ .../bramble/plugin/PluginManagerImpl.java | 15 ++++----- .../bramble/plugin/PollerImpl.java | 16 +++++----- .../rendezvous/RendezvousPollerImpl.java | 12 +++---- .../bramble/reporting/DevReporterImpl.java | 6 ++-- .../bramble/plugin/PollerImplTest.java | 18 +++++------ .../rendezvous/RendezvousPollerImplTest.java | 30 ++++++++--------- .../navdrawer/NavDrawerControllerImpl.java | 16 +++++----- .../briar/feed/FeedManagerImpl.java | 6 ++-- 11 files changed, 101 insertions(+), 66 deletions(-) rename bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/{TransportDisabledEvent.java => TransportActiveEvent.java} (64%) rename bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/{TransportEnabledEvent.java => TransportInactiveEvent.java} (64%) create mode 100644 bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportStateEvent.java diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportDisabledEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportActiveEvent.java similarity index 64% rename from bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportDisabledEvent.java rename to bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportActiveEvent.java index 1d415ca9f..de9c49c90 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportDisabledEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportActiveEvent.java @@ -2,20 +2,22 @@ package org.briarproject.bramble.api.plugin.event; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.bramble.api.plugin.Plugin.State; import org.briarproject.bramble.api.plugin.TransportId; import javax.annotation.concurrent.Immutable; /** - * An event that is broadcast when a transport is disabled. + * An event that is broadcast when a plugin enters the {@link State#ACTIVE} + * state. */ @Immutable @NotNullByDefault -public class TransportDisabledEvent extends Event { +public class TransportActiveEvent extends Event { private final TransportId transportId; - public TransportDisabledEvent(TransportId transportId) { + public TransportActiveEvent(TransportId transportId) { this.transportId = transportId; } diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportEnabledEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportInactiveEvent.java similarity index 64% rename from bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportEnabledEvent.java rename to bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportInactiveEvent.java index 7064c9b9a..e2167c0f5 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportEnabledEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportInactiveEvent.java @@ -2,20 +2,22 @@ package org.briarproject.bramble.api.plugin.event; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.bramble.api.plugin.Plugin.State; import org.briarproject.bramble.api.plugin.TransportId; import javax.annotation.concurrent.Immutable; /** - * An event that is broadcast when a transport is enabled. + * An event that is broadcast when a plugin leaves the {@link State#ACTIVE} + * state. */ @Immutable @NotNullByDefault -public class TransportEnabledEvent extends Event { +public class TransportInactiveEvent extends Event { private final TransportId transportId; - public TransportEnabledEvent(TransportId transportId) { + public TransportInactiveEvent(TransportId transportId) { this.transportId = transportId; } diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportStateEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportStateEvent.java new file mode 100644 index 000000000..376b5303f --- /dev/null +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/TransportStateEvent.java @@ -0,0 +1,32 @@ +package org.briarproject.bramble.api.plugin.event; + +import org.briarproject.bramble.api.event.Event; +import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.bramble.api.plugin.Plugin.State; +import org.briarproject.bramble.api.plugin.TransportId; + +import javax.annotation.concurrent.Immutable; + +/** + * An event that is broadcast when the {@link State state} of a plugin changes. + */ +@Immutable +@NotNullByDefault +public class TransportStateEvent extends Event { + + private final TransportId transportId; + private final State state; + + public TransportStateEvent(TransportId transportId, State state) { + this.transportId = transportId; + this.state = state; + } + + public TransportId getTransportId() { + return transportId; + } + + public State getState() { + return state; + } +} diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/PluginManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/PluginManagerImpl.java index cb9a8e6a4..ca25d3d3b 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/PluginManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/PluginManagerImpl.java @@ -19,8 +19,9 @@ import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; -import org.briarproject.bramble.api.plugin.event.TransportDisabledEvent; -import org.briarproject.bramble.api.plugin.event.TransportEnabledEvent; +import org.briarproject.bramble.api.plugin.event.TransportActiveEvent; +import org.briarproject.bramble.api.plugin.event.TransportInactiveEvent; +import org.briarproject.bramble.api.plugin.event.TransportStateEvent; import org.briarproject.bramble.api.plugin.simplex.SimplexPlugin; import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory; import org.briarproject.bramble.api.properties.TransportProperties; @@ -256,7 +257,6 @@ class PluginManagerImpl implements PluginManager, Service { private final TransportId id; private final AtomicReference state = new AtomicReference<>(DISABLED); - private final AtomicBoolean enabled = new AtomicBoolean(false); private Callback(TransportId id) { this.id = id; @@ -308,12 +308,11 @@ class PluginManagerImpl implements PluginManager, Service { LOG.info(id + " changed from state " + oldState + " to " + newState); } + eventBus.broadcast(new TransportStateEvent(id, newState)); if (newState == ACTIVE) { - if (!enabled.getAndSet(true)) - eventBus.broadcast(new TransportEnabledEvent(id)); - } else { - if (enabled.getAndSet(false)) - eventBus.broadcast(new TransportDisabledEvent(id)); + eventBus.broadcast(new TransportActiveEvent(id)); + } else if (oldState == ACTIVE) { + eventBus.broadcast(new TransportInactiveEvent(id)); } } else { // TODO: Remove diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/PollerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/PollerImpl.java index 256bf215e..3a4f51c8d 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/PollerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/PollerImpl.java @@ -20,8 +20,8 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.plugin.event.ConnectionClosedEvent; import org.briarproject.bramble.api.plugin.event.ConnectionOpenedEvent; -import org.briarproject.bramble.api.plugin.event.TransportDisabledEvent; -import org.briarproject.bramble.api.plugin.event.TransportEnabledEvent; +import org.briarproject.bramble.api.plugin.event.TransportActiveEvent; +import org.briarproject.bramble.api.plugin.event.TransportInactiveEvent; import org.briarproject.bramble.api.plugin.simplex.SimplexPlugin; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.properties.TransportPropertyManager; @@ -106,13 +106,13 @@ class PollerImpl implements Poller, EventListener { ConnectionOpenedEvent c = (ConnectionOpenedEvent) e; // Reschedule polling, the polling interval may have decreased reschedule(c.getTransportId()); - } else if (e instanceof TransportEnabledEvent) { - TransportEnabledEvent t = (TransportEnabledEvent) e; - // Poll the newly enabled transport + } else if (e instanceof TransportActiveEvent) { + TransportActiveEvent t = (TransportActiveEvent) e; + // Poll the newly activated transport pollNow(t.getTransportId()); - } else if (e instanceof TransportDisabledEvent) { - TransportDisabledEvent t = (TransportDisabledEvent) e; - // Cancel polling for the disabled transport + } else if (e instanceof TransportInactiveEvent) { + TransportInactiveEvent t = (TransportInactiveEvent) e; + // Cancel polling for the deactivated transport cancel(t.getTransportId()); } } diff --git a/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousPollerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousPollerImpl.java index d16317bff..4bce3d661 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousPollerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousPollerImpl.java @@ -31,8 +31,8 @@ import org.briarproject.bramble.api.plugin.TransportConnectionWriter; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; -import org.briarproject.bramble.api.plugin.event.TransportDisabledEvent; -import org.briarproject.bramble.api.plugin.event.TransportEnabledEvent; +import org.briarproject.bramble.api.plugin.event.TransportActiveEvent; +import org.briarproject.bramble.api.plugin.event.TransportInactiveEvent; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.rendezvous.KeyMaterialSource; import org.briarproject.bramble.api.rendezvous.RendezvousEndpoint; @@ -269,11 +269,11 @@ class RendezvousPollerImpl implements RendezvousPoller, Service, EventListener { } else if (e instanceof PendingContactRemovedEvent) { PendingContactRemovedEvent p = (PendingContactRemovedEvent) e; removePendingContactAsync(p.getId()); - } else if (e instanceof TransportEnabledEvent) { - TransportEnabledEvent t = (TransportEnabledEvent) e; + } else if (e instanceof TransportActiveEvent) { + TransportActiveEvent t = (TransportActiveEvent) e; addTransportAsync(t.getTransportId()); - } else if (e instanceof TransportDisabledEvent) { - TransportDisabledEvent t = (TransportDisabledEvent) e; + } else if (e instanceof TransportInactiveEvent) { + TransportInactiveEvent t = (TransportInactiveEvent) e; removeTransportAsync(t.getTransportId()); } else if (e instanceof RendezvousConnectionOpenedEvent) { RendezvousConnectionOpenedEvent r = diff --git a/bramble-core/src/main/java/org/briarproject/bramble/reporting/DevReporterImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/reporting/DevReporterImpl.java index f03d4f730..228569fa2 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/reporting/DevReporterImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/reporting/DevReporterImpl.java @@ -6,7 +6,7 @@ import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TorConstants; -import org.briarproject.bramble.api.plugin.event.TransportEnabledEvent; +import org.briarproject.bramble.api.plugin.event.TransportActiveEvent; import org.briarproject.bramble.api.reporting.DevConfig; import org.briarproject.bramble.api.reporting.DevReporter; import org.briarproject.bramble.util.IoUtils; @@ -92,8 +92,8 @@ class DevReporterImpl implements DevReporter, EventListener { @Override public void eventOccurred(Event e) { - if (e instanceof TransportEnabledEvent) { - TransportEnabledEvent t = (TransportEnabledEvent) e; + if (e instanceof TransportActiveEvent) { + TransportActiveEvent t = (TransportActiveEvent) e; if (t.getTransportId().equals(TorConstants.ID)) ioExecutor.execute(this::sendReports); } diff --git a/bramble-core/src/test/java/org/briarproject/bramble/plugin/PollerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/plugin/PollerImplTest.java index 255635a13..2cca5be44 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/plugin/PollerImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/plugin/PollerImplTest.java @@ -13,8 +13,8 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.plugin.event.ConnectionClosedEvent; import org.briarproject.bramble.api.plugin.event.ConnectionOpenedEvent; -import org.briarproject.bramble.api.plugin.event.TransportDisabledEvent; -import org.briarproject.bramble.api.plugin.event.TransportEnabledEvent; +import org.briarproject.bramble.api.plugin.event.TransportActiveEvent; +import org.briarproject.bramble.api.plugin.event.TransportInactiveEvent; import org.briarproject.bramble.api.plugin.simplex.SimplexPlugin; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.properties.TransportPropertyManager; @@ -322,7 +322,7 @@ public class PollerImplTest extends BrambleMockTestCase { } @Test - public void testPollsOnTransportEnabled() throws Exception { + public void testPollsOnTransportActivated() throws Exception { DuplexPlugin plugin = context.mock(DuplexPlugin.class); context.checking(new Expectations() {{ @@ -361,7 +361,7 @@ public class PollerImplTest extends BrambleMockTestCase { pairOf(equal(properties), any(ConnectionHandler.class))))); }}); - poller.eventOccurred(new TransportEnabledEvent(transportId)); + poller.eventOccurred(new TransportActiveEvent(transportId)); } @Test @@ -402,11 +402,11 @@ public class PollerImplTest extends BrambleMockTestCase { // All contacts are connected, so don't poll the plugin }}); - poller.eventOccurred(new TransportEnabledEvent(transportId)); + poller.eventOccurred(new TransportActiveEvent(transportId)); } @Test - public void testCancelsPollingOnTransportDisabled() { + public void testCancelsPollingOnTransportDeactivated() { Plugin plugin = context.mock(Plugin.class); context.checking(new Expectations() {{ @@ -424,11 +424,11 @@ public class PollerImplTest extends BrambleMockTestCase { oneOf(scheduler).schedule(with(any(Runnable.class)), with(0L), with(MILLISECONDS)); will(returnValue(future)); - // The plugin is disabled before the task runs - cancel the task + // The plugin is deactivated before the task runs - cancel the task oneOf(future).cancel(false); }}); - poller.eventOccurred(new TransportEnabledEvent(transportId)); - poller.eventOccurred(new TransportDisabledEvent(transportId)); + poller.eventOccurred(new TransportActiveEvent(transportId)); + poller.eventOccurred(new TransportInactiveEvent(transportId)); } } diff --git a/bramble-core/src/test/java/org/briarproject/bramble/rendezvous/RendezvousPollerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/rendezvous/RendezvousPollerImplTest.java index 0f65d9adf..2232b7c0e 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/rendezvous/RendezvousPollerImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/rendezvous/RendezvousPollerImplTest.java @@ -17,8 +17,8 @@ import org.briarproject.bramble.api.plugin.ConnectionManager; import org.briarproject.bramble.api.plugin.PluginManager; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; -import org.briarproject.bramble.api.plugin.event.TransportDisabledEvent; -import org.briarproject.bramble.api.plugin.event.TransportEnabledEvent; +import org.briarproject.bramble.api.plugin.event.TransportActiveEvent; +import org.briarproject.bramble.api.plugin.event.TransportInactiveEvent; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.rendezvous.KeyMaterialSource; import org.briarproject.bramble.api.rendezvous.RendezvousEndpoint; @@ -178,10 +178,10 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase { rendezvousPoller.startService(); context.assertIsSatisfied(); - // Enable the transport - no endpoints should be created yet + // Activate the transport - no endpoints should be created yet expectGetPlugin(); - rendezvousPoller.eventOccurred(new TransportEnabledEvent(transportId)); + rendezvousPoller.eventOccurred(new TransportActiveEvent(transportId)); context.assertIsSatisfied(); // Add the pending contact - endpoint should be created and polled @@ -212,8 +212,8 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase { new PendingContactRemovedEvent(pendingContact.getId())); context.assertIsSatisfied(); - // Disable the transport - endpoint is already closed - rendezvousPoller.eventOccurred(new TransportDisabledEvent(transportId)); + // Deactivate the transport - endpoint is already closed + rendezvousPoller.eventOccurred(new TransportInactiveEvent(transportId)); } @Test @@ -230,10 +230,10 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase { rendezvousPoller.startService(); context.assertIsSatisfied(); - // Enable the transport - no endpoints should be created yet + // Activate the transport - no endpoints should be created yet expectGetPlugin(); - rendezvousPoller.eventOccurred(new TransportEnabledEvent(transportId)); + rendezvousPoller.eventOccurred(new TransportActiveEvent(transportId)); context.assertIsSatisfied(); // Add the pending contact - endpoint should be created and polled @@ -269,12 +269,12 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase { new PendingContactRemovedEvent(pendingContact.getId())); context.assertIsSatisfied(); - // Disable the transport - endpoint is already closed - rendezvousPoller.eventOccurred(new TransportDisabledEvent(transportId)); + // Deactivate the transport - endpoint is already closed + rendezvousPoller.eventOccurred(new TransportInactiveEvent(transportId)); } @Test - public void testCreatesAndClosesEndpointsWhenTransportIsEnabledAndDisabled() + public void testCreatesAndClosesEndpointsWhenTransportIsActivatedAndDeactivated() throws Exception { long beforeExpiry = pendingContact.getTimestamp(); @@ -292,19 +292,19 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase { new PendingContactAddedEvent(pendingContact)); context.assertIsSatisfied(); - // Enable the transport - endpoint should be created + // Activate the transport - endpoint should be created expectGetPlugin(); expectCreateEndpoint(); expectStateChangedEvent(WAITING_FOR_CONNECTION); - rendezvousPoller.eventOccurred(new TransportEnabledEvent(transportId)); + rendezvousPoller.eventOccurred(new TransportActiveEvent(transportId)); context.assertIsSatisfied(); - // Disable the transport - endpoint should be closed + // Deactivate the transport - endpoint should be closed expectCloseEndpoint(); expectStateChangedEvent(OFFLINE); - rendezvousPoller.eventOccurred(new TransportDisabledEvent(transportId)); + rendezvousPoller.eventOccurred(new TransportInactiveEvent(transportId)); context.assertIsSatisfied(); // Remove the pending contact - endpoint is already closed diff --git a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerControllerImpl.java index a927fe409..b3488804e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerControllerImpl.java @@ -14,8 +14,8 @@ import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.plugin.Plugin; import org.briarproject.bramble.api.plugin.PluginManager; import org.briarproject.bramble.api.plugin.TransportId; -import org.briarproject.bramble.api.plugin.event.TransportDisabledEvent; -import org.briarproject.bramble.api.plugin.event.TransportEnabledEvent; +import org.briarproject.bramble.api.plugin.event.TransportActiveEvent; +import org.briarproject.bramble.api.plugin.event.TransportInactiveEvent; import org.briarproject.bramble.api.settings.Settings; import org.briarproject.bramble.api.settings.SettingsManager; import org.briarproject.briar.android.controller.DbControllerImpl; @@ -86,16 +86,16 @@ public class NavDrawerControllerImpl extends DbControllerImpl @Override public void eventOccurred(Event e) { - if (e instanceof TransportEnabledEvent) { - TransportId id = ((TransportEnabledEvent) e).getTransportId(); + if (e instanceof TransportActiveEvent) { + TransportId id = ((TransportActiveEvent) e).getTransportId(); if (LOG.isLoggable(INFO)) { - LOG.info("TransportEnabledEvent: " + id.getString()); + LOG.info("TransportActiveEvent: " + id.getString()); } listener.stateUpdate(id, true); - } else if (e instanceof TransportDisabledEvent) { - TransportId id = ((TransportDisabledEvent) e).getTransportId(); + } else if (e instanceof TransportInactiveEvent) { + TransportId id = ((TransportInactiveEvent) e).getTransportId(); if (LOG.isLoggable(INFO)) { - LOG.info("TransportDisabledEvent: " + id.getString()); + LOG.info("TransportInactiveEvent: " + id.getString()); } listener.stateUpdate(id, false); } diff --git a/briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java index 04350c8a6..b7dfa5783 100644 --- a/briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java @@ -24,7 +24,7 @@ import org.briarproject.bramble.api.lifecycle.LifecycleManager.OpenDatabaseHook; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TorConstants; import org.briarproject.bramble.api.plugin.TransportId; -import org.briarproject.bramble.api.plugin.event.TransportEnabledEvent; +import org.briarproject.bramble.api.plugin.event.TransportActiveEvent; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.system.Clock; @@ -120,8 +120,8 @@ class FeedManagerImpl implements FeedManager, EventListener, OpenDatabaseHook, @Override public void eventOccurred(Event e) { - if (e instanceof TransportEnabledEvent) { - TransportId t = ((TransportEnabledEvent) e).getTransportId(); + if (e instanceof TransportActiveEvent) { + TransportId t = ((TransportActiveEvent) e).getTransportId(); if (t.equals(TorConstants.ID)) { startFeedExecutor(); }