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

Only update bridge and padding settings if network is enabled.

Browse Source
This commit is contained in:
akwizgran
2020-01-20 16:20:36 +00:00
parent 9bfbb4d02d
commit 2e42fb3c44
1 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -801,35 +801,39 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
LOG.info("Disabling network, country is blocked"); LOG.info("Disabling network, country is blocked");
disabledBySettings = true; disabledBySettings = true;
reasonDisabled = REASON_COUNTRY_BLOCKED; 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 { } else {
LOG.info("Enabling network, not using bridges"); LOG.info("Enabling network");
enableNetwork = true; enableNetwork = true;
if (network == PREF_TOR_NETWORK_WITH_BRIDGES ||
(automatic && bridgesWork)) {
if (circumventionProvider.needsMeek(country)) {
LOG.info("Using meek bridges");
enableBridges = true;
useMeek = true;
} else {
LOG.info("Using obfs4 bridges");
enableBridges = true;
}
} else {
LOG.info("Not using bridges");
}
if (wifi && charging) {
LOG.info("Enabling connection padding");
enableConnectionPadding = true;
} else {
LOG.info("Disabling connection padding");
}
} }
if (online && wifi && charging) {
LOG.info("Enabling connection padding");
enableConnectionPadding = true;
} else {
LOG.info("Disabling connection padding");
}
state.setDisabledBySettings(disabledBySettings, reasonDisabled); state.setDisabledBySettings(disabledBySettings, reasonDisabled);
try { try {
enableBridges(enableBridges, useMeek); if (enableNetwork) {
enableBridges(enableBridges, useMeek);
enableConnectionPadding(enableConnectionPadding);
}
enableNetwork(enableNetwork); enableNetwork(enableNetwork);
enableConnectionPadding(enableConnectionPadding);
} catch (IOException e) { } catch (IOException e) {
logException(LOG, WARNING, e); logException(LOG, WARNING, e);
} }