diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-12-18 11:11:47 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-12-18 11:11:47 +0100 |
| commit | 9fe3b7ce6d350474d0827cb6ff6554eafa822378 (patch) | |
| tree | 53dc7d1f27af688ed8d7b483a0590f86c652bb04 /src/de/blinkt/openvpn/ConfigConverter.java | |
| parent | 6ebe4f9500f0761a1b6b91da3ab415e1db4c19c5 (diff) | |
Fix a few warnings and one bug when importing a file with a pkcs12 which cannot be read
Diffstat (limited to 'src/de/blinkt/openvpn/ConfigConverter.java')
| -rw-r--r-- | src/de/blinkt/openvpn/ConfigConverter.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/de/blinkt/openvpn/ConfigConverter.java b/src/de/blinkt/openvpn/ConfigConverter.java index 3f204368..8d746409 100644 --- a/src/de/blinkt/openvpn/ConfigConverter.java +++ b/src/de/blinkt/openvpn/ConfigConverter.java @@ -176,7 +176,7 @@ public class ConfigConverter extends ListActivity { private void embedPKCS12File() { mResult.mPKCS12Filename = embedFile(mResult.mPKCS12Filename,true); - if(mResult.mPKCS12Filename.startsWith(VpnProfile.INLINE_TAG)) { + if(mResult.mPKCS12Filename!=null && mResult.mPKCS12Filename.startsWith(VpnProfile.INLINE_TAG)) { if(mResult.mAuthenticationType==VpnProfile.TYPE_USERPASS_KEYSTORE) mResult.mAuthenticationType=VpnProfile.TYPE_USERPASS_PKCS12; |