android: Set preferred language for remediation instructions
This commit is contained in:
@@ -406,6 +406,10 @@ static void initiate(settings_t *settings)
|
|||||||
{
|
{
|
||||||
private_charonservice_t *this = (private_charonservice_t*)charonservice;
|
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);
|
this->creds->clear(this->creds);
|
||||||
DESTROY_IF(this->service);
|
DESTROY_IF(this->service);
|
||||||
this->service = android_service_create(this->creds, settings);
|
this->service = android_service_create(this->creds, settings);
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ import java.security.cert.CertificateEncodingException;
|
|||||||
import java.security.cert.X509Certificate;
|
import java.security.cert.X509Certificate;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Locale;
|
||||||
|
|
||||||
import org.strongswan.android.data.VpnProfile;
|
import org.strongswan.android.data.VpnProfile;
|
||||||
import org.strongswan.android.data.VpnProfileDataSource;
|
import org.strongswan.android.data.VpnProfileDataSource;
|
||||||
@@ -217,6 +218,7 @@ public class CharonVpnService extends VpnService implements Runnable
|
|||||||
{
|
{
|
||||||
Log.i(TAG, "charon started");
|
Log.i(TAG, "charon started");
|
||||||
SettingsWriter writer = new SettingsWriter();
|
SettingsWriter writer = new SettingsWriter();
|
||||||
|
writer.setValue("global.language", Locale.getDefault().getLanguage());
|
||||||
writer.setValue("connection.type", mCurrentProfile.getVpnType().getIdentifier());
|
writer.setValue("connection.type", mCurrentProfile.getVpnType().getIdentifier());
|
||||||
writer.setValue("connection.server", mCurrentProfile.getGateway());
|
writer.setValue("connection.server", mCurrentProfile.getGateway());
|
||||||
writer.setValue("connection.username", mCurrentProfile.getUsername());
|
writer.setValue("connection.username", mCurrentProfile.getUsername());
|
||||||
|
|||||||
Reference in New Issue
Block a user