Add support for asking username/password if none is set (closes issue #174)

1 files changed, 1 insertions, 6 deletions

diff --git a/src/de/blinkt/openvpn/VpnProfile.java b/src/de/blinkt/openvpn/VpnProfile.java
index 03fcbc1b..dcca334c 100644
--- a/src/de/blinkt/openvpn/VpnProfile.java
+++ b/src/de/blinkt/openvpn/VpnProfile.java
@@ -659,9 +659,6 @@ public class VpnProfile implements  Serializable{
 			if(mIPv4Address == null || cidrToIPAndNetmask(mIPv4Address) == null)
 				return R.string.ipv4_format_error;
 		}
-		if(isUserPWAuth() && !nonNull(mUsername)) {
-			return R.string.error_empty_username;
-		}
 		if(!mUseDefaultRoute && getCustomRoutes()==null)
 			return R.string.custom_route_format_error;
 
@@ -757,10 +754,8 @@ public class VpnProfile implements  Serializable{
 				}
 		}
 
-		if(isUserPWAuth() && (mPassword.equals("") || mPassword == null)) {
-			if(mTransientPW==null)
+		if (isUserPWAuth() && !(nonNull(mUsername) && (nonNull(mPassword) || mTransientPW!=null))) {
 				return R.string.password;
-
 		}
 		return 0;
 	}