core/DapServersListRequester.h

@@ -20,6 +20,11 @@ public:
         }
         return reply->errorString();
     }
+
+    QNetworkReply::NetworkError networkReplyError(){
+        return qobject_cast<QNetworkReply *>(parent())->error();
+    }
+
 signals:
     void sigResponse(const QJsonDocument& doc);
     void sigNetworkError(QNetworkReply::NetworkError);

core/DapSession.cpp

@@ -203,8 +203,14 @@ void DapSession::onEnc()
 {
     qDebug() << "Enc reply";
     if (m_netEncryptReply && (m_netEncryptReply->error() != QNetworkReply::NoError)) {
+
         qCritical() << "Network error: " << m_netEncryptReply->errorString();
-        emit errorNetwork(m_netEncryptReply->errorString());
+        if (m_netEncryptReply->error() == QNetworkReply::OperationCanceledError || m_netEncryptReply->error() == QNetworkReply::ConnectionRefusedError)
+            emit errorNetwork(6543 , m_netEncryptReply->errorString());
+        else if (m_netEncryptReply->error() == QNetworkReply::UnknownNetworkError)
+            emit errorNetwork(3244 , m_netEncryptReply->errorString());
+        else
+            emit errorNetwork(m_netEncryptReply->errorString());
         return;
     }
     QByteArray arrData;
@@ -479,7 +485,7 @@ void DapSession::onAuthorize()
                     }
                 } else if (m_xmlStreamReader.name() == "ts_active_till"){
                     DapDataLocal::instance()->serialKeyData()->setLicenseTermTill(m_xmlStreamReader.readElementText());
-                    qDebug() << "ts_active_till: " << DapDataLocal::instance()->serialKeyData()->licenseTermTill();
+                    qDebug() << "ts_active_till: " << DapDataLocal::instance()->serialKeyData()->licenseTermTill().toTime_t();
                 } else {
                     m_userInform[m_xmlStreamReader.name().toString()] = m_xmlStreamReader.readElementText();
                     qDebug() << "Add user information: " << m_xmlStreamReader.name().toString()

core/DapSession.h

@@ -170,6 +170,7 @@ signals:
     void errorAuthorization(const QString &);
     void activateKey();
     void errorNetwork(const QString&);
+    void errorNetwork(const int&, const QString&);
 
     void authRequested();
     void keyActRequested();

ui/controls/CustomLineEditBase.cpp

@@ -82,6 +82,7 @@ void CustomLineEditBase::setVisibleButton(bool a_visible)
     {
         if(m_btnControl!=Q_NULLPTR)
         {
+            m_btnControl->setGeometry(0,0,0,0);
             delete m_btnControl;
             m_btnControl = Q_NULLPTR;
         }

vpn/client/DapCmdHandlers/DapCmdAuth.cpp

@@ -39,6 +39,19 @@ void DapCmdAuth::sendCmdErrorAuth(const QString errorMsg)
     sendCmd(&response);
 }
 
+void DapCmdAuth::sendCmdErrorAuth(const int& a_errorCode, const QString a_errorMsg)
+{
+    qWarning() <<"Error message: "<< a_errorMsg;
+    QJsonObject response;
+    QJsonObject errorObj;
+
+    errorObj["code"] = a_errorCode;
+    errorObj["message"] = a_errorMsg;
+    response["error"] = errorObj;
+
+    sendCmd(&response);
+}
+
 /**
  * @brief DapCmdAuth::handle
  * @param params

vpn/client/DapCmdHandlers/DapCmdAuth.h

@@ -13,7 +13,9 @@ public:
     virtual ~DapCmdAuth() override;
 
     void handle(const QJsonObject* params) override;
+public slots:
     void sendCmdErrorAuth(const QString errorMsg); // TODO ENUM with errors and code in response
+    void sendCmdErrorAuth(const int& a_errorCode, const QString a_errorMsg);
 signals:
     void sigAuth(const QString& user, const QString& password, const QString& address, uint16_t port);
 };

vpn/client/DapCmdHandlers/DapCmdConnect.h

@@ -15,6 +15,7 @@ public:
     virtual ~DapCmdConnect() override;
 
     void handle(const QJsonObject* params) override;
+public slots:
     void sendCmdError(const QString errorMsg); // TODO ENUM with errors and code in response
     void sendCmdError(int a_errorCode,const QString a_errorMsg);
 signals:

vpn/client/DapCmdHandlers/DapCmdServersList.cpp

@@ -42,6 +42,9 @@ void DapCmdServersList::handle(const QJsonObject* params)
     connect(reply, &DapServersListNetworkReply::sigNetworkError, [=]{
         qWarning()<< "Network error: " << reply->errorString();
         rotateList();
-        sendSimpleError(-32002, reply->errorString());
+        if (reply->networkReplyError() == QNetworkReply::UnknownNetworkError)
+            sendSimpleError(-32003, reply->errorString());
+        else
+            sendSimpleError(-32002, reply->errorString());
     });
 }

vpn/ui/DapCmdHandlers/DapCmdConnect.cpp

@@ -45,5 +45,10 @@ void DapCmdConnect::handleError(int code, const QString& message)
     qDebug() << "handleError";
     Q_UNUSED(code);
     qWarning() << *m_errorObject;
+    if (code == 6543 || code == -1025){
+        emit errorMessage("Server not available. Please, try others or the same later");
+        return;
+    }
+
     emit errorMessage(message);
 }

vpn/ui/DapCmdHandlers/DapCmdServersList.cpp

@@ -14,10 +14,7 @@ void DapCmdServersList::handleResult(const QJsonObject& result)
             if (servers.isEmpty()) {
                 emit sigEmptyList("No servers available on this CDB. Try another...");
             } else {
-                emit sigServersList(servers);
-                for(auto server : servers) {
-                    qDebug() << server;
-                }
+                emit sigServersListUpdate(servers);
             }
         } else {
             qCritical() << "Error parse response from service";
@@ -35,6 +32,8 @@ void DapCmdServersList::handleError(int code, const QString& message)
         emit sigEmptyList(message);
     } else if (code == -32002) {
         emit sigErrorNetwork(message);
+    } else if (code == -32003) {
+        emit sigNetworkUnreachable(message);
     }
     qWarning() << *m_errorObject;
 }

vpn/ui/DapCmdHandlers/DapCmdServersList.h

@@ -13,9 +13,10 @@ protected:
 public:
     explicit DapCmdServersList(QObject *parent = nullptr);
 signals:
-    void sigServersList(const DapServerInfoList& servers);
+    void sigServersListUpdate(const DapServerInfoList& servers);
     void sigEmptyList(const QString &msg);
     void sigErrorNetwork(const QString &msg);
+    void sigNetworkUnreachable(const QString &msg);
 public slots:
     void sendCmdGetServersList() { sendCmd(); }
 };

vpn/ui/dialogs/SignInScreenSerialNumberBase.cpp

@@ -348,6 +348,9 @@ QString SignInScreenSerialNumberBase::translatedErrorMsg(QString a_errorMsg)
     else if (a_errorMsg == "Serial key activated, try to authorize")
         return  tr("Serial key activated, try to authorize");
 
+    else if (a_errorMsg == "Server not available. Please, try others or the same later")
+            return tr("Server not available. Please, try others or the same later");
+
     else return a_errorMsg;
 }
 

vpn/ui/dialogs/StartScreen.cpp

@@ -24,7 +24,13 @@ void StartScreen::setState(ConnectionState a_state)
     m_ui->lblSystemStatus->setText(statusText);
 }
 
+void StartScreen::setErrorMessage(const QString &msg)
+{
+    m_ui->lblSystemStatus->setText(msg);
+}
+
 void StartScreen::initVariantUi(QWidget *a_widget)
 {
     Q_UNUSED(a_widget)
 }
+

vpn/ui/dialogs/StartScreen.h

@@ -26,6 +26,7 @@ public:
     virtual QString screenName() override;
 
     void setState(ConnectionState a_state);
+    void setErrorMessage(const QString &msg);
 
 protected: