VPN+tethering is becoming a FAQ

3 files changed, 13 insertions, 2 deletions

diff --git a/res/layout/faq.xml b/res/layout/faq.xml
index c4fd57f0..8e0f561f 100644
--- a/res/layout/faq.xml
+++ b/res/layout/faq.xml
@@ -50,6 +50,14 @@
 
         <TextView
             style="@style/faqhead"
+            android:text="@string/vpn_tethering_title" />
+
+        <TextView
+            style="@style/faqitem"
+            android:id="@+id/vpn_tethering" />
+
+        <TextView
+            style="@style/faqhead"
             android:text="@string/faq_security_title" />
 
         <TextView
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a0d1a4f0..7958aca9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -228,5 +228,7 @@
     <string name="openvpn_log">OpenVPN Log</string>
     <string name="import_config">Import OpenVPN configuration</string>
     <string name="battery_consumption_title">Battery consumption</string>
-    <string name="baterry_consumption">In my personal tests the main reason for high battery consumption of OpenVPN are the keepalive packets. Most OpenVPN servers have a configuration directive like \'keepalive 10 60\' which translates to a keepalive packet from client to server and server to client every ten seconds. &lt;p> While these packets are small and do not use much traffic, they keep the mobile radio network busy and increase the energy consumption. &lt;p> This keepalive setting cannot be changed on the client. Only the system administrator of the OpenVPN can change the setting. &lt;p> Unfortunatly using a keepalive larger than 60 seconds with udp has problems with some NAT gateways which terminate the state for a connnection after a short timeout (60s in my tests). Using TCP with long keepalive timeout works but has the TCP over TCP problem. (See &lt;a href=\"http://sites.inka.de/bigred/devel/tcp-tcp.html\">Why TCP Over TCP Is A Bad Ide&lt;/a>)</string>
+    <string name="baterry_consumption">In my personal tests the main reason for high battery consumption of OpenVPN are the keepalive packets. Most OpenVPN servers have a configuration directive like \'keepalive 10 60\' which translates to a keepalive packet from client to server and server to client every ten seconds. &lt;p> While these packets are small and do not use much traffic, they keep the mobile radio network busy and increase the energy consumption. &lt;p> This keepalive setting cannot be changed on the client. Only the system administrator of the OpenVPN can change the setting. &lt;p> Unfortunately using a keepalive larger than 60 seconds with udp has problems with some NAT gateways which terminate the state for a connnection after a short timeout (60s in my tests). Using TCP with long keepalive timeout works but has the TCP over TCP problem. (See &lt;a href=\"http://sites.inka.de/bigred/devel/tcp-tcp.html\">Why TCP Over TCP Is A Bad Ide&lt;/a>)</string>
+    <string name="faq_tethering">The Android Tethering feature (over WiFi, USB or Bluetooth) and the VPNService API (used by this program) do not work together. For more details see the &lt;a href=\"http://code.google.com/p/ics-openvpn/issues/detail?id=34\">issue #34&lt;/a></string>
+    <string name="vpn_tethering_title">VPN and Tethering</string>
 </resources>
diff --git a/src/de/blinkt/openvpn/FaqFragment.java b/src/de/blinkt/openvpn/FaqFragment.java
index 79029757..1b262c7f 100644
--- a/src/de/blinkt/openvpn/FaqFragment.java
+++ b/src/de/blinkt/openvpn/FaqFragment.java
@@ -24,7 +24,8 @@ public class FaqFragment extends Fragment  {
     	
     	insertHtmlEntry(v,R.id.brokenimages,R.string.broken_images_faq);
     	insertHtmlEntry(v,R.id.faq_howto,R.string.faq_howto);
-    	insertHtmlEntry(v, R.id.faq_battery, R.string.baterry_consumption);    	
+    	insertHtmlEntry(v, R.id.faq_battery, R.string.baterry_consumption);  
+    	insertHtmlEntry(v, R.id.vpn_tethering, R.string.faq_tethering);
 		
 		return v;