From 9e7deecb994c0ac4dd4d32d6159502c51a45f73e Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Fri, 19 Nov 2021 23:04:35 +0300
Subject: [PATCH] Version 2.0.1

---
 client/defines.h                                |  4 ++--
 client/ui/pages_logic/ServerSettingsLogic.cpp   |  4 +++-
 client/ui/pages_logic/StartPageLogic.cpp        | 17 ++++++++++++++---
 client/ui/pages_logic/VpnLogic.cpp              |  3 ++-
 .../qml/Pages/Share/PageShareProtoAmnezia.qml   |  2 +-
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/client/defines.h b/client/defines.h
index ad7fc050..b4790d61 100644
--- a/client/defines.h
+++ b/client/defines.h
@@ -4,7 +4,7 @@
 #define APPLICATION_NAME    "AmneziaVPN"
 #define SERVICE_NAME        "AmneziaVPN-service"
 #define ORGANIZATION_NAME   "AmneziaVPN.ORG"
-#define APP_MAJOR_VERSION   "2.0.0"
-#define APP_VERSION         "2.0.0.0"
+#define APP_MAJOR_VERSION   "2.0.1"
+#define APP_VERSION         "2.0.1.0"
 
 #endif // DEFINES_H
diff --git a/client/ui/pages_logic/ServerSettingsLogic.cpp b/client/ui/pages_logic/ServerSettingsLogic.cpp
index 27ce64fb..ddbabf00 100644
--- a/client/ui/pages_logic/ServerSettingsLogic.cpp
+++ b/client/ui/pages_logic/ServerSettingsLogic.cpp
@@ -36,7 +36,9 @@ void ServerSettingsLogic::onUpdatePage()
                                      .arg(port.isEmpty() ? "" : ":")
                                      .arg(port));
     set_lineEditDescriptionText(server.value(config_key::description).toString());
-    QString selectedContainerName = m_settings.defaultContainerName(uiLogic()->selectedServerIndex);
+
+    DockerContainer selectedContainer = m_settings.defaultContainer(uiLogic()->selectedServerIndex);
+    QString selectedContainerName = ContainerProps::containerHumanNames().value(selectedContainer);
     set_labelCurrentVpnProtocolText(tr("Service: ") + selectedContainerName);
 }
 
diff --git a/client/ui/pages_logic/StartPageLogic.cpp b/client/ui/pages_logic/StartPageLogic.cpp
index a7ec7e49..68a3d00c 100644
--- a/client/ui/pages_logic/StartPageLogic.cpp
+++ b/client/ui/pages_logic/StartPageLogic.cpp
@@ -114,14 +114,23 @@ void StartPageLogic::onPushButtonConnect()
     set_pushButtonConnectText(tr("Connect"));
 
     uiLogic()->installCredentials = serverCredentials;
-    if (ok) uiLogic()->goToPage(Page::NewServer);
+    if (ok) emit uiLogic()->goToPage(Page::NewServer);
 }
 
 void StartPageLogic::onPushButtonImport()
 {
     QString s = lineEditStartExistingCodeText();
     s.replace("vpn://", "");
-    QJsonObject o = QJsonDocument::fromJson(QByteArray::fromBase64(s.toUtf8(), QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals)).object();
+    QByteArray ba = QByteArray::fromBase64(s.toUtf8(), QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
+    QByteArray ba_uncompressed = qUncompress(ba);
+
+    QJsonObject o;
+    if (!ba_uncompressed.isEmpty()) {
+        o = QJsonDocument::fromBinaryData(ba_uncompressed).object();
+    }
+    else {
+        o = QJsonDocument::fromJson(ba).object();
+    }
 
     ServerCredentials credentials;
     credentials.hostName = o.value("h").toString();
@@ -169,6 +178,8 @@ void StartPageLogic::onPushButtonImport()
     if (!o.contains(config_key::containers)) {
         uiLogic()->selectedServerIndex = m_settings.defaultServerIndex();
         uiLogic()->selectedDockerContainer = m_settings.defaultContainer(uiLogic()->selectedServerIndex);
-        uiLogic()->goToPage(Page::ServerContainers);
+        uiLogic()->onUpdateAllPages();
+
+        emit uiLogic()->goToPage(Page::ServerContainers);
     }
 }
diff --git a/client/ui/pages_logic/VpnLogic.cpp b/client/ui/pages_logic/VpnLogic.cpp
index a83d4f8b..10c56a82 100644
--- a/client/ui/pages_logic/VpnLogic.cpp
+++ b/client/ui/pages_logic/VpnLogic.cpp
@@ -50,7 +50,8 @@ void VpnLogic::onUpdatePage()
             .arg(server.value(config_key::hostName).toString());
     set_labelCurrentServer(serverString);
 
-    QString selectedContainerName = m_settings.defaultContainerName(m_settings.defaultServerIndex());
+    DockerContainer selectedContainer = m_settings.defaultContainer(m_settings.defaultServerIndex());
+    QString selectedContainerName = ContainerProps::containerHumanNames().value(selectedContainer);
     set_labelCurrentService(selectedContainerName);
 }
 
diff --git a/client/ui/qml/Pages/Share/PageShareProtoAmnezia.qml b/client/ui/qml/Pages/Share/PageShareProtoAmnezia.qml
index eb2b827e..aebba7fa 100644
--- a/client/ui/qml/Pages/Share/PageShareProtoAmnezia.qml
+++ b/client/ui/qml/Pages/Share/PageShareProtoAmnezia.qml
@@ -124,7 +124,7 @@ New encryption keys pair will be generated.")
             }
 
             LabelType {
-                height: 20
+                Layout.fillWidth: true
                 text: qsTr("Config too long to be displayed as QR code")
                 visible: ShareConnectionLogic.shareAmneziaQrCodeText.length == 0 && tfShareCode.textArea.length > 0
             }