From 6bebfb861c4b1f8ccce73c8830435481ae0988c0 Mon Sep 17 00:00:00 2001 From: Dmitriy Karpushin Date: Wed, 18 Jan 2023 15:54:19 +0300 Subject: [PATCH] Little cleanup --- client/CMakeLists.txt | 1 - client/platforms/android/android_controller.h | 7 ++----- client/platforms/android/androidvpnactivity.cpp | 1 - 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 6dca9915..7cb9f428 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -268,7 +268,6 @@ if(ANDROID) # We need to include qtprivate api's # As QAndroidBinder is not yet implemented with a public api set(LIBS ${LIBS} Qt6::CorePrivate) - # set(ANDROID_ABIS ANDROID_TARGET_ARCH) add_compile_definitions(MVPN_ANDROID) diff --git a/client/platforms/android/android_controller.h b/client/platforms/android/android_controller.h index 73877b5a..f09197df 100644 --- a/client/platforms/android/android_controller.h +++ b/client/platforms/android/android_controller.h @@ -11,6 +11,7 @@ #include "ui/pages_logic/StartPageLogic.h" #include "protocols/vpnprotocol.h" + using namespace amnezia; @@ -38,10 +39,6 @@ public: void cleanupBackendLogs(); void importConfig(const QString& data); - // from QAndroidServiceConnection -// void onServiceConnected(const QString& name, const QAndroidBinder& serviceBinder) override; -// void onServiceDisconnected(const QString& name) override; - const QJsonObject &vpnConfig() const; void setVpnConfig(const QJsonObject &newVpnConfig); @@ -63,7 +60,7 @@ protected: private: bool m_init = false; - //Protocol m_protocol; + QJsonObject m_vpnConfig; StartPageLogic *m_startPageLogic; diff --git a/client/platforms/android/androidvpnactivity.cpp b/client/platforms/android/androidvpnactivity.cpp index 5139352f..0e8b9574 100644 --- a/client/platforms/android/androidvpnactivity.cpp +++ b/client/platforms/android/androidvpnactivity.cpp @@ -48,7 +48,6 @@ void AndroidVPNActivity::maybeInit() { bool AndroidVPNActivity::handleBackButton(JNIEnv* env, jobject thiz) { Q_UNUSED(env); Q_UNUSED(thiz); - // return Navigator::instance()->eventHandled(); } void AndroidVPNActivity::connectService() {