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

Moving to Qt6:

Browse source 
1) removing of deprecated classes
2) update of IPC mechanism
This commit is contained in:
Dmitriy Karpushin 2022-12-23 17:32:20 +03:00
parent 8191c25dd7
commit 6c614a4b3c
21 changed files with 478 additions and 531 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,18 +1,20 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef ANDROID_CONTROLLER_H
#define ANDROID_CONTROLLER_H
//#include <QAndroidBinder>
//#include <QAndroidServiceConnection>
#include <QtCore/private/qandroidextras_p.h>
#include <QJniEnvironment>
#include <QJniObject>
#include "ui/uilogic.h"
#include "ui/pages_logic/StartPageLogic.h"
#include "protocols/vpnprotocol.h"
using namespace amnezia;
class AndroidController : public QObject, public QAndroidServiceConnection
class AndroidController : public QObject
{
Q_OBJECT
@ -37,8 +39,8 @@ public:
void importConfig(const QString& data);
// from QAndroidServiceConnection
void onServiceConnected(const QString& name, const QAndroidBinder& serviceBinder) override;
void onServiceDisconnected(const QString& name) override;
// void onServiceConnected(const QString& name, const QAndroidBinder& serviceBinder) override;
// void onServiceDisconnected(const QString& name) override;
const QJsonObject &vpnConfig() const;
void setVpnConfig(const QJsonObject &newVpnConfig);
@ -60,6 +62,7 @@ protected:
private:
bool m_init = false;
//Protocol m_protocol;
QJsonObject m_vpnConfig;
@ -68,22 +71,22 @@ private:
bool m_serviceConnected = false;
std::function<void(const QString&)> m_logCallback;
QAndroidBinder m_serviceBinder;
class VPNBinder : public QAndroidBinder {
public:
VPNBinder(AndroidController* controller) : m_controller(controller) {}
// QAndroidBinder m_serviceBinder;
// class VPNBinder : public QAndroidBinder {
// public:
// VPNBinder(AndroidController* controller) : m_controller(controller) {}
bool onTransact(int code, const QAndroidParcel& data,
const QAndroidParcel& reply,
QAndroidBinder::CallType flags) override;
// bool onTransact(int code, const QAndroidParcel& data,
// const QAndroidParcel& reply,
// QAndroidBinder::CallType flags) override;
QString readUTF8Parcel(QAndroidParcel data);
// QString readUTF8Parcel(QAndroidParcel data);
private:
AndroidController* m_controller = nullptr;
};
// private:
// AndroidController* m_controller = nullptr;
// };
VPNBinder m_binder;
// VPNBinder m_binder;
static void startActivityForResult(JNIEnv* env, jobject /*thiz*/, jobject intent);
};