[PR #177] [MERGED] Qr-code scanner for Android #1641

New issue

Closed

opened 2026-10-13 20:46:19 +00:00 by bsakaguchi · 0 comments

bsakaguchi commented

2026-10-13 20:46:19 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/177
Author: @kolobchanin
Created: 2/22/2023
Status: ✅ Merged
Merged: 2/27/2023
Merged by: @pokamest

Base: dev ← Head: feature/android_qr_code_scanner

📝 Commits (3)

a86e865 CameraActivity with Google ML KIT for decoding QR codes
b870306 Support of multiple-code config
0096e65 Increased build tools version

📊 Changes

19 files changed (+379 additions, -209 deletions)

View changed files

📝 client/android/AndroidManifest.xml (+5 -0)
📝 client/android/build.gradle (+22 -8)
➕ client/android/res/layout/activity_camera.xml (+14 -0)
📝 client/android/settings.gradle (+18 -0)
📝 client/android/shadowsocks/build.gradle (+0 -12)
➕ client/android/src/org/amnezia/vpn/qt/CameraActivity.kt (+158 -0)
📝 client/android/src/org/amnezia/vpn/qt/VPNActivity.kt (+20 -1)
📝 client/platforms/android/android_controller.cpp (+5 -1)
📝 client/platforms/android/android_controller.h (+4 -5)
📝 client/platforms/android/androidvpnactivity.cpp (+38 -6)
📝 client/platforms/android/androidvpnactivity.h (+9 -0)
📝 client/resources.qrc (+0 -1)
📝 client/ui/pages_logic/QrDecoderLogic.cpp (+61 -9)
📝 client/ui/pages_logic/QrDecoderLogic.h (+11 -0)
📝 client/ui/pages_logic/StartPageLogic.cpp (+8 -0)
📝 client/ui/pages_logic/StartPageLogic.h (+4 -0)
➖ client/ui/qml/Pages/PageQrDecoder.qml (+0 -164)
📝 client/ui/qml/Pages/PageStart.qml (+1 -1)
📝 deploy/build_android.sh (+1 -1)

📄 Description

Qr-code scanner based on Google ML Kit

_{🔄 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/177 **Author:** [@kolobchanin](https://github.com/kolobchanin) **Created:** 2/22/2023 **Status:** ✅ Merged **Merged:** 2/27/2023 **Merged by:** [@pokamest](https://github.com/pokamest) **Base:** `dev` ← **Head:** `feature/android_qr_code_scanner` --- ### 📝 Commits (3) - [`a86e865`](https://github.com/amnezia-vpn/amnezia-client/commit/a86e8659f795d49417e19b3cbbc3fab8427bf2a6) CameraActivity with Google ML KIT for decoding QR codes - [`b870306`](https://github.com/amnezia-vpn/amnezia-client/commit/b870306c5d15f5a99ceee128d07a8eef805dc4a8) Support of multiple-code config - [`0096e65`](https://github.com/amnezia-vpn/amnezia-client/commit/0096e65fe60fefd8028a9dc40232b730cae3294d) Increased build tools version ### 📊 Changes **19 files changed** (+379 additions, -209 deletions) <details> <summary>View changed files</summary> 📝 `client/android/AndroidManifest.xml` (+5 -0) 📝 `client/android/build.gradle` (+22 -8) ➕ `client/android/res/layout/activity_camera.xml` (+14 -0) 📝 `client/android/settings.gradle` (+18 -0) 📝 `client/android/shadowsocks/build.gradle` (+0 -12) ➕ `client/android/src/org/amnezia/vpn/qt/CameraActivity.kt` (+158 -0) 📝 `client/android/src/org/amnezia/vpn/qt/VPNActivity.kt` (+20 -1) 📝 `client/platforms/android/android_controller.cpp` (+5 -1) 📝 `client/platforms/android/android_controller.h` (+4 -5) 📝 `client/platforms/android/androidvpnactivity.cpp` (+38 -6) 📝 `client/platforms/android/androidvpnactivity.h` (+9 -0) 📝 `client/resources.qrc` (+0 -1) 📝 `client/ui/pages_logic/QrDecoderLogic.cpp` (+61 -9) 📝 `client/ui/pages_logic/QrDecoderLogic.h` (+11 -0) 📝 `client/ui/pages_logic/StartPageLogic.cpp` (+8 -0) 📝 `client/ui/pages_logic/StartPageLogic.h` (+4 -0) ➖ `client/ui/qml/Pages/PageQrDecoder.qml` (+0 -164) 📝 `client/ui/qml/Pages/PageStart.qml` (+1 -1) 📝 `deploy/build_android.sh` (+1 -1) </details> ### 📄 Description Qr-code scanner based on Google ML Kit --- <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:19 +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#1641

No description provided.

Rows
Columns