Finetune FAQ, change font sizes, add Information about broken Images from Sony and HTC

4 files changed, 27 insertions, 6 deletions

diff --git a/res/layout/faq.xml b/res/layout/faq.xml
index 88dcc7c6..691a2ead 100644
--- a/res/layout/faq.xml
+++ b/res/layout/faq.xml
@@ -24,10 +24,22 @@
             style="@style/faqitem"
             android:text="@string/faq_security" />
 
+        
+        <TextView
+            style="@style/faqhead"
+            android:text="@string/broken_images" 
+            />
+        
+        <TextView
+            style="@style/faqitem"
+            android:id="@+id/brokenimages" />
+        
+        
         <TextView
             style="@style/faqhead"
             android:text="@string/faq_shortcut" />
-
+        
+        
         <TextView
             style="@style/faqitem"
             android:text="@string/faq_howto_shortcut" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b6006103..623a3cf8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -176,7 +176,7 @@
     <string name="ics_openvpn_log_file">ICS Openvpn log file</string>
     <string name="copied_entry">Copied log entry to clip board</string>
     <string name="tap_mode">Tap Mode</string>
-    <string name="faq_tap_mode">Tap Mode is not possible with the non root VPN api. Therefore this application cannot provide tap support</string>
+    <string name="faq_tap_mode">Tap Mode is not possible with the non root VPN API. Therefore this application cannot provide tap support</string>
     <string name="tap_faq2">Again? Are you kidding? No tap mode is really not supported and sending more mail aksing if it will be supported will not help.</string>
     <string name="tap_faq3">A third time? Actually one could write a a tap emulator based on tun that would add layer2 information on send and strip layer2 information on receive. But this tap emulator would have to implement also ARP and possible a DHCP client. I am not aware of anybody doing any work in this direction. Contact me if you want to start coding on this.</string>
     <string name="faq">FAQ</string>  
@@ -213,7 +213,7 @@
     <string name="import_experimental">Please not that the config importer is an experimental feature. If it does not work for you or you think that things could be done better please drop me a email.</string>
     <string name="import_configuration_file">Import configuration file</string>
     <string name="faq_security_title">Security considerations</string>
-    <string name="faq_security">"As openvpn is security sensitive a few notes about security are sensible. All data on the sdcard is inherently unsecure. Every app can read it (for example this program requires no special sd card rights). The data of this application can only be read by the application itself. By using the import option for cacert/cert/key in the file dialog the data is stored in the vpn profile. The vpn profiles are only accessable by this application. (Do not forget to delte the copies on the sdcard afterwards). Even though accessible only by this application the data is stil unecrypted. By rooting the telephone or other exploits it may be possible to retrieve the data. Saved passwords are stored in plain text as well. For pkcs12 files it is highly recommended that you import them into the android keystore."</string>
+    <string name="faq_security">"As openvpn is security sensitive a few notes about security are sensible. All data on the sdcard is inherently unsecure. Every app can read it (for example this program requires no special sd card rights). The data of this application can only be read by the application itself. By using the import option for cacert/cert/key in the file dialog the data is stored in the vpn profile. The vpn profiles are only accessable by this application. (Do not forget to delete the copies on the sd card afterwards). Even though accessible only by this application the data is stil unecrypted. By rooting the telephone or other exploits it may be possible to retrieve the data. Saved passwords are stored in plain text as well. For pkcs12 files it is highly recommended that you import them into the android keystore."</string>
     <string name="import_vpn">Import</string>
     <string name="broken_image_cert_title">Error showing certificate selection</string>
     <string name="broken_image_cert">Got an excption trying to show the Android 4.0+ certificate selction dialog. This should never happens as this a standard feature of Android 4.0+. Maybe your Android ROM support for certificate storage is broken</string>
@@ -222,5 +222,7 @@
     <string name="speed_waiting">Waiting for state message…</string>
     <string name="generalsettings">General Settings</string>
     <string name="converted_profile">imported profile</string>
-    <string name="converted_profile_i">imported profile %d</string>  
+    <string name="converted_profile_i">imported profile %d</string>
+    <string name="broken_images">Broken Images</string>
+    <string name="broken_images_faq">&lt;p>Offical HTC images are known to have a strange routing problem causing traffic not to flow through the tunnel (See also &lt;a href=\"http://code.google.com/p/ics-openvpn/issues/detail?id=18\">Issue 18&lt;/a> in the bug tracker.)&lt;/p>&lt;p>The offical SONY images from Xperia arc S and Xperia Ray have been reported to be missing the VPNService completly from the image. Other Sony images may be affected as well. (See also &lt;a href=\"http://code.google.com/p/ics-openvpn/issues/detail?id=29\">Issue 29&lt;/a> in the bug tracker.)&lt;/p>&lt;p>On custom build images the tun module might be missing or the rights of /dev/tun might be wrong. On the experimental CM9 Defy image a &lt;i>chown system /dev/tun&lt;/i> is needed to make the VPNService API work.&lt;/p></string>  
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 2c627bff..c4d6a1d2 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -28,7 +28,7 @@
     <style name="faqitem">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
+        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
     </style>
    
     
@@ -36,7 +36,7 @@
         <item name="android:paddingTop">10sp</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:textAppearance">?android:attr/textAppearanceLarge</item>
+        <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
         <item name="android:singleLine">true</item>
     </style>
 
diff --git a/src/de/blinkt/openvpn/FaqFragment.java b/src/de/blinkt/openvpn/FaqFragment.java
index 26979946..09c6cbdc 100644
--- a/src/de/blinkt/openvpn/FaqFragment.java
+++ b/src/de/blinkt/openvpn/FaqFragment.java
@@ -2,9 +2,12 @@ package de.blinkt.openvpn;
 
 import android.app.Fragment;
 import android.os.Bundle;
+import android.text.Html;
+import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 public class FaqFragment extends Fragment  {
 
@@ -18,6 +21,10 @@ public class FaqFragment extends Fragment  {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
     		Bundle savedInstanceState) {
     	View v= inflater.inflate(R.layout.faq, container, false);
+    	
+    	TextView bImages = (TextView) v.findViewById(R.id.brokenimages);
+    	bImages.setText(Html.fromHtml(getActivity().getString(R.string.broken_images_faq)));
+    	bImages.setMovementMethod(LinkMovementMethod.getInstance());
 		return v;
 
     }