update obfsvpn to version 1.0.0, this is a breaking API change. Obfsvpn requires openvpn in UDP as inner transport protocol from now on

1 files changed, 7 insertions, 35 deletions

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 19ea180d..c646c099 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,12 +1,7 @@
 package de.blinkt.openvpn.core.connection;
 
-import static se.leap.bitmaskclient.base.utils.BuildConfigHelper.useObfsVpn;
-import static se.leap.bitmaskclient.pluggableTransports.ShapeshifterClient.DISPATCHER_IP;
-import static se.leap.bitmaskclient.pluggableTransports.ShapeshifterClient.DISPATCHER_PORT;
-
-import se.leap.bitmaskclient.pluggableTransports.HoppingObfsVpnClient;
-import se.leap.bitmaskclient.pluggableTransports.Obfs4Options;
-import se.leap.bitmaskclient.pluggableTransports.ObfsVpnClient;
+import se.leap.bitmaskclient.pluggableTransports.ObfsvpnClient;
+import se.leap.bitmaskclient.pluggableTransports.models.Obfs4Options;
 
 
 /**
@@ -19,33 +14,10 @@ public class Obfs4Connection extends Connection {
     private Obfs4Options options;
 
     public Obfs4Connection(Obfs4Options options) {
-        if (useObfsVpn()) {
-            setServerName(options.gatewayIP);
-            setServerPort(options.transport.getPorts()[0]);
-            setProxyName(ObfsVpnClient.SOCKS_IP);
-            setProxyType(ProxyType.SOCKS5);
-            switch (options.transport.getTransportType()) {
-                case OBFS4:
-                    setUseUdp(false);
-                    setProxyPort(String.valueOf(ObfsVpnClient.SOCKS_PORT.get()));
-                    break;
-                case OBFS4_HOP:
-                    setUseUdp(true);
-                    setProxyPort(String.valueOf(HoppingObfsVpnClient.PORT));
-                    break;
-                default:break;
-            }
-        } else {
-            setServerName(DISPATCHER_IP);
-            setServerPort(DISPATCHER_PORT);
-            setProxyName("");
-            setProxyPort("");
-            setProxyType(ProxyType.NONE);
-
-            // while udp/kcp might be used on the wire,
-            // we don't use udp for openvpn in case of a obfs4 connection
-            setUseUdp(false);
-        }
+        setServerName(ObfsvpnClient.IP);
+        setServerPort(String.valueOf(ObfsvpnClient.PORT));
+        setProxyType(ProxyType.NONE);
+        setUseUdp(true);
         setProxyAuthUser(null);
         setProxyAuthPassword(null);
         setUseProxyAuth(false);
@@ -61,7 +33,7 @@ public class Obfs4Connection extends Connection {
 
     @Override
     public TransportType getTransportType() {
-        return TransportType.OBFS4;
+        return options.transport.getTransportType();
     }