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

Add an option for Relay support to Orbot! 

svn:r21823
This commit is contained in:
Jacob Appelbaum 2010-03-06 01:23:36 +00:00
parent 66b72f8b32
commit b1e318f493
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -457,7 +457,9 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On
boolean useBridges = prefs.getBoolean(PREF_BRIDGES_ENABLED, false); boolean useBridges = prefs.getBoolean(PREF_BRIDGES_ENABLED, false);
boolean autoUpdateBridges = prefs.getBoolean(PREF_BRIDGES_UPDATED, false); boolean autoUpdateBridges = prefs.getBoolean(PREF_BRIDGES_UPDATED, false);
boolean becomeRelay = prefs.getBoolean(PREF_OR, false);
enableTransparentProxy = prefs.getBoolean(PREF_TRANSPARENT, false); enableTransparentProxy = prefs.getBoolean(PREF_TRANSPARENT, false);
if (hasRoot) if (hasRoot)
@ -509,7 +511,31 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On
{ {
torrcText.append("UseBridges 0"); torrcText.append("UseBridges 0");
} }
try
{
if (becomeRelay && !useBridges)
{
int ORPort = Integer.parseInt(prefs.getString(PREF_OR_PORT, "9001"));
String nickname = prefs.getString(PREF_OR_NICKNAME, "Orbot");
torrcText.append("ORPort ");
torrcText.append(ORPort);
torrcText.append('\n');
torrcText.append("Nickname ");
torrcText.append(nickname);
torrcText.append('\n');
torrcText.append("ExitPolicy reject *:*");
torrcText.append('\n');
}
}
catch (Exception e)
{
Toast.makeText(this, "Your relay settings caused an exception!", Toast.LENGTH_LONG).show();
}
Utils.saveTextFile(TorServiceConstants.TORRC_INSTALL_PATH, torrcText.toString()); Utils.saveTextFile(TorServiceConstants.TORRC_INSTALL_PATH, torrcText.toString());
} }
@ -826,4 +852,4 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On
} }
} }
} }