amnezia-vpn/DefaultVPN
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/DefaultVPN.git synced 2026-10-14 05:42:05 +00:00
Code Issues 2 Projects Packages Wiki Activity

[PR #41] [MERGED] Chore/merge with upstream #43

New issue
Closed
opened 2026-10-13 21:13:57 +00:00 by bsakaguchi · 0 comments
bsakaguchi commented 2026-10-13 21:13:57 +00:00
Owner
Copy link

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/DefaultVPN/pull/41
Author: @vkamn
Created: 4/29/2026
Status: ✅ Merged
Merged: 4/29/2026
Merged by: @vkamn

Base: dev ← Head: chore/merge-with-upstream

📝 Commits (10+)

📊 Changes

96 files changed (+4870 additions, -1200 deletions)

View changed files

📝 .github/workflows/deploy.yml (+7 -0)
📝 .github/workflows/tag-deploy.yml (+1 -0)
📝 CMakeLists.txt (+2 -2)
📝 README.md (+1 -1)
➕ THIRD_PARTY_LICENSES.md (+149 -0)
📝 client/3rd-prebuilt (+1 -1)
📝 client/CMakeLists.txt (+2 -1)
📝 client/amnezia_application.cpp (+10 -0)
📝 client/android/src/org/amnezia/vpn/AmneziaActivity.kt (+57 -68)
📝 client/android/src/org/amnezia/vpn/qt/QtAndroidController.kt (+3 -0)
📝 client/android/xray/src/main/kotlin/Xray.kt (+75 -2)
📝 client/android/xray/src/main/kotlin/XrayConfig.kt (+14 -0)
📝 client/cmake/ios.cmake (+1 -0)
📝 client/cmake/macos_ne.cmake (+3 -2)
📝 client/containers/containers_defs.cpp (+2 -2)
📝 client/core/api/apiDefs.h (+10 -1)
📝 client/core/api/apiUtils.cpp (+88 -24)
📝 client/core/api/apiUtils.h (+2 -0)
📝 client/core/controllers/coreController.cpp (+15 -2)
📝 client/core/controllers/coreController.h (+4 -0)

...and 76 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/DefaultVPN/pull/41 **Author:** [@vkamn](https://github.com/vkamn) **Created:** 4/29/2026 **Status:** ✅ Merged **Merged:** 4/29/2026 **Merged by:** [@vkamn](https://github.com/vkamn) **Base:** `dev` ← **Head:** `chore/merge-with-upstream` --- ### 📝 Commits (10+) - [`c86a641`](https://github.com/amnezia-vpn/DefaultVPN/commit/c86a641e05dce7df38f5990d00eece44a973eb19) fix: add suppord android 9 gamepad and remote control (#2302) - [`1892db4`](https://github.com/amnezia-vpn/DefaultVPN/commit/1892db4375ddcb0cd8367f5eca87931174816556) fix: remove nested qeventloop from isConfigValid (also rename to validateConfig) (#2305) - [`aea8ff4`](https://github.com/amnezia-vpn/DefaultVPN/commit/aea8ff4961ecbad52bf03c51d2c7ef5ce1362d70) fix: add handle handleContextCreationFailure (#2309) - [`83d045a`](https://github.com/amnezia-vpn/DefaultVPN/commit/83d045af6428706a09e69868c03cdb8ac89d53ce) fix: GP requrements (#2312) - [`ca639d2`](https://github.com/amnezia-vpn/DefaultVPN/commit/ca639d293d6cf199d2d4d308ab71d6ad9193f239) chore: bump version (#2319) - [`9963359`](https://github.com/amnezia-vpn/DefaultVPN/commit/9963359948acc44874e8ba11d760ce378bdaf79c) fix: disable gamepad for GP (#2321) - [`b0ca16d`](https://github.com/amnezia-vpn/DefaultVPN/commit/b0ca16d861faf03de36a9a34a0b161ac89339be4) chore: bump version (#2331) - [`f969fcd`](https://github.com/amnezia-vpn/DefaultVPN/commit/f969fcdbb8dac7a09aa7f903ece235bbe013a50a) fix: restore dpad functionality ATV (#2335) - [`477afb9`](https://github.com/amnezia-vpn/DefaultVPN/commit/477afb9d852a84d324e80cf4fa7c8c8a38d7f3ac) chore: bump version (#2336) - [`67bd880`](https://github.com/amnezia-vpn/DefaultVPN/commit/67bd880cdf0f0cababe50a8287e2e0033c2afd0e) fix: swap buffers error (#2347) ### 📊 Changes **96 files changed** (+4870 additions, -1200 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/deploy.yml` (+7 -0) 📝 `.github/workflows/tag-deploy.yml` (+1 -0) 📝 `CMakeLists.txt` (+2 -2) 📝 `README.md` (+1 -1) ➕ `THIRD_PARTY_LICENSES.md` (+149 -0) 📝 `client/3rd-prebuilt` (+1 -1) 📝 `client/CMakeLists.txt` (+2 -1) 📝 `client/amnezia_application.cpp` (+10 -0) 📝 `client/android/src/org/amnezia/vpn/AmneziaActivity.kt` (+57 -68) 📝 `client/android/src/org/amnezia/vpn/qt/QtAndroidController.kt` (+3 -0) 📝 `client/android/xray/src/main/kotlin/Xray.kt` (+75 -2) 📝 `client/android/xray/src/main/kotlin/XrayConfig.kt` (+14 -0) 📝 `client/cmake/ios.cmake` (+1 -0) 📝 `client/cmake/macos_ne.cmake` (+3 -2) 📝 `client/containers/containers_defs.cpp` (+2 -2) 📝 `client/core/api/apiDefs.h` (+10 -1) 📝 `client/core/api/apiUtils.cpp` (+88 -24) 📝 `client/core/api/apiUtils.h` (+2 -0) 📝 `client/core/controllers/coreController.cpp` (+15 -2) 📝 `client/core/controllers/coreController.h` (+4 -0) _...and 76 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:13:57 +00:00
Sign in to join this conversation.
No Branch/Tag specified
Branches Tags
dev
feat/location-separation
bugfix/amnezia-premium-name-from-config
feauture/add-button-for-import-config-from-file
feature/add-russian-language
chore/minor-ui-fixes
chore/bump-version
feature/add-country-selection-page
feature/add-about-page
feature/default-vpn-ui
feature/defaultvpn-apple
feature/anhtv-clone-app
No results found.
Labels
Clear labels   
pull-request
Mirrored from GitHub Pull Request

No labels
pull-request
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
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/DefaultVPN#43
No description provided.