Merge branch 'feature/new-gui' of github.com:amnezia-vpn/amnezia-client into feature/new-gui

client/amnezia_application.cpp

@@ -330,7 +330,7 @@ void AmneziaApplication::initControllers()
     m_pageController.reset(new PageController(m_serversModel, m_settings));
     m_engine->rootContext()->setContextProperty("PageController", m_pageController.get());
 
-    m_installController.reset(new InstallController(m_serversModel, m_containersModel, m_settings));
+    m_installController.reset(new InstallController(m_serversModel, m_containersModel, m_protocolsModel, m_settings));
     m_engine->rootContext()->setContextProperty("InstallController", m_installController.get());
     connect(m_installController.get(), &InstallController::passphraseRequestStarted, m_pageController.get(),
             &PageController::showPassphraseRequestDrawer);

client/amnezia_application.h

@@ -91,7 +91,7 @@ private:
     QSharedPointer<ContainersModel> m_containersModel;
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<LanguageModel> m_languageModel;
-    QScopedPointer<ProtocolsModel> m_protocolsModel;
+    QSharedPointer<ProtocolsModel> m_protocolsModel;
     QSharedPointer<SitesModel> m_sitesModel;
 
     QScopedPointer<OpenVpnConfigModel> m_openVpnConfigModel;

client/mozilla/localsocketcontroller.cpp

@@ -113,7 +113,6 @@ void LocalSocketController::daemonConnected() {
 
 void LocalSocketController::activate(const QJsonObject &rawConfig) {
 
-  qDebug() << rawConfig;
   QJsonObject wgConfig = rawConfig.value("wireguard_config_data").toObject();
 
   QJsonObject json;

client/protocols/openvpnovercloakprotocol.cpp

@@ -16,7 +16,6 @@ OpenVpnOverCloakProtocol::OpenVpnOverCloakProtocol(const QJsonObject &configurat
 
 OpenVpnOverCloakProtocol::~OpenVpnOverCloakProtocol()
 {
-    qDebug() << "OpenVpnOverCloakProtocol::~OpenVpnOverCloakProtocol";
     OpenVpnOverCloakProtocol::stop();
     m_ckProcess.close();
 }

client/protocols/openvpnprotocol.cpp

@@ -19,7 +19,6 @@ OpenVpnProtocol::OpenVpnProtocol(const QJsonObject &configuration, QObject *pare
 
 OpenVpnProtocol::~OpenVpnProtocol()
 {
-    qDebug() << "OpenVpnProtocol::~OpenVpnProtocol()";
     OpenVpnProtocol::stop();
     QThread::msleep(200);
 }

client/ui/controllers/installController.cpp

@@ -40,8 +40,13 @@ namespace
 
 InstallController::InstallController(const QSharedPointer<ServersModel> &serversModel,
                                      const QSharedPointer<ContainersModel> &containersModel,
+                                     const QSharedPointer<ProtocolsModel> &protocolsModel,
                                      const std::shared_ptr<Settings> &settings, QObject *parent)
-    : QObject(parent), m_serversModel(serversModel), m_containersModel(containersModel), m_settings(settings)
+    : QObject(parent),
+      m_serversModel(serversModel),
+      m_containersModel(containersModel),
+      m_protocolModel(protocolsModel),
+      m_settings(settings)
 {
 }
 
@@ -252,6 +257,8 @@ void InstallController::updateContainer(QJsonObject config)
     auto errorCode = serverController.updateContainer(serverCredentials, container, oldContainerConfig, config);
     if (errorCode == ErrorCode::NoError) {
         m_containersModel->setData(modelIndex, config, ContainersModel::Roles::ConfigRole);
+        m_protocolModel->updateModel(config);
+
         emit updateContainerFinished();
         return;
     }

client/ui/controllers/installController.h

@@ -8,6 +8,7 @@
 #include "core/defs.h"
 #include "ui/models/containers_model.h"
 #include "ui/models/servers_model.h"
+#include "ui/models/protocols_model.h"
 
 class InstallController : public QObject
 {
@@ -15,6 +16,7 @@ class InstallController : public QObject
 public:
     explicit InstallController(const QSharedPointer<ServersModel> &serversModel,
                                const QSharedPointer<ContainersModel> &containersModel,
+                               const QSharedPointer<ProtocolsModel> &protocolsModel,
                                const std::shared_ptr<Settings> &settings, QObject *parent = nullptr);
     ~InstallController();
 
@@ -71,6 +73,7 @@ private:
 
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<ContainersModel> m_containersModel;
+    QSharedPointer<ProtocolsModel> m_protocolModel;
     std::shared_ptr<Settings> m_settings;
 
     ServerCredentials m_currentlyInstalledServerCredentials;

client/ui/qml/Pages2/PageProtocolCloakSettings.qml

@@ -91,7 +91,15 @@ PageType {
 
                             textField.onEditingFinished: {
                                 if (textFieldText !== site) {
-                                    site = textFieldText
+                                    var tmpText = textFieldText
+                                    tmpText = tmpText.toLocaleLowerCase()
+
+                                    var indexHttps = tmpText.indexOf("https://")
+                                    if (indexHttps === 0) {
+                                        tmpText = textFieldText.substring(8)
+                                    } else {
+                                        site = textFieldText
+                                    }
                                 }
                             }
                         }

deploy/installer/config/macos.xml.in

@@ -8,7 +8,7 @@
     <TargetDir>/Applications/AmneziaVPN.app</TargetDir>
     <WizardDefaultWidth>600</WizardDefaultWidth>
     <WizardDefaultHeight>380</WizardDefaultHeight>
-    <WizardStyle>Modern</WizardStyle>
+    <WizardStyle>Mac</WizardStyle>
     <RemoveTargetDir>true</RemoveTargetDir>
     <AllowSpaceInPath>true</AllowSpaceInPath>
     <AllowNonAsciiCharacters>false</AllowNonAsciiCharacters>