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 98287ce31ae4d539f63c33259824fd1c7d6e3629..5b4d649ae1194a79c70dc731d858b52f8d9c997e 100644 (file)
--- 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 a1e8ffcf9d5dbe25a0183ce65f0ed4d78b0f9a9c..a79d9f8c14ae1b9798714a67a1edd5131a0f69dd 100644 (file)
--- 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());