From 005c64c7fc7027a2d269a65fa19a4d1fa005906e Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Sun, 9 Sep 2012 11:43:14 +0200 Subject: Fix null pointer when connecting with pkcs12 and no password set. --- src/de/blinkt/openvpn/VpnProfile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/de/blinkt/openvpn/VpnProfile.java b/src/de/blinkt/openvpn/VpnProfile.java index 0d650991..afb779d2 100644 --- a/src/de/blinkt/openvpn/VpnProfile.java +++ b/src/de/blinkt/openvpn/VpnProfile.java @@ -664,7 +664,7 @@ public class VpnProfile implements Serializable{ public int needUserPWInput() { if((mAuthenticationType == TYPE_PKCS12 || mAuthenticationType == TYPE_USERPASS_PKCS12)&& - (mPKCS12Password.equals("") || mPKCS12Password == null)) { + (mPKCS12Password == null || mPKCS12Password.equals(""))) { if(mTransientPCKS12PW==null) return R.string.pkcs12_file_encryption_key; } -- cgit v1.2.3