[tor-commits] [orbot/master] improve root access check for transproxy

[n8fr8]

commit c39cdcba6040fc578fc9eb7f566bd7a542aaf6ec
Author: Nathan Freitas <nat...@freitas.net>
Date:   Thu Apr 9 09:14:12 2015 -0400

    improve root access check for transproxy
---
 .../android/settings/SettingsPreferences.java          |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/org/torproject/android/settings/SettingsPreferences.java 
b/src/org/torproject/android/settings/SettingsPreferences.java
index 147f84d..339514a 100644
--- a/src/org/torproject/android/settings/SettingsPreferences.java
+++ b/src/org/torproject/android/settings/SettingsPreferences.java
@@ -6,6 +6,7 @@ package org.torproject.android.settings;
 import java.util.Locale;
 
 import org.sufficientlysecure.rootcommands.RootCommands;
+import org.sufficientlysecure.rootcommands.Shell;
 import org.torproject.android.R;
 import org.torproject.android.service.TorServiceUtils;
 
@@ -146,13 +147,24 @@ public class SettingsPreferences
                {
                        if (prefRequestRoot.isChecked())
                        {
+                               
                                boolean canRoot = 
RootCommands.rootAccessGiven();
-                       
                                prefRequestRoot.setChecked(canRoot);
 
                                if (!canRoot)
                                {
-                                       Toast.makeText(this, 
R.string.wizard_permissions_no_root_msg, Toast.LENGTH_LONG).show();
+                                       try
+                                       {
+                                               Shell shell = 
Shell.startRootShell();
+                                               shell.close();
+                                               
+                                               
prefRequestRoot.setChecked(true);
+
+                                       }
+                                       catch (Exception e)
+                                       {
+                                               Toast.makeText(this, 
R.string.wizard_permissions_no_root_msg, Toast.LENGTH_LONG).show();
+                                       }
                                }
                        }
                }



_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits