commit 384fe1c21e782434ba2fc630478106cdf01f94fc Author: Nathan Freitas <nathan@freitas.net> Date: Wed Apr 8 16:46:40 2015 -0400 fix handling of network connectivity state management --- src/org/torproject/android/service/TorService.java | 47 ++++++++++---------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 03c7ebb..b0419a4 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -2105,35 +2105,38 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon isChanged = ((mNetworkType != newNetType)||(mConnectivity != newConnectivityState)); - //is this a change in state? - if (isChanged) + mNetworkType = newNetType; + mConnectivity = newConnectivityState; + + if (doNetworKSleep) { - mNetworkType = newNetType; - mConnectivity = newConnectivityState; - - if (doNetworKSleep) + setTorNetworkEnabled (mConnectivity); + + if (!mConnectivity) + { + logNotice(context.getString(R.string.no_network_connectivity_putting_tor_to_sleep_)); + showToolbarNotification(getString(R.string.no_internet_connection_tor),NOTIFY_ID,R.drawable.ic_stat_tor_off); + + } + else + { + logNotice(context.getString(R.string.network_connectivity_is_good_waking_tor_up_)); + showToolbarNotification(getString(R.string.status_activated),NOTIFY_ID,R.drawable.ic_stat_tor); + } + + //is this a change in state? + if (isChanged) { try { - setTorNetworkEnabled (mConnectivity); - if (mCurrentStatus != STATUS_OFF) { - if (!mConnectivity) + if (mConnectivity) { - logNotice(context.getString(R.string.no_network_connectivity_putting_tor_to_sleep_)); - showToolbarNotification(getString(R.string.no_internet_connection_tor),NOTIFY_ID,R.drawable.ic_stat_tor_off); - - } - else - { - logNotice(context.getString(R.string.network_connectivity_is_good_waking_tor_up_)); - showToolbarNotification(getString(R.string.status_activated),NOTIFY_ID,R.drawable.ic_stat_tor); - if (mHasRoot && mEnableTransparentProxy && mTransProxyNetworkRefresh) { - Shell shell = Shell.startRootShell(); + Shell shell = Shell.startRootShell(); disableTransparentProxy(shell); enableTransparentProxy(shell); @@ -2144,7 +2147,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (mUseVPN) //we need to turn on VPN here so the proxy is running refreshVpnProxy(); - } } @@ -2153,9 +2155,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } catch (Exception e) { logException ("error updating state after network restart",e); } + } - - } @@ -2467,7 +2468,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon updateConfiguration("DNSListenAddress","10.0.0.1:" + TorServiceConstants.TOR_DNS_PORT_DEFAULT,false); } - // updateConfiguration("DisableNetwork","0", false); + updateConfiguration("DisableNetwork","0", false); saveConfiguration();