[PR #1389] [MERGED] pull fixes #2338

New issue

Closed

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

bsakaguchi commented

2026-10-13 21:21:03 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/1389
Author: @pokamest
Created: 1/31/2025
Status: ✅ Merged
Merged: 1/31/2025
Merged by: @pokamest

Base: android-7 ← Head: android7-pull

📝 Commits (10+)

4869429 refactoring: improved the performance of secure_settings
49a6a9e Merge pull request #1369 from amnezia-vpn/refactoring/improve-secure-settings
52ecd68 bugfix: fixed textFields on PageSetupWizardCredentials
36045c6 bugfix: fixed scrolling by keys on PageSettingsApiServerInfo
6425700 chore: hide site links for ios (#1374)
e707471 chore: fixed log output with split tunneling info
7664031 chore: hide "open logs folder" button for mobule platforms
3011a0e chore: fixed again log output with split tunneling info
f79bfa9 chore: bump version
fbbba64 Install apparmor (#1379)

📊 Changes

33 files changed (+376 additions, -361 deletions)

View changed files

📝 CMakeLists.txt (+2 -2)
📝 client/protocols/xrayprotocol.cpp (+64 -72)
📝 client/protocols/xrayprotocol.h (+6 -4)
📝 client/secure_qsettings.cpp (+7 -1)
📝 client/secure_qsettings.h (+1 -5)
📝 client/server_scripts/install_docker.sh (+4 -1)
📝 client/ui/models/apiServicesModel.cpp (+1 -8)
📝 client/ui/qml/Components/InstalledAppsDrawer.qml (+1 -1)
📝 client/ui/qml/Controls2/TextFieldWithHeaderType.qml (+2 -5)
📝 client/ui/qml/Pages2/PageDevMenu.qml (+5 -5)
📝 client/ui/qml/Pages2/PageProtocolAwgClientSettings.qml (+19 -19)
📝 client/ui/qml/Pages2/PageProtocolAwgSettings.qml (+35 -35)
📝 client/ui/qml/Pages2/PageProtocolCloakSettings.qml (+8 -8)
📝 client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml (+6 -6)
📝 client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml (+3 -3)
📝 client/ui/qml/Pages2/PageProtocolWireGuardClientSettings.qml (+4 -4)
📝 client/ui/qml/Pages2/PageProtocolWireGuardSettings.qml (+6 -6)
📝 client/ui/qml/Pages2/PageProtocolXraySettings.qml (+5 -5)
📝 client/ui/qml/Pages2/PageServiceSocksProxySettings.qml (+23 -23)
📝 client/ui/qml/Pages2/PageSettings.qml (+1 -4)

...and 13 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/1389 **Author:** [@pokamest](https://github.com/pokamest) **Created:** 1/31/2025 **Status:** ✅ Merged **Merged:** 1/31/2025 **Merged by:** [@pokamest](https://github.com/pokamest) **Base:** `android-7` ← **Head:** `android7-pull` --- ### 📝 Commits (10+) - [`4869429`](https://github.com/amnezia-vpn/amnezia-client/commit/4869429eb6ffbec2d0dcfaf6e0189a7f234b6af8) refactoring: improved the performance of secure_settings - [`49a6a9e`](https://github.com/amnezia-vpn/amnezia-client/commit/49a6a9ed76043545be3943a6c516949865673538) Merge pull request #1369 from amnezia-vpn/refactoring/improve-secure-settings - [`52ecd68`](https://github.com/amnezia-vpn/amnezia-client/commit/52ecd6899bac5941d7a96de7384f5a0ebddf4905) bugfix: fixed textFields on PageSetupWizardCredentials - [`36045c6`](https://github.com/amnezia-vpn/amnezia-client/commit/36045c6694a94b3001ae40ba9f15f19531a6dc61) bugfix: fixed scrolling by keys on PageSettingsApiServerInfo - [`6425700`](https://github.com/amnezia-vpn/amnezia-client/commit/6425700d1cee41dcf39cda08147d73d7a08c4306) chore: hide site links for ios (#1374) - [`e707471`](https://github.com/amnezia-vpn/amnezia-client/commit/e707471b04b16a7a08456fccde3f568373a545b1) chore: fixed log output with split tunneling info - [`7664031`](https://github.com/amnezia-vpn/amnezia-client/commit/76640311abd34e072fc04c08ff39e778a2ff2f68) chore: hide "open logs folder" button for mobule platforms - [`3011a0e`](https://github.com/amnezia-vpn/amnezia-client/commit/3011a0e3066fcc44da2d776b45b7903c832a5da2) chore: fixed again log output with split tunneling info - [`f79bfa9`](https://github.com/amnezia-vpn/amnezia-client/commit/f79bfa9d2ed6e639e7cac27e1ec8741a82625d65) chore: bump version - [`fbbba64`](https://github.com/amnezia-vpn/amnezia-client/commit/fbbba648c4a02bb7eadc2722e7e4090beecdba4e) Install apparmor (#1379) ### 📊 Changes **33 files changed** (+376 additions, -361 deletions) <details> <summary>View changed files</summary> 📝 `CMakeLists.txt` (+2 -2) 📝 `client/protocols/xrayprotocol.cpp` (+64 -72) 📝 `client/protocols/xrayprotocol.h` (+6 -4) 📝 `client/secure_qsettings.cpp` (+7 -1) 📝 `client/secure_qsettings.h` (+1 -5) 📝 `client/server_scripts/install_docker.sh` (+4 -1) 📝 `client/ui/models/apiServicesModel.cpp` (+1 -8) 📝 `client/ui/qml/Components/InstalledAppsDrawer.qml` (+1 -1) 📝 `client/ui/qml/Controls2/TextFieldWithHeaderType.qml` (+2 -5) 📝 `client/ui/qml/Pages2/PageDevMenu.qml` (+5 -5) 📝 `client/ui/qml/Pages2/PageProtocolAwgClientSettings.qml` (+19 -19) 📝 `client/ui/qml/Pages2/PageProtocolAwgSettings.qml` (+35 -35) 📝 `client/ui/qml/Pages2/PageProtocolCloakSettings.qml` (+8 -8) 📝 `client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml` (+6 -6) 📝 `client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml` (+3 -3) 📝 `client/ui/qml/Pages2/PageProtocolWireGuardClientSettings.qml` (+4 -4) 📝 `client/ui/qml/Pages2/PageProtocolWireGuardSettings.qml` (+6 -6) 📝 `client/ui/qml/Pages2/PageProtocolXraySettings.qml` (+5 -5) 📝 `client/ui/qml/Pages2/PageServiceSocksProxySettings.qml` (+23 -23) 📝 `client/ui/qml/Pages2/PageSettings.qml` (+1 -4) _...and 13 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:21:03 +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#2338

No description provided.

Rows
Columns