diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-07-02 22:54:50 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-07-02 22:54:50 +0200 |
| commit | bf7aece58cd44b02616d30497d9d022f026edb07 (patch) | |
| tree | a68b061733073cea5be46b70d278011555c0889d /src/de/blinkt | |
| parent | 106b2ec64486b32008471a6c81e1f43111e4cf49 (diff) | |
The "things that look similar are actually different" commit
fix last commit (mName != mUsername)
MAIN != VIEW
Diffstat (limited to 'src/de/blinkt')
| -rw-r--r-- | src/de/blinkt/openvpn/ConfigConverter.java | 4 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/ConfigParser.java | 2 |
2 files changed, 3 insertions, 3 deletions
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); } } |