diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp index 0831b1a22..55bc1b584 100644 --- a/client/amnezia_application.cpp +++ b/client/amnezia_application.cpp @@ -182,8 +182,8 @@ void AmneziaApplication::init() // /qt/6.6.1/Src/qtbase/src/plugins/platforms/android/androidjniclipboard.cpp:46 // So we catch all the copies to the clipboard and clear them from "text/html" #ifdef Q_OS_ANDROID - connect(QGuiApplication::clipboard(), &QClipboard::dataChanged, []() { - auto clipboard = QGuiApplication::clipboard(); + connect(QApplication::clipboard(), &QClipboard::dataChanged, []() { + auto clipboard = QApplication::clipboard(); if (clipboard->mimeData()->hasHtml()) { clipboard->setText(clipboard->text()); } diff --git a/client/amnezia_application.h b/client/amnezia_application.h index 2f5e54127..7810b7c7e 100644 --- a/client/amnezia_application.h +++ b/client/amnezia_application.h @@ -5,11 +5,7 @@ #include #include #include -#if defined(Q_OS_ANDROID) - #include -#else - #include -#endif +#include #include "settings.h" #include "vpnconnection.h" @@ -44,9 +40,7 @@ #define amnApp (static_cast(QCoreApplication::instance())) -#if defined(Q_OS_ANDROID) - #define AMNEZIA_BASE_CLASS QGuiApplication -#elif defined(Q_OS_IOS) +#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) #define AMNEZIA_BASE_CLASS QApplication #else #define AMNEZIA_BASE_CLASS SingleApplication diff --git a/client/android/src/org/amnezia/vpn/AmneziaActivity.kt b/client/android/src/org/amnezia/vpn/AmneziaActivity.kt index 9a813626d..46d1e8052 100644 --- a/client/android/src/org/amnezia/vpn/AmneziaActivity.kt +++ b/client/android/src/org/amnezia/vpn/AmneziaActivity.kt @@ -56,7 +56,7 @@ class AmneziaActivity : QtActivity() { object : Handler(Looper.getMainLooper()) { override fun handleMessage(msg: Message) { val event = msg.extractIpcMessage() - Log.d(TAG, "Handle event: $event") + if (event != ServiceEvent.STATISTICS_UPDATE) Log.d(TAG, "Handle event: $event") when (event) { ServiceEvent.CONNECTED -> { QtAndroidController.onVpnConnected() diff --git a/client/android/src/org/amnezia/vpn/AmneziaVpnService.kt b/client/android/src/org/amnezia/vpn/AmneziaVpnService.kt index 78f89ab87..c30fedf38 100644 --- a/client/android/src/org/amnezia/vpn/AmneziaVpnService.kt +++ b/client/android/src/org/amnezia/vpn/AmneziaVpnService.kt @@ -312,7 +312,7 @@ class AmneziaVpnService : VpnService() { @MainThread private fun launchSendingStatistics() { - /* if (isServiceBound && isConnected) { + if (isServiceBound && isConnected) { statisticsSendingJob = mainScope.launch { while (true) { clientMessenger.send { @@ -323,7 +323,7 @@ class AmneziaVpnService : VpnService() { delay(STATISTICS_SENDING_TIMEOUT) } } - } */ + } } @MainThread