From 0b85aca932fb7d606061c700ff60d600bb8f035b Mon Sep 17 00:00:00 2001 From: akwizgran Date: Thu, 19 May 2022 17:45:10 +0100 Subject: [PATCH] Remove connectivity workaround that should no longer be needed. --- .../bramble/plugin/tor/TorPlugin.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java index 5f7ca3293..8914979d3 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java @@ -751,13 +751,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener { else if (status.equals("FAILED")) state.onOrConnectionFailed(); else if (status.equals("CONNECTED")) state.onOrConnectionConnected(); else if (status.equals("CLOSED")) state.onOrConnectionClosed(); - - if ((status.equals("FAILED") || status.equals("CLOSED")) && - state.getNumOrConnections() == 0) { - // Check whether we've lost connectivity - updateConnectionStatus(networkManager.getNetworkStatus(), - batteryManager.isCharging()); - } } @Override @@ -857,8 +850,8 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener { settings = s.getSettings(); // Works around a bug introduced in Tor 0.3.4.8. // https://trac.torproject.org/projects/tor/ticket/28027 - // Could be replaced with callback.transportDisabled() - // when fixed. + // TODO: The upstream ticket is marked as fixed and backported, + // but this workaround is still needed when disabling bridges disableNetwork(); updateConnectionStatus(networkManager.getNetworkStatus(), batteryManager.isCharging()); @@ -1014,6 +1007,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener { callback.pluginStateChanged(getState()); } + @SuppressWarnings("BooleanMethodIsAlwaysInverted") private synchronized boolean isTorRunning() { return started && !stopped; } @@ -1126,10 +1120,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener { logOrConnections(); } - private synchronized int getNumOrConnections() { - return orConnectionsPending + orConnectionsConnected; - } - @GuardedBy("this") private void logOrConnections() { if (LOG.isLoggable(INFO)) {