Merge local changes with repository

1 files changed, 20 insertions, 6 deletions

diff --git a/src/de/blinkt/openvpn/VpnProfile.java b/src/de/blinkt/openvpn/VpnProfile.java
index bdfdd70a..98f15044 100644
--- a/src/de/blinkt/openvpn/VpnProfile.java
+++ b/src/de/blinkt/openvpn/VpnProfile.java
@@ -101,9 +101,15 @@ public class VpnProfile implements  Serializable{
 	public boolean mUseDefaultRoutev6=true;
 	public String mCustomRoutesv6="";
 	public String mKeyPassword="";
+	public boolean mPersistTun = false;
+	public String mConnectRetryMax="5";
+	public String mConnectRetry="5";
+	
 	static final String MINIVPN = "miniopenvpn";
 	
-	public boolean mPersistTun = false;
+	
+	
+
 
 
 	public void clearDefaults() {
@@ -191,11 +197,19 @@ public class VpnProfile implements  Serializable{
 
 		cfg+="verb " + mVerb + "\n";
 
-
-
-
-		// quit after 5 tries
-		cfg+="connect-retry-max 5\n";
+		if(mConnectRetryMax ==null) {
+			mConnectRetryMax="5";
+		}
+		
+		if(!mConnectRetryMax.equals("-1"))
+				cfg+="connect-retry-max " + mConnectRetryMax+ "\n";
+	
+		if(mConnectRetry==null)
+			mConnectRetry="5";
+		
+	
+		cfg+="connect-retry " + mConnectRetry + "\n";
+		
 		cfg+="resolv-retry 60\n";