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/eip | |
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/eip')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java b/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java index f60d89ce..72a0d80a 100644 --- a/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java +++ b/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java @@ -33,8 +33,8 @@ import static se.leap.bitmaskclient.base.models.Constants.TRANSPORT; import static se.leap.bitmaskclient.base.models.Constants.TYPE; import static se.leap.bitmaskclient.base.models.Constants.UDP; 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 androidx.annotation.VisibleForTesting; @@ -55,7 +55,6 @@ import de.blinkt.openvpn.core.VpnStatus; import de.blinkt.openvpn.core.connection.Connection; import de.blinkt.openvpn.core.connection.Connection.TransportType; import se.leap.bitmaskclient.base.models.Provider; -import se.leap.bitmaskclient.base.models.Transport; import se.leap.bitmaskclient.base.utils.ConfigHelper; import se.leap.bitmaskclient.pluggableTransports.Obfs4Options; |