diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2013-08-14 14:46:00 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2013-08-14 14:46:00 +0200 |
| commit | d4df5164c15493a8a2696c245c119c398ee4c492 (patch) | |
| tree | db15f48ba44c316540b30902a48f2702a4eda410 | |
| parent | 44be79efab27fe17eba2833d8278f8b63ba25992 (diff) | |
Add FAQ for Android 4.3
| -rw-r--r-- | res/layout/faq.xml | 8 | ||||
| -rwxr-xr-x | res/values/strings.xml | 5 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/fragments/FaqFragment.java | 5 |
3 files changed, 12 insertions, 6 deletions
diff --git a/res/layout/faq.xml b/res/layout/faq.xml index 354b467c..792ed1d4 100644 --- a/res/layout/faq.xml +++ b/res/layout/faq.xml @@ -21,6 +21,14 @@ tools:ignore="SelectableText" /> <TextView + style="@style/faqhead" + android:text="@string/faq_vpndialog43_title" /> + + <TextView + android:id="@+id/faq_vpndialog43" + style="@style/faqitem" /> + + <TextView style="@style/faqhead" android:text="@string/faq_system_dialogs_title" /> diff --git a/res/values/strings.xml b/res/values/strings.xml index 963050bb..56017cd8 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -292,5 +292,6 @@ <string name="allow_vpn_changes">Allow changes to VPN Profiles</string> <string name="hwkeychain">Hardware Keystore:</string> <string name="permission_icon_app">Icon of app trying to use OpenVPN for Android</string> - -</resources>
\ No newline at end of file + <string name="faq_vpndialog43">"Starting with Android 4.3 the VPN confirmation is guarded against \"overlaying apps\". If you have an app that uses overlays it may cause this behaviour. If you find an offending app contact the author of the app. This problem affect all VPN applications on Android 4.3 and later. See also <a href=\"http://code.google.com/p/ics-openvpn/issues/detail?id=185\">Issue 185<a> for additional details"</string> + <string name="faq_vpndialog43_title">Vpn Confirm Dialog on Android 4.3 and later</string> +</resources> diff --git a/src/de/blinkt/openvpn/fragments/FaqFragment.java b/src/de/blinkt/openvpn/fragments/FaqFragment.java index 3aa84fd7..5f229edb 100644 --- a/src/de/blinkt/openvpn/fragments/FaqFragment.java +++ b/src/de/blinkt/openvpn/fragments/FaqFragment.java @@ -21,11 +21,8 @@ public class FaqFragment extends Fragment { insertHtmlEntry(v,R.id.faq_howto,R.string.faq_howto); insertHtmlEntry(v, R.id.baterry_consumption, R.string.baterry_consumption); insertHtmlEntry(v, R.id.faq_tethering, R.string.faq_tethering); - + insertHtmlEntry(v, R.id.faq_vpndialog43, R.string.faq_vpndialog43); return v; - - - } private void insertHtmlEntry (View v, int viewId, int stringId) { |