[tor-commits] [orbot/master] make sure transproxy is renabled when network returns

[n8fr8 at torproject.org]

commit 298a01e5195e23ea6e82de44e32ec93d477c77b7
Author: Nathan Freitas <nathan at freitas.net>
Date:   Thu Jun 19 10:30:02 2014 -0400

    make sure transproxy is renabled when network returns
---
 src/org/torproject/android/service/TorService.java |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index cca714c..7830a68 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -240,8 +240,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 		}
 		else
 		{
-			mNotifyBuilder.setTicker("");
-			//mNotifyBuilder.setLights(Color.GREEN, 5000, 5000);
+			mNotifyBuilder.setTicker(null); //make sure to clear ticker
 		}
 		
 		if (isOngoing)
@@ -1809,8 +1808,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 							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,prefPersistNotifications);
 
-							//if (mHasRoot && mEnableTransparentProxy)
-								//enableTransparentProxy(mTransProxyAll, mTransProxyTethering);
+							if (mHasRoot && mEnableTransparentProxy)
+								enableTransparentProxy(mTransProxyAll, mTransProxyTethering);
 							
 				        }
 					}