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

replacing FascistFirewalling with ReachableAddresses 

svn:r21827
This commit is contained in:
Jacob Appelbaum 2010-03-06 04:46:53 +00:00
parent 84d5e3dcba
commit 44845e2429
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
res/xml/preferences.xml
View File

@ -50,19 +50,21 @@ android:dialogTitle="Enter a custom relay nickname"
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen android:title="FascistFirewalling"> <PreferenceCategory android:title="ReachableAddresses">
<CheckBoxPreference <CheckBoxPreference
android:key="pref_fascist_firewall" android:key="pref_reachable_addresses"
android:title="Fascist Firewall" android:defaultValue="false"
android:title="ReachableAddresses"
android:summary="Run as a client behind a firewall with restrictive policies" android:summary="Run as a client behind a firewall with restrictive policies"
android:enabled="true"></CheckBoxPreference> android:enabled="false"></CheckBoxPreference>
<EditTextPreference android:key="pref_fascist_firewall_ports" <EditTextPreference
android:defaultValue="80,443" android:key="pref_reachable_addresses_ports"
android:defaultValue="*:80,*:443"
android:title="Reachable ports" android:title="Reachable ports"
android:summary="Ports reachable behind a restrictive firewall" android:summary="Ports reachable behind a restrictive firewall"
android:dialogTitle="Enter ports" android:dialogTitle="Enter ports"
/> />
</PreferenceScreen> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>

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

@ -460,7 +460,7 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On
boolean becomeRelay = prefs.getBoolean(PREF_OR, false); boolean becomeRelay = prefs.getBoolean(PREF_OR, false);
boolean fascistFirewall = prefs.getBoolean(PREF_FASCIST_FIREWALL,false); boolean ReachableAddresses = prefs.getBoolean(PREF_REACHABLE_ADDRESSES,false);
enableTransparentProxy = prefs.getBoolean(PREF_TRANSPARENT, false); enableTransparentProxy = prefs.getBoolean(PREF_TRANSPARENT, false);
@ -518,22 +518,19 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On
try try
{ {
if (fascistFirewall) if (ReachableAddresses)
{ {
String fascistFirewallPorts = String ReachableAddressesPorts =
prefs.getString(PREF_FASCIST_FIREWALL_PORTS, "80,443"); prefs.getString(PREF_REACHABLE_ADDRESSES_PORTS, "*:80,*:443");
torrcText.append("ReachableAddresses ");
torrcText.append("FascistFirewall 1");
torrcText.append('\n');
torrcText.append("FirewallPorts ");
// We should verify this and someday, the Exception will matter :-) // We should verify this and someday, the Exception will matter :-)
torrcText.append(fascistFirewallPorts); torrcText.append(ReachableAddressesPorts);
torrcText.append('\n'); torrcText.append('\n');
} }
} }
catch (Exception e) catch (Exception e)
{ {
Toast.makeText(this,"Your FascistFirewall settings caused an exception!", Toast.makeText(this,"Your ReachableAddresses settings caused an exception!",
Toast.LENGTH_LONG).show(); Toast.LENGTH_LONG).show();
} }

4
src/org/torproject/android/TorConstants.java
View File

@ -37,8 +37,8 @@ public interface TorConstants {
public final static String PREF_OR = "pref_or"; public final static String PREF_OR = "pref_or";
public final static String PREF_OR_PORT = "pref_or_port"; public final static String PREF_OR_PORT = "pref_or_port";
public final static String PREF_OR_NICKNAME = "pref_or_nickname"; public final static String PREF_OR_NICKNAME = "pref_or_nickname";
public final static String PREF_FASCIST_FIREWALL = "pref_fascist_firewall"; public final static String PREF_REACHABLE_ADDRESSES = "pref_reachable_addresses";
public final static String PREF_FASCIST_FIREWALL_PORTS = "pref_fascist_firewall_ports"; public final static String PREF_REACHABLE_ADDRESSES_PORTS = "pref_reachable_addresses_ports";
public final static String PREF_TRANSPARENT = "pref_transparent"; public final static String PREF_TRANSPARENT = "pref_transparent";