[or-cvs] r21827: {projects} replacing FascistFirewalling with ReachableAddresses (in projects/android/trunk/Orbot: res/xml src/org/torproject/android)

[Jacob Appelbaum]

Author: ioerror
Date: 2010-03-06 04:46:53 +0000 (Sat, 06 Mar 2010)
New Revision: 21827

Modified:
   projects/android/trunk/Orbot/res/xml/preferences.xml
   projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java
   projects/android/trunk/Orbot/src/org/torproject/android/TorConstants.java
Log:
replacing FascistFirewalling with ReachableAddresses

Modified: projects/android/trunk/Orbot/res/xml/preferences.xml
===================================================================
--- projects/android/trunk/Orbot/res/xml/preferences.xml	2010-03-06 04:11:36 UTC (rev 21826)
+++ projects/android/trunk/Orbot/res/xml/preferences.xml	2010-03-06 04:46:53 UTC (rev 21827)
@@ -50,19 +50,21 @@
 
 </PreferenceScreen>
 
-<PreferenceScreen android:title="FascistFirewalling">
+<PreferenceCategory android:title="ReachableAddresses">
 <CheckBoxPreference
-android:key="pref_fascist_firewall"
-android:title="Fascist Firewall"
+android:key="pref_reachable_addresses"
+android:defaultValue="false"
+android:title="ReachableAddresses"
 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"
-android:defaultValue="80,443"
+<EditTextPreference
+android:key="pref_reachable_addresses_ports"
+android:defaultValue="*:80,*:443"
 android:title="Reachable ports"
 android:summary="Ports reachable behind a restrictive firewall"
 android:dialogTitle="Enter ports"
 />
-</PreferenceScreen>
+</PreferenceCategory>
 
 </PreferenceScreen>

Modified: projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java
===================================================================
--- projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java	2010-03-06 04:11:36 UTC (rev 21826)
+++ projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java	2010-03-06 04:46:53 UTC (rev 21827)
@@ -460,7 +460,7 @@
 
         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);
 		
@@ -518,22 +518,19 @@
 
         try
         {
-            if (fascistFirewall)
+            if (ReachableAddresses)
             {
-                String fascistFirewallPorts =
-                    prefs.getString(PREF_FASCIST_FIREWALL_PORTS, "80,443");
-
-                torrcText.append("FascistFirewall 1");
-                torrcText.append('\n');
-                torrcText.append("FirewallPorts ");
+                String ReachableAddressesPorts =
+                    prefs.getString(PREF_REACHABLE_ADDRESSES_PORTS, "*:80,*:443");
+                torrcText.append("ReachableAddresses ");
                 // We should verify this and someday, the Exception will matter :-)
-                torrcText.append(fascistFirewallPorts);
+                torrcText.append(ReachableAddressesPorts);
                 torrcText.append('\n');
             }
         }
         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();
         }
 

Modified: projects/android/trunk/Orbot/src/org/torproject/android/TorConstants.java
===================================================================
--- projects/android/trunk/Orbot/src/org/torproject/android/TorConstants.java	2010-03-06 04:11:36 UTC (rev 21826)
+++ projects/android/trunk/Orbot/src/org/torproject/android/TorConstants.java	2010-03-06 04:46:53 UTC (rev 21827)
@@ -37,8 +37,8 @@
     public final static String PREF_OR = "pref_or";
     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_FASCIST_FIREWALL = "pref_fascist_firewall";
-    public final static String PREF_FASCIST_FIREWALL_PORTS = "pref_fascist_firewall_ports";
+    public final static String PREF_REACHABLE_ADDRESSES = "pref_reachable_addresses";
+    public final static String PREF_REACHABLE_ADDRESSES_PORTS = "pref_reachable_addresses_ports";
 	public final static String PREF_TRANSPARENT = "pref_transparent";