Merge branch 'dev' of github.com:amnezia-vpn/amnezia-client into HEAD

client/core/controllers/apiController.cpp

@@ -50,6 +50,8 @@ namespace
         constexpr char authData[] = "auth_data";
     }
 
+    const int requestTimeoutMsecs = 12 * 1000; // 12 secs
+
     ErrorCode checkErrors(const QList<QSslError> &sslErrors, QNetworkReply *reply)
     {
         if (!sslErrors.empty()) {
@@ -177,7 +179,7 @@ void ApiController::fillServerConfig(const QString &protocol, const ApiControlle
 QStringList ApiController::getProxyUrls()
 {
     QNetworkRequest request;
-    request.setTransferTimeout(7000);
+    request.setTransferTimeout(requestTimeoutMsecs);
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
 
     QEventLoop wait;
@@ -280,7 +282,7 @@ void ApiController::updateServerConfigFromApi(const QString &installationUuid, c
 
     if (serverConfig.value(config_key::configVersion).toInt()) {
         QNetworkRequest request;
-        request.setTransferTimeout(7000);
+        request.setTransferTimeout(requestTimeoutMsecs);
         request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
         request.setRawHeader("Authorization", "Api-Key " + serverConfig.value(configKey::accessToken).toString().toUtf8());
         QString endpoint = serverConfig.value(configKey::apiEdnpoint).toString();
@@ -336,7 +338,7 @@ ErrorCode ApiController::getServicesList(QByteArray &responseBody)
 #endif
 
     QNetworkRequest request;
-    request.setTransferTimeout(7000);
+    request.setTransferTimeout(requestTimeoutMsecs);
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
 
     request.setUrl(QString("%1v1/services").arg(m_gatewayEndpoint));
@@ -377,13 +379,6 @@ ErrorCode ApiController::getServicesList(QByteArray &responseBody)
 
     auto errorCode = checkErrors(sslErrors, reply);
     reply->deleteLater();
-
-    if (errorCode == ErrorCode::NoError) {
-        if (!responseBody.contains("services")) {
-            return ErrorCode::ApiServicesMissingError;
-        }
-    }
-
     return errorCode;
 }
 
@@ -397,7 +392,7 @@ ErrorCode ApiController::getConfigForService(const QString &installationUuid, co
 #endif
 
     QNetworkRequest request;
-    request.setTransferTimeout(7000);
+    request.setTransferTimeout(requestTimeoutMsecs);
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
 
     request.setUrl(QString("%1v1/config").arg(m_gatewayEndpoint));

client/core/defs.h

@@ -109,7 +109,6 @@ namespace amnezia
         ApiConfigSslError = 1104,
         ApiMissingAgwPublicKey = 1105,
         ApiConfigDecryptionError = 1106,
-        ApiServicesMissingError = 1107,
 
         // QFile errors
         OpenError = 1200,

client/core/errorstrings.cpp

@@ -63,8 +63,7 @@ QString errorString(ErrorCode code) {
     case (ErrorCode::ApiConfigTimeoutError): errorMessage = QObject::tr("Server response timeout on api request"); break;
     case (ErrorCode::ApiMissingAgwPublicKey): errorMessage = QObject::tr("Missing AGW public key"); break;
     case (ErrorCode::ApiConfigDecryptionError): errorMessage = QObject::tr("Failed to decrypt response payload"); break;
-    case (ErrorCode::ApiServicesMissingError): errorMessage = QObject::tr("Missing list of available services"); break;
-
+      
     // QFile errors
     case(ErrorCode::OpenError): errorMessage = QObject::tr("QFile error: The file could not be opened"); break;
     case(ErrorCode::ReadError): errorMessage = QObject::tr("QFile error: An error occurred when reading from the file"); break;

client/ui/controllers/connectionController.cpp

@@ -55,7 +55,7 @@ void ConnectionController::openConnection()
         && !m_serversModel->data(serverIndex, ServersModel::Roles::HasInstalledContainers).toBool()) {
         emit updateApiConfigFromGateway();
     } else if (configVersion && m_serversModel->isApiKeyExpired(serverIndex)) {
-        qDebug() << "attempt to update api config by expires_at event";
+        qDebug() << "attempt to update api config by end_date event";
         if (configVersion == ApiConfigSources::Telegram) {
             emit updateApiConfigFromTelegram();
         } else {

client/ui/models/apiServicesModel.cpp

@@ -27,9 +27,6 @@ namespace
         constexpr char storeEndpoint[] = "store_endpoint";
 
         constexpr char isAvailable[] = "is_available";
-
-        constexpr char subscription[] = "subscription";
-        constexpr char endDate[] = "end_date";
     }
 
     namespace serviceType
@@ -54,23 +51,23 @@ QVariant ApiServicesModel::data(const QModelIndex &index, int role) const
     if (!index.isValid() || index.row() < 0 || index.row() >= static_cast<int>(rowCount()))
         return QVariant();
 
-    auto apiServiceData = m_services.at(index.row());
-    auto serviceType = apiServiceData.type;
-    auto isServiceAvailable = apiServiceData.isServiceAvailable;
+    QJsonObject service = m_services.at(index.row()).toObject();
+    QJsonObject serviceInfo = service.value(configKey::serviceInfo).toObject();
+    auto serviceType = service.value(configKey::serviceType).toString();
 
     switch (role) {
     case NameRole: {
-        return apiServiceData.serviceInfo.name;
+        return serviceInfo.value(configKey::name).toString();
     }
     case CardDescriptionRole: {
-        auto speed = apiServiceData.serviceInfo.speed;
+        auto speed = serviceInfo.value(configKey::speed).toString();
         if (serviceType == serviceType::amneziaPremium) {
             return tr("Classic VPN for comfortable work, downloading large files and watching videos. "
                       "Works for any sites. Speed up to %1 MBit/s")
                     .arg(speed);
         } else if (serviceType == serviceType::amneziaFree){
             QString description = tr("VPN to access blocked sites in regions with high levels of Internet censorship. ");
-            if (isServiceAvailable) {
+            if (service.value(configKey::isAvailable).isBool() && !service.value(configKey::isAvailable).toBool()) {
                 description += tr("<p><a style=\"color: #EB5757;\">Not available in your region. If you have VPN enabled, disable it, return to the previous screen, and try again.</a>");
             }
             return description;
@@ -86,24 +83,25 @@ QVariant ApiServicesModel::data(const QModelIndex &index, int role) const
     }
     case IsServiceAvailableRole: {
         if (serviceType == serviceType::amneziaFree) {
-            if (isServiceAvailable) {
+            if (service.value(configKey::isAvailable).isBool() && !service.value(configKey::isAvailable).toBool()) {
                 return false;
             }
         }
         return true;
     }
     case SpeedRole: {
-        return tr("%1 MBit/s").arg(apiServiceData.serviceInfo.speed);
+        auto speed = serviceInfo.value(configKey::speed).toString();
+        return tr("%1 MBit/s").arg(speed);
     }
-    case TimeLimitRole: {
-        auto timeLimit = apiServiceData.serviceInfo.timeLimit;
-        if (timeLimit == "0") {
+    case WorkPeriodRole: {
+        auto timelimit = serviceInfo.value(configKey::timelimit).toString();
+        if (timelimit == "0") {
             return "";
         }
-        return tr("%1 days").arg(timeLimit);
+        return tr("%1 days").arg(timelimit);
     }
     case RegionRole: {
-        return apiServiceData.serviceInfo.region;
+        return serviceInfo.value(configKey::region).toString();
     }
     case FeaturesRole: {
         if (serviceType == serviceType::amneziaPremium) {
@@ -115,15 +113,12 @@ QVariant ApiServicesModel::data(const QModelIndex &index, int role) const
         }
     }
     case PriceRole: {
-        auto price = apiServiceData.serviceInfo.price;
+        auto price = serviceInfo.value(configKey::price).toString();
         if (price == "free") {
             return tr("Free");
         }
         return tr("%1 $/month").arg(price);
     }
-    case EndDateRole: {
-        return QDateTime::fromString(apiServiceData.subscription.endDate, Qt::ISODate).toLocalTime().toString("d MMM yyyy");
-    }
     }
 
     return QVariant();
@@ -133,18 +128,15 @@ void ApiServicesModel::updateModel(const QJsonObject &data)
 {
     beginResetModel();
 
-    m_services.clear();
-
     m_countryCode = data.value(configKey::userCountryCode).toString();
-    auto services = data.value(configKey::services).toArray();
+    m_services = data.value(configKey::services).toArray();
+    if (m_services.isEmpty()) {
+        QJsonObject service;
+        service.insert(configKey::serviceInfo, data.value(configKey::serviceInfo));
+        service.insert(configKey::serviceType, data.value(configKey::serviceType));
 
-    if (services.isEmpty()) {
-        m_services.push_back(getApiServicesData(data));
+        m_services.push_back(service);
         m_selectedServiceIndex = 0;
-    } else {
-        for (const auto &service : services) {
-            m_services.push_back(getApiServicesData(service.toObject()));
-        }
     }
 
     endResetModel();
@@ -157,32 +149,32 @@ void ApiServicesModel::setServiceIndex(const int index)
 
 QJsonObject ApiServicesModel::getSelectedServiceInfo()
 {
-    auto service = m_services.at(m_selectedServiceIndex);
-    return service.serviceInfo.object;
+    QJsonObject service = m_services.at(m_selectedServiceIndex).toObject();
+    return service.value(configKey::serviceInfo).toObject();
 }
 
 QString ApiServicesModel::getSelectedServiceType()
 {
-    auto service = m_services.at(m_selectedServiceIndex);
-    return service.type;
+    QJsonObject service = m_services.at(m_selectedServiceIndex).toObject();
+    return service.value(configKey::serviceType).toString();
 }
 
 QString ApiServicesModel::getSelectedServiceProtocol()
 {
-    auto service = m_services.at(m_selectedServiceIndex);
-    return service.protocol;
+    QJsonObject service = m_services.at(m_selectedServiceIndex).toObject();
+    return service.value(configKey::serviceProtocol).toString();
 }
 
 QString ApiServicesModel::getSelectedServiceName()
 {
-    auto service = m_services.at(m_selectedServiceIndex);
-    return service.serviceInfo.name;
+    auto modelIndex = index(m_selectedServiceIndex, 0);
+    return data(modelIndex, ApiServicesModel::Roles::NameRole).toString();
 }
 
 QJsonArray ApiServicesModel::getSelectedServiceCountries()
 {
-    auto service = m_services.at(m_selectedServiceIndex);
-    return service.availableCountries;
+    QJsonObject service = m_services.at(m_selectedServiceIndex).toObject();
+    return service.value(configKey::availableCountries).toArray();
 }
 
 QString ApiServicesModel::getCountryCode()
@@ -192,8 +184,8 @@ QString ApiServicesModel::getCountryCode()
 
 QString ApiServicesModel::getStoreEndpoint()
 {
-    auto service = m_services.at(m_selectedServiceIndex);
-    return service.storeEndpoint;
+    QJsonObject service = m_services.at(m_selectedServiceIndex).toObject();
+    return service.value(configKey::storeEndpoint).toString();
 }
 
 QVariant ApiServicesModel::getSelectedServiceData(const QString roleString)
@@ -217,46 +209,10 @@ QHash<int, QByteArray> ApiServicesModel::roleNames() const
     roles[ServiceDescriptionRole] = "serviceDescription";
     roles[IsServiceAvailableRole] = "isServiceAvailable";
     roles[SpeedRole] = "speed";
-    roles[TimeLimitRole] = "timeLimit";
+    roles[WorkPeriodRole] = "workPeriod";
     roles[RegionRole] = "region";
     roles[FeaturesRole] = "features";
     roles[PriceRole] = "price";
-    roles[EndDateRole] = "endDate";
 
     return roles;
 }
-
-ApiServicesModel::ApiServicesData ApiServicesModel::getApiServicesData(const QJsonObject &data)
-{
-    auto serviceInfo =  data.value(configKey::serviceInfo).toObject();
-    auto serviceType = data.value(configKey::serviceType).toString();
-    auto serviceProtocol = data.value(configKey::serviceProtocol).toString();
-    auto availableCountries = data.value(configKey::availableCountries).toArray();
-
-    auto subscriptionObject = data.value(configKey::subscription).toObject();
-
-    ApiServicesData serviceData;
-    serviceData.serviceInfo.name = serviceInfo.value(configKey::name).toString();
-    serviceData.serviceInfo.price = serviceInfo.value(configKey::price).toString();
-    serviceData.serviceInfo.region = serviceInfo.value(configKey::region).toString();
-    serviceData.serviceInfo.speed = serviceInfo.value(configKey::speed).toString();
-    serviceData.serviceInfo.timeLimit = serviceInfo.value(configKey::timelimit).toString();
-
-    serviceData.type = serviceType;
-    serviceData.protocol = serviceProtocol;
-
-    serviceData.storeEndpoint = serviceInfo.value(configKey::storeEndpoint).toString();
-
-    if (serviceInfo.value(configKey::isAvailable).isBool()) {
-        serviceData.isServiceAvailable = data.value(configKey::isAvailable).toBool();
-    } else {
-        serviceData.isServiceAvailable = true;
-    }
-
-    serviceData.serviceInfo.object = serviceInfo;
-    serviceData.availableCountries = availableCountries;
-
-    serviceData.subscription.endDate = subscriptionObject.value(configKey::endDate).toString();
-
-    return serviceData;
-}

client/ui/models/apiServicesModel.h

@@ -3,7 +3,6 @@
 
 #include <QAbstractListModel>
 #include <QJsonArray>
-#include <QJsonObject>
 
 class ApiServicesModel : public QAbstractListModel
 {
@@ -16,11 +15,10 @@ public:
         ServiceDescriptionRole,
         IsServiceAvailableRole,
         SpeedRole,
-        TimeLimitRole,
+        WorkPeriodRole,
         RegionRole,
         FeaturesRole,
-        PriceRole,
-        EndDateRole
+        PriceRole
     };
 
     explicit ApiServicesModel(QObject *parent = nullptr);
@@ -50,40 +48,8 @@ protected:
     QHash<int, QByteArray> roleNames() const override;
 
 private:
-    struct ServiceInfo
-    {
-        QString name;
-        QString speed;
-        QString timeLimit;
-        QString region;
-        QString price;
-
-        QJsonObject object;
-    };
-
-    struct Subscription
-    {
-        QString endDate;
-    };
-
-    struct ApiServicesData
-    {
-        bool isServiceAvailable;
-
-        QString type;
-        QString protocol;
-        QString storeEndpoint;
-
-        ServiceInfo serviceInfo;
-        Subscription subscription;
-
-        QJsonArray availableCountries;
-    };
-
-    ApiServicesData getApiServicesData(const QJsonObject &data);
-
     QString m_countryCode;
-    QVector<ApiServicesData> m_services;
+    QJsonArray m_services;
 
     int m_selectedServiceIndex;
 };

client/ui/models/servers_model.cpp

@@ -22,7 +22,7 @@ namespace
         constexpr char serviceProtocol[] = "service_protocol";
 
         constexpr char publicKeyInfo[] = "public_key";
-        constexpr char expiresAt[] = "expires_at";
+        constexpr char endDate[] = "end_date";
     }
 }
 
@@ -39,9 +39,6 @@ ServersModel::ServersModel(std::shared_ptr<Settings> settings, QObject *parent)
         emit ServersModel::defaultServerNameChanged();
         updateDefaultServerContainersModel();
     });
-
-    connect(this, &ServersModel::processedServerIndexChanged, this, &ServersModel::processedServerChanged);
-    connect(this, &ServersModel::dataChanged, this, &ServersModel::processedServerChanged);
 }
 
 int ServersModel::rowCount(const QModelIndex &parent) const
@@ -82,12 +79,6 @@ bool ServersModel::setData(const QModelIndex &index, const QVariant &value, int
     return true;
 }
 
-bool ServersModel::setData(const int index, const QVariant &value, int role)
-{
-    QModelIndex modelIndex = this->index(index);
-    return setData(modelIndex, value, role);
-}
-
 QVariant ServersModel::data(const QModelIndex &index, int role) const
 {
     if (!index.isValid() || index.row() < 0 || index.row() >= static_cast<int>(m_servers.size())) {
@@ -688,18 +679,6 @@ QVariant ServersModel::getProcessedServerData(const QString roleString)
     return {};
 }
 
-bool ServersModel::setProcessedServerData(const QString &roleString, const QVariant &value)
-{
-    const auto roles = roleNames();
-    for (auto it = roles.begin(); it != roles.end(); it++) {
-        if (QString(it.value()) == roleString) {
-            return setData(m_processedServerIndex, value, it.key());
-        }
-    }
-
-    return false;
-}
-
 bool ServersModel::isDefaultServerDefaultContainerHasSplitTunneling()
 {
     auto server = m_servers.at(m_defaultServerIndex).toObject();
@@ -739,9 +718,9 @@ bool ServersModel::isApiKeyExpired(const int serverIndex)
     auto apiConfig = serverConfig.value(configKey::apiConfig).toObject();
 
     auto publicKeyInfo = apiConfig.value(configKey::publicKeyInfo).toObject();
-    const QString expiresAt = publicKeyInfo.value(configKey::expiresAt).toString();
-    if (expiresAt.isEmpty()) {
-        publicKeyInfo.insert(configKey::expiresAt, QDateTime::currentDateTimeUtc().addDays(1).toString(Qt::ISODate));
+    const QString endDate = publicKeyInfo.value(configKey::endDate).toString();
+    if (endDate.isEmpty()) {
+        publicKeyInfo.insert(configKey::endDate, QDateTime::currentDateTimeUtc().addDays(1).toString(Qt::ISODate));
         apiConfig.insert(configKey::publicKeyInfo, publicKeyInfo);
         serverConfig.insert(configKey::apiConfig, apiConfig);
         editServer(serverConfig, serverIndex);
@@ -749,8 +728,8 @@ bool ServersModel::isApiKeyExpired(const int serverIndex)
         return false;
     }
 
-    auto expiresAtDateTime = QDateTime::fromString(expiresAt, Qt::ISODate).toUTC();
-    if (expiresAtDateTime < QDateTime::currentDateTimeUtc()) {
+    auto endDateDateTime = QDateTime::fromString(endDate, Qt::ISODate).toUTC();
+    if (endDateDateTime < QDateTime::currentDateTimeUtc()) {
         return true;
     }
     return false;

client/ui/models/servers_model.h

@@ -46,7 +46,6 @@ public:
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
     bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
-    bool setData(const int index, const QVariant &value, int role = Qt::EditRole);
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     QVariant data(const int index, int role = Qt::DisplayRole) const;
 
@@ -116,7 +115,6 @@ public slots:
     QVariant getDefaultServerData(const QString roleString);
 
     QVariant getProcessedServerData(const QString roleString);
-    bool setProcessedServerData(const QString &roleString, const QVariant &value);
 
     bool isDefaultServerDefaultContainerHasSplitTunneling();
 
@@ -129,9 +127,6 @@ protected:
 
 signals:
     void processedServerIndexChanged(const int index);
-    // emitted when the processed server index or processed server data is changed
-    void processedServerChanged();
-
     void defaultServerIndexChanged(const int index);
     void defaultServerNameChanged();
     void defaultServerDescriptionChanged();

client/ui/qml/Pages2/PageSettingsApiLanguageList.qml

@@ -54,14 +54,8 @@ PageType {
                         imageSource: "qrc:/images/controls/download.svg"
 
                         checked: index === ApiCountryModel.currentIndex
-                        checkable: !ConnectionController.isConnected
 
                         onClicked: {
-                            if (ConnectionController.isConnected) {
-                                PageController.showNotificationMessage(qsTr("Unable change server location while there is an active connection"))
-                                return
-                            }
-
                             if (index !== ApiCountryModel.currentIndex) {
                                 PageController.showBusyIndicator(true)
                                 var prevIndex = ApiCountryModel.currentIndex

client/ui/qml/Pages2/PageSettingsApiServerInfo.qml

@@ -56,15 +56,12 @@ PageType {
             }
 
             LabelWithImageType {
-                property bool showSubscriptionEndDate: ServersModel.getProcessedServerData("isCountrySelectionAvailable")
-
                 Layout.fillWidth: true
                 Layout.margins: 16
 
                 imageSource: "qrc:/images/controls/history.svg"
-                leftText: showSubscriptionEndDate ? qsTr("Valid until") : qsTr("Work period")
-                rightText: showSubscriptionEndDate ? ApiServicesModel.getSelectedServiceData("endDate")
-                                                   : ApiServicesModel.getSelectedServiceData("workPeriod")
+                leftText: qsTr("Work period")
+                rightText: ApiServicesModel.getSelectedServiceData("workPeriod")
 
                 visible: rightText !== ""
             }

client/ui/qml/Pages2/PageSettingsServerInfo.qml

@@ -25,8 +25,6 @@ PageType {
     property int pageSettingsApiServerInfo: 3
     property int pageSettingsApiLanguageList: 4
 
-    property var processedServer
-
     defaultActiveFocusItem: focusItem
 
     Connections {
@@ -37,18 +35,8 @@ PageType {
         }
     }
 
-    Connections {
-        target: ServersModel
-
-        function onProcessedServerChanged() {
-            root.processedServer = proxyServersModel.get(0)
-        }
-    }
-
     SortFilterProxyModel {
         id: proxyServersModel
-        objectName: "proxyServersModel"
-
         sourceModel: ServersModel
         filters: [
             ValueFilter {
@@ -56,139 +44,147 @@ PageType {
                 value: true
             }
         ]
-
-        Component.onCompleted: {
-            root.processedServer = proxyServersModel.get(0)
-        }
     }
 
     Item {
         id: focusItem
-        //KeyNavigation.tab: header
+        KeyNavigation.tab: header
     }
 
     ColumnLayout {
         anchors.fill: parent
 
-        spacing: 4
+        spacing: 16
 
-        BackButtonType {
-            id: backButton
+        Repeater {
+            id: header
+            model: proxyServersModel
 
-            Layout.topMargin: 20
-            KeyNavigation.tab: headerContent.actionButton
-
-            backButtonFunction: function() {
-                if (nestedStackView.currentIndex === root.pageSettingsApiServerInfo &&
-                        root.processedServer.isCountrySelectionAvailable) {
-                    nestedStackView.currentIndex = root.pageSettingsApiLanguageList
-                } else {
-                    PageController.closePage()
-                }
-            }
-        }
-
-        HeaderType {
-            id: headerContent
-            Layout.fillWidth: true
-            Layout.leftMargin: 16
-            Layout.rightMargin: 16
-
-            actionButtonImage: nestedStackView.currentIndex === root.pageSettingsApiLanguageList ? "qrc:/images/controls/settings.svg"
-                                                                                                 : "qrc:/images/controls/edit-3.svg"
-
-            headerText: root.processedServer.name
-            descriptionText: {
-                if (root.processedServer.isServerFromGatewayApi) {
-                    if (nestedStackView.currentIndex === root.pageSettingsApiLanguageList) {
-                        return qsTr("Subscription is valid until ") + ApiServicesModel.getSelectedServiceData("endDate")
-                    } else {
-                        return ApiServicesModel.getSelectedServiceData("serviceDescription")
-                    }
-                } else if (root.processedServer.isServerFromTelegramApi) {
-                    return root.processedServer.serverDescription
-                } else if (root.processedServer.hasWriteAccess) {
-                    return root.processedServer.credentialsLogin + " · " + root.processedServer.hostName
-                } else {
-                    return root.processedServer.hostName
-                }
+            activeFocusOnTab: true
+            onFocusChanged: {
+                header.itemAt(0).focusItem.forceActiveFocus()
             }
 
-            KeyNavigation.tab: tabBar
+            delegate: ColumnLayout {
 
-            actionButtonFunction: function() {
-                if (nestedStackView.currentIndex === root.pageSettingsApiLanguageList) {
-                    nestedStackView.currentIndex = root.pageSettingsApiServerInfo
-                } else {
-                    serverNameEditDrawer.open()
-                }
-            }
-        }
+                property alias focusItem: backButton
 
-        DrawerType2 {
-            id: serverNameEditDrawer
+                id: content
 
-            parent: root
+                Layout.topMargin: 20
 
-            anchors.fill: parent
-            expandedHeight: root.height * 0.35
+                BackButtonType {
+                    id: backButton
+                    KeyNavigation.tab: headerContent.actionButton
 
-            onClosed: {
-                if (!GC.isMobile()) {
-                    headerContent.actionButton.forceActiveFocus()
-                }
-            }
-
-            expandedContent: ColumnLayout {
-                anchors.top: parent.top
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.topMargin: 32
-                anchors.leftMargin: 16
-                anchors.rightMargin: 16
-
-                Connections {
-                    target: serverNameEditDrawer
-                    enabled: !GC.isMobile()
-                    function onOpened() {
-                        serverName.textField.forceActiveFocus()
+                    backButtonFunction: function() {
+                        if (nestedStackView.currentIndex === root.pageSettingsApiServerInfo &&
+                                ServersModel.getProcessedServerData("isCountrySelectionAvailable")) {
+                            nestedStackView.currentIndex = root.pageSettingsApiLanguageList
+                        } else {
+                            PageController.closePage()
+                        }
                     }
                 }
 
-                Item {
-                    id: focusItem1
-                    KeyNavigation.tab: serverName.textField
+                HeaderType {
+                    id: headerContent
+                    Layout.fillWidth: true
+                    Layout.leftMargin: 16
+                    Layout.rightMargin: 16
+
+                    actionButtonImage: nestedStackView.currentIndex === root.pageSettingsApiLanguageList ? "qrc:/images/controls/settings.svg" : "qrc:/images/controls/edit-3.svg"
+
+                    headerText: name
+                    descriptionText: {
+                        if (ServersModel.getProcessedServerData("isServerFromGatewayApi")) {
+                            return ApiServicesModel.getSelectedServiceData("serviceDescription")
+                        } else if (ServersModel.getProcessedServerData("isServerFromTelegramApi")) {
+                            return serverDescription
+                        } else if (ServersModel.isProcessedServerHasWriteAccess()) {
+                            return credentialsLogin + " · " + hostName
+                        } else {
+                            return hostName
+                        }
+                    }
+
+                    KeyNavigation.tab: tabBar
+
+                    actionButtonFunction: function() {
+                        if (nestedStackView.currentIndex === root.pageSettingsApiLanguageList) {
+                            nestedStackView.currentIndex = root.pageSettingsApiServerInfo
+                        } else {
+                            serverNameEditDrawer.open()
+                        }
+                    }
                 }
 
-                TextFieldWithHeaderType {
-                    id: serverName
+                DrawerType2 {
+                    id: serverNameEditDrawer
 
-                    Layout.fillWidth: true
-                    headerText: qsTr("Server name")
-                    textFieldText: root.processedServer.name
-                    textField.maximumLength: 30
-                    checkEmptyText: true
+                    parent: root
 
-                    KeyNavigation.tab: saveButton
-                }
+                    anchors.fill: parent
+                    expandedHeight: root.height * 0.35
 
-                BasicButtonType {
-                    id: saveButton
+                    onClosed: {
+                        if (!GC.isMobile()) {
+                            headerContent.actionButton.forceActiveFocus()
+                        }
+                    }
 
-                    Layout.fillWidth: true
+                    expandedContent: ColumnLayout {
+                        anchors.top: parent.top
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+                        anchors.topMargin: 32
+                        anchors.leftMargin: 16
+                        anchors.rightMargin: 16
 
-                    text: qsTr("Save")
-                    KeyNavigation.tab: focusItem1
-
-                    clickedFunc: function() {
-                        if (serverName.textFieldText === "") {
-                            return
+                        Connections {
+                            target: serverNameEditDrawer
+                            enabled: !GC.isMobile()
+                            function onOpened() {
+                                serverName.textField.forceActiveFocus()
+                            }
                         }
 
-                        if (serverName.textFieldText !== root.processedServer.name) {
-                            ServersModel.setProcessedServerData("name", serverName.textFieldText);
+                        Item {
+                            id: focusItem1
+                            KeyNavigation.tab: serverName.textField
+                        }
+
+                        TextFieldWithHeaderType {
+                            id: serverName
+
+                            Layout.fillWidth: true
+                            headerText: qsTr("Server name")
+                            textFieldText: name
+                            textField.maximumLength: 30
+                            checkEmptyText: true
+
+                            KeyNavigation.tab: saveButton
+                        }
+
+                        BasicButtonType {
+                            id: saveButton
+
+                            Layout.fillWidth: true
+
+                            text: qsTr("Save")
+                            KeyNavigation.tab: focusItem1
+
+                            clickedFunc: function() {
+                                if (serverName.textFieldText === "") {
+                                    return
+                                }
+
+                                if (serverName.textFieldText !== name) {
+                                    name = serverName.textFieldText
+                                }
+                                serverNameEditDrawer.close()
+                            }
                         }
-                        serverNameEditDrawer.close()
                     }
                 }
             }
@@ -261,7 +257,8 @@ PageType {
 
         StackLayout {
             id: nestedStackView
-            Layout.fillWidth: true
+            Layout.preferredWidth: root.width
+            Layout.preferredHeight: root.height - tabBar.implicitHeight - header.implicitHeight
 
             currentIndex: ServersModel.getProcessedServerData("isServerFromGatewayApi") ?
                               (ServersModel.getProcessedServerData("isCountrySelectionAvailable") ?