summaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2022-01-25 02:37:39 +0000
committercyberta <cyberta@riseup.net>2022-01-25 02:37:39 +0000
commitf316bbdfed366a5e9e8139e18c704bc3bd62790c (patch)
tree276517c536fb82516d7e9c80b574ab58953184ad /app/src/main
parentada541b2c326d8f2261e2542c952a8003cbec8de (diff)
parentbdeb934f1276e72aee114680e77c3e43e03d25af (diff)
Merge branch 'update_ics-openvpn' into 'master'
update dependencies Closes #9060 See merge request leap/bitmask_android!161
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/de/blinkt/openvpn/core/NativeUtils.java2
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/tor/ClientTransportPlugin.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/core/NativeUtils.java b/app/src/main/java/de/blinkt/openvpn/core/NativeUtils.java
index a66b7b51..5a1757ac 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/NativeUtils.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/NativeUtils.java
@@ -37,7 +37,7 @@ public class NativeUtils {
static {
if (!isRoboUnitTest() && !isUnitTest()) {
- System.loadLibrary("opvpnutil");
+ System.loadLibrary("ovpnutil");
if (Build.VERSION.SDK_INT == Build.VERSION_CODES.JELLY_BEAN)
System.loadLibrary("jbcrypto");
}
diff --git a/app/src/main/java/se/leap/bitmaskclient/tor/ClientTransportPlugin.java b/app/src/main/java/se/leap/bitmaskclient/tor/ClientTransportPlugin.java
index 764d5f06..0b481780 100644
--- a/app/src/main/java/se/leap/bitmaskclient/tor/ClientTransportPlugin.java
+++ b/app/src/main/java/se/leap/bitmaskclient/tor/ClientTransportPlugin.java
@@ -76,7 +76,7 @@ public class ClientTransportPlugin implements ClientTransportPluginInterface {
String front = getCdnFront("snowflake-front");
String stunServer = getCdnFront("snowflake-stun");
Log.d(TAG, "startSnowflake. target: " + target + ", front:" + front + ", stunServer" + stunServer);
- snowflakePort = IPtProxy.startSnowflake( stunServer, target, front, logfile.getAbsolutePath(), false, false, true, 5);
+ snowflakePort = IPtProxy.startSnowflake(stunServer, target, front, null, logfile.getAbsolutePath(), false, false, true, 5);
Log.d(TAG, "startSnowflake running on port: " + snowflakePort);
watchLogFile(logfile);
}