From e2dd5109f91d18ea416713cf3ffe38952614beec Mon Sep 17 00:00:00 2001 From: albexk Date: Tue, 17 Sep 2024 20:52:31 +0300 Subject: [PATCH] Add a method to detect Google Play build --- client/android/src/org/amnezia/vpn/AmneziaActivity.kt | 3 +++ client/platforms/android/android_controller.cpp | 5 +++++ client/platforms/android/android_controller.h | 1 + 3 files changed, 9 insertions(+) diff --git a/client/android/src/org/amnezia/vpn/AmneziaActivity.kt b/client/android/src/org/amnezia/vpn/AmneziaActivity.kt index 60d1a4b5..bcd17023 100644 --- a/client/android/src/org/amnezia/vpn/AmneziaActivity.kt +++ b/client/android/src/org/amnezia/vpn/AmneziaActivity.kt @@ -708,6 +708,9 @@ class AmneziaActivity : QtActivity() { } } + @Suppress("unused") + fun isPlay(): Boolean = BuildConfig.FLAVOR == "play" + /** * Utils methods */ diff --git a/client/platforms/android/android_controller.cpp b/client/platforms/android/android_controller.cpp index 2790eb1b..ece67d1c 100644 --- a/client/platforms/android/android_controller.cpp +++ b/client/platforms/android/android_controller.cpp @@ -287,6 +287,11 @@ bool AndroidController::requestAuthentication() return result; } +bool AndroidController::isPlay() +{ + return callActivityMethod("isPlay", "()Z"); +} + // Moving log processing to the Android side jclass AndroidController::log; jmethodID AndroidController::logDebug; diff --git a/client/platforms/android/android_controller.h b/client/platforms/android/android_controller.h index 759c9c3f..b5ab45a5 100644 --- a/client/platforms/android/android_controller.h +++ b/client/platforms/android/android_controller.h @@ -48,6 +48,7 @@ public: bool isNotificationPermissionGranted(); void requestNotificationPermission(); bool requestAuthentication(); + bool isPlay(); static bool initLogging(); static void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &message);