[PR #202] [MERGED] Fix/android various fixes #1665

Closed
opened 2026-10-13 20:46:36 +00:00 by bsakaguchi · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/202
Author: @kolobchanin
Created: 3/29/2023
Status: ✅ Merged
Merged: 3/29/2023
Merged by: @pokamest

Base: dev ← Head: fix/android_various_fixes


📝 Commits (9)

  • 20846c8 * correct behavior of back button on Android
  • 7167c2f Fix of "Connect" button state after restoring of an app
  • 8fa409d Restoration of bandwidth meter after closing of GUI
  • 5f85bf6 Missing def check
  • 8d45af2 Files now saving with the file picker, not with the sharing mechanism
  • c0bb06b Fix of copying to clipboard
  • 3a5317f Implementation of "migration manager" to fix placement of config files issue appeared after moving from Qt 5 to Qt 6
  • 90c8fbb Update Room to fix build on Apple M1
  • 2225a73 Fixed typo

📊 Changes

16 files changed (+293 additions, -96 deletions)

View changed files

📝 client/CMakeLists.txt (+2 -0)
📝 client/android/shadowsocks/build.gradle (+4 -4)
📝 client/android/src/org/amnezia/vpn/VPNService.kt (+2 -41)
📝 client/android/src/org/amnezia/vpn/VPNServiceBinder.kt (+0 -16)
📝 client/android/src/org/amnezia/vpn/qt/VPNActivity.kt (+55 -7)
📝 client/main.cpp (+4 -0)
➕ client/migrations.cpp (+86 -0)
➕ client/migrations.h (+24 -0)
📝 client/platforms/android/android_controller.cpp (+15 -8)
📝 client/platforms/android/android_controller.h (+1 -1)
📝 client/platforms/android/androidvpnactivity.cpp (+18 -2)
📝 client/platforms/android/androidvpnactivity.h (+2 -0)
📝 client/ui/qml/main.qml (+4 -0)
📝 client/ui/uilogic.cpp (+16 -4)
📝 client/vpnconnection.cpp (+43 -13)
📝 client/vpnconnection.h (+17 -0)

📄 Description

  • Fixed behaviour of "back" button
  • Fixed restoration of "Connect" button state
  • Fixed restoration of bandwidth meter after closing of application
  • Fixed config export - now it uses android system file picker instead of sharing dialog
  • Fixed "copy" button
  • Fixed update to version 3 from version 2 (Qt 5 and Qt6 used different directories for storing of config files)
  • Increased version of Room in ShadowSocks library to fix build on Apple M1

🔄 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/202 **Author:** [@kolobchanin](https://github.com/kolobchanin) **Created:** 3/29/2023 **Status:** ✅ Merged **Merged:** 3/29/2023 **Merged by:** [@pokamest](https://github.com/pokamest) **Base:** `dev` ← **Head:** `fix/android_various_fixes` --- ### 📝 Commits (9) - [`20846c8`](https://github.com/amnezia-vpn/amnezia-client/commit/20846c8effae90a8f5fdbb745abe8cd2ee636e78) * correct behavior of back button on Android - [`7167c2f`](https://github.com/amnezia-vpn/amnezia-client/commit/7167c2f20da6392074e0b2f7a55e78b9af99d0dd) Fix of "Connect" button state after restoring of an app - [`8fa409d`](https://github.com/amnezia-vpn/amnezia-client/commit/8fa409d6c196aebb07b7078a6c54129dd37893fe) Restoration of bandwidth meter after closing of GUI - [`5f85bf6`](https://github.com/amnezia-vpn/amnezia-client/commit/5f85bf62f51ddbb5db96c7f3a04ccdb126355dcc) Missing def check - [`8d45af2`](https://github.com/amnezia-vpn/amnezia-client/commit/8d45af2034b93106c09cf3f3b56023b9ab86c359) Files now saving with the file picker, not with the sharing mechanism - [`c0bb06b`](https://github.com/amnezia-vpn/amnezia-client/commit/c0bb06bf49b4691319456fe50140a45e13e65720) Fix of copying to clipboard - [`3a5317f`](https://github.com/amnezia-vpn/amnezia-client/commit/3a5317f16a35a3b11d978589e876ab5702c29710) Implementation of "migration manager" to fix placement of config files issue appeared after moving from Qt 5 to Qt 6 - [`90c8fbb`](https://github.com/amnezia-vpn/amnezia-client/commit/90c8fbb49598a0949d7ac7142da03847b4cd9c3e) Update Room to fix build on Apple M1 - [`2225a73`](https://github.com/amnezia-vpn/amnezia-client/commit/2225a735ca872151c580dd4f194f715cbc835a8b) Fixed typo ### 📊 Changes **16 files changed** (+293 additions, -96 deletions) <details> <summary>View changed files</summary> 📝 `client/CMakeLists.txt` (+2 -0) 📝 `client/android/shadowsocks/build.gradle` (+4 -4) 📝 `client/android/src/org/amnezia/vpn/VPNService.kt` (+2 -41) 📝 `client/android/src/org/amnezia/vpn/VPNServiceBinder.kt` (+0 -16) 📝 `client/android/src/org/amnezia/vpn/qt/VPNActivity.kt` (+55 -7) 📝 `client/main.cpp` (+4 -0) ➕ `client/migrations.cpp` (+86 -0) ➕ `client/migrations.h` (+24 -0) 📝 `client/platforms/android/android_controller.cpp` (+15 -8) 📝 `client/platforms/android/android_controller.h` (+1 -1) 📝 `client/platforms/android/androidvpnactivity.cpp` (+18 -2) 📝 `client/platforms/android/androidvpnactivity.h` (+2 -0) 📝 `client/ui/qml/main.qml` (+4 -0) 📝 `client/ui/uilogic.cpp` (+16 -4) 📝 `client/vpnconnection.cpp` (+43 -13) 📝 `client/vpnconnection.h` (+17 -0) </details> ### 📄 Description * Fixed behaviour of "back" button * Fixed restoration of "Connect" button state * Fixed restoration of bandwidth meter after closing of application * Fixed config export - now it uses android system file picker instead of sharing dialog * Fixed "copy" button * Fixed update to version 3 from version 2 (Qt 5 and Qt6 used different directories for storing of config files) * Increased version of Room in ShadowSocks library to fix build on Apple M1 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
bsakaguchi 2026-10-13 20:46:36 +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#1665
No description provided.