diff --git a/app/src/main/java/io/nekohasekai/sagernet/ui/profile/HysteriaSettingsActivity.kt b/app/src/main/java/io/nekohasekai/sagernet/ui/profile/HysteriaSettingsActivity.kt index 0e506b1..f442982 100644 --- a/app/src/main/java/io/nekohasekai/sagernet/ui/profile/HysteriaSettingsActivity.kt +++ b/app/src/main/java/io/nekohasekai/sagernet/ui/profile/HysteriaSettingsActivity.kt @@ -90,6 +90,8 @@ class HysteriaSettingsActivity : ProfileSettingsActivity() { false findPreference(Key.SERVER_DISABLE_MTU_DISCOVERY)!!.isVisible = false + // + authPayload.title = resources.getString(R.string.password) } else { authType.isVisible = true authPayload.isVisible = true @@ -103,6 +105,8 @@ class HysteriaSettingsActivity : ProfileSettingsActivity() { true findPreference(Key.SERVER_DISABLE_MTU_DISCOVERY)!!.isVisible = true + // + authPayload.title = resources.getString(R.string.hysteria_auth_payload) } } findPreference(Key.PROTOCOL_VERSION)!!.setOnPreferenceChangeListener { _, newValue -> diff --git a/buildScript/lib/core/get_source_env.sh b/buildScript/lib/core/get_source_env.sh index 6d12944..0b35401 100644 --- a/buildScript/lib/core/get_source_env.sh +++ b/buildScript/lib/core/get_source_env.sh @@ -1,5 +1,5 @@ if [ ! -z $ENV_NB4A ]; then - export COMMIT_SING_BOX_EXTRA="6cc2ef25bff24703c46da1a000d201413d697db6" + export COMMIT_SING_BOX_EXTRA="363f419392f51d8f70d8ecf6af2622a771cdcae3" fi if [ ! -z $ENV_SING_BOX_EXTRA ]; then diff --git a/libcore/go.mod b/libcore/go.mod index ee4a00d..899faba 100644 --- a/libcore/go.mod +++ b/libcore/go.mod @@ -10,7 +10,7 @@ require ( github.com/sagernet/sing v0.2.13-0.20231001070509-81a98bf16263 github.com/sagernet/sing-box v1.0.0 // replaced github.com/sagernet/sing-dns v0.1.10 - github.com/sagernet/sing-tun v0.1.15-0.20230930170051-6cfee41a5684 + github.com/sagernet/sing-tun v0.1.15-0.20231003035000-3ae726d9f02b github.com/ulikunitz/xz v0.5.10 golang.org/x/mobile v0.0.0-20220722155234-aaac322e2105 ) diff --git a/libcore/go.sum b/libcore/go.sum index d872d74..3ab69b2 100644 --- a/libcore/go.sum +++ b/libcore/go.sum @@ -125,8 +125,8 @@ github.com/sagernet/sing-shadowsocks2 v0.1.4 h1:vht2M8t3m5DTgXR2j24KbYOygG5aOp+M github.com/sagernet/sing-shadowsocks2 v0.1.4/go.mod h1:Mgdee99NxxNd5Zld3ixIs18yVs4x2dI2VTDDE1N14Wc= github.com/sagernet/sing-shadowtls v0.1.4 h1:aTgBSJEgnumzFenPvc+kbD9/W0PywzWevnVpEx6Tw3k= github.com/sagernet/sing-shadowtls v0.1.4/go.mod h1:F8NBgsY5YN2beQavdgdm1DPlhaKQlaL6lpDdcBglGK4= -github.com/sagernet/sing-tun v0.1.15-0.20230930170051-6cfee41a5684 h1:F4cEIq+UpXxFoprR1xpC0mAMvPI8Jky6MfVPktFZ9yE= -github.com/sagernet/sing-tun v0.1.15-0.20230930170051-6cfee41a5684/go.mod h1:D+13Yc2j9CJ/EP25hs0vHn4kgH9JVfe0PIpdZwIbYZs= +github.com/sagernet/sing-tun v0.1.15-0.20231003035000-3ae726d9f02b h1:lg4ddG9BaVVsLAx4972MefhLI7xYlTuE6q7SHK9nLfU= +github.com/sagernet/sing-tun v0.1.15-0.20231003035000-3ae726d9f02b/go.mod h1:D+13Yc2j9CJ/EP25hs0vHn4kgH9JVfe0PIpdZwIbYZs= github.com/sagernet/sing-vmess v0.1.8 h1:XVWad1RpTy9b5tPxdm5MCU8cGfrTGdR8qCq6HV2aCNc= github.com/sagernet/sing-vmess v0.1.8/go.mod h1:vhx32UNzTDUkNwOyIjcZQohre1CaytquC5mPplId8uA= github.com/sagernet/smux v0.0.0-20230312102458-337ec2a5af37 h1:HuE6xSwco/Xed8ajZ+coeYLmioq0Qp1/Z2zczFaV8as=