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 #43] [MERGED] chore: merge with upstream #42

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

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/DefaultVPN/pull/43
Author: @vkamn
Created: 6/16/2026
Status: ✅ Merged
Merged: 7/16/2026
Merged by: @vkamn

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

📝 Commits (10+)

  • 50769f2 feat: add proxy storage cache
  • 129f79c chore: bump version
  • 2dd3531 chore: bump awg dependency
  • e9efe32 chore: bump version
  • 047dbb2 Merge branch 'feat/proxy-storage-cache' of github-amnezia:amnezia-vpn/amnezia-client into feat/proxy-storage-cache
  • 7f2d461 Merge branch 'feat/proxy-storage-cache' of github-amnezia:amnezia-vpn/amnezia-client into HEAD
  • e9ed5b5 chore: bump version
  • b9ca331 fix: handle undefined values properly
  • ef909d3 chore: fix typo
  • 16fc44f chore: bump version

📊 Changes

38 files changed (+1353 additions, -276 deletions)

View changed files

📝 .github/workflows/deploy.yml (+2 -2)
📝 .gitmodules (+0 -3)
📝 CMakeLists.txt (+2 -2)
📝 client/3rd-prebuilt (+1 -1)
➖ client/3rd/QSimpleCrypto (+0 -1)
📝 client/CMakeLists.txt (+1 -0)
📝 client/android/src/org/amnezia/vpn/AmneziaActivity.kt (+10 -2)
📝 client/cmake/3rdparty.cmake (+0 -2)
➖ client/cmake/QSimpleCrypto.cmake (+0 -21)
📝 client/cmake/sources.cmake (+4 -0)
📝 client/core/api/apiDefs.h (+1 -1)
📝 client/core/controllers/gatewayController.cpp (+104 -89)
📝 client/core/controllers/gatewayController.h (+9 -2)
➕ client/core/payloadSender.cpp (+193 -0)
➕ client/core/payloadSender.h (+18 -0)
📝 client/daemon/daemon.cpp (+32 -32)
➕ client/images/controls/arrow-left-right.svg (+6 -0)
📝 client/protocols/protocols_defs.h (+7 -0)
📝 client/resources.qrc (+2 -0)
📝 client/secure_qsettings.cpp (+7 -16)

...and 18 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/43 **Author:** [@vkamn](https://github.com/vkamn) **Created:** 6/16/2026 **Status:** ✅ Merged **Merged:** 7/16/2026 **Merged by:** [@vkamn](https://github.com/vkamn) **Base:** `dev` ← **Head:** `chore/merge-with-upstream` --- ### 📝 Commits (10+) - [`50769f2`](https://github.com/amnezia-vpn/DefaultVPN/commit/50769f231df33d0ce75cc308a46a286183f02850) feat: add proxy storage cache - [`129f79c`](https://github.com/amnezia-vpn/DefaultVPN/commit/129f79ca2c8fd5afe6abe6d7da87244f03d08909) chore: bump version - [`2dd3531`](https://github.com/amnezia-vpn/DefaultVPN/commit/2dd3531e78a4cc226133e6367c91a9bdfa669ec3) chore: bump awg dependency - [`e9efe32`](https://github.com/amnezia-vpn/DefaultVPN/commit/e9efe32f9bff0546c73254db3733ce34f48b7ddf) chore: bump version - [`047dbb2`](https://github.com/amnezia-vpn/DefaultVPN/commit/047dbb26774c77322460c0ed250b8724ae18d1c0) Merge branch 'feat/proxy-storage-cache' of github-amnezia:amnezia-vpn/amnezia-client into feat/proxy-storage-cache - [`7f2d461`](https://github.com/amnezia-vpn/DefaultVPN/commit/7f2d4614c31fac2578d7d60d3606bfc7e61c2e9e) Merge branch 'feat/proxy-storage-cache' of github-amnezia:amnezia-vpn/amnezia-client into HEAD - [`e9ed5b5`](https://github.com/amnezia-vpn/DefaultVPN/commit/e9ed5b59a4484d8a246e7b0e772bea65b678c607) chore: bump version - [`b9ca331`](https://github.com/amnezia-vpn/DefaultVPN/commit/b9ca3315c66a8eee73cb38cd419038345d7d69c6) fix: handle undefined values properly - [`ef909d3`](https://github.com/amnezia-vpn/DefaultVPN/commit/ef909d3605ef1aefb7e1162843acd9eba04d601b) chore: fix typo - [`16fc44f`](https://github.com/amnezia-vpn/DefaultVPN/commit/16fc44f989827bd3f531b62e890213af42aa5061) chore: bump version ### 📊 Changes **38 files changed** (+1353 additions, -276 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/deploy.yml` (+2 -2) 📝 `.gitmodules` (+0 -3) 📝 `CMakeLists.txt` (+2 -2) 📝 `client/3rd-prebuilt` (+1 -1) ➖ `client/3rd/QSimpleCrypto` (+0 -1) 📝 `client/CMakeLists.txt` (+1 -0) 📝 `client/android/src/org/amnezia/vpn/AmneziaActivity.kt` (+10 -2) 📝 `client/cmake/3rdparty.cmake` (+0 -2) ➖ `client/cmake/QSimpleCrypto.cmake` (+0 -21) 📝 `client/cmake/sources.cmake` (+4 -0) 📝 `client/core/api/apiDefs.h` (+1 -1) 📝 `client/core/controllers/gatewayController.cpp` (+104 -89) 📝 `client/core/controllers/gatewayController.h` (+9 -2) ➕ `client/core/payloadSender.cpp` (+193 -0) ➕ `client/core/payloadSender.h` (+18 -0) 📝 `client/daemon/daemon.cpp` (+32 -32) ➕ `client/images/controls/arrow-left-right.svg` (+6 -0) 📝 `client/protocols/protocols_defs.h` (+7 -0) 📝 `client/resources.qrc` (+2 -0) 📝 `client/secure_qsettings.cpp` (+7 -16) _...and 18 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:56 +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#42
No description provided.