Android manifest fix, IPC refactoring

client/ui/pages_logic/ServerSettingsLogic.cpp

@@ -8,6 +8,7 @@
 
 #include "core/errorstrings.h"
 #include <core/servercontroller.h>
+#include <QTimer>
 
 ServerSettingsLogic::ServerSettingsLogic(UiLogic *logic, QObject *parent):
     PageLogicBase(logic, parent),

client/ui/pages_logic/VpnLogic.cpp

@@ -1,7 +1,10 @@
+#include <QApplication>
+
 #include "VpnLogic.h"
 
 #include "core/errorstrings.h"
 #include "vpnconnection.h"
+#include <QTimer>
 #include <functional>
 #include "../uilogic.h"
 #include "defines.h"
@@ -239,6 +242,6 @@ void VpnLogic::onConnectWorker(int serverIndex, const ServerCredentials &credent
 
 void VpnLogic::onDisconnect()
 {
-    set_pushButtonConnectChecked(false);
+    onConnectionStateChanged(VpnProtocol::Disconnected);
     emit disconnectFromVpn();
 }

client/ui/uilogic.cpp

@@ -30,7 +30,6 @@
 #include "core/errorstrings.h"
 
 #include "containers/containers_defs.h"
-#include "protocols/shadowsocksvpnprotocol.h"
 
 #include "ui/qautostart.h"
 
@@ -136,6 +135,11 @@ UiLogic::~UiLogic()
 void UiLogic::initalizeUiLogic()
 {
 #ifdef Q_OS_ANDROID
+    connect(AndroidController::instance(), &AndroidController::initialized, [this](bool status, bool connected, const QDateTime& connectionDate) {
+        if (connected) {
+            vpnLogic()->onConnectionStateChanged(VpnProtocol::Connected);
+        }
+    });
     if (!AndroidController::instance()->initialize()) {
          qDebug() << QString("Init failed") ;
          emit VpnProtocol::Error;