From b5b3defb6d37c491a5300ae6cececcc9f8cff97d Mon Sep 17 00:00:00 2001 From: ssrlive <30760636+ssrlive@users.noreply.github.com> Date: Sun, 28 Jan 2024 20:55:46 +0800 Subject: [PATCH] update rust modules --- README.md | 6 ++++++ build.gradle | 4 ++-- .../java/com/github/shadowsocks/preference/DataStore.kt | 4 ++-- rust/overtls | 2 +- rust/tun2proxy | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7a315f11..400a392f 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,12 @@ export JAVA_HOME="/Applications/Android Studio.app/Contents/jre/Contents/Home" # 建议编辑 mobile/build.gradle ,修改 applicationId 以规避检测 ./gradlew assembleDebug ./gradlew assembleRelease + +# 在 windows 系統下,上述編譯命令應該是: +.\gradlew.bat assembleDebug +.\gradlew.bat assembleRelease + +# 將編譯出的 apk 包安裝到當前連接到電腦上的手機裏: adb install mobile/build/outputs/apk/release/ssrdroid-release.apk ``` diff --git a/build.gradle b/build.gradle index dafc35f9..eb82b6bc 100644 --- a/build.gradle +++ b/build.gradle @@ -6,8 +6,8 @@ ext { sdkVersion = 33 compileSdkVersion = 33 buildToolsVersion = '31.0.0' - versionCode = 520 - versionName = '5.2.0' + versionCode = 530 + versionName = '5.3.0' resConfigs = ['zh-rCN'] } diff --git a/core/src/main/java/com/github/shadowsocks/preference/DataStore.kt b/core/src/main/java/com/github/shadowsocks/preference/DataStore.kt index 27da3281..06e3c270 100644 --- a/core/src/main/java/com/github/shadowsocks/preference/DataStore.kt +++ b/core/src/main/java/com/github/shadowsocks/preference/DataStore.kt @@ -80,10 +80,10 @@ object DataStore : OnPreferenceDataStoreChangeListener { set(value) = publicStore.putString(Key.portTransproxy, value.toString()) val useTun2proxy: Boolean - get() = publicStore.getBoolean(Key.useTun2proxy, false) + get() = publicStore.getBoolean(Key.useTun2proxy, true) val useOverTLS: Boolean - get() = publicStore.getBoolean(Key.useOverTLS, false) + get() = publicStore.getBoolean(Key.useOverTLS, true) val socksAddress: InetSocketAddress? get() = if (publicStore.getString(Key.socksHost).isNullOrBlank()) null diff --git a/rust/overtls b/rust/overtls index 73fff50b..38dbd353 160000 --- a/rust/overtls +++ b/rust/overtls @@ -1 +1 @@ -Subproject commit 73fff50b6bfd1613ec3fa707589a994b4aff4b63 +Subproject commit 38dbd353b3d3cbf723da8fd551b3aecbca7cd3a5 diff --git a/rust/tun2proxy b/rust/tun2proxy index 2b3463c5..d5084744 160000 --- a/rust/tun2proxy +++ b/rust/tun2proxy @@ -1 +1 @@ -Subproject commit 2b3463c55c8b448dfbce77123263520d117a3dc0 +Subproject commit d50847447abf37ed8fc8a26af4e66317cb1c8b2f