Skip to content

Conversation

@TrueNight
Copy link
Owner

Updated to v5.1.0 of official client

Mygod and others added 30 commits December 13, 2019 22:29
This fixes confusions once and for all in like fa3d4e7.

Also updates China IP address blocks.
8M on <1GB RAM devices, 64M otherwise.
# Conflicts:
#	build.gradle
#	core/build.gradle
#	core/src/main/java/com/github/shadowsocks/bg/GuardedProcessPool.kt
#	core/src/main/java/com/github/shadowsocks/database/Profile.kt
#	mobile/build.gradle
#	mobile/google-services.json
#	mobile/src/main/AndroidManifest.xml
#	mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt
# Conflicts:
#	build.gradle
Mygod and others added 28 commits April 21, 2020 02:23
Co-authored-by: Mygod <contact-git@mygod.be>
# Conflicts:
#	build.gradle
#	core/build.gradle
#	core/src/main/AndroidManifest.xml
#	core/src/main/java/com/github/shadowsocks/Core.kt
#	core/src/main/java/com/github/shadowsocks/VpnRequestActivity.kt
#	core/src/main/java/com/github/shadowsocks/acl/Acl.kt
#	core/src/main/java/com/github/shadowsocks/bg/BaseService.kt
#	core/src/main/java/com/github/shadowsocks/bg/Executable.kt
#	core/src/main/java/com/github/shadowsocks/bg/GuardedProcessPool.kt
#	core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt
#	core/src/main/java/com/github/shadowsocks/bg/RemoteConfig.kt
#	core/src/main/java/com/github/shadowsocks/database/Profile.kt
#	core/src/main/java/com/github/shadowsocks/net/DefaultNetworkListener.kt
#	core/src/main/java/com/github/shadowsocks/net/LocalDnsServer.kt
#	core/src/main/java/com/github/shadowsocks/plugin/PluginConfiguration.kt
#	core/src/main/java/com/github/shadowsocks/plugin/PluginManager.kt
#	core/src/main/java/com/github/shadowsocks/utils/Utils.kt
#	core/src/main/java/com/github/shadowsocks/widget/AutoCollapseTextView.kt
#	core/src/main/res/values-ar/strings.xml
#	mobile/build.gradle
#	mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
#	mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt
#	mobile/src/main/java/com/github/shadowsocks/ScannerActivity.kt
#	tv/build.gradle
#	tv/src/main/java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
@TrueNight TrueNight self-assigned this May 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants