From 195b0a10d96ad358d956381d8a0e423a8dd913c7 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sun, 7 Apr 2013 14:05:05 +0200
Subject: Allow clearing of external apps

---
 res/menu/logmenu.xml         |  2 +-
 res/values/strings.xml       |  4 ++++
 res/xml/general_settings.xml | 12 +++++++++---
 3 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'res')

diff --git a/res/menu/logmenu.xml b/res/menu/logmenu.xml
index 9e79702c..12b54c67 100644
--- a/res/menu/logmenu.xml
+++ b/res/menu/logmenu.xml
@@ -11,7 +11,7 @@
         android:id="@+id/cancel"
         android:icon="@android:drawable/ic_menu_close_clear_cancel"
         android:showAsAction="ifRoom|withText"
-        android:title="@string/cancel_connection"
+        android:title="@string/disconnect"
         android:titleCondensed="@string/cancel"/>
     <item
         android:id="@+id/info"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3e969f18..abdf1779 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -57,6 +57,7 @@
     <string name="custom_config_summary">Specify custom options. Use with care!</string>
     <string name="route_rejected">Route rejected by Android</string>
     <string name="cancel_connection">Disconnect</string>
+    <string name="disconnect">Disconnect</string>
     <string name="clear_log">clear log</string>
     <string name="title_cancel">Cancel Confirmation</string>
     <string name="cancel_connection_query">Disconnect the connected VPN/cancel the connection attempt?</string>
@@ -281,5 +282,8 @@
     <string name="prompt">%1$s attempts to control %2$s</string>
     <string name="remote_warning">By proceeding, you are giving the application permission to completely control OpenVPN for Android and to intercept all network traffic. <b> Do NOT accept unless you trust the application. </b> Otherwise, you run the risk of having your data compromised by malicious software."</string>
     <string name="remote_trust">I trust this application.</string>
+    <string name="no_external_app_allowed">No app allowed to use external API</string>
+    <string name="allowed_apps">Allowed apps: %s</string>
+    <string name="clearappsdialog">Clear list of allowed external apps?\nCurrent list of allowed apps:\n\n%s</string>
 
 </resources>
\ No newline at end of file
diff --git a/res/xml/general_settings.xml b/res/xml/general_settings.xml
index 5b4726d3..6dbf58bf 100644
--- a/res/xml/general_settings.xml
+++ b/res/xml/general_settings.xml
@@ -11,11 +11,13 @@
         android:key="showlogwindow"
         android:summary="@string/show_log_summary"
         android:title="@string/show_log_window" />
-    <!--  <CheckBoxPreference
+    <!--
+          <CheckBoxPreference
         android:defaultValue="false"
         android:key="statusafterconnect"
         android:summary="@string/keppstatus_summary"
-        android:title="@string/keepstatus" /> -->
+        android:title="@string/keepstatus" />
+    -->
     <CheckBoxPreference
         android:defaultValue="true"
         android:key="usesystemproxy"
@@ -27,6 +29,11 @@
         android:summary="@string/onbootrestartsummary"
         android:title="@string/onbootrestart" />
 
+    <Preference
+        android:key="clearapi"
+        android:title="Clear allowed external apps"
+        android:persistent="false" />
+
     <PreferenceCategory android:title="Device specifics Hacks" >
         <CheckBoxPreference
             android:defaultValue="false"
@@ -40,5 +47,4 @@
             android:title="@string/setting_loadtun" />
     </PreferenceCategory>
 
-
 </PreferenceScreen>
\ No newline at end of file
-- 
cgit v1.2.3