update ics-openvpn: update classes, manifest, resources and build script

1 files changed, 16 insertions, 7 deletions

diff --git a/app/src/main/java/de/blinkt/openvpn/core/Connection.java b/app/src/main/java/de/blinkt/openvpn/core/Connection.java
index 3455450b..ff15daec 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/Connection.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/Connection.java
@@ -8,21 +8,23 @@ package de.blinkt.openvpn.core;
 import android.text.TextUtils;
 
 import java.io.Serializable;
+import java.util.Locale;
 
 public class Connection implements Serializable, Cloneable {
-    public String mServerName = "openvpn.blinkt.de";
+    public String mServerName = "openvpn.example.com";
     public String mServerPort = "1194";
     public boolean mUseUdp = true;
-    public String mCustomConfiguration="";
-    public boolean mUseCustomConfig=false;
-    public boolean mEnabled=true;
+    public String mCustomConfiguration = "";
+    public boolean mUseCustomConfig = false;
+    public boolean mEnabled = true;
     public int mConnectTimeout = 0;
+    public static final int CONNECTION_DEFAULT_TIMEOUT = 120;
 
     private static final long serialVersionUID = 92031902903829089L;
 
 
     public String getConnectionBlock() {
-        String cfg="";
+        String cfg = "";
 
         // Server Address
         cfg += "remote ";
@@ -34,8 +36,8 @@ public class Connection implements Serializable, Cloneable {
         else
             cfg += " tcp-client\n";
 
-        if (mConnectTimeout!=0)
-            cfg += String.format(" connect-timeout  %d\n" , mConnectTimeout);
+        if (mConnectTimeout != 0)
+            cfg += String.format(Locale.US, " connect-timeout  %d\n", mConnectTimeout);
 
 
         if (!TextUtils.isEmpty(mCustomConfiguration) && mUseCustomConfig) {
@@ -53,4 +55,11 @@ public class Connection implements Serializable, Cloneable {
     public boolean isOnlyRemote() {
         return TextUtils.isEmpty(mCustomConfiguration) || !mUseCustomConfig;
     }
+
+    public int getTimeout() {
+        if (mConnectTimeout <= 0)
+            return CONNECTION_DEFAULT_TIMEOUT;
+        else
+            return mConnectTimeout;
+    }
 }