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

Updated Permissions 

Asks for superuser privileges after user clicks
"Grant Permissions" and checks for iptables OWNER
module
This commit is contained in:
Sathyanarayanan Gunasekaran 2011-06-28 09:14:43 +05:30
parent e63c745808
commit d9e0ede797
1 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/org/torproject/android/Permissions.java
View File

@ -51,27 +51,6 @@ public class Permissions extends Activity implements TorConstants {
private void stepThree(){ private void stepThree(){
boolean hasRoot = TorServiceUtils.checkRootAccess(); boolean hasRoot = TorServiceUtils.checkRootAccess();
if (hasRoot)
{
try {
int resp = TorTransProxy.testOwnerModule(context);
if (resp < 0)
{
hasRoot = false;
Toast.makeText(context, "ERROR: IPTables OWNER module not available", Toast.LENGTH_LONG).show();
Log.i(TorService.TAG,"ERROR: IPTables OWNER module not available");
}
} catch (Exception e) {
hasRoot = false;
Log.d(TorService.TAG,"ERROR: IPTables OWNER module not available",e);
}
}
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
Editor pEdit = prefs.edit(); Editor pEdit = prefs.edit();
@ -149,6 +128,31 @@ public class Permissions extends Activity implements TorConstants {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
//Check and Install iptables - TorTransProxy.testOwnerModule(this) //Check and Install iptables - TorTransProxy.testOwnerModule(this)
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean hasRoot = prefs.getBoolean("has_root",false);
if (hasRoot)
{
try {
int resp = TorTransProxy.testOwnerModule(context);
if (resp < 0)
{
hasRoot = false;
Toast.makeText(context, "ERROR: IPTables OWNER module not available", Toast.LENGTH_LONG).show();
Log.i(TorService.TAG,"ERROR: IPTables OWNER module not available");
stepFour();
}
} catch (Exception e) {
hasRoot = false;
Log.d(TorService.TAG,"ERROR: IPTables OWNER module not available",e);
}
}
startActivityForResult(new Intent(getBaseContext(), ConfigureTransProxy.class), 1); startActivityForResult(new Intent(getBaseContext(), ConfigureTransProxy.class), 1);
@ -185,12 +189,24 @@ public class Permissions extends Activity implements TorConstants {
TextView txtTitle = ((TextView)findViewById(R.id.WizardTextTitle)); TextView txtTitle = ((TextView)findViewById(R.id.WizardTextTitle));
txtTitle.setText(title); txtTitle.setText(title);
TextView txtBody = ((TextView)findViewById(R.id.WizardTextBody)); TextView txtBody = ((TextView)findViewById(R.id.WizardTextBody1));
txtBody.setText(msg); txtBody.setText(msg);
Button btn1 = ((Button)findViewById(R.id.btnWizard1)); Button btn1 = ((Button)findViewById(R.id.btnWizard1));
Button btn2 = ((Button)findViewById(R.id.btnWizard2)); Button btn2 = ((Button)findViewById(R.id.btnWizard2));
btn2.setEnabled(true);
TextView txtBody2 = ((TextView)findViewById(R.id.WizardTextBody2));
txtBody2.setVisibility(TextView.GONE);
Button grantPermissions = ((Button)findViewById(R.id.grantPermissions));
grantPermissions.setVisibility(Button.GONE);
CheckBox consent = (CheckBox)findViewById(R.id.checkBox);
consent.setVisibility(CheckBox.GONE);
btn1.setOnClickListener(new View.OnClickListener() { btn1.setOnClickListener(new View.OnClickListener() {
@Override @Override