From ba4844b8a72d7149af5774a4abdbf44fea90d662 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Sun, 15 Jul 2012 16:16:57 +0200 Subject: Add support for Certificates from Keystore under Jelly Beans (Thanks Kenny Root for the right pointers) Move jniglue/minivpn files to more sensitive places --- src/de/blinkt/openvpn/VpnProfile.java | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/de/blinkt/openvpn/VpnProfile.java') diff --git a/src/de/blinkt/openvpn/VpnProfile.java b/src/de/blinkt/openvpn/VpnProfile.java index b495cc9e..64ca3db6 100644 --- a/src/de/blinkt/openvpn/VpnProfile.java +++ b/src/de/blinkt/openvpn/VpnProfile.java @@ -24,7 +24,6 @@ import org.spongycastle.util.io.pem.PemWriter; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; -import android.os.Build; import android.security.KeyChain; import android.security.KeyChainException; @@ -555,8 +554,6 @@ public class VpnProfile implements Serializable{ if(mAuthenticationType==TYPE_KEYSTORE || mAuthenticationType==TYPE_USERPASS_KEYSTORE) { if(mAlias==null) return R.string.no_keystore_cert_selected; - if(Build.VERSION.SDK_INT >= 16 && !Build.MODEL.equals("sdk") ) - return R.string.keychain_jellybeans; } if(!mUsePull) { -- cgit v1.2.3