diff options
| author | cyberta <cyberta@riseup.net> | 2022-01-25 02:37:39 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2022-01-25 02:37:39 +0000 |
| commit | f316bbdfed366a5e9e8139e18c704bc3bd62790c (patch) | |
| tree | 276517c536fb82516d7e9c80b574ab58953184ad /app | |
| parent | ada541b2c326d8f2261e2542c952a8003cbec8de (diff) | |
| parent | bdeb934f1276e72aee114680e77c3e43e03d25af (diff) | |
Merge branch 'update_ics-openvpn' into 'master'
update dependencies
Closes #9060
See merge request leap/bitmask_android!161
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/fronts | 9 | ||||
| -rw-r--r-- | app/src/main/java/de/blinkt/openvpn/core/NativeUtils.java | 2 | ||||
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/tor/ClientTransportPlugin.java | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/app/assets/fronts b/app/assets/fronts index 937332df..cd850e2e 100644 --- a/app/assets/fronts +++ b/app/assets/fronts @@ -1,6 +1,3 @@ -snowflake-target https://snowflake-broker.torproject.net.global.prod.fastly.net/ -snowflake-front cdn.sstatic.net -snowflake-stun stun:stun.stunprotocol.org:3478 -moat-cdn https://d50gd378qj74g.cloudfront.net/ -moat-url https://moat.torproject.org.global.prod.fastly.net/ -moat-front cdn.sstatic.net +snowflake-target https://snowflake-broker.azureedge.net +snowflake-front ajax.aspnetcdn.com +snowflake-stun stun:stun.stunprotocol.org:3478,stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 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); } |