Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 13:19:52 +01:00
Code Issues Projects Releases Wiki Activity

Remove connectivity workaround that should no longer be needed.

Browse Source
This commit is contained in:
akwizgran
2022-05-19 17:45:10 +01:00
parent d4cdedeed7
commit 0b85aca932
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
View File

@@ -751,13 +751,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
else if (status.equals("FAILED")) state.onOrConnectionFailed(); else if (status.equals("FAILED")) state.onOrConnectionFailed();
else if (status.equals("CONNECTED")) state.onOrConnectionConnected(); else if (status.equals("CONNECTED")) state.onOrConnectionConnected();
else if (status.equals("CLOSED")) state.onOrConnectionClosed(); 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 @Override
@@ -857,8 +850,8 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
settings = s.getSettings(); settings = s.getSettings();
// Works around a bug introduced in Tor 0.3.4.8. // Works around a bug introduced in Tor 0.3.4.8.
// https://trac.torproject.org/projects/tor/ticket/28027 // https://trac.torproject.org/projects/tor/ticket/28027
// Could be replaced with callback.transportDisabled() // TODO: The upstream ticket is marked as fixed and backported,
// when fixed. // but this workaround is still needed when disabling bridges
disableNetwork(); disableNetwork();
updateConnectionStatus(networkManager.getNetworkStatus(), updateConnectionStatus(networkManager.getNetworkStatus(),
batteryManager.isCharging()); batteryManager.isCharging());
@@ -1014,6 +1007,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
callback.pluginStateChanged(getState()); callback.pluginStateChanged(getState());
} }
@SuppressWarnings("BooleanMethodIsAlwaysInverted")
private synchronized boolean isTorRunning() { private synchronized boolean isTorRunning() {
return started && !stopped; return started && !stopped;
} }
@@ -1126,10 +1120,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
logOrConnections(); logOrConnections();
} }
private synchronized int getNumOrConnections() {
return orConnectionsPending + orConnectionsConnected;
}
@GuardedBy("this") @GuardedBy("this")
private void logOrConnections() { private void logOrConnections() {
if (LOG.isLoggable(INFO)) { if (LOG.isLoggable(INFO)) {