[PR #70] [MERGED] Android shadowsocks #1562

Closed
opened 2026-10-13 20:45:19 +00:00 by bsakaguchi · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/70
Author: @pokamest
Created: 4/27/2022
Status: ✅ Merged
Merged: 8/9/2022
Merged by: @pokamest

Base: dev ← Head: android_shadowsocks


📝 Commits (7)

  • 4a6ea38 so files for shadowsocks added
  • ccdd433 Shadowsocks open source code added
  • 929bcf0 Android shadowsocks code added
  • 59b4bf5 Shadowsocks added as a library folder in android
  • 29656fb Shadowsocks protocol added
  • eea88f6 Cleanup
  • fd9b922 Merge branch 'dev' into android_shadowsocks

📊 Changes

122 files changed (+81213 additions, -70 deletions)

View changed files

📝 client/android/AndroidManifest.xml (+17 -9)
➕ client/android/assets/acl/bypass-china.acl (+10377 -0)
➕ client/android/assets/acl/bypass-lan-china.acl (+10391 -0)
➕ client/android/assets/acl/bypass-lan.acl (+17 -0)
➕ client/android/assets/acl/china-list.acl (+5245 -0)
➕ client/android/assets/acl/gfwlist.acl (+5492 -0)
📝 client/android/build.gradle (+18 -1)
📝 client/android/gradle.properties (+5 -1)
📝 client/android/gradlew (+0 -0)
➕ client/android/res/drawable/ic_navigation_close.xml (+10 -0)
➕ client/android/res/drawable/ic_service_active.xml (+11 -0)
➕ client/android/res/drawable/ic_service_busy.xml (+11 -0)
➕ client/android/res/drawable/ic_service_connected.xml (+16 -0)
➕ client/android/res/drawable/ic_service_connecting.xml (+27 -0)
➕ client/android/res/drawable/ic_service_idle.xml (+18 -0)
➕ client/android/res/drawable/ic_service_stopped.xml (+27 -0)
➕ client/android/res/drawable/ic_service_stopping.xml (+16 -0)
➕ client/android/res/drawable/ic_social_share.xml (+11 -0)
➕ client/android/res/raw/china_ip_list.txt (+5215 -0)
➕ client/android/res/values/arrays.xml (+210 -0)

...and 80 more files

📄 Description

Initial Android shadowsocks implementation


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/amnezia-vpn/amnezia-client/pull/70 **Author:** [@pokamest](https://github.com/pokamest) **Created:** 4/27/2022 **Status:** ✅ Merged **Merged:** 8/9/2022 **Merged by:** [@pokamest](https://github.com/pokamest) **Base:** `dev` ← **Head:** `android_shadowsocks` --- ### 📝 Commits (7) - [`4a6ea38`](https://github.com/amnezia-vpn/amnezia-client/commit/4a6ea38ef8a430e6ee600ab7e038fef1feaddabc) so files for shadowsocks added - [`ccdd433`](https://github.com/amnezia-vpn/amnezia-client/commit/ccdd433e35a20407753368606898123fee3bb6e3) Shadowsocks open source code added - [`929bcf0`](https://github.com/amnezia-vpn/amnezia-client/commit/929bcf03a0b1a951d66b4be0af854a2128353967) Android shadowsocks code added - [`59b4bf5`](https://github.com/amnezia-vpn/amnezia-client/commit/59b4bf52674bf48df5df5f662acaed7759e6fb6b) Shadowsocks added as a library folder in android - [`29656fb`](https://github.com/amnezia-vpn/amnezia-client/commit/29656fb9a6d9e93db25a8c1cbe05d770bc3a882f) Shadowsocks protocol added - [`eea88f6`](https://github.com/amnezia-vpn/amnezia-client/commit/eea88f6e11f23507afcd9226a2b80d1ebc2e28ea) Cleanup - [`fd9b922`](https://github.com/amnezia-vpn/amnezia-client/commit/fd9b922b21c38ab3a57e78a2ac906605b1b9ff7c) Merge branch 'dev' into android_shadowsocks ### 📊 Changes **122 files changed** (+81213 additions, -70 deletions) <details> <summary>View changed files</summary> 📝 `client/android/AndroidManifest.xml` (+17 -9) ➕ `client/android/assets/acl/bypass-china.acl` (+10377 -0) ➕ `client/android/assets/acl/bypass-lan-china.acl` (+10391 -0) ➕ `client/android/assets/acl/bypass-lan.acl` (+17 -0) ➕ `client/android/assets/acl/china-list.acl` (+5245 -0) ➕ `client/android/assets/acl/gfwlist.acl` (+5492 -0) 📝 `client/android/build.gradle` (+18 -1) 📝 `client/android/gradle.properties` (+5 -1) 📝 `client/android/gradlew` (+0 -0) ➕ `client/android/res/drawable/ic_navigation_close.xml` (+10 -0) ➕ `client/android/res/drawable/ic_service_active.xml` (+11 -0) ➕ `client/android/res/drawable/ic_service_busy.xml` (+11 -0) ➕ `client/android/res/drawable/ic_service_connected.xml` (+16 -0) ➕ `client/android/res/drawable/ic_service_connecting.xml` (+27 -0) ➕ `client/android/res/drawable/ic_service_idle.xml` (+18 -0) ➕ `client/android/res/drawable/ic_service_stopped.xml` (+27 -0) ➕ `client/android/res/drawable/ic_service_stopping.xml` (+16 -0) ➕ `client/android/res/drawable/ic_social_share.xml` (+11 -0) ➕ `client/android/res/raw/china_ip_list.txt` (+5215 -0) ➕ `client/android/res/values/arrays.xml` (+210 -0) _...and 80 more files_ </details> ### 📄 Description Initial Android shadowsocks implementation --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
bsakaguchi 2026-10-13 20:45:19 +00:00
Sign in to join this conversation.
No labels
pull-request
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
amnezia-vpn/amnezia-client#1562
No description provided.