[PR #1024] [MERGED] Android qt 6.7 #2208

Closed
opened 2026-10-13 21:19:42 +00:00 by bsakaguchi · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/1024
Author: @albexk
Created: 8/28/2024
Status: ✅ Merged
Merged: 9/9/2024
Merged by: @pokamest

Base: dev ← Head: android-qt-6.7


📝 Commits (10+)

  • 44eab77 Up Gradle to 8.10
  • aa87b1c Update Android dependencies
  • b49859f Up Qt to 6.7.2
  • 59d9884 Up qtkeychain to 0.14.3
  • 85df363 Move function of changing the color of the navigation bar to the android side
  • e1749e9 Fix splashscreen and recent apps thumbnail backgrounds
  • 24f294b Android authentication refactoring
  • d683b2e Fix GitHub action
  • 9a860b6 Fix the extra circle around the connect button on Android
  • 34c6f73 Fix keyboard popup

📊 Changes

33 files changed (+255 additions, -191 deletions)

View changed files

📝 .github/workflows/deploy.yml (+7 -7)
📝 client/3rd/qtkeychain (+1 -1)
📝 client/android/AndroidManifest.xml (+8 -5)
📝 client/android/build.gradle (+3 -0)
📝 client/android/build.gradle.kts (+2 -0)
📝 client/android/gradle/libs.versions.toml (+13 -9)
📝 client/android/gradle/wrapper/gradle-wrapper.jar (+0 -0)
📝 client/android/gradle/wrapper/gradle-wrapper.properties (+1 -3)
📝 client/android/gradlew (+5 -2)
📝 client/android/gradlew.bat (+12 -10)
📝 client/android/qt/build.gradle.kts (+1 -1)
📝 client/android/res/values/styles.xml (+3 -0)
📝 client/android/settings.gradle.kts (+1 -1)
📝 client/android/src/org/amnezia/vpn/AmneziaActivity.kt (+23 -0)
➕ client/android/src/org/amnezia/vpn/AuthActivity.kt (+97 -0)
➖ client/android/src/org/amnezia/vpn/AuthHelper.java (+0 -24)
📝 client/android/src/org/amnezia/vpn/ImportConfigActivity.kt (+2 -2)
📝 client/android/src/org/amnezia/vpn/qt/QtAndroidController.kt (+2 -0)
📝 client/android/utils/src/main/kotlin/net/NetworkState.kt (+1 -1)
📝 client/cmake/android.cmake (+0 -2)

...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/1024 **Author:** [@albexk](https://github.com/albexk) **Created:** 8/28/2024 **Status:** ✅ Merged **Merged:** 9/9/2024 **Merged by:** [@pokamest](https://github.com/pokamest) **Base:** `dev` ← **Head:** `android-qt-6.7` --- ### 📝 Commits (10+) - [`44eab77`](https://github.com/amnezia-vpn/amnezia-client/commit/44eab77d42cd4962425858751ae973584a4f5619) Up Gradle to 8.10 - [`aa87b1c`](https://github.com/amnezia-vpn/amnezia-client/commit/aa87b1c79ca51b48471fb5e475f5288175580e6c) Update Android dependencies - [`b49859f`](https://github.com/amnezia-vpn/amnezia-client/commit/b49859fa31c7c00d60dadeab5f2dddde347357b2) Up Qt to 6.7.2 - [`59d9884`](https://github.com/amnezia-vpn/amnezia-client/commit/59d98848cd4d58ab81efe13cbb36433777a33d52) Up qtkeychain to 0.14.3 - [`85df363`](https://github.com/amnezia-vpn/amnezia-client/commit/85df3632faaf66d977e8454182ff9a9157453aa4) Move function of changing the color of the navigation bar to the android side - [`e1749e9`](https://github.com/amnezia-vpn/amnezia-client/commit/e1749e9e04b77e0392db0e95984d3abb1f787cb2) Fix splashscreen and recent apps thumbnail backgrounds - [`24f294b`](https://github.com/amnezia-vpn/amnezia-client/commit/24f294b408ca64923a93ad657dd487681dad88b8) Android authentication refactoring - [`d683b2e`](https://github.com/amnezia-vpn/amnezia-client/commit/d683b2e9a41b2f79183523ecf439907ddbf8e939) Fix GitHub action - [`9a860b6`](https://github.com/amnezia-vpn/amnezia-client/commit/9a860b655f1f656377f96cde8d24cdd002f57545) Fix the extra circle around the connect button on Android - [`34c6f73`](https://github.com/amnezia-vpn/amnezia-client/commit/34c6f73fbde64b1a78eb8e1f2e67c19c99d8aa54) Fix keyboard popup ### 📊 Changes **33 files changed** (+255 additions, -191 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/deploy.yml` (+7 -7) 📝 `client/3rd/qtkeychain` (+1 -1) 📝 `client/android/AndroidManifest.xml` (+8 -5) 📝 `client/android/build.gradle` (+3 -0) 📝 `client/android/build.gradle.kts` (+2 -0) 📝 `client/android/gradle/libs.versions.toml` (+13 -9) 📝 `client/android/gradle/wrapper/gradle-wrapper.jar` (+0 -0) 📝 `client/android/gradle/wrapper/gradle-wrapper.properties` (+1 -3) 📝 `client/android/gradlew` (+5 -2) 📝 `client/android/gradlew.bat` (+12 -10) 📝 `client/android/qt/build.gradle.kts` (+1 -1) 📝 `client/android/res/values/styles.xml` (+3 -0) 📝 `client/android/settings.gradle.kts` (+1 -1) 📝 `client/android/src/org/amnezia/vpn/AmneziaActivity.kt` (+23 -0) ➕ `client/android/src/org/amnezia/vpn/AuthActivity.kt` (+97 -0) ➖ `client/android/src/org/amnezia/vpn/AuthHelper.java` (+0 -24) 📝 `client/android/src/org/amnezia/vpn/ImportConfigActivity.kt` (+2 -2) 📝 `client/android/src/org/amnezia/vpn/qt/QtAndroidController.kt` (+2 -0) 📝 `client/android/utils/src/main/kotlin/net/NetworkState.kt` (+1 -1) 📝 `client/cmake/android.cmake` (+0 -2) _...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:19:42 +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#2208
No description provided.