From a01e771f678fbcfff3b7a38f42ce392102165fcc Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Tue, 18 Dec 2012 11:11:47 +0100
Subject: Fix a few warnings and one bug when importing a file with a pkcs12
 which cannot be read

--HG--
extra : rebase_source : d11215373582cb1a656f7cae9bf3642b34c3a2c9
---
 src/de/blinkt/openvpn/ConfigConverter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/de/blinkt/openvpn/ConfigConverter.java')

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;
 			
-- 
cgit v1.2.3