Version 0.4 had a User/password and static keys options that will not work. Fix that

1 files changed, 13 insertions, 3 deletions

diff --git a/src/de/blinkt/openvpn/VpnProfile.java b/src/de/blinkt/openvpn/VpnProfile.java
index 2df4ec39..201bc111 100644
--- a/src/de/blinkt/openvpn/VpnProfile.java
+++ b/src/de/blinkt/openvpn/VpnProfile.java
@@ -70,8 +70,8 @@ public class VpnProfile implements  Serializable{
 	public boolean mCheckRemoteCN=false;
 	public boolean mExpectTLSCert=true;
 	public String mRemoteCN="";
-	private String mPassword;
-	private String mUsername;
+	public String mPassword="";
+	public String mUsername="";
 	public boolean mRoutenopull=false;
 
 
@@ -225,6 +225,13 @@ public class VpnProfile implements  Serializable{
 			cfg+="\n";
 			cfg+="management-query-passwords\n";
 			break;
+		case VpnProfile.TYPE_USERPASS:
+			cfg+="ca " + mCaFilename + "\n";
+			cfg+="auth-user-pass\n";
+			cfg+="management-query-passwords\n";
+			break;
+			
+
 
 		}
 
@@ -233,7 +240,10 @@ public class VpnProfile implements  Serializable{
 		}
 
 		if(mUseTLSAuth) {
-			cfg+="tls-auth ";
+			if(mAuthenticationType==TYPE_STATICKEYS)
+				cfg+="static ";
+			else
+				cfg+="tls-auth ";
 			cfg+=mTLSAuthFilename;
 			cfg+=" ";
 			cfg+= mTLSAuthDirection;