From 8cb30f32e8f8bad8de720513dc0fe986abec90b5 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Wed, 19 Apr 2023 12:35:44 +0200 Subject: Do not show expection of CN parsing in log --- main/src/main/java/de/blinkt/openvpn/core/X509Utils.java | 6 +++--- .../ui/java/de/blinkt/openvpn/fragments/KeyChainSettingsFragment.kt | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/main/src/main/java/de/blinkt/openvpn/core/X509Utils.java b/main/src/main/java/de/blinkt/openvpn/core/X509Utils.java index eeb54675..e5ca561e 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/X509Utils.java +++ b/main/src/main/java/de/blinkt/openvpn/core/X509Utils.java @@ -80,7 +80,7 @@ public class X509Utils { try { X509Certificate cert = (X509Certificate) getCertificatesFromFile(filename)[0]; String friendlycn = getCertificateFriendlyName(cert); - friendlycn = getCertificateValidityString(cert, c.getResources()) + friendlycn; + friendlycn = getCertificateValidityString(cert, c.getResources()) + ", " + friendlycn; return friendlycn; } catch (Exception e) { @@ -146,9 +146,9 @@ public class X509Utils { friendlyName= (String) toString.invoke(subjectName,true,defaultSymbols); - } catch (ClassNotFoundException | IllegalAccessException | NoSuchFieldException | NoSuchMethodException e) { + } catch (ClassNotFoundException | IllegalAccessException | NoSuchFieldException e) { exp =e ; - } catch (InvocationTargetException e) { + } catch (InvocationTargetException | NoSuchMethodException e) { /* Ignore this. Modern Android versions do not expose this */ exp = null; } diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/KeyChainSettingsFragment.kt b/main/src/ui/java/de/blinkt/openvpn/fragments/KeyChainSettingsFragment.kt index 2444fb25..8430d788 100644 --- a/main/src/ui/java/de/blinkt/openvpn/fragments/KeyChainSettingsFragment.kt +++ b/main/src/ui/java/de/blinkt/openvpn/fragments/KeyChainSettingsFragment.kt @@ -128,6 +128,7 @@ internal abstract class KeyChainSettingsFragment : Settings_Fragment(), View.OnC } if (cert != null) { certstr += X509Utils.getCertificateValidityString(cert, resources) + certstr += ", " certstr += X509Utils.getCertificateFriendlyName(cert) } -- cgit v1.2.3