mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-23 10:27:57 +00:00
Code Issues Releases Wiki Activity

Certificate generation fails when locale is set to Arabic

Browse Source
This commit is contained in:
Erik Duisters 2019-12-22 18:57:36 +00:00 committed by Nicolas Fella
parent f66263d05c
commit ef55d6d783
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/org/kde/kdeconnect/Helpers/SecurityHelpers/SslHelper.java
View File

@ -22,6 +22,8 @@ package org.kde.kdeconnect.Helpers.SecurityHelpers;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.Build; import android.os.Build;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.util.Base64; import android.util.Base64;
@ -57,6 +59,7 @@ import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.Formatter; import java.util.Formatter;
import java.util.Locale;
import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext; import javax.net.ssl.SSLContext;
@ -115,6 +118,10 @@ public class SslHelper {
if (needsToGenerateCertificate) { if (needsToGenerateCertificate) {
Log.i("KDE/SslHelper", "Generating a certificate"); Log.i("KDE/SslHelper", "Generating a certificate");
try { try {
//Fix for https://issuetracker.google.com/issues/37095309
Locale initialLocale = Locale.getDefault();
setLocale(Locale.ENGLISH, context);
X500NameBuilder nameBuilder = new X500NameBuilder(BCStyle.INSTANCE); X500NameBuilder nameBuilder = new X500NameBuilder(BCStyle.INSTANCE);
nameBuilder.addRDN(BCStyle.CN, deviceId); nameBuilder.addRDN(BCStyle.CN, deviceId);
nameBuilder.addRDN(BCStyle.OU, "KDE Connect"); nameBuilder.addRDN(BCStyle.OU, "KDE Connect");
@ -138,12 +145,22 @@ public class SslHelper {
SharedPreferences.Editor edit = settings.edit(); SharedPreferences.Editor edit = settings.edit();
edit.putString("certificate", Base64.encodeToString(certificate.getEncoded(), 0)); edit.putString("certificate", Base64.encodeToString(certificate.getEncoded(), 0));
edit.apply(); edit.apply();
setLocale(initialLocale, context);
} catch (Exception e) { } catch (Exception e) {
Log.e("KDE/initialiseCert", "Exception", e); Log.e("KDE/initialiseCert", "Exception", e);
} }
} }
} }
private static void setLocale(Locale locale, Context context) {
Locale.setDefault(locale);
Resources resources = context.getResources();
Configuration config = resources.getConfiguration();
config.locale = locale;
resources.updateConfiguration(config, resources.getDisplayMetrics());
}
public static boolean isCertificateStored(Context context, String deviceId) { public static boolean isCertificateStored(Context context, String deviceId) {
SharedPreferences devicePreferences = context.getSharedPreferences(deviceId, Context.MODE_PRIVATE); SharedPreferences devicePreferences = context.getSharedPreferences(deviceId, Context.MODE_PRIVATE);
String cert = devicePreferences.getString("certificate", ""); String cert = devicePreferences.getString("certificate", "");