From 61e8d576d262889816da53814d1b68d5fef8ac69 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 6 Feb 2019 14:20:04 +0000 Subject: [PATCH] Update mobile data log message, simplify logic. --- .../briarproject/bramble/plugin/tor/TorPlugin.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 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 db3257e55..d672b4cb4 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 @@ -701,16 +701,15 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener { } try { - if (!online || (!charging && onlyWhenCharging)) { - if (!online) { - LOG.info("Disabling network, device is offline"); - } else { - LOG.info("Disabling network, device is on battery"); - } + if (!online) { + LOG.info("Disabling network, device is offline"); + enableNetwork(false); + } else if (!charging && onlyWhenCharging) { + LOG.info("Disabling network, device is on battery"); enableNetwork(false); } else if (network == PREF_TOR_NETWORK_NEVER || (!useMobile && !wifi)) { - LOG.info("Disabling network due to setting"); + LOG.info("Disabling network, device is using mobile data"); enableNetwork(false); } else if (automatic && blocked && !bridgesWork) { LOG.info("Disabling network, country is blocked");