From df8a748e05b9fc9c6e7079012873fe046cfd02a4 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Mon, 2 Jul 2012 22:54:50 +0200 Subject: The "things that look similar are actually different" commit fix last commit (mName != mUsername) MAIN != VIEW --- src/de/blinkt/openvpn/ConfigConverter.java | 4 ++-- src/de/blinkt/openvpn/ConfigParser.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/de/blinkt/openvpn/ConfigConverter.java b/src/de/blinkt/openvpn/ConfigConverter.java index 71a17fa2..9b97cf14 100644 --- a/src/de/blinkt/openvpn/ConfigConverter.java +++ b/src/de/blinkt/openvpn/ConfigConverter.java @@ -159,8 +159,8 @@ public class ConfigConverter extends ListActivity { mResult.mClientKeyFilename = VpnProfile.INLINE_TAG + embedFile(mResult.mClientKeyFilename); mResult.mTLSAuthFilename = VpnProfile.INLINE_TAG + embedFile(mResult.mTLSAuthFilename); - if(mResult.mUsername != null){ - String data =embedFile(mResult.mName); + if(mResult.mUsername != null && !mResult.mUsername.equals("")){ + String data =embedFile(mResult.mUsername); mResult.mName=null; if(data!=null) { String[] parts = data.split("\n"); diff --git a/src/de/blinkt/openvpn/ConfigParser.java b/src/de/blinkt/openvpn/ConfigParser.java index b897f63a..1b07178e 100644 --- a/src/de/blinkt/openvpn/ConfigParser.java +++ b/src/de/blinkt/openvpn/ConfigParser.java @@ -436,7 +436,7 @@ public class ConfigParser { np.mAuthenticationType=VpnProfile.TYPE_USERPASS_KEYSTORE; } if(authuser.size()>1) { - np.mName=authuser.get(1); + np.mUsername=authuser.get(1); } } -- cgit v1.2.3