[PR #2693] [MERGED] fix: various fixes #2907

Closed
opened 2026-10-14 21:06:06 +00:00 by bsakaguchi · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/2693
Author: @vkamn
Created: 6/3/2026
Status: ✅ Merged
Merged: 6/4/2026
Merged by: @vkamn

Base: dev ← Head: fix/various-fixes


📝 Commits (10+)

  • 1894ec0 fix: fixed country model update
  • 9178d64 fix: fixed context menu crush on ios
  • f117e81 Merge branch 'dev' of github-amnezia:amnezia-vpn/amnezia-client into HEAD
  • 0fc8503 fix: fixed passphrase dialog freeze
  • 0d89021 fix: fixed country switch
  • 707662e fix: fixed start minimized
  • 78f507b fix: fixed black screen after remove container
  • 6472a3a Merge branch 'dev' of github-amnezia:amnezia-vpn/amnezia-client into HEAD
  • 0de2be2 refactor: return cloak and ss only for view
  • 38f364e fix: fixed default server change after improt while connected

📊 Changes

61 files changed (+518 additions, -172 deletions)

View changed files

📝 CMakeLists.txt (+2 -2)
📝 client/core/controllers/connectionController.cpp (+81 -7)
📝 client/core/controllers/connectionController.h (+4 -0)
📝 client/core/controllers/coreController.cpp (+1 -1)
📝 client/core/controllers/coreSignalHandlers.cpp (+23 -19)
📝 client/core/controllers/selfhosted/installController.cpp (+42 -7)
📝 client/core/controllers/selfhosted/installController.h (+6 -1)
📝 client/core/models/selfhosted/nativeServerConfig.cpp (+5 -0)
📝 client/core/models/selfhosted/nativeServerConfig.h (+2 -0)
📝 client/core/models/selfhosted/selfHostedUserServerConfig.cpp (+5 -0)
📝 client/core/models/selfhosted/selfHostedUserServerConfig.h (+2 -0)
📝 client/core/protocols/openVpnProtocol.cpp (+24 -13)
📝 client/core/protocols/openVpnProtocol.h (+1 -0)
📝 client/core/utils/containerEnum.h (+2 -0)
📝 client/core/utils/containers/containerUtils.cpp (+24 -0)
📝 client/core/utils/containers/containerUtils.h (+2 -0)
📝 client/core/utils/errorCodes.h (+1 -0)
📝 client/core/utils/errorStrings.cpp (+1 -0)
📝 client/ui/controllers/api/subscriptionUiController.cpp (+1 -2)
📝 client/ui/controllers/connectionUiController.cpp (+58 -1)

...and 41 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/2693 **Author:** [@vkamn](https://github.com/vkamn) **Created:** 6/3/2026 **Status:** ✅ Merged **Merged:** 6/4/2026 **Merged by:** [@vkamn](https://github.com/vkamn) **Base:** `dev` ← **Head:** `fix/various-fixes` --- ### 📝 Commits (10+) - [`1894ec0`](https://github.com/amnezia-vpn/amnezia-client/commit/1894ec0882147587146a6acfbd244d9378819d28) fix: fixed country model update - [`9178d64`](https://github.com/amnezia-vpn/amnezia-client/commit/9178d6473ad07c08d05018f5b2d10b8b8d244f21) fix: fixed context menu crush on ios - [`f117e81`](https://github.com/amnezia-vpn/amnezia-client/commit/f117e8111ac6a2d87269e3cc29814e8506c22781) Merge branch 'dev' of github-amnezia:amnezia-vpn/amnezia-client into HEAD - [`0fc8503`](https://github.com/amnezia-vpn/amnezia-client/commit/0fc8503ea4b85432f5a2feb036f9302bdf29c6c2) fix: fixed passphrase dialog freeze - [`0d89021`](https://github.com/amnezia-vpn/amnezia-client/commit/0d8902169f1bfc8f3f7f9f9084ede50b177c74dd) fix: fixed country switch - [`707662e`](https://github.com/amnezia-vpn/amnezia-client/commit/707662e1c73a221bd5bf7bd0e501bdcabbca223d) fix: fixed start minimized - [`78f507b`](https://github.com/amnezia-vpn/amnezia-client/commit/78f507b64889d1775d04fc36f17a016a077f035f) fix: fixed black screen after remove container - [`6472a3a`](https://github.com/amnezia-vpn/amnezia-client/commit/6472a3a6495aab35e1cb28cd71dfd4c8d245280e) Merge branch 'dev' of github-amnezia:amnezia-vpn/amnezia-client into HEAD - [`0de2be2`](https://github.com/amnezia-vpn/amnezia-client/commit/0de2be21c7287090aee7ff99160490ad7d1d252f) refactor: return cloak and ss only for view - [`38f364e`](https://github.com/amnezia-vpn/amnezia-client/commit/38f364eae1cf68ce2a950993255417f285702514) fix: fixed default server change after improt while connected ### 📊 Changes **61 files changed** (+518 additions, -172 deletions) <details> <summary>View changed files</summary> 📝 `CMakeLists.txt` (+2 -2) 📝 `client/core/controllers/connectionController.cpp` (+81 -7) 📝 `client/core/controllers/connectionController.h` (+4 -0) 📝 `client/core/controllers/coreController.cpp` (+1 -1) 📝 `client/core/controllers/coreSignalHandlers.cpp` (+23 -19) 📝 `client/core/controllers/selfhosted/installController.cpp` (+42 -7) 📝 `client/core/controllers/selfhosted/installController.h` (+6 -1) 📝 `client/core/models/selfhosted/nativeServerConfig.cpp` (+5 -0) 📝 `client/core/models/selfhosted/nativeServerConfig.h` (+2 -0) 📝 `client/core/models/selfhosted/selfHostedUserServerConfig.cpp` (+5 -0) 📝 `client/core/models/selfhosted/selfHostedUserServerConfig.h` (+2 -0) 📝 `client/core/protocols/openVpnProtocol.cpp` (+24 -13) 📝 `client/core/protocols/openVpnProtocol.h` (+1 -0) 📝 `client/core/utils/containerEnum.h` (+2 -0) 📝 `client/core/utils/containers/containerUtils.cpp` (+24 -0) 📝 `client/core/utils/containers/containerUtils.h` (+2 -0) 📝 `client/core/utils/errorCodes.h` (+1 -0) 📝 `client/core/utils/errorStrings.cpp` (+1 -0) 📝 `client/ui/controllers/api/subscriptionUiController.cpp` (+1 -2) 📝 `client/ui/controllers/connectionUiController.cpp` (+58 -1) _...and 41 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-14 21:06:06 +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#2907
No description provided.