From 7b838e77a02fa01ef8a157c109201d0fdf4a4e96 Mon Sep 17 00:00:00 2001
From: Nethius <nethiuswork@gmail.com>
Date: Sun, 13 Oct 2024 15:14:43 +0400
Subject: [PATCH] bugfix: removed the importErrorOccurred() signal overload,
 since qml does not know how to handle signal overloads (#1111)

---
 client/core/defs.h                                 | 1 +
 client/core/errorstrings.cpp                       | 1 +
 client/ui/controllers/importController.cpp         | 6 +++---
 client/ui/controllers/importController.h           | 1 -
 client/ui/controllers/installController.cpp        | 2 +-
 client/ui/controllers/installController.h          | 2 +-
 client/ui/qml/Pages2/PageSetupWizardViewConfig.qml | 2 +-
 client/ui/qml/Pages2/PageStart.qml                 | 4 ++++
 8 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/client/core/defs.h b/client/core/defs.h
index ebc07f4b..802eca45 100644
--- a/client/core/defs.h
+++ b/client/core/defs.h
@@ -96,6 +96,7 @@ namespace amnezia
 
         // import and install errors
         ImportInvalidConfigError = 900,
+        ImportOpenConfigError = 901,
 
         // Android errors
         AndroidError = 1000,
diff --git a/client/core/errorstrings.cpp b/client/core/errorstrings.cpp
index 8c16d786..00e94995 100644
--- a/client/core/errorstrings.cpp
+++ b/client/core/errorstrings.cpp
@@ -50,6 +50,7 @@ QString errorString(ErrorCode code) {
     case (ErrorCode::AddressPoolError): errorMessage = QObject::tr("VPN pool error: no available addresses"); break;
 
     case (ErrorCode::ImportInvalidConfigError): errorMessage = QObject::tr("The config does not contain any containers and credentials for connecting to the server"); break;
+    case (ErrorCode::ImportOpenConfigError): errorMessage = QObject::tr(""); break;
 
     // Android errors
     case (ErrorCode::AndroidError): errorMessage = QObject::tr("VPN connection error"); break;
diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp
index 261551ea..168e3564 100644
--- a/client/ui/controllers/importController.cpp
+++ b/client/ui/controllers/importController.cpp
@@ -84,7 +84,7 @@ bool ImportController::extractConfigFromFile(const QString &fileName)
         return extractConfigFromData(data);
     }
 
-    emit importErrorOccurred(tr("Unable to open file"), false);
+    emit importErrorOccurred(ErrorCode::ImportOpenConfigError, false);
     return false;
 }
 
@@ -188,12 +188,12 @@ bool ImportController::extractConfigFromData(QString data)
         if (!m_serversModel->getServersCount()) {
             emit restoreAppConfig(config.toUtf8());
         } else {
-            emit importErrorOccurred(tr("Invalid configuration file"), false);
+            emit importErrorOccurred(ErrorCode::ImportInvalidConfigError, false);
         }
         break;
     }
     case ConfigTypes::Invalid: {
-        emit importErrorOccurred(tr("Invalid configuration file"), false);
+        emit importErrorOccurred(ErrorCode::ImportInvalidConfigError, false);
         break;
     }
     }
diff --git a/client/ui/controllers/importController.h b/client/ui/controllers/importController.h
index 61205253..05e320a5 100644
--- a/client/ui/controllers/importController.h
+++ b/client/ui/controllers/importController.h
@@ -54,7 +54,6 @@ public slots:
 
 signals:
     void importFinished();
-    void importErrorOccurred(const QString &errorMessage, bool goToPageHome);
     void importErrorOccurred(ErrorCode errorCode, bool goToPageHome);
 
     void qrDecodingFinished();
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index c6f17057..31aa1fb1 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -768,7 +768,7 @@ bool InstallController::checkSshConnection(QSharedPointer<ServerController> serv
     } else {
         if (output.contains(tr("Please login as the user"))) {
             output.replace("\n", "");
-            emit installationErrorOccurred(output);
+            emit wrongInstallationUser(output);
             return false;
         }
     }
diff --git a/client/ui/controllers/installController.h b/client/ui/controllers/installController.h
index 7eea216a..d7ab3553 100644
--- a/client/ui/controllers/installController.h
+++ b/client/ui/controllers/installController.h
@@ -75,8 +75,8 @@ signals:
     void removeAllContainersFinished(const QString &finishedMessage);
     void removeProcessedContainerFinished(const QString &finishedMessage);
 
-    void installationErrorOccurred(const QString &errorMessage);
     void installationErrorOccurred(ErrorCode errorCode);
+    void wrongInstallationUser(const QString &message);
 
     void serverAlreadyExists(int serverIndex);
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
index 3aac1555..92048f36 100644
--- a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
@@ -37,7 +37,7 @@ PageType {
     Connections {
         target: ImportController
 
-        function onImportErrorOccurred(errorMessage, goToPageHome) {
+        function onImportErrorOccurred(error, goToPageHome) {
             if (goToPageHome) {
                 PageController.goToStartPage()
             } else {
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index bb6663fb..640c61ef 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -123,6 +123,10 @@ PageType {
             }
         }
 
+        function onWrongInstallationUser(message) {
+            onInstallationErrorOccurred(message)
+        }
+
         function onUpdateContainerFinished(message) {
             PageController.showNotificationMessage(message)
             PageController.closePage()