* refactor vpn profile generation

* fix lzo-comp flag parsing in ConfigParser

2 files changed, 39 insertions, 51 deletions

diff --git a/app/src/main/java/de/blinkt/openvpn/core/connection/Connection.java b/app/src/main/java/de/blinkt/openvpn/core/connection/Connection.java
index f333a13e..a318e55d 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/connection/Connection.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/connection/Connection.java
@@ -35,10 +35,22 @@ public abstract class Connection implements Serializable, Cloneable {
     }
 
     public enum TransportType {
-        OBFS4,
-        OPENVPN
+        OBFS4("obfs4"),
+        OPENVPN("openvpn");
+
+        String transport;
+
+        TransportType(String transportType) {
+            this.transport = transportType;
+        }
+
+        @Override
+        public String toString() {
+            return transport;
+        }
     }
 
+
     private static final long serialVersionUID = 92031902903829089L;
 
 
diff --git a/app/src/main/java/de/blinkt/openvpn/core/connection/Obfs4Connection.java b/app/src/main/java/de/blinkt/openvpn/core/connection/Obfs4Connection.java
index 790b8b1a..4f6be276 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/connection/Obfs4Connection.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/connection/Obfs4Connection.java
@@ -1,6 +1,9 @@
 package de.blinkt.openvpn.core.connection;
 
-import org.json.JSONObject;
+import se.leap.bitmaskclient.pluggableTransports.DispatcherOptions;
+
+import static se.leap.bitmaskclient.pluggableTransports.Dispatcher.DISPATCHER_IP;
+import static se.leap.bitmaskclient.pluggableTransports.Dispatcher.DISPATCHER_PORT;
 
 /**
  * Created by cyberta on 08.03.19.
@@ -9,46 +12,38 @@ import org.json.JSONObject;
 public class Obfs4Connection extends Connection {
 
     private static final String TAG = Obfs4Connection.class.getName();
+    private DispatcherOptions options;
 
-
-    private String mObfs4RemoteProxyName = "";
-    private String mObfs4RemoteProxyPort = "";
-    private String mObfs4Certificate = "";
-    private String mObfs4IatMode = "";
-
-    public Obfs4Connection() {
-        setDefaults();
-    }
-
-    public Obfs4Connection(Connection connection) {
-        mObfs4RemoteProxyName = connection.getServerName();
-        setConnectTimeout(connection.getConnectTimeout());
-        setCustomConfiguration(connection.getCustomConfiguration());
-        setUseCustomConfig(connection.isUseCustomConfig());
-
-        setDefaults();
-    }
-
-    private void setDefaults() {
+    public Obfs4Connection(DispatcherOptions options) {
         setUseUdp(false);
-        setServerName("127.0.0.1");
-        setServerPort("");
+        setServerName(DISPATCHER_IP);
+        setServerPort(DISPATCHER_PORT);
         setProxyName("");
         setProxyPort("");
         setProxyAuthUser(null);
         setProxyAuthPassword(null);
         setProxyType(ProxyType.NONE);
         setUseProxyAuth(false);
+        this.options = options;
     }
 
-    public void setTransportOptions(JSONObject jsonObject) {
-        mObfs4Certificate = jsonObject.optString("cert");
-        mObfs4IatMode = jsonObject.optString("iat-mode");
-    }
+    @Deprecated
+    public Obfs4Connection() {
+        setUseUdp(false);
+        setServerName(DISPATCHER_IP);
+        setServerPort(DISPATCHER_PORT);
+        setProxyName("");
+        setProxyPort("");
+        setProxyAuthUser(null);
+        setProxyAuthPassword(null);
+        setProxyType(ProxyType.NONE);
+        setUseProxyAuth(false);    }
 
     @Override
     public Connection clone() throws CloneNotSupportedException {
-        return super.clone();
+        Obfs4Connection connection = (Obfs4Connection) super.clone();
+        connection.options = this.options;
+        return connection;
     }
 
     @Override
@@ -56,28 +51,9 @@ public class Obfs4Connection extends Connection {
         return TransportType.OBFS4;
     }
 
-    public String getmObfs4RemoteProxyName() {
-        return mObfs4RemoteProxyName;
-    }
-
-    public void setObfs4RemoteProxyName(String mObfs4RemoteProxyName) {
-        this.mObfs4RemoteProxyName = mObfs4RemoteProxyName;
-    }
-
-    public String getmObfs4RemoteProxyPort() {
-        return mObfs4RemoteProxyPort;
-    }
-
-    public void setObfs4RemoteProxyPort(String mObfs4RemoteProxyPort) {
-        this.mObfs4RemoteProxyPort = mObfs4RemoteProxyPort;
-    }
-
-    public String getmObfs4Certificate() {
-        return mObfs4Certificate;
-    }
 
-    public String getmObfs4IatMode() {
-        return mObfs4IatMode;
+    public DispatcherOptions getDispatcherOptions() {
+        return options;
     }
 
 }