From bbbefe26e6c160bca867dce3188b3679f0fcf2fc Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Thu, 27 Dec 2012 19:47:35 +0100
Subject: Make changes needed to provide an external API

---
 src/de/blinkt/openvpn/ConfigConverter.java | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(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 40aa24e0..5065436c 100644
--- a/src/de/blinkt/openvpn/ConfigConverter.java
+++ b/src/de/blinkt/openvpn/ConfigConverter.java
@@ -350,17 +350,9 @@ public class ConfigConverter extends ListActivity {
 		mResult.mPKCS12Filename = embedFile(mResult.mPKCS12Filename,true);
 		
 
-		if(mResult.mUsername != null && !mResult.mUsername.equals("")){
-			String data =embedFile(mResult.mUsername);
-			mResult.mUsername=null;
-			if(data!=null) {
-				data = data.replace(VpnProfile.INLINE_TAG, "");
-				String[] parts = data.split("\n");
-				if(parts.length >= 2) {
-					mResult.mUsername=parts[0];
-					mResult.mPassword=parts[1];
-				}
-			}
+		if(mResult.mUsername == null && mResult.mPassword != null ){
+			String data =embedFile(mResult.mPassword);
+			ConfigParser.useEmbbedUserAuth(mResult, data);			
 		}
 	}
 
-- 
cgit v1.2.3