[tor-commits] [orbot/master] fixed check for tor binary and install process

[n8fr8 at torproject.org]

commit 2d4ebe27ee98501dc2924af89179cea126bf86a6
Author: n8fr8 <nathan at freitas.net>
Date:   Thu Jun 28 22:02:09 2012 -0400

    fixed check for tor binary and install process
---
 src/org/torproject/android/service/TorService.java |   40 +++++++++++---------
 1 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 85095ee..74a91cf 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -205,25 +205,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 		
 		initTorPaths();
 		
-		//if Tor was deleted for some reason, do this again!
-		if (!fileTor.exists())
-		{
-			new Thread ()
-			{				
-				public void run ()
-				{
-					try {
-						checkTorBinaries (false);
-					} catch (Exception e) {
 		
-						logNotice("unable to find tor binaries: " + e.getMessage());
-				    	showToolbarNotification(getString(R.string.error_installing_binares), ERROR_NOTIFY_ID, R.drawable.tornotificationerr, -1);
-		
-						Log.e(TAG, "error checking tor binaries", e);
-					}
-				}
-			}.start();
-		}
 	}
 
 
@@ -1157,6 +1139,28 @@ public class TorService extends Service implements TorServiceConstants, TorConst
     	_torInstance = this;
     	initTorPaths();
     	
+    	//android.os.Debug.waitForDebugger();
+    	
+    	//if Tor was deleted for some reason, do this again!
+		if (!fileTor.exists())
+		{
+			new Thread ()
+			{				
+				public void run ()
+				{
+					try {
+						checkTorBinaries (false);
+					} catch (Exception e) {
+		
+						logNotice("unable to find tor binaries: " + e.getMessage());
+				    	showToolbarNotification(getString(R.string.error_installing_binares), ERROR_NOTIFY_ID, R.drawable.tornotificationerr, -1);
+		
+						Log.e(TAG, "error checking tor binaries", e);
+					}
+				}
+			}.start();
+		}
+    	
     	
     	SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);