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

Android Activity refactoring

Browse source
This commit is contained in:
albexk 2023-11-23 20:30:03 +03:00
parent ccdcfdce8a
commit 0ba5d754d5
6 changed files with 339 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,9 +17,9 @@ AndroidController::AndroidController() : QObject()
connect(this, &AndroidController::status, this,
[this](bool isVpnConnected) {
qDebug() << "Android event: status; connected:" << isVpnConnected;
if (isWaitingInitStatus) {
if (isWaitingStatus) {
qDebug() << "Android VPN service is alive, initialization by service status";
isWaitingInitStatus = false;
isWaitingStatus = false;
emit serviceIsAlive(isVpnConnected);
}
},
@ -29,6 +29,7 @@ AndroidController::AndroidController() : QObject()
this, &AndroidController::serviceDisconnected, this,
[this]() {
qDebug() << "Android event: service disconnected";
isWaitingStatus = true;
emit connectionStateChanged(Vpn::ConnectionState::Unknown);
},
Qt::QueuedConnection);
@ -140,7 +141,7 @@ void AndroidController::callActivityMethod(const char *methodName, const char *s
ErrorCode AndroidController::start(const QJsonObject &vpnConfig)
{
isWaitingInitStatus = false;
isWaitingStatus = false;
auto config = QJsonDocument(vpnConfig).toJson();
callActivityMethod("start", "(Ljava/lang/String;)V",
QJniObject::fromString(config).object<jstring>());