moved passphraseCallback and passphraseDialog to startPage

- made some methods of the servercontroller class private
- returned a call to the checkSshConnection() function

client/ui/pages_logic/StartPageLogic.cpp

@@ -10,6 +10,7 @@
 
 #include <QFileDialog>
 #include <QStandardPaths>
+#include <QEventLoop>
 
 #ifdef Q_OS_ANDROID
 #include <QJniObject>
@@ -131,11 +132,20 @@ void StartPageLogic::onPushButtonConnect()
     set_pushButtonConnectText(tr("Connecting..."));
 
     ErrorCode errorCode = ErrorCode::NoError;
-#ifdef Q_DEBUG
-    //QString output = m_serverController->checkSshConnection(serverCredentials, &e);
-#else
-    QString output;
-#endif
+
+    if (pushButtonConnectKeyChecked()) {
+        auto passphraseCallback = [this]() {
+            emit showPassphraseRequestMessage();
+            QEventLoop loop;
+            QObject::connect(this, &StartPageLogic::passphraseDialogClosed, &loop, &QEventLoop::quit);
+            loop.exec();
+
+            return m_privateKeyPassphrase;
+        };
+        m_serverController->setPassphraseCallback(passphraseCallback);
+    }
+
+    QString output = m_serverController->checkSshConnection(serverCredentials, &errorCode);
 
     if (pushButtonConnectKeyChecked()) {
         QString decryptedPrivateKey;

client/ui/pages_logic/StartPageLogic.h

@@ -23,6 +23,8 @@ class StartPageLogic : public PageLogicBase
     AUTO_PROPERTY(QString, labelWaitInfoText)
     AUTO_PROPERTY(bool, pushButtonBackFromStartVisible)
 
+    AUTO_PROPERTY(QString, privateKeyPassphrase);
+
     READONLY_PROPERTY(QRegularExpression, ipAddressPortRegex)
 public:
     Q_INVOKABLE void onUpdatePage() override;
@@ -47,5 +49,8 @@ public:
     explicit StartPageLogic(UiLogic *uiLogic, QObject *parent = nullptr);
     ~StartPageLogic() = default;
 
+signals:
+    void showPassphraseRequestMessage();
+    void passphraseDialogClosed();
 };
 #endif // START_PAGE_LOGIC_H

client/ui/pages_logic/protocols/ShadowSocksLogic.cpp

@@ -104,15 +104,13 @@ void ShadowSocksLogic::onPushButtonSaveClicked()
 
     progressBarFunc.setTextVisibleFunc(true);
     progressBarFunc.setTextFunc(QString("Configuring..."));
-    ErrorCode e = uiLogic()->pageLogic<ServerConfiguringProgressLogic>()->doInstallAction([this, containerConfig, &newContainerConfig](){
+    auto installAction = [this, containerConfig, &newContainerConfig]() {
         return m_serverController->updateContainer(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex),
-                                                   uiLogic()->m_selectedDockerContainer,
-                                                   containerConfig,
-                                                   newContainerConfig);
-    },
-    pageFunc, progressBarFunc,
-    saveButtonFunc, waitInfoFunc,
-    busyInfoFuncy, cancelButtonFunc);
+                                                   uiLogic()->m_selectedDockerContainer, containerConfig, newContainerConfig);
+    };
+    ErrorCode e = uiLogic()->pageLogic<ServerConfiguringProgressLogic>()->doInstallAction(installAction, pageFunc, progressBarFunc,
+                                                                                          saveButtonFunc, waitInfoFunc,
+                                                                                          busyInfoFuncy, cancelButtonFunc);
 
     if (!e) {
         m_settings->setContainerConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer, newContainerConfig);