From 6db137d9b5a31c17142fc89a3506a157f2b5b315 Mon Sep 17 00:00:00 2001
From: Nathan Freitas <nathan@freitas.net>
Date: Wed, 24 Feb 2010 05:09:05 +0000
Subject: [PATCH] updated resources file to add new preferences, modified help
 text

svn:r21748
---
 Orbot/res/layout/layout_about.xml |  9 +++++----
 Orbot/res/values/strings.xml      | 10 +++++-----
 Orbot/res/xml/preferences.xml     | 12 +++++++++++-
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/Orbot/res/layout/layout_about.xml b/Orbot/res/layout/layout_about.xml
index e390bbb3..92e9ecb3 100644
--- a/Orbot/res/layout/layout_about.xml
+++ b/Orbot/res/layout/layout_about.xml
@@ -32,7 +32,8 @@
 				android:paddingLeft="15px"
 				android:textStyle="bold"
 				android:textColor="#ffffff" />
-			<TextView android:text="http://torproject.org/orbot"
+			<TextView android:text="https://torproject.org/android
+http://guardianproject.info/apps/orbot/"
 				android:layout_width="fill_parent" 
 				android:layout_height="wrap_content"
 				android:autoLink="web"
@@ -52,7 +53,7 @@
 				android:layout_height="wrap_content"
 				android:paddingLeft="15px"								
 				android:textColor="#ffffff" />	
-			<TextView android:text="http://torproject.org"
+			<TextView android:text="https://torproject.org"
 				android:layout_width="fill_parent" 
 				android:layout_height="wrap_content"
 				android:autoLink="web"
@@ -67,7 +68,7 @@
 				android:paddingLeft="15px"
 				android:textStyle="bold"
 				android:textColor="#ffffff" />	
-			<TextView android:text="Tor vX.x: http://www.torproject.org"
+			<TextView android:text="Tor v2.0.x: https://www.torproject.org"
 				android:layout_width="fill_parent" 
 				android:layout_height="wrap_content"
 				android:autoLink="web"
@@ -75,7 +76,7 @@
 				android:paddingLeft="15px"
 				android:textSize="12sp"					
 				android:textColor="#ffffff" />				
-			<TextView android:text="LibEvent vX.x: http://www.monkey.org/~provos/libevent/"
+			<TextView android:text="LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/"
 				android:layout_width="fill_parent" 
 				android:layout_height="wrap_content"
 				android:autoLink="web"
diff --git a/Orbot/res/values/strings.xml b/Orbot/res/values/strings.xml
index eab22c2b..97b5ee4c 100644
--- a/Orbot/res/values/strings.xml
+++ b/Orbot/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Orbot</string>
-    <string name="app_version">0.0.3a</string>
+    <string name="app_version">0.0.3b</string>
     <string name="internal_web_url">http://orbot/</string>
     <string name="default_web_url">http://check.torproject.org</string>
     <string name="control_permission_label">start and stop the anonymous data connection</string>
@@ -29,17 +29,17 @@
 <string name="button_about">About</string>
 
 <string name="help_text">Orbot requires different configuration depending on the Android operating system version it is used on.
+Please visit http://torproject.org/android for the latest information.
 \n\n
 For non-rooted Android 1.x devices (G1, MyTouch3G, Hero): Please use the "ProxySurf" browser available in the Android Market, and set 
-the HTTP Proxy to 127.0.0.1 and port 8118. For Instant Messsaging, try "Beem" in the market, and set the HTTP or SOCKS5 proxy (to port 9050).
+the HTTP Proxy to 127.0.0.1 and port 8118. For Instant Messsaging, try "Beem" in the market, and set the SOCKS5 proxy to 127.0.0.1 / port 9050.
 \n\n
 For Android 2.x devices, you MUST ROOT your device in order for Orbot to work transparently for all web and DNS traffic. Otherwise, the "Beem" app will allow
 you to set the SOCKS5 proxy to 127.0.0.1 and port 9050. You should also enable SSL to protect your username and password.
 \n\n
-If you root your device, whether it is 1.x or 2.x based, Orbot will automatically, transparently proxy all web traffic on port 80
-and all DNS requests. This includes the built-in Browser, Gmail, YouTube, Maps and any other application that uses standard port 80
+If you root your device, whether it is 1.x or 2.x based, Orbot will automatically, transparently proxy all web traffic (http and https)
+and all DNS requests. This includes the built-in Browser, Gmail, YouTube, Maps and any other application that access the web.
 traffic.
 \n\n
-At this time, Orbot cannot proxy standard HTTPS traffic unless the application supports proxy via HTTP or SOCKS.
 </string>
 </resources>
diff --git a/Orbot/res/xml/preferences.xml b/Orbot/res/xml/preferences.xml
index 5ba73c19..930ab1a3 100644
--- a/Orbot/res/xml/preferences.xml
+++ b/Orbot/res/xml/preferences.xml
@@ -15,6 +15,15 @@ android:summary="IP address and port of bridges"
 android:dialogTitle="Enter Bridge Addresses"
 />
 
+
+<CheckBoxPreference android:defaultValue="false" 
+android:key="pref_transparent"
+android:title="Transparent Proxying"
+android:summary="ROOTED DEVICES ONLY: Activate Tor for all web traffic and DNS"
+android:enabled="true"/>
+
+<!-- 
+
 <EditTextPreference android:key="pref_relay"
 android:title="Relaying"
 android:summary="Enable your device to be a relay"
@@ -22,10 +31,11 @@ android:dialogTitle="Enter Bridge Addresses"
 android:enabled="false"
 />
 
+
 <CheckBoxPreference android:defaultValue="false" 
 android:title="Fascist Firewall" android:key="pref_fascist_firewall" 
 android:summary="Run as a client behind a firewall with restrictive policies"
 android:enabled="false"></CheckBoxPreference>
-
+ -->
 
 </PreferenceScreen>
\ No newline at end of file