diff options
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/pluggableTransports')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/pluggableTransports/Dispatcher.java | 10 | ||||
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/pluggableTransports/Obfs4Options.java (renamed from app/src/main/java/se/leap/bitmaskclient/pluggableTransports/DispatcherOptions.java) | 4 | ||||
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/pluggableTransports/Shapeshifter.java | 19 |
3 files changed, 25 insertions, 8 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/Dispatcher.java b/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/Dispatcher.java index 240dae75..8e787b57 100644 --- a/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/Dispatcher.java +++ b/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/Dispatcher.java @@ -46,12 +46,12 @@ public class Dispatcher { private Thread dispatcherThread = null; private int dispatcherPid = -1; - public Dispatcher(Context context, DispatcherOptions dispatcherOptions) { + public Dispatcher(Context context, Obfs4Options obfs4Options) { this.context = context.getApplicationContext(); - this.remoteIP = dispatcherOptions.remoteIP; - this.remotePort = dispatcherOptions.remotePort; - this.certificate = dispatcherOptions.cert; - this.iatMode = dispatcherOptions.iatMode; + this.remoteIP = obfs4Options.remoteIP; + this.remotePort = obfs4Options.remotePort; + this.certificate = obfs4Options.cert; + this.iatMode = obfs4Options.iatMode; } @WorkerThread diff --git a/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/DispatcherOptions.java b/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/Obfs4Options.java index 76ccbd79..2f9cb732 100644 --- a/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/DispatcherOptions.java +++ b/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/Obfs4Options.java @@ -2,13 +2,13 @@ package se.leap.bitmaskclient.pluggableTransports; import java.io.Serializable; -public class DispatcherOptions implements Serializable { +public class Obfs4Options implements Serializable { public String cert; public String iatMode; public String remoteIP; public String remotePort; - public DispatcherOptions(String remoteIP, String remotePort, String cert, String iatMode) { + public Obfs4Options(String remoteIP, String remotePort, String cert, String iatMode) { this.cert = cert; this.iatMode = iatMode; this.remoteIP = remoteIP; diff --git a/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/Shapeshifter.java b/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/Shapeshifter.java index 513a310e..175e236a 100644 --- a/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/Shapeshifter.java +++ b/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/Shapeshifter.java @@ -1,3 +1,20 @@ +/** + * Copyright (c) 2019 LEAP Encryption Access Project and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + package se.leap.bitmaskclient.pluggableTransports; import android.util.Log; @@ -12,7 +29,7 @@ public class Shapeshifter { ShapeShifter shapeShifter; - public Shapeshifter(DispatcherOptions options) { + public Shapeshifter(Obfs4Options options) { shapeShifter = new ShapeShifter(); shapeShifter.setIatMode(Long.valueOf(options.iatMode)); shapeShifter.setSocksAddr(DISPATCHER_IP+":"+DISPATCHER_PORT); |