diff options
author | cyberta <cyberta@riseup.net> | 2022-11-22 00:32:42 +0000 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2022-11-22 00:32:42 +0000 |
commit | 0806936f2e2499b2cfa85a429f7926cd3dc6d142 (patch) | |
tree | 2e2f2660a8463667f297a5a1985366cbf309c8ae /app/src/main/java/se/leap/bitmaskclient/pluggableTransports | |
parent | 2bd3f94e15ce2d81ba24ed41defbbf6a237394fc (diff) | |
parent | 9d2c5e400e1e69575cdb5782c1f3576a058733fa (diff) |
Merge branch 'last_shapeshifter_update<3' into 'master'
fix bitmaskcore builds on macOS
See merge request leap/bitmask_android!216
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/pluggableTransports')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/pluggableTransports/ShapeshifterClient.java (renamed from app/src/main/java/se/leap/bitmaskclient/pluggableTransports/Shapeshifter.java) | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/Shapeshifter.java b/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/ShapeshifterClient.java index 9bd61859..f1eb0f1b 100644 --- a/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/Shapeshifter.java +++ b/app/src/main/java/se/leap/bitmaskclient/pluggableTransports/ShapeshifterClient.java @@ -27,17 +27,16 @@ import java.util.Observer; import de.blinkt.openvpn.core.ConnectionStatus; import de.blinkt.openvpn.core.VpnStatus; import se.leap.bitmaskclient.eip.EipStatus; -import shapeshifter.ShapeShifter; -public class Shapeshifter implements Observer { +public class ShapeshifterClient implements Observer { public static final String DISPATCHER_PORT = "4430"; public static final String DISPATCHER_IP = "127.0.0.1"; private static final int MAX_RETRY = 5; private static final int RETRY_TIME = 4000; - private static final String TAG = Shapeshifter.class.getSimpleName(); + private static final String TAG = ShapeshifterClient.class.getSimpleName(); - private final shapeshifter.ShapeShifter shapeShifter; + private final shapeshifter.Shapeshifter_ shapeShifter; private boolean isErrorHandling; private boolean noNetwork; private int retry = 0; @@ -53,15 +52,15 @@ public class Shapeshifter implements Observer { if (retry < MAX_RETRY && !noNetwork) { retry++; - reconnectHandler.postDelayed(Shapeshifter.this::reconnect, RETRY_TIME); + reconnectHandler.postDelayed(ShapeshifterClient.this::reconnect, RETRY_TIME); } else { VpnStatus.logError(VpnStatus.ErrorType.SHAPESHIFTER); } } } - public Shapeshifter(Obfs4Options options) { - shapeShifter = new ShapeShifter(); + public ShapeshifterClient(Obfs4Options options) { + shapeShifter = new shapeshifter.Shapeshifter_(); shapeShifter.setLogger(new ShapeshifterLogger()); setup(options); Looper.prepare(); |