From 5144166172e3620a5bd9f6df7436222afeb4d133 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 2 Aug 2019 00:46:10 +0200
Subject: rename DispatcherOptions to Obfs4Options

---
 app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java     | 10 +++++-----
 .../de/blinkt/openvpn/core/connection/Obfs4Connection.java     |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'app/src/main/java/de/blinkt')

diff --git a/app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java b/app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
index 4c53087f..5ccd83dd 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
@@ -25,7 +25,7 @@ import de.blinkt.openvpn.VpnProfile;
 import de.blinkt.openvpn.core.connection.Connection;
 import de.blinkt.openvpn.core.connection.Obfs4Connection;
 import de.blinkt.openvpn.core.connection.OpenvpnConnection;
-import se.leap.bitmaskclient.pluggableTransports.DispatcherOptions;
+import se.leap.bitmaskclient.pluggableTransports.Obfs4Options;
 
 import static de.blinkt.openvpn.core.connection.Connection.TransportType.OBFS4;
 
@@ -140,7 +140,7 @@ public class ConfigParser {
     private HashMap<String, Vector<Vector<String>>> options = new HashMap<>();
     private HashMap<String, Vector<String>> meta = new HashMap<String, Vector<String>>();
     private String auth_user_pass_file;
-    private DispatcherOptions dispatcherOptions;
+    private Obfs4Options obfs4Options;
 
     static public void useEmbbedUserAuth(VpnProfile np, String inlinedata) {
         String data = VpnProfile.getEmbeddedContent(inlinedata);
@@ -752,8 +752,8 @@ public class ConfigParser {
             return TextUtils.join(s, str);
     }
 
-    public void setDispatcherOptions(DispatcherOptions dispatcherOptions) {
-        this.dispatcherOptions = dispatcherOptions;
+    public void setObfs4Options(Obfs4Options obfs4Options) {
+        this.obfs4Options = obfs4Options;
     }
 
     private Pair<Connection, Connection[]> parseConnection(String connection, Connection defaultValues) throws IOException, ConfigParseError {
@@ -776,7 +776,7 @@ public class ConfigParser {
                 return null;
             }
         else
-            conn = transportType == OBFS4 ? new Obfs4Connection(dispatcherOptions) : new OpenvpnConnection();
+            conn = transportType == OBFS4 ? new Obfs4Connection(obfs4Options) : new OpenvpnConnection();
 
         Vector<String> port = getOption("port", 1, 1);
         if (port != null) {
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 4f6be276..a2f86e05 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,6 @@
 package de.blinkt.openvpn.core.connection;
 
-import se.leap.bitmaskclient.pluggableTransports.DispatcherOptions;
+import se.leap.bitmaskclient.pluggableTransports.Obfs4Options;
 
 import static se.leap.bitmaskclient.pluggableTransports.Dispatcher.DISPATCHER_IP;
 import static se.leap.bitmaskclient.pluggableTransports.Dispatcher.DISPATCHER_PORT;
@@ -12,9 +12,9 @@ import static se.leap.bitmaskclient.pluggableTransports.Dispatcher.DISPATCHER_PO
 public class Obfs4Connection extends Connection {
 
     private static final String TAG = Obfs4Connection.class.getName();
-    private DispatcherOptions options;
+    private Obfs4Options options;
 
-    public Obfs4Connection(DispatcherOptions options) {
+    public Obfs4Connection(Obfs4Options options) {
         setUseUdp(false);
         setServerName(DISPATCHER_IP);
         setServerPort(DISPATCHER_PORT);
@@ -52,7 +52,7 @@ public class Obfs4Connection extends Connection {
     }
 
 
-    public DispatcherOptions getDispatcherOptions() {
+    public Obfs4Options getDispatcherOptions() {
         return options;
     }
 
-- 
cgit v1.2.3