From 8c9f91328bae45d48f8088dfb256280713d8ea59 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 | 7 +++++++ client/platforms/android/android_controller.h | 1 + 3 files changed, 11 insertions(+) diff --git a/client/android/src/org/amnezia/vpn/AmneziaActivity.kt b/client/android/src/org/amnezia/vpn/AmneziaActivity.kt index 8d891291d..06811a1f9 100644 --- a/client/android/src/org/amnezia/vpn/AmneziaActivity.kt +++ b/client/android/src/org/amnezia/vpn/AmneziaActivity.kt @@ -1163,6 +1163,9 @@ class AmneziaActivity : QtActivity() { return super.dispatchTrackballEvent(ev) } + @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 c7f972132..1d712103e 100644 --- a/client/platforms/android/android_controller.cpp +++ b/client/platforms/android/android_controller.cpp @@ -328,6 +328,13 @@ void AndroidController::sendTouch(float x, float y) callActivityMethod("sendTouch", "(FF)V", x, y); } + +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 2294cc78b..f9a921008 100644 --- a/client/platforms/android/android_controller.h +++ b/client/platforms/android/android_controller.h @@ -55,6 +55,7 @@ public: void requestNotificationPermission(); bool requestAuthentication(); void sendTouch(float x, float y); + bool isPlay(); static bool initLogging(); static void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &message);