Merge pull request #325 from amnezia-vpn/bugfix/reconnectvpn_when_dc_…

…changed auto reconection when current-server's defaul container hase been cha…
amnezia-vpn · Sep 17, 2023 · 32dda9b · 32dda9b
2 parents ff60030 + c0cb5b9
commit 32dda9b
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 26 deletions.
diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
@@ -344,6 +344,8 @@ void AmneziaApplication::initControllers()
             &PageController::showPassphraseRequestDrawer);
     connect(m_pageController.get(), &PageController::passphraseRequestDrawerClosed, m_installController.get(),
             &InstallController::setEncryptedPassphrase);
+    connect(m_installController.get(), &InstallController::currentContainerUpdated, m_connectionController.get(),
+            &ConnectionController::onCurrentContainerUpdated);
 
     m_importController.reset(new ImportController(m_serversModel, m_containersModel, m_settings));
     m_engine->rootContext()->setContextProperty("ImportController", m_importController.get());

diff --git a/client/core/servercontroller.h b/client/core/servercontroller.h
@@ -28,6 +28,7 @@ class ServerController : public QObject
                              bool isUpdate = false);
     ErrorCode updateContainer(const ServerCredentials &credentials, DockerContainer container,
                               const QJsonObject &oldConfig, QJsonObject &newConfig);
+
     ErrorCode getAlreadyInstalledContainers(const ServerCredentials &credentials,
                                             QMap<DockerContainer, QJsonObject> &installedContainers);
 

diff --git a/client/ui/controllers/connectionController.cpp b/client/ui/controllers/connectionController.cpp
@@ -118,6 +118,14 @@ void ConnectionController::onConnectionStateChanged(Vpn::ConnectionState state)
     emit connectionStateChanged();
 }
 
+void ConnectionController::onCurrentContainerUpdated()
+{
+    if (m_isConnected || m_isConnectionInProgress) {
+        emit reconnectWithUpdatedContainer(tr("Settings updated successfully, Reconnnection..."));
+        openConnection();
+    }
+}
+
 QString ConnectionController::connectionStateText() const
 {
     return m_connectionStateText;

diff --git a/client/ui/controllers/connectionController.h b/client/ui/controllers/connectionController.h
@@ -32,13 +32,16 @@ public slots:
     QString getLastConnectionError();
     void onConnectionStateChanged(Vpn::ConnectionState state);
 
+    void onCurrentContainerUpdated();
+
 signals:
     void connectToVpn(int serverIndex, const ServerCredentials &credentials, DockerContainer container,
                       const QJsonObject &containerConfig);
     void disconnectFromVpn();
     void connectionStateChanged();
 
     void connectionErrorOccurred(const QString &errorMessage);
+    void reconnectWithUpdatedContainer(const QString &message);
 
 private:
     QSharedPointer<ServersModel> m_serversModel;

diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
@@ -259,7 +259,13 @@ void InstallController::updateContainer(QJsonObject config)
         m_containersModel->setData(modelIndex, config, ContainersModel::Roles::ConfigRole);
         m_protocolModel->updateModel(config);
 
-        emit updateContainerFinished();
+        if ((serverIndex == m_serversModel->getDefaultServerIndex())
+            && (container == m_containersModel->getDefaultContainer())) {
+            emit currentContainerUpdated();
+        } else {
+            emit updateContainerFinished(tr("Settings updated successfully"));
+        }
+
         return;
     }
 

diff --git a/client/ui/controllers/installController.h b/client/ui/controllers/installController.h
@@ -49,7 +49,7 @@ public slots:
     void installContainerFinished(const QString &finishMessage, bool isServiceInstall);
     void installServerFinished(const QString &finishMessage);
 
-    void updateContainerFinished();
+    void updateContainerFinished(const QString& message);
 
     void scanServerFinished(bool isInstalledContainerFound);
 
@@ -66,6 +66,8 @@ public slots:
 
     void serverIsBusy(const bool isBusy);
 
+    void currentContainerUpdated();
+
 private:
     void installServer(DockerContainer container, QJsonObject &config);
     void installContainer(DockerContainer container, QJsonObject &config);

diff --git a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
@@ -13,14 +13,6 @@ import "../Components"
 PageType {
     id: root
 
-    Connections {
-        target: InstallController
-
-        function onUpdateContainerFinished() {
-            PageController.showNotificationMessage(qsTr("Settings updated successfully"))
-        }
-    }
-
     ColumnLayout {
         id: backButton
 

diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -15,14 +15,6 @@ import "../Components"
 PageType {
     id: root
 
-    Connections {
-        target: InstallController
-
-        function onUpdateContainerFinished() {
-            PageController.showNotificationMessage(qsTr("Settings updated successfully"))
-        }
-    }
-
     ColumnLayout {
         id: backButton
 

diff --git a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
@@ -13,14 +13,6 @@ import "../Components"
 PageType {
     id: root
 
-    Connections {
-        target: InstallController
-
-        function onUpdateContainerFinished() {
-            PageController.showNotificationMessage(qsTr("Settings updated successfully"))
-        }
-    }
-
     ColumnLayout {
         id: backButton
 

diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
@@ -82,6 +82,18 @@ PageType {
                 PageController.closePage()
             }
         }
+
+        function onUpdateContainerFinished(message) {
+            PageController.showNotificationMessage(message)
+        }
+    }
+
+    Connections {
+        target: ConnectionController
+
+        function onReconnectWithUpdatedContainer(message) {
+            PageController.showNotificationMessage(message)
+        }
     }
 
     StackViewType {