From c986dc374b1c6579918d976701c000178a6ea281 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Tue, 17 Dec 2013 13:48:54 +0100
Subject: Add a note for the xposed module to the FAQ

--HG--
extra : source : a853fe367b5b31c1c315bbd4501ad07870bfa385
---
 AndroidManifest.xml                              | 3 ++-
 res/layout/faq.xml                               | 5 +++++
 res/values/strings.xml                           | 1 +
 src/de/blinkt/openvpn/fragments/FaqFragment.java | 2 ++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7a96675a..b42cda8c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -33,7 +33,8 @@
         android:supportsRtl="true" >
         <activity
             android:name=".activities.VPNPreferences"
-            android:windowSoftInputMode="stateHidden" />
+            android:windowSoftInputMode="stateHidden"
+            android:exported="false"/>
 
         <activity
                 android:theme="@android:style/Theme.DeviceDefault.Light.Dialog"
diff --git a/res/layout/faq.xml b/res/layout/faq.xml
index 9d11e786..8983e203 100644
--- a/res/layout/faq.xml
+++ b/res/layout/faq.xml
@@ -38,6 +38,11 @@
             style="@style/faqitem"
             android:text="@string/faq_system_dialogs" />
 
+        <TextView
+            style="@style/faqitem"
+            tools:text="@string/faq_system_dialog_xposed"
+            android:id="@+id/faq_system_dialog_xposed"/>
+
         <TextView
             style="@style/faqhead"
             android:text="@string/faq_duplicate_notification_title" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e0665d7b..34e13cfe 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -309,4 +309,5 @@
     <string name="logview_options">View options</string>
     <string name="unhandled_exception">Unhandled exception: %1$s\n\n%2$s</string>
     <string name="unhandled_exception_context">%3$s: %1$s\n\n%2$s</string>
+    <string name="faq_system_dialog_xposed">If you have rooted your Android device you can install the &lt;a href=\"http://xposed.info/\"&gt;Xposed framework&lt;/a&gt; and a the &lt;a href=\"http://repo.xposed.info/module/de.blinkt.vpndialogxposed\"&gt;VPN Dialog confirm module&lt;/a&gt; at your own risk"</string>
 </resources>
diff --git a/src/de/blinkt/openvpn/fragments/FaqFragment.java b/src/de/blinkt/openvpn/fragments/FaqFragment.java
index 5f229edb..238ad952 100644
--- a/src/de/blinkt/openvpn/fragments/FaqFragment.java
+++ b/src/de/blinkt/openvpn/fragments/FaqFragment.java
@@ -22,6 +22,7 @@ public class FaqFragment extends Fragment  {
     	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);
+        insertHtmlEntry(v, R.id.faq_system_dialog_xposed, R.string.faq_system_dialog_xposed);
 		return v;
     }
 
@@ -29,6 +30,7 @@ public class FaqFragment extends Fragment  {
 		TextView faqitem = (TextView) v.findViewById(viewId);
     	faqitem.setText(Html.fromHtml(getActivity().getString(stringId)));
     	faqitem.setMovementMethod(LinkMovementMethod.getInstance());
+
 	}
 
 }
-- 
cgit v1.2.3