dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

improved root detect and binary installation

This commit is contained in:
Nathan Freitas 2012-01-13 19:19:04 -05:00
parent c23c7b5217
commit f14ca9a2d9
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/torproject/android/Orbot.java
View File

@ -72,7 +72,7 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants
//if Tor binary is not running, then start the service up //if Tor binary is not running, then start the service up
//might want to look at whether we need to call this every time //might want to look at whether we need to call this every time
//or whether binding to the service is enough //or whether binding to the service is enough
startService(new Intent(INTENT_TOR_SERVICE)); startService(new Intent(INTENT_TOR_SERVICE));
//something to play with on the UI branch //something to play with on the UI branch
setTheme(android.R.style.Theme_Black_NoTitleBar); setTheme(android.R.style.Theme_Black_NoTitleBar);

3
src/org/torproject/android/service/TorBinaryInstaller.java
View File

@ -249,9 +249,6 @@ public class TorBinaryInstaller implements TorServiceConstants {
} }
*/ */
if (changed) {
Toast.makeText(ctx, R.string.status_install_success, Toast.LENGTH_LONG).show();
}
return true; return true;
} }

34
src/org/torproject/android/service/TorService.java
View File

@ -206,23 +206,32 @@ public class TorService extends Service implements TorServiceConstants, TorConst
Log.i(TAG, "service started: " + intent.getAction()); Log.i(TAG, "service started: " + intent.getAction());
try {
checkTorBinaries (false); Thread thread = new Thread ()
} catch (Exception e) { {
logNotice("unable to find tor binaries: " + e.getMessage()); public void run ()
showToolbarNotification(getString(R.string.error_installing_binares), NOTIFY_ID, R.drawable.tornotificationerr); {
try {
Log.e(TAG, "error checking tor binaries", e); checkTorBinaries (false);
} } catch (Exception e) {
logNotice("unable to find tor binaries: " + e.getMessage());
showToolbarNotification(getString(R.string.error_installing_binares), NOTIFY_ID, R.drawable.tornotificationerr);
Log.e(TAG, "error checking tor binaries", e);
}
}
};
thread.start();
if (intent.getAction()!=null && intent.getAction().equals("onboot")) if (intent.getAction()!=null && intent.getAction().equals("onboot"))
{ {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
boolean startOnBoot = prefs.getBoolean("pref_start_boot",true); boolean startOnBoot = prefs.getBoolean("pref_start_boot",false);
if (startOnBoot) if (startOnBoot)
{ {
@ -474,8 +483,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
logNotice(getString(R.string.status_install_success)); logNotice(getString(R.string.status_install_success));
showToolbarNotification(getString(R.string.status_install_success), NOTIFY_ID, R.drawable.tornotification); //showToolbarNotification(getString(R.string.status_install_success), NOTIFY_ID, R.drawable.tornotification);
torBinaryPath = fileTor.getAbsolutePath(); torBinaryPath = fileTor.getAbsolutePath();
privoxyPath = filePrivoxy.getAbsolutePath(); privoxyPath = filePrivoxy.getAbsolutePath();