[PR #840] [MERGED] Android XRay #2144

New issue

Closed

opened 2026-10-13 21:19:01 +00:00 by bsakaguchi · 0 comments

bsakaguchi commented

2026-10-13 21:19:01 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/840
Author: @albexk
Created: 6/4/2024
Status: ✅ Merged
Merged: 6/18/2024
Merged by: @pokamest

Base: dev ← Head: feature/android-xray

📝 Commits (10+)

e74afc9 Add XRay module
ddd635d Merge branch 'dev' into feature/android-xray
0b94a5b Update 3rd-prebuilt
5066ecb Add libxray module
5a3f65d Add Android XRay implementation
267781b Split protocols into separate processes
4bf6734 Merge branch 'dev' into feature/android-xray
11624b3 Update 3rd-prebuilt
99b33a8 Fix assets path for xray geo files
0809e41 Merge branch 'dev' into feature/android-xray

📊 Changes

26 files changed (+637 additions, -151 deletions)

View changed files

📝 CMakeLists.txt (+2 -2)
📝 client/3rd-prebuilt (+1 -1)
📝 client/android/AndroidManifest.xml (+28 -2)
📝 client/android/build.gradle.kts (+3 -1)
📝 client/android/gradle/libs.versions.toml (+3 -0)
📝 client/android/openvpn/src/main/kotlin/org/amnezia/vpn/protocol/openvpn/OpenVpn.kt (+6 -8)
📝 client/android/protocolApi/src/main/kotlin/Protocol.kt (+8 -1)
📝 client/android/qt/build.gradle.kts (+1 -1)
📝 client/android/settings.gradle.kts (+2 -0)
📝 client/android/src/org/amnezia/vpn/AmneziaActivity.kt (+48 -14)
📝 client/android/src/org/amnezia/vpn/AmneziaTileService.kt (+38 -27)
📝 client/android/src/org/amnezia/vpn/AmneziaVpnService.kt (+44 -41)
➕ client/android/src/org/amnezia/vpn/AwgService.kt (+3 -0)
➕ client/android/src/org/amnezia/vpn/OpenVpnService.kt (+3 -0)
📝 client/android/src/org/amnezia/vpn/ServiceNotification.kt (+9 -14)
➕ client/android/src/org/amnezia/vpn/VpnProto.kt (+67 -0)
📝 client/android/src/org/amnezia/vpn/VpnRequestActivity.kt (+21 -4)
📝 client/android/src/org/amnezia/vpn/VpnState.kt (+37 -29)
➕ client/android/src/org/amnezia/vpn/XrayService.kt (+3 -0)
📝 client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/Wireguard.kt (+2 -6)

...and 6 more files

📄 Description

No description provided

_{🔄 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/840 **Author:** [@albexk](https://github.com/albexk) **Created:** 6/4/2024 **Status:** ✅ Merged **Merged:** 6/18/2024 **Merged by:** [@pokamest](https://github.com/pokamest) **Base:** `dev` ← **Head:** `feature/android-xray` --- ### 📝 Commits (10+) - [`e74afc9`](https://github.com/amnezia-vpn/amnezia-client/commit/e74afc94fd01d97f0280a343dddfbadd93c5f85a) Add XRay module - [`ddd635d`](https://github.com/amnezia-vpn/amnezia-client/commit/ddd635dc4b997ad26abb9bc7c5d72318d2745007) Merge branch 'dev' into feature/android-xray - [`0b94a5b`](https://github.com/amnezia-vpn/amnezia-client/commit/0b94a5b5209769f70c0a4727697473943f883a94) Update 3rd-prebuilt - [`5066ecb`](https://github.com/amnezia-vpn/amnezia-client/commit/5066ecbd56897e00253ae85aa257627d1ab355bf) Add libxray module - [`5a3f65d`](https://github.com/amnezia-vpn/amnezia-client/commit/5a3f65df8b69a971baac4fb81bef17cc1b0baa81) Add Android XRay implementation - [`267781b`](https://github.com/amnezia-vpn/amnezia-client/commit/267781bfdc16740877a089ab6572ca402c3b81af) Split protocols into separate processes - [`4bf6734`](https://github.com/amnezia-vpn/amnezia-client/commit/4bf6734c2a907616ee8931bb7e4870c2fa2ce9ad) Merge branch 'dev' into feature/android-xray - [`11624b3`](https://github.com/amnezia-vpn/amnezia-client/commit/11624b38bd3a23da51e4b053efb7e3dffdfb968d) Update 3rd-prebuilt - [`99b33a8`](https://github.com/amnezia-vpn/amnezia-client/commit/99b33a812bc01405edad55220baac1780e297557) Fix assets path for xray geo files - [`0809e41`](https://github.com/amnezia-vpn/amnezia-client/commit/0809e41a248a5b2632c92a550a43ee5b02729773) Merge branch 'dev' into feature/android-xray ### 📊 Changes **26 files changed** (+637 additions, -151 deletions) <details> <summary>View changed files</summary> 📝 `CMakeLists.txt` (+2 -2) 📝 `client/3rd-prebuilt` (+1 -1) 📝 `client/android/AndroidManifest.xml` (+28 -2) 📝 `client/android/build.gradle.kts` (+3 -1) 📝 `client/android/gradle/libs.versions.toml` (+3 -0) 📝 `client/android/openvpn/src/main/kotlin/org/amnezia/vpn/protocol/openvpn/OpenVpn.kt` (+6 -8) 📝 `client/android/protocolApi/src/main/kotlin/Protocol.kt` (+8 -1) 📝 `client/android/qt/build.gradle.kts` (+1 -1) 📝 `client/android/settings.gradle.kts` (+2 -0) 📝 `client/android/src/org/amnezia/vpn/AmneziaActivity.kt` (+48 -14) 📝 `client/android/src/org/amnezia/vpn/AmneziaTileService.kt` (+38 -27) 📝 `client/android/src/org/amnezia/vpn/AmneziaVpnService.kt` (+44 -41) ➕ `client/android/src/org/amnezia/vpn/AwgService.kt` (+3 -0) ➕ `client/android/src/org/amnezia/vpn/OpenVpnService.kt` (+3 -0) 📝 `client/android/src/org/amnezia/vpn/ServiceNotification.kt` (+9 -14) ➕ `client/android/src/org/amnezia/vpn/VpnProto.kt` (+67 -0) 📝 `client/android/src/org/amnezia/vpn/VpnRequestActivity.kt` (+21 -4) 📝 `client/android/src/org/amnezia/vpn/VpnState.kt` (+37 -29) ➕ `client/android/src/org/amnezia/vpn/XrayService.kt` (+3 -0) 📝 `client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/Wireguard.kt` (+2 -6) _...and 6 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

bsakaguchi

2026-10-13 21:19:01 +00:00

closed this issue
added the
pull-request
label

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#2144

No description provided.

Rows
Columns