summaryrefslogtreecommitdiff
path: root/src/de
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-09-09 11:43:14 +0200
committerArne Schwabe <arne@rfc2549.org>2012-09-09 11:43:14 +0200
commite8bbdcdc5a080139e3e840bb299214d1d1cd06fb (patch)
tree95938ae9503d3e4f76a2d379fdbf74d392ecf206 /src/de
parentcefb0c7e7b67730689d03138b40ed4b94fb5cd23 (diff)
Fix null pointer when connecting with pkcs12 and no password set.
Diffstat (limited to 'src/de')
-rw-r--r--src/de/blinkt/openvpn/VpnProfile.java2
1 files changed, 1 insertions, 1 deletions
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;
}