Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 05:39:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '316-mobile-data-setting' into 'master'

Browse Source 
Fix name of Tor mobile data setting

Closes #316.

See merge request !167
This commit is contained in:
akwizgran
2016-05-03 14:39:22 +00:00
parent b57b65e803 c35cad9719
commit 189efe8d97
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-android/src/org/briarproject/plugins/tor/TorPlugin.java
View File

@@ -681,7 +681,7 @@ class TorPlugin implements DuplexPlugin, EventHandler,
boolean blocked = TorNetworkMetadata.isTorProbablyBlocked( boolean blocked = TorNetworkMetadata.isTorProbablyBlocked(
country); country);
Settings s = callback.getSettings(); Settings s = callback.getSettings();
boolean wifiOnly = s.getBoolean("torOverWifi", false); boolean useMobileData = s.getBoolean("torOverMobile", true);
try { try {
if (!online) { if (!online) {
@@ -690,8 +690,8 @@ class TorPlugin implements DuplexPlugin, EventHandler,
} else if (blocked) { } else if (blocked) {
LOG.info("Disabling network, country is blocked"); LOG.info("Disabling network, country is blocked");
enableNetwork(false); enableNetwork(false);
} else if (wifiOnly & !connectedToWifi) { } else if (!useMobileData & !connectedToWifi) {
LOG.info("Disabling network due to wifi setting"); LOG.info("Disabling network due to data setting");
enableNetwork(false); enableNetwork(false);
} else { } else {
enableNetwork(true); enableNetwork(true);