diff options
| author | cyberta <cyberta@riseup.net> | 2022-11-21 15:49:52 +0100 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2022-11-21 15:49:52 +0100 |
| commit | 93fe05806856897749846203f832867327d14352 (patch) | |
| tree | 090a7d1a6c31df23d1305292e30c1e7f7f378c80 /app/src/main/java/de | |
| parent | 5b9505dbb37d110b8c528671bbfc67f7944d2e43 (diff) | |
fix bitmaskcore builds on macOS, rename Shapeshifter to ShapeshifterClient as part of this gombile JNI generation fix
Diffstat (limited to 'app/src/main/java/de')
| -rw-r--r-- | app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java | 6 | ||||
| -rw-r--r-- | app/src/main/java/de/blinkt/openvpn/core/connection/Obfs4Connection.java | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java index 4b394136..88a85de3 100644 --- a/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java +++ b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java @@ -54,7 +54,7 @@ import se.leap.bitmaskclient.eip.EipStatus; import se.leap.bitmaskclient.eip.VpnNotificationManager; import se.leap.bitmaskclient.firewall.FirewallManager; import se.leap.bitmaskclient.pluggableTransports.ObfsVpnClient; -import se.leap.bitmaskclient.pluggableTransports.Shapeshifter; +import se.leap.bitmaskclient.pluggableTransports.ShapeshifterClient; public class OpenVPNService extends VpnService implements StateListener, Callback, ByteCountListener, IOpenVPNServiceInternal, VpnNotificationManager.VpnServiceCallback { @@ -90,7 +90,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac private Toast mlastToast; private Runnable mOpenVPNThread; private VpnNotificationManager notificationManager; - private Shapeshifter shapeshifter; + private ShapeshifterClient shapeshifter; private ObfsVpnClient obfsVpnClient; private FirewallManager firewallManager; @@ -426,7 +426,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac int runningSocksPort = obfsVpnClient.start(); connection.setProxyPort(String.valueOf(runningSocksPort)); } else if (shapeshifter == null) { - shapeshifter = new Shapeshifter(obfs4Connection.getDispatcherOptions()); + shapeshifter = new ShapeshifterClient(obfs4Connection.getDispatcherOptions()); shapeshifter.start(); } } 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 5189afcc..c77c23fd 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,8 +1,8 @@ package de.blinkt.openvpn.core.connection; import static se.leap.bitmaskclient.base.utils.ConfigHelper.ObfsVpnHelper.useObfsVpn; -import static se.leap.bitmaskclient.pluggableTransports.Shapeshifter.DISPATCHER_IP; -import static se.leap.bitmaskclient.pluggableTransports.Shapeshifter.DISPATCHER_PORT; +import static se.leap.bitmaskclient.pluggableTransports.ShapeshifterClient.DISPATCHER_IP; +import static se.leap.bitmaskclient.pluggableTransports.ShapeshifterClient.DISPATCHER_PORT; import se.leap.bitmaskclient.pluggableTransports.Obfs4Options; import se.leap.bitmaskclient.pluggableTransports.ObfsVpnClient; |