Restructure global settings

--HG--
extra : amend_source : 1b4e0ac86c557993b0195c4b1bad968f3f27aac1

7 files changed, 88 insertions, 54 deletions

diff --git a/build.gradle b/build.gradle
index ace57649..413e6240 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,8 +19,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 17
-        versionCode = 70
-        versionName = "0.5.38.2"
+        versionCode = 71
+        versionName = "0.5.39"
     }
     sourceSets {
         main {
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index cbf9d5bb..03601d26 100755
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -5,6 +5,7 @@
   <string name="address">Server Adres:</string>
   <string name="port">Server Poort:</string>
   <string name="location">Locatie</string>
+  <string name="cant_read_folder">Map is onleesbaar</string>
   <string name="select">Selecteer</string>
   <string name="cancel">Annuleer</string>
   <string name="no_data">Geen Gegevens</string>
@@ -14,24 +15,35 @@
   <string name="client_key_title">Client Certificaat Sleutel</string>
   <string name="client_pkcs12_title">PKCS12 Bestand</string>
   <string name="ca_title">CA Certificaat</string>
+  <string name="no_certificate">Je moet een certificaat selecteren</string>
+  <string name="copyright_guicode">De broncode en bugs zijn te vinden op http://code.google.com/p/ics-openvpn/</string>
+  <string name="copyright_others">Het programma gebruikt de volgende componenten. Zie de broncode voor volledige details over de licenties.</string>
   <string name="about">Over</string>
+  <string name="vpn_list_title">Profielen</string>
   <string name="vpn_type">Type</string>
   <string name="pkcs12pwquery">PKCS12 Wachtwoord</string>
   <string name="file_select">Selecteer…</string>
+  <string name="file_nothing_selected">Je moet een bestand selecteren</string>
   <string name="useTLSAuth">Gebruik TLS autentificatie</string>
   <string name="tls_direction">TLS Richting</string>
   <string name="ipv6_dialog_tile">Voer een IPv6 Adres/Netmask in met het CIDR Formaat (v.b. 2000:dd::23/64)</string>
   <string name="ipv4_dialog_title">Voer een IPv4 Adres/Netmask in met het CIDR Formaat (v.b. 1.2.3.4/24)</string>
   <string name="ipv4_address">IPv4 Adres</string>
   <string name="ipv6_address">IPv4 Adres</string>
+  <string name="custom_option_warning">Geavanceerde OpenVPN opties. Veel van de tun gerelateerde OpenVPN instellingen worden niet ondersteund. Als u denkt dat een belangrijke optie ontbreekt, neem dan contact op met de auteur.</string>
   <string name="auth_username">Gebruikersnaam</string>
   <string name="auth_pwquery">wachtwoord</string>
+  <string name="static_keys_info">Voor de statische configuratie worden de TLS Auth keys als statische sleutels gebruikt</string>
   <string name="configure_the_vpn">VPN configureren</string>
   <string name="menu_add_profile">Profiel toevoegen</string>
   <string name="add_profile_name_prompt">Voer een naam in voor het nieuwe Profiel</string>
+  <string name="duplicate_profile_name">Profielnaam is al in gebruik</string>
   <string name="profilename">Profiel name</string>
+  <string name="no_keystore_cert_selected">Geen gebruikerscertificaat geselecteerd</string>
   <string name="no_error_found">Geen fout.</string>
   <string name="config_error_found">Fout in de configuratie</string>
+  <string name="ipv4_format_error">Fout bij inlezen van IPv4-adres</string>
+  <string name="custom_route_format_error">Fout bij inlezen van aangepaste routes</string>
   <string name="vpn_shortcut">Open VPN shortcut</string>
   <string name="vpn_launch_title">Met VPN verbinden</string>
   <string name="shortcut_profile_notfound">Het profiel zoals aangegeven in de snelkoppeling kon niet gevonden worden.</string>
@@ -41,11 +53,15 @@
   <string name="custom_config_summary">Geef je eigen configuratieopties aan. Wees voorzichtig!</string>
   <string name="route_rejected">Route geweigert door Android</string>
   <string name="cancel_connection">Verbinding verbreken</string>
+  <string name="cancel_connection_long">VPN verbinding verbreken</string>
   <string name="clear_log">logboek wissen</string>
   <string name="title_cancel">Annuleer bevestiging</string>
   <string name="cancel_connection_query">Sluit de verbonden VPN af/annuleer de verbindingspoging?</string>
   <string name="remove_vpn">VPN wissen</string>
+  <string name="check_remote_tlscert_title">Verwacht TLS server-certificaat</string>
+  <string name="remote_tlscn_check_summary">Controleert de externe server certificaathouder</string>
   <string name="remote_tlscn_check_title">Controleer Certificaat Hostname</string>
+  <string name="enter_tlscn_title">Externe certificaathouder</string>
   <string name="tls_auth_file">TLS Auth Bestand</string>
   <string name="pull_on_summary">Vraag IP adres, routes en timing opties van de server.</string>
   <string name="use_pull">Pull Instellingen</string>
@@ -66,6 +82,7 @@
   <string name="float_title">Zwevende server toestaan</string>
   <string name="custom_options_title">Aangepaste Opties</string>
   <string name="edit_vpn">VPN Instellingen Bewerken</string>
+  <string name="remove_vpn_query">De VPN-profiel \'%s\' verwijderen?</string>
   <string name="error">"Fout:"</string>
   <string name="clear">Leeg maken</string>
   <string name="info">info</string>
@@ -77,6 +94,9 @@
   <string name="send">Verzenden</string>
   <string name="tap_mode">Tap mode</string>
   <string name="faq_tap_mode">De VPN API van Android werkt zonder rooten van de telefoon en ondersteunt alleen de tun modus. Daarom is de tap modus niet mogelijk met deze app.</string>
+  <string name="faq">Veelgestelde vragen </string>
+  <string name="encryption">Codering</string>
+  <string name="cipher_dialog_title">Codering methode</string>
   <string name="import_configuration_file">configuratie bestand importeren</string>
   <string name="faq_security_title">Beveiligingsoverwegingen</string>
   <string name="import_vpn">Importeren</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 10074e8a..5a12b461 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -285,5 +285,9 @@
     <string name="resumevpn">Resume VPN</string>
     <string name="state_userpause">VPN pause requested by user</string>
     <string name="state_screenoff">VPN paused - screen off</string>
+    <string name="device_specific">Device specifics Hacks</string>
+    <string name="cannotparsecert">Cannot display certificate information</string>
+    <string name="appbehaviour">Application behaviour</string>
+    <string name="vpnbehaviour">VPN behaviour</string>
 
 </resources>
\ No newline at end of file
diff --git a/res/xml/general_settings.xml b/res/xml/general_settings.xml
index 9aa62956..ec016aa9 100644
--- a/res/xml/general_settings.xml
+++ b/res/xml/general_settings.xml
@@ -1,49 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="netchangereconnect"
-        android:summary="@string/netchange_summary"
-        android:title="@string/netchange" />
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="showlogwindow"
-        android:summary="@string/show_log_summary"
-        android:title="@string/show_log_window" />
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="usesystemproxy"
-        android:summary="@string/use_system_proxy_summary"
-        android:title="@string/use_system_proxy" />
-    <CheckBoxPreference
-        android:defaultValue="false"
-        android:key="restartvpnonboot"
-        android:summary="@string/onbootrestartsummary"
-        android:title="@string/onbootrestart" />
-    
-    <CheckBoxPreference
-        android:defaultValue="false"
-        android:key="screenoff"
-        android:summary="@string/screenoff_summary"
-        android:title="@string/screenoff_title" />
-
-    <Preference
-        android:key="clearapi"
-        android:persistent="false"
-        android:title="Clear allowed external apps" />
-
-    <PreferenceCategory android:title="Device specifics Hacks" >
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory android:title="@string/appbehaviour">
         <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="useCM9Fix"
-            android:summary="@string/owner_fix_summary"
-            android:title="@string/owner_fix" />
+                android:defaultValue="true"
+                android:key="showlogwindow"
+                android:summary="@string/show_log_summary"
+                android:title="@string/show_log_window"/>
+
+        <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="restartvpnonboot"
+                android:summary="@string/onbootrestartsummary"
+                android:title="@string/onbootrestart"/>
+
+        <Preference
+                android:key="clearapi"
+                android:persistent="false"
+                android:title="Clear allowed external apps"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/vpnbehaviour">
+        <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="usesystemproxy"
+                android:summary="@string/use_system_proxy_summary"
+                android:title="@string/use_system_proxy"/>
+        <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="netchangereconnect"
+                android:summary="@string/netchange_summary"
+                android:title="@string/netchange"/>
+
+
+        <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="screenoff"
+                android:summary="@string/screenoff_summary"
+                android:title="@string/screenoff_title"/>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/device_specific">
+        <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="useCM9Fix"
+                android:summary="@string/owner_fix_summary"
+                android:title="@string/owner_fix"/>
         <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="loadTunModule"
-            android:summary="@string/setting_loadtun_summary"
-            android:title="@string/setting_loadtun" />
+                android:defaultValue="false"
+                android:key="loadTunModule"
+                android:summary="@string/setting_loadtun_summary"
+                android:title="@string/setting_loadtun"/>
     </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/src/de/blinkt/openvpn/FileSelectLayout.java b/src/de/blinkt/openvpn/FileSelectLayout.java
index d7bcc475..f5a01e10 100644
--- a/src/de/blinkt/openvpn/FileSelectLayout.java
+++ b/src/de/blinkt/openvpn/FileSelectLayout.java
@@ -66,7 +66,7 @@ public class FileSelectLayout extends LinearLayout implements OnClickListener {
 		return mData;
 	}
 
-	public void setData(String data) {
+	public void setData(String data, Context c) {
 		mData = data;
 		if(data==null) { 
 			mDataView.setText(mFragment.getString(R.string.no_data));
@@ -76,7 +76,7 @@ public class FileSelectLayout extends LinearLayout implements OnClickListener {
 				mDataView.setText(R.string.inline_file_data);
 			else
 				mDataView.setText(data);
-			mDataDetails.setText(X509Utils.getCertificateFriendlyName(data));
+			mDataDetails.setText(X509Utils.getCertificateFriendlyName(c,data));
 		}
 
 	}
diff --git a/src/de/blinkt/openvpn/core/X509Utils.java b/src/de/blinkt/openvpn/core/X509Utils.java
index b533c886..4d2e6668 100644
--- a/src/de/blinkt/openvpn/core/X509Utils.java
+++ b/src/de/blinkt/openvpn/core/X509Utils.java
@@ -1,6 +1,9 @@
 package de.blinkt.openvpn.core;
 
+import android.content.Context;
 import android.text.TextUtils;
+
+import de.blinkt.openvpn.R;
 import de.blinkt.openvpn.VpnProfile;
 import org.spongycastle.util.io.pem.PemObject;
 import org.spongycastle.util.io.pem.PemReader;
@@ -52,7 +55,7 @@ public class X509Utils {
 
 
 
-	public static String getCertificateFriendlyName (String filename) {
+	public static String getCertificateFriendlyName (Context c, String filename) {
 		if(!TextUtils.isEmpty(filename)) {
 			try {
 				X509Certificate cert = (X509Certificate) getCertificateFromFile(filename);
@@ -63,7 +66,7 @@ public class X509Utils {
 				OpenVPN.logError("Could not read certificate" + e.getLocalizedMessage());
 			}
 		}
-		return "Cannot display certificate information";
+		return c.getString(R.string.cannotparsecert);
 	}
 
     public static String getCertificateFriendlyName(X509Certificate cert) {
diff --git a/src/de/blinkt/openvpn/fragments/Settings_Basic.java b/src/de/blinkt/openvpn/fragments/Settings_Basic.java
index 05e4a2a8..77025dbd 100644
--- a/src/de/blinkt/openvpn/fragments/Settings_Basic.java
+++ b/src/de/blinkt/openvpn/fragments/Settings_Basic.java
@@ -131,7 +131,7 @@ public class Settings_Basic extends Fragment implements View.OnClickListener, On
 		if (result == Activity.RESULT_OK && request >= CHOOSE_FILE_OFFSET) {
 			String filedata = data.getStringExtra(FileSelect.RESULT_DATA);
 			FileSelectLayout fsl = fileselects.get(request);
-			fsl.setData(filedata);
+			fsl.setData(filedata, getActivity());
 
 			savePreferences();
 
@@ -207,16 +207,16 @@ public class Settings_Basic extends Fragment implements View.OnClickListener, On
 
 	private void loadPreferences() {
 		mProfileName.setText(mProfile.mName);
-		mClientCert.setData(mProfile.mClientCertFilename);
-		mClientKey.setData(mProfile.mClientKeyFilename);
-		mCaCert.setData(mProfile.mCaFilename);
+		mClientCert.setData(mProfile.mClientCertFilename, getActivity());
+		mClientKey.setData(mProfile.mClientKeyFilename, getActivity());
+		mCaCert.setData(mProfile.mCaFilename, getActivity());
 
 		mUseLzo.setChecked(mProfile.mUseLzo);
 		mServerPort.setText(mProfile.mServerPort);
 		mServerAddress.setText(mProfile.mServerName);
 		mTcpUdp.setChecked(mProfile.mUseUdp);
 		mType.setSelection(mProfile.mAuthenticationType);
-		mpkcs12.setData(mProfile.mPKCS12Filename);
+		mpkcs12.setData(mProfile.mPKCS12Filename, getActivity());
 		mPKCS12Password.setText(mProfile.mPKCS12Password);
 		mUserName.setText(mProfile.mUsername);
 		mPassword.setText(mProfile.mPassword);