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 unnecessary inner class, state checks.

Browse Source
This commit is contained in:
akwizgran
2020-01-16 13:08:16 +00:00
parent 0aada89625
commit 0a5f93edf9
2 changed files with 69 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPlugin.java
View File

@@ -74,7 +74,6 @@ class AndroidTorPlugin extends TorPlugin {
@Override @Override
protected void enableNetwork(boolean enable) throws IOException { protected void enableNetwork(boolean enable) throws IOException {
if (!state.isTorRunning()) return;
if (enable) wakeLock.acquire(); if (enable) wakeLock.acquire();
super.enableNetwork(enable); super.enableNetwork(enable);
if (!enable) wakeLock.release(); if (!enable) wakeLock.release();

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

@@ -57,7 +57,6 @@ import java.util.zip.ZipInputStream;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import javax.annotation.concurrent.GuardedBy; import javax.annotation.concurrent.GuardedBy;
import javax.annotation.concurrent.Immutable;
import javax.annotation.concurrent.ThreadSafe; import javax.annotation.concurrent.ThreadSafe;
import javax.net.SocketFactory; import javax.net.SocketFactory;
@@ -480,7 +479,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
} }
protected void enableNetwork(boolean enable) throws IOException { protected void enableNetwork(boolean enable) throws IOException {
if (!state.isTorRunning()) return;
state.enableNetwork(enable); state.enableNetwork(enable);
callback.pluginStateChanged(getState()); callback.pluginStateChanged(getState());
controlConnection.setConf("DisableNetwork", enable ? "0" : "1"); controlConnection.setConf("DisableNetwork", enable ? "0" : "1");
@@ -713,6 +711,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
@Override @Override
public void message(String severity, String msg) { public void message(String severity, String msg) {
if (LOG.isLoggable(INFO)) LOG.info(severity + " " + msg);
if (LOG.isLoggable(INFO)) LOG.info(severity + " " + msg); if (LOG.isLoggable(INFO)) LOG.info(severity + " " + msg);
if (severity.equals("NOTICE") && msg.startsWith("Bootstrapped 100%")) { if (severity.equals("NOTICE") && msg.startsWith("Bootstrapped 100%")) {
state.setBootstrapped(); state.setBootstrapped();
@@ -754,7 +753,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
private void disableNetwork() { private void disableNetwork() {
connectionStatusExecutor.execute(() -> { connectionStatusExecutor.execute(() -> {
try { try {
enableNetwork(false); if (state.isTorRunning()) enableNetwork(false);
} catch (IOException ex) { } catch (IOException ex) {
logException(LOG, WARNING, ex); logException(LOG, WARNING, ex);
} }
@@ -765,91 +764,79 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
boolean charging) { boolean charging) {
connectionStatusExecutor.execute(() -> { connectionStatusExecutor.execute(() -> {
if (!state.isTorRunning()) return; if (!state.isTorRunning()) return;
NetworkConfig config = getNetworkConfig(status, charging); boolean online = status.isConnected();
state.setDisabledBySettings(config.disabledBySettings, boolean wifi = status.isWifi();
config.reasonDisabled); String country = locationUtils.getCurrentCountry();
callback.pluginStateChanged(getState()); boolean blocked =
applyNetworkConfig(config); circumventionProvider.isTorProbablyBlocked(country);
}); int network = settings.getInt(PREF_TOR_NETWORK,
} PREF_TOR_NETWORK_AUTOMATIC);
boolean useMobile = settings.getBoolean(PREF_TOR_MOBILE, true);
boolean onlyWhenCharging =
settings.getBoolean(PREF_TOR_ONLY_WHEN_CHARGING, false);
boolean bridgesWork = circumventionProvider.doBridgesWork(country);
boolean automatic = network == PREF_TOR_NETWORK_AUTOMATIC;
private NetworkConfig getNetworkConfig(NetworkStatus status, if (LOG.isLoggable(INFO)) {
boolean charging) { LOG.info("Online: " + online + ", wifi: " + wifi);
boolean online = status.isConnected(); if (country.isEmpty()) LOG.info("Country code unknown");
boolean wifi = status.isWifi(); else LOG.info("Country code: " + country);
String country = locationUtils.getCurrentCountry(); LOG.info("Charging: " + charging);
boolean blocked = circumventionProvider.isTorProbablyBlocked(country);
int network =
settings.getInt(PREF_TOR_NETWORK, PREF_TOR_NETWORK_AUTOMATIC);
boolean useMobile = settings.getBoolean(PREF_TOR_MOBILE, true);
boolean onlyWhenCharging =
settings.getBoolean(PREF_TOR_ONLY_WHEN_CHARGING, false);
boolean bridgesWork = circumventionProvider.doBridgesWork(country);
boolean automatic = network == PREF_TOR_NETWORK_AUTOMATIC;
if (LOG.isLoggable(INFO)) {
LOG.info("Online: " + online + ", wifi: " + wifi);
if (country.isEmpty()) LOG.info("Country code unknown");
else LOG.info("Country code: " + country);
LOG.info("Charging: " + charging);
}
boolean enableNetwork = false, enableBridges = false;
boolean useMeek = false, enableConnectionPadding = false;
boolean disabledBySettings = false;
int reasonDisabled = REASON_STARTING_STOPPING;
if (!online) {
LOG.info("Disabling network, device is offline");
} else if (network == PREF_TOR_NETWORK_NEVER) {
LOG.info("Disabling network, user has disabled Tor");
disabledBySettings = true;
reasonDisabled = REASON_USER;
} else if (!charging && onlyWhenCharging) {
LOG.info("Disabling network, device is on battery");
disabledBySettings = true;
reasonDisabled = REASON_BATTERY;
} else if (!useMobile && !wifi) {
LOG.info("Disabling network, device is using mobile data");
disabledBySettings = true;
reasonDisabled = REASON_MOBILE_DATA;
} else if (automatic && blocked && !bridgesWork) {
LOG.info("Disabling network, country is blocked");
disabledBySettings = true;
reasonDisabled = REASON_COUNTRY_BLOCKED;
} else if (network == PREF_TOR_NETWORK_WITH_BRIDGES ||
(automatic && bridgesWork)) {
if (circumventionProvider.needsMeek(country)) {
LOG.info("Enabling network, using meek bridges");
enableBridges = true;
useMeek = true;
} else {
LOG.info("Enabling network, using obfs4 bridges");
enableBridges = true;
} }
enableNetwork = true;
} else {
LOG.info("Enabling network, not using bridges");
enableNetwork = true;
}
if (online && wifi && charging) { boolean enableNetwork = false, enableBridges = false;
LOG.info("Enabling connection padding"); boolean useMeek = false, enableConnectionPadding = false;
enableConnectionPadding = true; boolean disabledBySettings = false;
} else { int reasonDisabled = REASON_STARTING_STOPPING;
LOG.info("Disabling connection padding");
}
return new NetworkConfig(enableNetwork, enableBridges, useMeek, if (!online) {
enableConnectionPadding, disabledBySettings, reasonDisabled); LOG.info("Disabling network, device is offline");
} } else if (network == PREF_TOR_NETWORK_NEVER) {
LOG.info("Disabling network, user has disabled Tor");
disabledBySettings = true;
reasonDisabled = REASON_USER;
} else if (!charging && onlyWhenCharging) {
LOG.info("Disabling network, device is on battery");
disabledBySettings = true;
reasonDisabled = REASON_BATTERY;
} else if (!useMobile && !wifi) {
LOG.info("Disabling network, device is using mobile data");
disabledBySettings = true;
reasonDisabled = REASON_MOBILE_DATA;
} else if (automatic && blocked && !bridgesWork) {
LOG.info("Disabling network, country is blocked");
disabledBySettings = true;
reasonDisabled = REASON_COUNTRY_BLOCKED;
} else if (network == PREF_TOR_NETWORK_WITH_BRIDGES ||
(automatic && bridgesWork)) {
if (circumventionProvider.needsMeek(country)) {
LOG.info("Enabling network, using meek bridges");
enableBridges = true;
useMeek = true;
} else {
LOG.info("Enabling network, using obfs4 bridges");
enableBridges = true;
}
enableNetwork = true;
} else {
LOG.info("Enabling network, not using bridges");
enableNetwork = true;
}
if (online && wifi && charging) {
LOG.info("Enabling connection padding");
enableConnectionPadding = true;
} else {
LOG.info("Disabling connection padding");
}
state.setDisabledBySettings(disabledBySettings, reasonDisabled);
callback.pluginStateChanged(getState());
private void applyNetworkConfig(NetworkConfig config) {
connectionStatusExecutor.execute(() -> {
try { try {
enableBridges(config.enableBridges, config.useMeek); enableBridges(enableBridges, useMeek);
enableNetwork(config.enableNetwork); enableNetwork(enableNetwork);
enableConnectionPadding(config.enableConnectionPadding); enableConnectionPadding(enableConnectionPadding);
} catch (IOException e) { } catch (IOException e) {
logException(LOG, WARNING, e); logException(LOG, WARNING, e);
} }
@@ -857,30 +844,9 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
} }
private void enableConnectionPadding(boolean enable) throws IOException { private void enableConnectionPadding(boolean enable) throws IOException {
if (!state.isTorRunning()) return;
controlConnection.setConf("ConnectionPadding", enable ? "1" : "0"); controlConnection.setConf("ConnectionPadding", enable ? "1" : "0");
} }
@Immutable
@NotNullByDefault
private static class NetworkConfig {
private final boolean enableNetwork, enableBridges, useMeek;
private final boolean enableConnectionPadding, disabledBySettings;
private final int reasonDisabled;
private NetworkConfig(boolean enableNetwork, boolean enableBridges,
boolean useMeek, boolean enableConnectionPadding,
boolean disabledBySettings, int reasonDisabled) {
this.enableNetwork = enableNetwork;
this.enableBridges = enableBridges;
this.useMeek = useMeek;
this.enableConnectionPadding = enableConnectionPadding;
this.disabledBySettings = disabledBySettings;
this.reasonDisabled = reasonDisabled;
}
}
@ThreadSafe @ThreadSafe
@NotNullByDefault @NotNullByDefault
protected static class PluginState { protected static class PluginState {