From 0343b6cf98805c05d855068c9c5c923f560a3b9f Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Sat, 2 Sep 2023 19:48:43 +0100
Subject: [PATCH 1/4] Crash on exit fix

---
 client/protocols/openvpnovercloakprotocol.cpp |  1 -
 client/protocols/openvpnprotocol.cpp          |  1 -
 client/ui/uilogic.cpp                         | 13 -------------
 3 files changed, 15 deletions(-)

diff --git a/client/protocols/openvpnovercloakprotocol.cpp b/client/protocols/openvpnovercloakprotocol.cpp
index c40999f6..538f555c 100644
--- a/client/protocols/openvpnovercloakprotocol.cpp
+++ b/client/protocols/openvpnovercloakprotocol.cpp
@@ -16,7 +16,6 @@ OpenVpnOverCloakProtocol::OpenVpnOverCloakProtocol(const QJsonObject &configurat
 
 OpenVpnOverCloakProtocol::~OpenVpnOverCloakProtocol()
 {
-    qDebug() << "OpenVpnOverCloakProtocol::~OpenVpnOverCloakProtocol";
     OpenVpnOverCloakProtocol::stop();
     m_ckProcess.close();
 }
diff --git a/client/protocols/openvpnprotocol.cpp b/client/protocols/openvpnprotocol.cpp
index f395b4bc..ed6b63d0 100644
--- a/client/protocols/openvpnprotocol.cpp
+++ b/client/protocols/openvpnprotocol.cpp
@@ -20,7 +20,6 @@ OpenVpnProtocol::OpenVpnProtocol(const QJsonObject &configuration, QObject* pare
 
 OpenVpnProtocol::~OpenVpnProtocol()
 {
-    qDebug() << "OpenVpnProtocol::~OpenVpnProtocol()";
     OpenVpnProtocol::stop();
     QThread::msleep(200);
 }
diff --git a/client/ui/uilogic.cpp b/client/ui/uilogic.cpp
index b9c7567f..f3c0b1b4 100644
--- a/client/ui/uilogic.cpp
+++ b/client/ui/uilogic.cpp
@@ -107,19 +107,6 @@ UiLogic::~UiLogic()
 {
     emit hide();
 
-#ifdef AMNEZIA_DESKTOP
-    if (m_vpnConnection->connectionState() != VpnProtocol::VpnConnectionState::Disconnected) {
-        m_vpnConnection->disconnectFromVpn();
-        for (int i = 0; i < 50; i++) {
-            qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
-            QThread::msleep(100);
-            if (m_vpnConnection->isDisconnected()) {
-                break;
-            }
-        }
-    }
-#endif
-
     m_vpnConnection->deleteLater();
     m_vpnConnectionThread.quit();
     m_vpnConnectionThread.wait(3000);

From 66a3538d05b75ff51e50156a33df9c3e0eeef118 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Thu, 7 Sep 2023 07:44:51 +0800
Subject: [PATCH 2/4] fixed: text field can not be updated to memory, including
 site and port

---
 client/ui/pages_logic/protocols/CloakLogic.cpp   |  6 +++++-
 client/ui/qml/Pages/Protocols/PageProtoCloak.qml | 10 ++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/client/ui/pages_logic/protocols/CloakLogic.cpp b/client/ui/pages_logic/protocols/CloakLogic.cpp
index 0062d12d..4f21895b 100644
--- a/client/ui/pages_logic/protocols/CloakLogic.cpp
+++ b/client/ui/pages_logic/protocols/CloakLogic.cpp
@@ -47,7 +47,11 @@ void CloakLogic::updateProtocolPage(const QJsonObject &ckConfig, DockerContainer
 QJsonObject CloakLogic::getProtocolConfigFromPage(QJsonObject oldConfig)
 {
     oldConfig.insert(config_key::cipher, comboBoxCipherText());
-    oldConfig.insert(config_key::site, lineEditSiteText());
+
+    QString newSite = lineEditSiteText();
+    newSite.replace("https://", "");
+    oldConfig.insert(config_key::site, newSite);
+
     oldConfig.insert(config_key::port, lineEditPortText());
 
     return oldConfig;
diff --git a/client/ui/qml/Pages/Protocols/PageProtoCloak.qml b/client/ui/qml/Pages/Protocols/PageProtoCloak.qml
index 2b5b12ca..3475a82b 100644
--- a/client/ui/qml/Pages/Protocols/PageProtoCloak.qml
+++ b/client/ui/qml/Pages/Protocols/PageProtoCloak.qml
@@ -76,11 +76,16 @@ PageProtocolBase {
             TextFieldType {
                 id: lineEdit_proto_cloak_site
                 Layout.fillWidth: true
+                focus: true
                 height: 31
                 text: logic.lineEditSiteText
                 onEditingFinished: {
                     logic.lineEditSiteText = text
                 }
+
+                onCursorRectangleChanged: {
+                    logic.lineEditSiteText = text
+                }
             }
         }
 
@@ -96,12 +101,17 @@ PageProtocolBase {
             TextFieldType {
                 id: lineEdit_proto_cloak_port
                 Layout.fillWidth: true
+                focus: true
                 height: 31
                 text: logic.lineEditPortText
                 onEditingFinished: {
                     logic.lineEditPortText = text
                 }
                 enabled: logic.lineEditPortEnabled
+
+                onCursorRectangleChanged: {
+                    logic.lineEditPortText = text
+                }
             }
         }
 

From 3740cb2c300082886f6de2003a9249f545343725 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Thu, 7 Sep 2023 10:56:26 -0700
Subject: [PATCH 3/4] Remove unnecessary qDebug() [no ci]

---
 client/mozilla/localsocketcontroller.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/mozilla/localsocketcontroller.cpp b/client/mozilla/localsocketcontroller.cpp
index 8d0c6255..cd25ddc1 100644
--- a/client/mozilla/localsocketcontroller.cpp
+++ b/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;

From 7c223feef5cbe1c915eb0c8b31fc4de37bfc59df Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Fri, 8 Sep 2023 16:05:24 +0800
Subject: [PATCH 4/4] updated installer-wizardstyle for adapting macos,
 especially text does not wrapped in the page 'ready for install'

---
 deploy/installer/config/macos.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/installer/config/macos.xml.in b/deploy/installer/config/macos.xml.in
index 74b682b7..3888d08d 100644
--- a/deploy/installer/config/macos.xml.in
+++ b/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>