[PR #452] [MERGED] Android refactoring #1834

New issue

Closed

opened 2026-10-13 21:15:55 +00:00 by bsakaguchi · 0 comments

bsakaguchi commented

2026-10-13 21:15:55 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/452
Author: @albexk
Created: 12/4/2023
Status: ✅ Merged
Merged: 12/23/2023
Merged by: @pokamest

Base: dev ← Head: refactoring/android

📝 Commits (10+)

fcabf08 Update gradle, fix gradlew.bat crlf
e1eec55 Refactoring build
06776eb Fix errors
d77f3ec Fix build error
4e5f2f4 Detach shadowsocks module
2fde47a Move qt binding java code to a separate module
f1c9704 Create utils module, move Log class there
617cdf1 Log class refactoring
bc68c48 Update to qt 6.6.0
5a5ea4a Android project restructuring

📊 Changes

238 files changed (+5070 additions, -84655 deletions)

View changed files

📝 .gitattributes (+1 -0)
📝 .github/workflows/deploy.yml (+71 -34)
📝 CMakeLists.txt (+1 -0)
📝 client/amnezia_application.cpp (+5 -7)
📝 client/android/AndroidManifest.xml (+108 -121)
➖ client/android/assets/acl/bypass-china.acl (+0 -10377)
➖ client/android/assets/acl/bypass-lan-china.acl (+0 -10391)
➖ client/android/assets/acl/bypass-lan.acl (+0 -17)
➖ client/android/assets/acl/china-list.acl (+0 -5245)
➖ client/android/assets/acl/gfwlist.acl (+0 -5492)
➕ client/android/awg/build.gradle.kts (+18 -0)
➕ client/android/awg/src/main/kotlin/Awg.kt (+80 -0)
➕ client/android/awg/src/main/kotlin/AwgConfig.kt (+108 -0)
📝 client/android/build.gradle (+4 -152)
➕ client/android/build.gradle.kts (+115 -0)
➕ client/android/cloak/build.gradle.kts (+18 -0)
➕ client/android/cloak/src/main/kotlin/Cloak.kt (+69 -0)
📝 client/android/gradle.properties (+41 -22)
➕ client/android/gradle/libs.versions.toml (+35 -0)
➕ client/android/gradle/plugins/build.gradle.kts (+25 -0)

...and 80 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/452 **Author:** [@albexk](https://github.com/albexk) **Created:** 12/4/2023 **Status:** ✅ Merged **Merged:** 12/23/2023 **Merged by:** [@pokamest](https://github.com/pokamest) **Base:** `dev` ← **Head:** `refactoring/android` --- ### 📝 Commits (10+) - [`fcabf08`](https://github.com/amnezia-vpn/amnezia-client/commit/fcabf08e74398cd57e506797feb4e70d9e981c57) Update gradle, fix gradlew.bat crlf - [`e1eec55`](https://github.com/amnezia-vpn/amnezia-client/commit/e1eec55f627ee93bd56cf1d41e2dfecdb16be754) Refactoring build - [`06776eb`](https://github.com/amnezia-vpn/amnezia-client/commit/06776ebe8ff062dc72b998f14d5bbbdb8f856f16) Fix errors - [`d77f3ec`](https://github.com/amnezia-vpn/amnezia-client/commit/d77f3ecee899bcc9e75d0f92b1e5013c6b466713) Fix build error - [`4e5f2f4`](https://github.com/amnezia-vpn/amnezia-client/commit/4e5f2f44b65d8310744345cbc94f826c97b3840f) Detach shadowsocks module - [`2fde47a`](https://github.com/amnezia-vpn/amnezia-client/commit/2fde47a86f1f96027ddd4848806aa763396e9c24) Move qt binding java code to a separate module - [`f1c9704`](https://github.com/amnezia-vpn/amnezia-client/commit/f1c970461f84d3474dec57e8da67717a54ebe7c9) Create utils module, move Log class there - [`617cdf1`](https://github.com/amnezia-vpn/amnezia-client/commit/617cdf14addb8d33b993af3321b0d3ca151d7123) Log class refactoring - [`bc68c48`](https://github.com/amnezia-vpn/amnezia-client/commit/bc68c487eed34231dc92477e15b08df7094b6129) Update to qt 6.6.0 - [`5a5ea4a`](https://github.com/amnezia-vpn/amnezia-client/commit/5a5ea4a018befa65cf6ad69cef1b8de1fc8eef47) Android project restructuring ### 📊 Changes **238 files changed** (+5070 additions, -84655 deletions) <details> <summary>View changed files</summary> 📝 `.gitattributes` (+1 -0) 📝 `.github/workflows/deploy.yml` (+71 -34) 📝 `CMakeLists.txt` (+1 -0) 📝 `client/amnezia_application.cpp` (+5 -7) 📝 `client/android/AndroidManifest.xml` (+108 -121) ➖ `client/android/assets/acl/bypass-china.acl` (+0 -10377) ➖ `client/android/assets/acl/bypass-lan-china.acl` (+0 -10391) ➖ `client/android/assets/acl/bypass-lan.acl` (+0 -17) ➖ `client/android/assets/acl/china-list.acl` (+0 -5245) ➖ `client/android/assets/acl/gfwlist.acl` (+0 -5492) ➕ `client/android/awg/build.gradle.kts` (+18 -0) ➕ `client/android/awg/src/main/kotlin/Awg.kt` (+80 -0) ➕ `client/android/awg/src/main/kotlin/AwgConfig.kt` (+108 -0) 📝 `client/android/build.gradle` (+4 -152) ➕ `client/android/build.gradle.kts` (+115 -0) ➕ `client/android/cloak/build.gradle.kts` (+18 -0) ➕ `client/android/cloak/src/main/kotlin/Cloak.kt` (+69 -0) 📝 `client/android/gradle.properties` (+41 -22) ➕ `client/android/gradle/libs.versions.toml` (+35 -0) ➕ `client/android/gradle/plugins/build.gradle.kts` (+25 -0) _...and 80 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:15:55 +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#1834

No description provided.

Rows
Columns