AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Little cleanup

Browse source
This commit is contained in:
Dmitriy Karpushin 2023-01-18 15:54:19 +03:00
parent 30ae13b245
commit 6bebfb861c
3 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/CMakeLists.txt
View file

@ -268,7 +268,6 @@ if(ANDROID)
# We need to include qtprivate api's # We need to include qtprivate api's
# As QAndroidBinder is not yet implemented with a public api # As QAndroidBinder is not yet implemented with a public api
set(LIBS ${LIBS} Qt6::CorePrivate) set(LIBS ${LIBS} Qt6::CorePrivate)
# set(ANDROID_ABIS ANDROID_TARGET_ARCH)
add_compile_definitions(MVPN_ANDROID) add_compile_definitions(MVPN_ANDROID)

7
client/platforms/android/android_controller.h
View file

@ -11,6 +11,7 @@
#include "ui/pages_logic/StartPageLogic.h" #include "ui/pages_logic/StartPageLogic.h"
#include "protocols/vpnprotocol.h" #include "protocols/vpnprotocol.h"
using namespace amnezia; using namespace amnezia;
@ -38,10 +39,6 @@ public:
void cleanupBackendLogs(); void cleanupBackendLogs();
void importConfig(const QString& data); 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; const QJsonObject &vpnConfig() const;
void setVpnConfig(const QJsonObject &newVpnConfig); void setVpnConfig(const QJsonObject &newVpnConfig);
@ -63,7 +60,7 @@ protected:
private: private:
bool m_init = false; bool m_init = false;
//Protocol m_protocol;
QJsonObject m_vpnConfig; QJsonObject m_vpnConfig;
StartPageLogic *m_startPageLogic; StartPageLogic *m_startPageLogic;

1
client/platforms/android/androidvpnactivity.cpp
View file

@ -48,7 +48,6 @@ void AndroidVPNActivity::maybeInit() {
bool AndroidVPNActivity::handleBackButton(JNIEnv* env, jobject thiz) { bool AndroidVPNActivity::handleBackButton(JNIEnv* env, jobject thiz) {
Q_UNUSED(env); Q_UNUSED(env);
Q_UNUSED(thiz); Q_UNUSED(thiz);
// return Navigator::instance()->eventHandled();
} }
void AndroidVPNActivity::connectService() { void AndroidVPNActivity::connectService() {