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 | a01e771f678fbcfff3b7a38f42ce392102165fcc (patch) | |
| tree | 7b29bc4f601e40eef74e51bfb4ded45e2be4d927 /src/de/blinkt/openvpn/ConfigConverter.java | |
| parent | fd52a72467252aa449f1c8081ed02fc064a65729 (diff) | |
Fix a few warnings and one bug when importing a file with a pkcs12 which cannot be read
--HG--
extra : rebase_source : d11215373582cb1a656f7cae9bf3642b34c3a2c9
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; |