summaryrefslogtreecommitdiff
path: root/src/de/blinkt
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
commit005c64c7fc7027a2d269a65fa19a4d1fa005906e (patch)
treeaae9162151482ef637172c828a247e3cb83e0a4d /src/de/blinkt
parent157dca131a514634251235dacc93c86d32ba4dee (diff)
Fix null pointer when connecting with pkcs12 and no password set.
Diffstat (limited to 'src/de/blinkt')
-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;
}