From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 12 Jun 2015 12:14:46 +0000 (+0200)
Subject: android: Set preferred language for remediation instructions
X-Git-Tag: 5.3.3dr3~8^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6830cb1c1bf61b2319298cf4d9531f9de61a08fc;p=thirdparty%2Fstrongswan.git

android: Set preferred language for remediation instructions
---

diff --git a/src/frontends/android/jni/libandroidbridge/charonservice.c b/src/frontends/android/jni/libandroidbridge/charonservice.c
index 98287ce31a..5b4d649ae1 100644
--- a/src/frontends/android/jni/libandroidbridge/charonservice.c
+++ b/src/frontends/android/jni/libandroidbridge/charonservice.c
@@ -406,6 +406,10 @@ static void initiate(settings_t *settings)
 {
 	private_charonservice_t *this = (private_charonservice_t*)charonservice;
 
+	lib->settings->set_str(lib->settings,
+						"charon.plugins.tnc-imc.preferred_language",
+						settings->get_str(settings, "global.language", "en"));
+
 	this->creds->clear(this->creds);
 	DESTROY_IF(this->service);
 	this->service = android_service_create(this->creds, settings);
diff --git a/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java b/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
index a1e8ffcf9d..a79d9f8c14 100644
--- a/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
+++ b/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
@@ -23,6 +23,7 @@ import java.security.cert.CertificateEncodingException;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import org.strongswan.android.data.VpnProfile;
 import org.strongswan.android.data.VpnProfileDataSource;
@@ -217,6 +218,7 @@ public class CharonVpnService extends VpnService implements Runnable
 						{
 							Log.i(TAG, "charon started");
 							SettingsWriter writer = new SettingsWriter();
+							writer.setValue("global.language", Locale.getDefault().getLanguage());
 							writer.setValue("connection.type", mCurrentProfile.getVpnType().getIdentifier());
 							writer.setValue("connection.server", mCurrentProfile.getGateway());
 							writer.setValue("connection.username", mCurrentProfile.getUsername());