diff --git a/core/src/main/jni/shadowsocks-libev b/core/src/main/jni/shadowsocks-libev index 7e414bb9..3e7c8529 160000 --- a/core/src/main/jni/shadowsocks-libev +++ b/core/src/main/jni/shadowsocks-libev @@ -1 +1 @@ -Subproject commit 7e414bb993c8e6dcc6f0c55cad3e00471910a2f7 +Subproject commit 3e7c852970ec050794becdaef04382d6e63c15b2 diff --git a/mobile/build.gradle b/mobile/build.gradle index a889c44b..a2fbacc3 100644 --- a/mobile/build.gradle +++ b/mobile/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.github.shadowsocks" minSdkVersion rootProject.minSdkVersion targetSdkVersion rootProject.sdkVersion - versionCode 4050300 - versionName "4.5.3" + versionCode 4050400 + versionName "4.5.4" testApplicationId "com.github.shadowsocks.test" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" resConfigs "fa", "fr", "ja", "ko", "ru", "zh-rCN", "zh-rTW" diff --git a/mobile/src/main/java/com/github/shadowsocks/bg/BaseService.kt b/mobile/src/main/java/com/github/shadowsocks/bg/BaseService.kt index 5422e87d..f3561ede 100644 --- a/mobile/src/main/java/com/github/shadowsocks/bg/BaseService.kt +++ b/mobile/src/main/java/com/github/shadowsocks/bg/BaseService.kt @@ -255,6 +255,7 @@ object BaseService { fun startNativeProcesses() { val data = data + val profile = data.profile!! val cmd = buildAdditionalArguments(arrayListOf( File((this as Context).applicationInfo.nativeLibraryDir, Executable.SS_LOCAL).absolutePath, "-u", @@ -269,6 +270,8 @@ object BaseService { cmd += acl.absolutePath } + if (profile.udpdns) cmd += "-D" + if (TcpFastOpen.sendEnabled) cmd += "--fast-open" data.sslocalProcess = GuardedProcess(cmd).start() diff --git a/mobile/src/main/java/com/github/shadowsocks/bg/VpnService.kt b/mobile/src/main/java/com/github/shadowsocks/bg/VpnService.kt index 14541c49..cd31abcb 100644 --- a/mobile/src/main/java/com/github/shadowsocks/bg/VpnService.kt +++ b/mobile/src/main/java/com/github/shadowsocks/bg/VpnService.kt @@ -183,9 +183,7 @@ class VpnService : BaseVpnService(), LocalDnsService.Interface { } override fun buildAdditionalArguments(cmd: ArrayList): ArrayList { - val profile = data.profile!! cmd += "-V" - if (profile.udpdns) cmd += "-D" return cmd }