diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2013-07-03 14:10:59 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2013-07-03 14:10:59 +0200 |
| commit | 56889cd25ff1762fca0e30d99eab0a572dbc2fab (patch) | |
| tree | 0feba21e6fee1b30191e80a409e5bfebcd2eb7df /src/de/blinkt/openvpn/core | |
| parent | d06b048b29d9e7f200bcb1d572b4572176b0beb7 (diff) | |
Restructure global settings
--HG--
extra : amend_source : 1b4e0ac86c557993b0195c4b1bad968f3f27aac1
Diffstat (limited to 'src/de/blinkt/openvpn/core')
| -rw-r--r-- | src/de/blinkt/openvpn/core/X509Utils.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/de/blinkt/openvpn/core/X509Utils.java b/src/de/blinkt/openvpn/core/X509Utils.java index b533c886..4d2e6668 100644 --- a/src/de/blinkt/openvpn/core/X509Utils.java +++ b/src/de/blinkt/openvpn/core/X509Utils.java @@ -1,6 +1,9 @@ package de.blinkt.openvpn.core; +import android.content.Context; import android.text.TextUtils; + +import de.blinkt.openvpn.R; import de.blinkt.openvpn.VpnProfile; import org.spongycastle.util.io.pem.PemObject; import org.spongycastle.util.io.pem.PemReader; @@ -52,7 +55,7 @@ public class X509Utils { - public static String getCertificateFriendlyName (String filename) { + public static String getCertificateFriendlyName (Context c, String filename) { if(!TextUtils.isEmpty(filename)) { try { X509Certificate cert = (X509Certificate) getCertificateFromFile(filename); @@ -63,7 +66,7 @@ public class X509Utils { OpenVPN.logError("Could not read certificate" + e.getLocalizedMessage()); } } - return "Cannot display certificate information"; + return c.getString(R.string.cannotparsecert); } public static String getCertificateFriendlyName(X509Certificate cert) { |