fix: add core skippltgormController

fix: use list(APPEND LIBS) instead of target_link_libraries for gamepad on Android
fix: add binary dir to add_subdirectory calls in 3rdparty.cmake
2026-07-03 14:07:39 +02:00 · 2026-06-30 16:09:41 +03:00 · 2026-06-30 15:39:51 +03:00 · 2026-06-25 11:02:25 +03:00 · 2026-06-24 00:08:21 +08:00 · 2026-06-24 00:07:42 +08:00
119 changed files with 1240 additions and 3522 deletions
@@ -157,7 +157,7 @@ jobs:
      run: pip install "conan==2.28.0"

    - name: 'Build dependencies'
-      run: cmake -S . -B build -G "Visual Studio 17 2022" -DPREBUILTS_ONLY=1
+      run: cmake -S . -B build -DPREBUILTS_ONLY=1
    
    - name: 'Authorize in remote'
      if: github.ref == 'refs/heads/dev'
@@ -4,7 +4,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

 set(PROJECT AmneziaVPN)
-set(AMNEZIAVPN_VERSION 4.9.0.1)
+set(AMNEZIAVPN_VERSION 4.9.0.2)

 set(QT_CREATOR_SKIP_PACKAGE_MANAGER_SETUP ON CACHE BOOL "" FORCE)
 set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES
@@ -28,7 +28,7 @@ string(TIMESTAMP CURRENT_DATE "%Y-%m-%d")
 set(RELEASE_DATE "${CURRENT_DATE}")

 set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
-set(APP_ANDROID_VERSION_CODE 2122)
+set(APP_ANDROID_VERSION_CODE 2123)

 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
    set(MZ_PLATFORM_NAME "linux")
@@ -119,7 +119,13 @@ void AmneziaApplication::init()
                win->setPersistentSceneGraph(true);
                win->setPersistentGraphics(true);
 #endif
+#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
                win->show();
+#else
+                if (!m_coreController || !m_coreController->pageController()->shouldStartMinimized()) {
+                    win->show();
+                }
+#endif
            }
        },
        Qt::QueuedConnection);
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:type="linear"
+        android:angle="135"
+        android:startColor="#2A2A2E"
+        android:centerColor="#17171A"
+        android:endColor="#0E0E11" />
+</shape>
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/ic_amnezia_round"
+    android:insetLeft="19.5%"
+    android:insetTop="19.5%"
+    android:insetRight="19.5%"
+    android:insetBottom="19.5%" />
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
+</adaptive-icon>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
+</adaptive-icon>
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="NoActionBar">
+        <item name="android:windowBackground">@color/black</item>
+        <item name="android:colorBackground">@color/black</item>
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:enforceNavigationBarContrast">false</item>
+        <item name="android:enforceStatusBarContrast">false</item>
+
+        <item name="android:windowSplashScreenBackground">@color/ic_launcher_background</item>
+        <item name="android:windowSplashScreenIconBackgroundColor">@color/ic_launcher_background</item>
+        <item name="android:windowSplashScreenAnimatedIcon">@mipmap/icon</item>
+    </style>
+</resources>
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#0E0E11</color>
+</resources>
@@ -2,7 +2,7 @@ set(CLIENT_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/..)

 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/Modules;${CMAKE_MODULE_PATH}")

-add_subdirectory(${CLIENT_ROOT_DIR}/3rd/SortFilterProxyModel)
+add_subdirectory(${CLIENT_ROOT_DIR}/3rd/SortFilterProxyModel ${CMAKE_BINARY_DIR}/3rd/SortFilterProxyModel)
 set(LIBS ${LIBS} SortFilterProxyModel)
 include(${CLIENT_ROOT_DIR}/cmake/QSimpleCrypto.cmake)

@@ -12,20 +12,20 @@ add_compile_definitions(_WINSOCKAPI_)

 set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
 set(BUILD_WITH_QT6 ON)
-add_subdirectory(${CLIENT_ROOT_DIR}/3rd/qtkeychain EXCLUDE_FROM_ALL)
+add_subdirectory(${CLIENT_ROOT_DIR}/3rd/qtkeychain ${CMAKE_BINARY_DIR}/3rd/qtkeychain EXCLUDE_FROM_ALL)

 if(ANDROID)
    # Use qtgamepad from amnezia-vpn/qtgamepad repository
    # Only if Qt6CorePrivate is available (required by qtgamepad)
    find_package(Qt6CorePrivate CONFIG QUIET)
    if(Qt6CorePrivate_FOUND)
-        add_subdirectory(${CLIENT_ROOT_DIR}/3rd/qtgamepad)
+        add_subdirectory(${CLIENT_ROOT_DIR}/3rd/qtgamepad ${CMAKE_BINARY_DIR}/3rd/qtgamepad)
        # Link both the C++ module and QML plugin
        if(TARGET GamepadLegacy)
-            target_link_libraries(${PROJECT} PRIVATE GamepadLegacy)
+            list(APPEND LIBS GamepadLegacy)
        endif()
        if(TARGET GamepadLegacyQuickPrivate)
-            target_link_libraries(${PROJECT} PRIVATE GamepadLegacyQuickPrivate)
+            list(APPEND LIBS GamepadLegacyQuickPrivate)
        endif()
        message(STATUS "Gamepad support enabled for Android")
    else()
@@ -152,5 +152,5 @@ message(${QtCore_location})
 get_filename_component(QT_BIN_DIR_DETECTED "${QtCore_location}/../../../../../bin" ABSOLUTE)

 add_custom_command(TARGET ${PROJECT} POST_BUILD
-    COMMAND ${QT_BIN_DIR_DETECTED}/macdeployqt $<TARGET_BUNDLE_DIR:AmneziaVPN> -appstore-compliant -qmldir=${CMAKE_CURRENT_SOURCE_DIR}
+    COMMAND ${QT_BIN_DIR_DETECTED}/macdeployqt $<TARGET_BUNDLE_DIR:AmneziaVPN> -appstore-compliant -qmldir=${CMAKE_CURRENT_SOURCE_DIR} -no-codesign
 )
@@ -244,11 +244,7 @@ ErrorCode XrayConfigurator::applyServerSettingsToRemote(const ServerCredentials
                    << "container=" << static_cast<int>(container) << "host=" << credentials.hostName
                    << "transport=" << srv.transport << "security=" << srv.security << "port=" << srv.port
                    << "appendClient=" << appendNewClient;
-    QString flowValue = srv.flow;
-    if (flowValue.isEmpty() && srv.security == QLatin1String("reality")) {
-        flowValue = QStringLiteral("xtls-rprx-vision");
-    }
-
+    const QString flowValue = srv.flow;
    QString realityPublicKey;
    QString realityShortId;
    if (srv.security == QLatin1String("reality")) {
@@ -563,9 +559,12 @@ QJsonObject XrayConfigurator::buildStreamSettings(const XrayServerConfig &srv, c
        if (pad.obfsMode) {
            if (!pad.bytesMin.isEmpty() || !pad.bytesMax.isEmpty()) {
                QJsonObject br;
-                br[QStringLiteral("from")] = pad.bytesMin.isEmpty() ? 1 : pad.bytesMin.toInt();
-                br[QStringLiteral("to")] = pad.bytesMax.isEmpty() ? (pad.bytesMin.isEmpty() ? 256 : pad.bytesMin.toInt())
-                                                                  : pad.bytesMax.toInt();
+                const int fromV = pad.bytesMin.isEmpty() ? 1 : pad.bytesMin.toInt();
+                int toV = pad.bytesMax.isEmpty() ? 256 : pad.bytesMax.toInt();
+                if (toV < fromV)
+                    toV = fromV;
+                br[QStringLiteral("from")] = fromV;
+                br[QStringLiteral("to")] = toV;
                xo[QStringLiteral("xPaddingBytes")] = br;
            }
            xo[QStringLiteral("xPaddingKey")] = pad.key.isEmpty() ? QStringLiteral("x_padding") : pad.key;
@@ -49,14 +49,96 @@ void ConnectionController::setConnectionState(Vpn::ConnectionState state)
    }
 }

-ErrorCode ConnectionController::prepareConnection(const QString &serverId,
-                                                 QJsonObject& vpnConfiguration,
-                                                 DockerContainer& container)
+ErrorCode ConnectionController::defaultContainerForServer(const QString &serverId, DockerContainer &container) const
 {
+    const auto kind = m_serversRepository->serverKind(serverId);
+    switch (kind) {
+    case serverConfigUtils::ConfigType::SelfHostedAdmin: {
+        const auto cfg = m_serversRepository->selfHostedAdminConfig(serverId);
+        if (!cfg.has_value()) {
+            return ErrorCode::InternalError;
+        }
+        container = cfg->defaultContainer;
+        return ErrorCode::NoError;
+    }
+    case serverConfigUtils::ConfigType::SelfHostedUser: {
+        const auto cfg = m_serversRepository->selfHostedUserConfig(serverId);
+        if (!cfg.has_value()) {
+            return ErrorCode::InternalError;
+        }
+        container = cfg->defaultContainer;
+        return ErrorCode::NoError;
+    }
+    case serverConfigUtils::ConfigType::Native: {
+        const auto cfg = m_serversRepository->nativeConfig(serverId);
+        if (!cfg.has_value()) {
+            return ErrorCode::InternalError;
+        }
+        container = cfg->defaultContainer;
+        return ErrorCode::NoError;
+    }
+    case serverConfigUtils::ConfigType::AmneziaPremiumV2:
+    case serverConfigUtils::ConfigType::AmneziaFreeV3:
+    case serverConfigUtils::ConfigType::ExternalPremium: {
+        const auto cfg = m_serversRepository->apiV2Config(serverId);
+        if (!cfg.has_value()) {
+            return ErrorCode::InternalError;
+        }
+        container = cfg->defaultContainer;
+        return ErrorCode::NoError;
+    }
+    case serverConfigUtils::ConfigType::AmneziaPremiumV1:
+    case serverConfigUtils::ConfigType::AmneziaFreeV2:
+        return ErrorCode::LegacyApiV1NotSupportedError;
+    case serverConfigUtils::ConfigType::Invalid:
+    default:
+        return ErrorCode::InternalError;
+    }
+}
+
+ErrorCode ConnectionController::isConnectionSupported(const QString &serverId) const
+{
+    if (serverId.isEmpty()) {
+        return ErrorCode::InternalError;
+    }
+
    if (!isServiceReady()) {
        return ErrorCode::AmneziaServiceNotRunning;
    }

+    const serverConfigUtils::ConfigType kind = m_serversRepository->serverKind(serverId);
+    if (serverConfigUtils::isLegacyApiSubscription(kind)) {
+        return ErrorCode::LegacyApiV1NotSupportedError;
+    }
+
+    DockerContainer container = DockerContainer::None;
+    const ErrorCode errorCode = defaultContainerForServer(serverId, container);
+    if (errorCode != ErrorCode::NoError) {
+        return errorCode;
+    }
+
+    if (container == DockerContainer::None) {
+        if (serverConfigUtils::isApiV2Subscription(kind)) {
+            return ErrorCode::NoError;
+        }
+        return ErrorCode::NoInstalledContainersError;
+    }
+
+    if (ContainerUtils::isUnsupportedContainer(container)) {
+        return ErrorCode::LegacyContainerNotSupportedError;
+    }
+
+    if (!isContainerSupported(container)) {
+        return ErrorCode::NotSupportedOnThisPlatform;
+    }
+
+    return ErrorCode::NoError;
+}
+
+ErrorCode ConnectionController::prepareConnection(const QString &serverId,
+                                                 QJsonObject& vpnConfiguration,
+                                                 DockerContainer& container)
+{
    ContainerConfig containerConfigModel;
    QPair<QString, QString> dns;
    QString hostName;
@@ -120,10 +202,6 @@ ErrorCode ConnectionController::prepareConnection(const QString &serverId,
        return ErrorCode::InternalError;
    }

-    if (!isContainerSupported(container)) {
-        return ErrorCode::NotSupportedOnThisPlatform;
-    }
-
    vpnConfiguration = createConnectionConfiguration(dns, isApiConfig, hostName, description, configVersion,
                                                     containerConfigModel, container);

@@ -34,6 +34,8 @@ public:
                               QJsonObject& vpnConfiguration,
                               DockerContainer& container);

+    ErrorCode isConnectionSupported(const QString &serverId) const;
+
    ErrorCode openConnection(const QString &serverId);

    void closeConnection();
@@ -73,6 +75,8 @@ signals:
 #endif

 private:
+    ErrorCode defaultContainerForServer(const QString &serverId, DockerContainer &container) const;
+
    SecureServersRepository* m_serversRepository;
    SecureAppSettingsRepository* m_appSettingsRepository;
    VpnConnection* m_vpnConnection;
@@ -22,7 +22,8 @@
 #endif

 CoreController::CoreController(const QSharedPointer<VpnConnection> &vpnConnection, SecureQSettings* settings,
-                               QQmlApplicationEngine *engine, QObject *parent)
+                               QQmlApplicationEngine *engine, QObject *parent,
+                               bool skipPlatformControllerInit)
    : QObject(parent), m_vpnConnection(vpnConnection), m_settings(settings), m_engine(engine)
 {
    initRepositories();
@@ -31,8 +32,10 @@ CoreController::CoreController(const QSharedPointer<VpnConnection> &vpnConnectio
    initControllers();
    initSignalHandlers();

-    initAndroidController();
-    initAppleController();
+    if (!skipPlatformControllerInit) {
+        initAndroidController();
+        initAppleController();
+    }
    initLogging();

    m_translator = new QTranslator(this);
@@ -191,7 +194,7 @@ void CoreController::initControllers()
    m_languageUiController = new LanguageUiController(m_settingsController, m_languageModel, this);
    setQmlContextProperty("LanguageUiController", m_languageUiController);

-    m_settingsUiController = new SettingsUiController(m_settingsController, m_serversController, m_languageUiController, this);
+    m_settingsUiController = new SettingsUiController(m_settingsController, m_serversController, this);
    setQmlContextProperty("SettingsController", m_settingsUiController);

    m_pageController = new PageController(m_serversController, m_settingsController, this);
@@ -203,9 +206,6 @@ void CoreController::initControllers()
    m_ipSplitTunnelingUiController = new IpSplitTunnelingUiController(m_ipSplitTunnelingController, m_ipSplitTunnelingModel, this);
    setQmlContextProperty("IpSplitTunnelingController", m_ipSplitTunnelingUiController);

-    m_serversBackupController = new ServersBackupController(m_settings, m_serversModel, m_serversUiController, m_serversController);
-    setQmlContextProperty("ServersBackupController", m_serversBackupController);
-
    m_allowedDnsUiController = new AllowedDnsUiController(m_allowedDnsController, m_allowedDnsModel, this);
    setQmlContextProperty("AllowedDnsController", m_allowedDnsUiController);

@@ -24,7 +24,6 @@
 #include "ui/controllers/settingsUiController.h"
 #include "ui/controllers/serversUiController.h"
 #include "ui/controllers/ipSplitTunnelingUiController.h"
-#include "ui/controllers/serversBackupController.h"
 #include "ui/controllers/systemController.h"
 #include "ui/controllers/languageUiController.h"
 #include "ui/controllers/updateUiController.h"
@@ -91,7 +90,8 @@ class CoreController : public QObject

 public:
    explicit CoreController(const QSharedPointer<VpnConnection> &vpnConnection, SecureQSettings* settings,
-                            QQmlApplicationEngine *engine, QObject *parent = nullptr);
+                            QQmlApplicationEngine *engine, QObject *parent = nullptr,
+                            bool skipPlatformControllerInit = false);

    PageController* pageController() const;
    void setQmlRoot();
@@ -175,7 +175,6 @@ private:
    AllowedDnsUiController* m_allowedDnsUiController;
    LanguageUiController* m_languageUiController;
    UpdateUiController* m_updateUiController;
-    ServersBackupController* m_serversBackupController;

    SubscriptionUiController* m_subscriptionUiController;
    ApiNewsUiController* m_apiNewsUiController;
@@ -1,6 +1,7 @@
 #include "coreSignalHandlers.h"

 #include <QTimer>
+#include <QtConcurrent>

 #include "core/utils/selfhosted/sshSession.h"
 #include "core/utils/errorCodes.h"
@@ -33,7 +34,6 @@
 #include "core/controllers/connectionController.h"
 #include "ui/models/clientManagementModel.h"
 #include "ui/controllers/api/apiNewsUiController.h"
-#include "ui/models/api/apiCountryModel.h"
 #include "ui/models/containersModel.h"
 #include "core/utils/containerEnum.h"

@@ -145,7 +145,9 @@ void CoreSignalHandlers::initExportControllerHandler()
            });
    connect(m_coreController->m_exportController, &ExportController::revokeClientRequested, this,
            [this](const QString &serverId, int row, DockerContainer container) {
-                m_coreController->m_usersController->revokeClient(serverId, row, container);
+                QtConcurrent::run([this, serverId, row, container]() {
+                    m_coreController->m_usersController->revokeClient(serverId, row, container);
+                });
            });
    connect(m_coreController->m_exportController, &ExportController::renameClientRequested, this,
            [this](const QString &serverId, int row, const QString &clientName, DockerContainer container) {
@@ -156,15 +158,17 @@ void CoreSignalHandlers::initExportControllerHandler()
 void CoreSignalHandlers::initImportControllerHandler()
 {
    connect(m_coreController->m_importCoreController, &ImportController::importFinished, this, [this]() {
-        if (!m_coreController->m_connectionController->isConnected()) {
-            int newServerIndex = m_coreController->m_serversController->getServersCount() - 1;
-            const QString serverId = m_coreController->m_serversController->getServerId(newServerIndex);
-            if (!serverId.isEmpty()) {
-                m_coreController->m_serversController->setDefaultServer(serverId);
-            }
-            if (m_coreController->m_serversUiController) {
-                m_coreController->m_serversUiController->setProcessedServerId(serverId);
-            }
+        if (m_coreController->m_connectionUiController->isConnected()) {
+            return;
+        }
+
+        const int newServerIndex = m_coreController->m_serversController->getServersCount() - 1;
+        const QString serverId = m_coreController->m_serversController->getServerId(newServerIndex);
+        if (!serverId.isEmpty()) {
+            m_coreController->m_serversController->setDefaultServer(serverId);
+        }
+        if (m_coreController->m_serversUiController) {
+            m_coreController->m_serversUiController->setProcessedServerId(serverId);
        }
    });
 }
@@ -176,17 +180,14 @@ void CoreSignalHandlers::initApiCountryModelUpdateHandler()
        if (processedServerId.isEmpty()) {
            return;
        }
-        
-        QJsonArray availableCountries;
-        QString serverCountryCode;

        const auto apiV2 = m_coreController->m_serversRepository->apiV2Config(processedServerId);
-        if (apiV2.has_value()) {
-            availableCountries = apiV2->apiConfig.availableCountries;
-            serverCountryCode = apiV2->apiConfig.serverCountryCode;
+        if (!apiV2.has_value()) {
+            return;
        }
-        
-        m_coreController->m_apiCountryModel->updateModel(availableCountries, serverCountryCode);
+
+        m_coreController->m_apiCountryModel->updateModel(apiV2->apiConfig.availableCountries,
+                                                           apiV2->apiConfig.serverCountryCode);
    });
 }

@@ -204,13 +205,15 @@ void CoreSignalHandlers::initAdminConfigRevokedHandler()
 {
    connect(m_coreController->m_installController, &InstallController::clientRevocationRequested, this,
            [this](const QString &serverId, const ContainerConfig &containerConfig, DockerContainer container) {
-                m_coreController->m_usersController->revokeClient(serverId, containerConfig, container);
+                QtConcurrent::run([this, serverId, containerConfig, container]() {
+                    m_coreController->m_usersController->revokeClient(serverId, containerConfig, container);
+                });
            });

    connect(m_coreController->m_installController, &InstallController::clientAppendRequested, this,
            [this](const QString &serverId, const QString &clientId, const QString &clientName, DockerContainer container) {
                m_coreController->m_usersController->appendClient(serverId, clientId, clientName, container);
-            });
+            }, Qt::DirectConnection);

    connect(m_coreController->m_usersController, &UsersController::adminConfigRevoked, m_coreController->m_installController,
            &InstallController::clearCachedProfile);
@@ -237,13 +240,16 @@ void CoreSignalHandlers::initLanguageHandler()
    connect(m_coreController->m_settingsUiController, &SettingsUiController::resetLanguageToSystem, m_coreController->m_languageUiController, [this]() {
        m_coreController->m_languageUiController->changeLanguage(m_coreController->m_languageUiController->getSystemLanguageEnum());
    });
+    connect(m_coreController->m_settingsUiController, &SettingsUiController::appLanguageChanged, m_coreController->m_languageUiController, [this]() {
+        m_coreController->m_languageUiController->onAppLanguageChanged(m_coreController->m_settingsController->getAppLanguage());
+    });
 }

 void CoreSignalHandlers::initAutoConnectHandler()
 {
    if (m_coreController->m_settingsUiController->isAutoConnectEnabled()
        && !m_coreController->m_serversController->getDefaultServerId().isEmpty()) {
-        QTimer::singleShot(1000, this, [this]() { m_coreController->m_connectionUiController->openConnection(); });
+        QTimer::singleShot(1000, this, [this]() { m_coreController->m_connectionUiController->toggleConnection(); });
    }
 }

@@ -284,6 +290,8 @@ void CoreSignalHandlers::initClientManagementModelUpdateHandler()
            m_coreController->m_clientManagementModel, &ClientManagementModel::updateModel);
    connect(m_coreController->m_usersController, &UsersController::clientRenamed,
            m_coreController->m_clientManagementModel, &ClientManagementModel::updateClientName);
+    connect(m_coreController->m_usersController, &UsersController::revokeFinished,
+            m_coreController->m_exportController, &ExportController::revokeFinished);
 }

 void CoreSignalHandlers::initSitesModelUpdateHandler()
@@ -348,6 +356,9 @@ void CoreSignalHandlers::initUnsupportedConnectDrawerHandler()
 {
    connect(m_coreController->m_subscriptionUiController, &SubscriptionUiController::unsupportedConnectDrawerRequested,
            m_coreController->m_pageController, &PageController::unsupportedConnectDrawerRequested);
+
+    connect(m_coreController->m_connectionUiController, &ConnectionUiController::unsupportedConnectDrawerRequested,
+            m_coreController->m_pageController, &PageController::unsupportedConnectDrawerRequested);
 }

 void CoreSignalHandlers::initStrictKillSwitchHandler()
@@ -48,6 +48,7 @@ signals:
    void appendClientRequested(const QString &serverId, const QString &clientId, const QString &clientName, DockerContainer container);
    void updateClientsRequested(const QString &serverId, DockerContainer container);
    void revokeClientRequested(const QString &serverId, int row, DockerContainer container);
+    void revokeFinished(ErrorCode errorCode);
    void renameClientRequested(const QString &serverId, int row, const QString &clientName, DockerContainer container);

 public slots:
@@ -72,6 +72,16 @@ namespace
        }
        return false;
    }
+
+    QString buildRemoveContainerScript(const amnezia::ScriptVars &vars, bool removeDataVolume)
+    {
+        QString script = SshSession::replaceVars(amnezia::scriptData(SharedScriptType::remove_container), vars);
+        if (removeDataVolume) {
+            script += QLatin1String("\nsudo docker volume rm -f $CONTAINER_NAME-data 2>/dev/null || true");
+            script = SshSession::replaceVars(script, vars);
+        }
+        return script;
+    }
 }

 InstallController::InstallController(SecureServersRepository *serversRepository,
@@ -120,14 +130,10 @@ ErrorCode InstallController::setupContainer(const ServerCredentials &credentials
        return e;
    qDebug().noquote() << "InstallController::setupContainer prepareHostWorker finished";

-    amnezia::ScriptVars removeContainerVars =
+    const amnezia::ScriptVars removeContainerVars =
            amnezia::genBaseVars(credentials, container, QString(), QString());
-    if (!isUpdate) {
-        removeContainerVars.append({ { "$REMOVE_CONTAINER_DATA", QStringLiteral("1") } });
-    }
-    sshSession.runScript(credentials,
-                         sshSession.replaceVars(amnezia::scriptData(SharedScriptType::remove_container),
-                                                removeContainerVars));
+    const bool removeDataVolume = !isUpdate && (container == DockerContainer::MtProxy || container == DockerContainer::Telemt);
+    sshSession.runScript(credentials, buildRemoveContainerScript(removeContainerVars, removeDataVolume));
    qDebug().noquote() << "InstallController::setupContainer removeContainer finished";

    qDebug().noquote() << "buildContainerWorker start";
@@ -152,8 +158,8 @@ ErrorCode InstallController::setupContainer(const ServerCredentials &credentials
    return startupContainerWorker(credentials, container, config, sshSession);
 }

-ErrorCode InstallController::updateContainer(const QString &serverId, DockerContainer container, const ContainerConfig &oldConfig,
-                                             ContainerConfig &newConfig)
+ErrorCode InstallController::updateServerConfig(const QString &serverId, DockerContainer container, const ContainerConfig &oldConfig,
+                                                ContainerConfig &newConfig)
 {
    if (!isUpdateDockerContainerRequired(container, oldConfig, newConfig)) {
        auto adminConfig = m_serversRepository->selfHostedAdminConfig(serverId);
@@ -185,7 +191,7 @@ ErrorCode InstallController::updateContainer(const QString &serverId, DockerCont
    SshSession sshSession(this);

    bool reinstallRequired = isReinstallContainerRequired(container, oldConfig, newConfig);
-    qDebug() << "InstallController::updateContainer for container" << container << "reinstall required is" << reinstallRequired;
+    qDebug() << "InstallController::updateServerConfig for container" << container << "reinstall required is" << reinstallRequired;

    bool xrayServerSettingsChanged = false;
    if (container == DockerContainer::Xray || container == DockerContainer::SSXray) {
@@ -213,11 +219,11 @@ ErrorCode InstallController::updateContainer(const QString &serverId, DockerCont
    if (errorCode == ErrorCode::NoError && xrayServerSettingsChanged && !skipXrayInboundSync) {
        DnsSettings dnsSettings = { m_appSettingsRepository->primaryDns(), m_appSettingsRepository->secondaryDns() };
        XrayConfigurator xrayConfigurator(&sshSession);
-        qDebug() << "InstallController::updateContainer applying Xray server inbound sync, reinstall="
+        qDebug() << "InstallController::updateServerConfig applying Xray server inbound sync, reinstall="
                 << reinstallRequired;
        errorCode = xrayConfigurator.applyServerSettingsToRemote(credentials, container, newConfig, dnsSettings, false);
        if (errorCode != ErrorCode::NoError) {
-            qDebug() << "InstallController::updateContainer Xray inbound sync failed, error="
+            qDebug() << "InstallController::updateServerConfig Xray inbound sync failed, error="
                     << static_cast<int>(errorCode);
        }
    }
@@ -228,7 +234,9 @@ ErrorCode InstallController::updateContainer(const QString &serverId, DockerCont
        } else if (container == DockerContainer::Telemt) {
            TelemtInstaller::uploadClientSettingsSnapshot(sshSession, credentials, container, newConfig);
        }
-        clearCachedProfile(serverId, container);
+        if (reinstallRequired) {
+            clearCachedProfile(serverId, container);
+        }
        adminConfig->updateContainerConfig(container, newConfig);
        m_serversRepository->editServer(serverId, adminConfig->toJson(), serverConfigUtils::ConfigType::SelfHostedAdmin);
    }
@@ -236,6 +244,41 @@ ErrorCode InstallController::updateContainer(const QString &serverId, DockerCont
    return errorCode;
 }

+ErrorCode InstallController::updateClientConfig(const QString &serverId, DockerContainer container, ContainerConfig &newConfig)
+{
+    switch (m_serversRepository->serverKind(serverId)) {
+    case serverConfigUtils::ConfigType::SelfHostedAdmin: {
+        auto config = m_serversRepository->selfHostedAdminConfig(serverId);
+        if (!config.has_value()) {
+            return ErrorCode::InternalError;
+        }
+        config->updateContainerConfig(container, newConfig);
+        m_serversRepository->editServer(serverId, config->toJson(), serverConfigUtils::ConfigType::SelfHostedAdmin);
+        return ErrorCode::NoError;
+    }
+    case serverConfigUtils::ConfigType::SelfHostedUser: {
+        auto config = m_serversRepository->selfHostedUserConfig(serverId);
+        if (!config.has_value()) {
+            return ErrorCode::InternalError;
+        }
+        config->updateContainerConfig(container, newConfig);
+        m_serversRepository->editServer(serverId, config->toJson(), serverConfigUtils::ConfigType::SelfHostedUser);
+        return ErrorCode::NoError;
+    }
+    case serverConfigUtils::ConfigType::Native: {
+        auto config = m_serversRepository->nativeConfig(serverId);
+        if (!config.has_value()) {
+            return ErrorCode::InternalError;
+        }
+        config->updateContainerConfig(container, newConfig);
+        m_serversRepository->editServer(serverId, config->toJson(), serverConfigUtils::ConfigType::Native);
+        return ErrorCode::NoError;
+    }
+    default:
+        return ErrorCode::InternalError;
+    }
+}
+
 void InstallController::clearCachedProfile(const QString &serverId, DockerContainer container)
 {
    if (ContainerUtils::containerService(container) == ServiceType::Other) {
@@ -795,8 +838,8 @@ ErrorCode InstallController::installDockerWorker(const ServerCredentials &creden
    qDebug().noquote() << "InstallController::installDockerWorker" << stdOut;

    if (container == DockerContainer::Awg2) {
-        QRegularExpression regex(R"(Linux\s+(\d+)\.(\d+)[^\d]*)");
-        QRegularExpressionMatch match = regex.match(stdOut);
+        QRegularExpression kernelVersionRegex(R"(Linux\s+(\d+)\.(\d+)[^\d]*)");
+        QRegularExpressionMatch match = kernelVersionRegex.match(stdOut);
        if (match.hasMatch()) {
            int majorVersion = match.captured(1).toInt();
            int minorVersion = match.captured(2).toInt();
@@ -809,8 +852,19 @@ ErrorCode InstallController::installDockerWorker(const ServerCredentials &creden

    if (stdOut.contains("lock"))
        return ErrorCode::ServerPacketManagerError;
-    if (stdOut.contains("command not found"))
+    if (stdOut.contains("Container runtime is not supported"))
+        return ErrorCode::ServerContainerRuntimeNotSupported;
+    
+    QRegularExpression notFoundRegex(
+        R"(^.*(?:sudo:|docker:).*not found.*$)",
+        QRegularExpression::MultilineOption);
+
+    if (notFoundRegex.match(stdOut).hasMatch()) {
        return ErrorCode::ServerDockerFailedError;
+    }
+    
+    if (stdOut.contains("Container runtime service not running"))
+        return ErrorCode::ContainerRuntimeServiceNotRunning;

    return error;
 }
@@ -847,7 +901,7 @@ ErrorCode InstallController::isUserInSudo(const ServerCredentials &credentials,
        return ErrorCode::ServerUserNotInSudo;
    if (stdOut.contains("can't cd to") || stdOut.contains("Permission denied") || stdOut.contains("No such file or directory"))
        return ErrorCode::ServerUserDirectoryNotAccessible;
-    if (stdOut.contains("sudoers") || stdOut.contains("is not allowed to run sudo on"))
+    if (stdOut.contains(QRegularExpression(R"(\bsudoers\b)")) || stdOut.contains("is not allowed to") || stdOut.contains("can't do that"))
        return ErrorCode::ServerUserNotAllowedInSudoers;
    if (stdOut.contains("password is required") || stdOut.contains("authentication is required"))
        return ErrorCode::ServerUserPasswordRequired;
@@ -980,12 +1034,11 @@ ErrorCode InstallController::removeContainer(const QString &serverId, DockerCont
        return ErrorCode::InternalError;
    }
    SshSession sshSession(this);
-    amnezia::ScriptVars removeContainerVars =
+    const amnezia::ScriptVars removeContainerVars =
            amnezia::genBaseVars(credentials, container, QString(), QString());
-    removeContainerVars.append({ { "$REMOVE_CONTAINER_DATA", QStringLiteral("1") } });
-    ErrorCode errorCode = sshSession.runScript(
-            credentials,
-            sshSession.replaceVars(amnezia::scriptData(SharedScriptType::remove_container), removeContainerVars));
+    const bool removeDataVolume = (container == DockerContainer::MtProxy || container == DockerContainer::Telemt);
+    ErrorCode errorCode =
+            sshSession.runScript(credentials, buildRemoveContainerScript(removeContainerVars, removeDataVolume));

    if (errorCode == ErrorCode::NoError) {
        QMap<DockerContainer, ContainerConfig> containers = adminConfig->containers;
@@ -1463,7 +1516,7 @@ ErrorCode InstallController::getAlreadyInstalledContainers(const ServerCredentia
            QString transportProtoStr = containerAndPortMatch.captured(3);
            DockerContainer container = ContainerUtils::containerFromString(name);

-            if (container == DockerContainer::None) {
+            if (container == DockerContainer::None || ContainerUtils::isUnsupportedContainer(container)) {
                continue;
            }

@@ -1488,7 +1541,7 @@ ErrorCode InstallController::getAlreadyInstalledContainers(const ServerCredentia
            QString transportProtoStr = torOrDnsRegMatch.captured(3);
            DockerContainer container = ContainerUtils::containerFromString(name);

-            if (container == DockerContainer::None) {
+            if (container == DockerContainer::None || ContainerUtils::isUnsupportedContainer(container)) {
                continue;
            }

@@ -34,7 +34,12 @@ public:
    ~InstallController();

    ErrorCode setupContainer(const ServerCredentials &credentials, DockerContainer container, ContainerConfig &config, bool isUpdate = false);
-    ErrorCode updateContainer(const QString &serverId, DockerContainer container, const ContainerConfig &oldConfig, ContainerConfig &newConfig);
+
+    // Updates server-side container settings (admin self-hosted only): reconfigures the container over SSH.
+    ErrorCode updateServerConfig(const QString &serverId, DockerContainer container, const ContainerConfig &oldConfig, ContainerConfig &newConfig);
+
+    // Updates client-local settings only: rewrites the stored container config for any self-hosted/native server. No SSH.
+    ErrorCode updateClientConfig(const QString &serverId, DockerContainer container, ContainerConfig &newConfig);

    ErrorCode rebootServer(const QString &serverId);
    ErrorCode removeAllContainers(const QString &serverId);
@@ -698,7 +698,7 @@ ErrorCode UsersController::revokeXray(const int row,

    QString restartScript = QString("sudo docker restart $CONTAINER_NAME");
    error = sshSession->runScript(
-        credentials, 
+        credentials,
        sshSession->replaceVars(restartScript, amnezia::genBaseVars(credentials, container, QString(), QString()))
    );
    if (error != ErrorCode::NoError) {
@@ -758,14 +758,17 @@ ErrorCode UsersController::revokeClient(const QString &serverId, const int index
        ContainerConfig containerCfg = adminConfig->containerConfig(container);
        QString containerClientId = containerCfg.protocolConfig.clientId();

-        if (!clientId.isEmpty() && !containerClientId.isEmpty() && containerClientId.contains(clientId)) {
+        const bool isAdminMatch = !clientId.isEmpty() && !containerClientId.isEmpty() && containerClientId.contains(clientId);
+        if (isAdminMatch) {
            emit adminConfigRevoked(serverId, container);
        }

        emit clientRevoked(index);
-        emit clientsUpdated(m_clientsTable);
    }

+    emit clientsUpdated(m_clientsTable);
+    emit revokeFinished(errorCode);
+
    return errorCode;
 }

@@ -37,6 +37,7 @@ signals:
    void clientAdded(const QJsonObject &client);
    void clientRenamed(int row, const QString &newName);
    void clientRevoked(int row);
+    void revokeFinished(ErrorCode errorCode);
    void adminConfigRevoked(const QString &serverId, DockerContainer container);

 public slots:
@@ -32,7 +32,7 @@ XrayXPaddingConfig XrayXPaddingConfig::fromJson(const QJsonObject &json)
    c.bytesMin  = json.value(configKey::xPaddingBytesMin).toString();
    c.bytesMax  = json.value(configKey::xPaddingBytesMax).toString();
    c.obfsMode  = json.value(configKey::xPaddingObfsMode).toBool(true);
-    c.key       = json.value(configKey::xPaddingKey).toString(protocols::xray::defaultSite);
+    c.key       = json.value(configKey::xPaddingKey).toString();
    c.header    = json.value(configKey::xPaddingHeader).toString();
    c.placement = json.value(configKey::xPaddingPlacement).toString(protocols::xray::defaultXPaddingPlacement);
    c.method    = json.value(configKey::xPaddingMethod).toString(protocols::xray::defaultXPaddingMethod);
@@ -365,6 +365,8 @@ XrayServerConfig XrayServerConfig::fromJson(const QJsonObject &json)
 bool XrayServerConfig::hasEqualServerSettings(const XrayServerConfig &other) const
 {
    return port == other.port
+           && transportProto == other.transportProto
+           && subnetAddress == other.subnetAddress
           && site == other.site
           && security == other.security
           && flow == other.flow
@@ -466,6 +468,17 @@ XrayProtocolConfig XrayProtocolConfig::fromJson(const QJsonObject &json)
                        }
                    }
                }
+                const QJsonArray outbounds = parsed.value(protocols::xray::outbounds).toArray();
+                if (!outbounds.isEmpty()) {
+                    const QJsonObject settings = outbounds[0].toObject().value(protocols::xray::settings).toObject();
+                    const QJsonArray vnext = settings.value(protocols::xray::vnext).toArray();
+                    if (!vnext.isEmpty()) {
+                        const QJsonArray users = vnext[0].toObject().value(protocols::xray::users).toArray();
+                        if (!users.isEmpty()) {
+                            clientCfg.id = users[0].toObject().value(protocols::xray::id).toString();
+                        }
+                    }
+                }
                c.clientConfig = clientCfg;
            } else {
                c.clientConfig = XrayClientConfig::fromJson(parsed);
@@ -29,6 +29,11 @@ ContainerConfig NativeServerConfig::containerConfig(DockerContainer container) c
    return containers.value(container);
 }

+void NativeServerConfig::updateContainerConfig(DockerContainer container, const ContainerConfig &config)
+{
+    containers[container] = config;
+}
+
 QPair<QString, QString> NativeServerConfig::getDnsPair(const QString &primaryDns, const QString &secondaryDns) const
 {
    QString d1 = dns1;
@@ -27,6 +27,8 @@ struct NativeServerConfig {
    bool hasContainers() const;
    ContainerConfig containerConfig(DockerContainer container) const;

+    void updateContainerConfig(DockerContainer container, const ContainerConfig &config);
+
    QPair<QString, QString> getDnsPair(const QString &primaryDns, const QString &secondaryDns) const;

    QJsonObject toJson() const;
@@ -43,6 +43,11 @@ ContainerConfig SelfHostedUserServerConfig::containerConfig(DockerContainer cont
    return containers.value(container);
 }

+void SelfHostedUserServerConfig::updateContainerConfig(DockerContainer container, const ContainerConfig &config)
+{
+    containers[container] = config;
+}
+
 QPair<QString, QString> SelfHostedUserServerConfig::getDnsPair(const QString &primaryDns,
                                                               const QString &secondaryDns) const
 {
@@ -32,6 +32,8 @@ struct SelfHostedUserServerConfig {
    bool hasContainers() const;
    ContainerConfig containerConfig(DockerContainer container) const;

+    void updateContainerConfig(DockerContainer container, const ContainerConfig &config);
+
    QPair<QString, QString> getDnsPair(const QString &primaryDns, const QString &secondaryDns) const;

    QJsonObject toJson() const;
@@ -39,33 +39,44 @@ QString OpenVpnProtocol::defaultConfigPath()
    return p;
 }

-void OpenVpnProtocol::stop()
+void OpenVpnProtocol::cleanupResources()
 {
-    qDebug() << "OpenVpnProtocol::stop()";
-    setConnectionState(Vpn::ConnectionState::Disconnecting);
-
-    // TODO: need refactoring
-    // sendTermSignal() will even return true while server connected ???
-    if ((m_connectionState == Vpn::ConnectionState::Preparing) || (m_connectionState == Vpn::ConnectionState::Connecting)
-        || (m_connectionState == Vpn::ConnectionState::Connected)
-        || (m_connectionState == Vpn::ConnectionState::Reconnecting)) {
+    if (m_openVpnProcess || openVpnProcessIsRunning()) {
        if (!sendTermSignal()) {
            killOpenVpnProcess();
        }
        QThread::msleep(10);
-        m_managementServer.stop();
    }
+    m_managementServer.stop();

 #if defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
    IpcClient::withInterface([](QSharedPointer<IpcInterfaceReplica> iface) {
        QRemoteObjectPendingReply<bool> reply = iface->disableKillSwitch();
        if (!reply.waitForFinished(1000) && !reply.returnValue()) {
-            qWarning() << "OpenVpnProtocol::stop(): Failed to disable killswitch";
+            qWarning() << "OpenVpnProtocol::cleanupResources(): Failed to disable killswitch";
        }
    });
 #endif
+}

-    setConnectionState(Vpn::ConnectionState::Disconnected);
+void OpenVpnProtocol::stop()
+{
+    qDebug() << "OpenVpnProtocol::stop()";
+
+    const bool wasActive = m_connectionState == Vpn::ConnectionState::Preparing
+            || m_connectionState == Vpn::ConnectionState::Connecting
+            || m_connectionState == Vpn::ConnectionState::Connected
+            || m_connectionState == Vpn::ConnectionState::Reconnecting;
+
+    if (wasActive) {
+        setConnectionState(Vpn::ConnectionState::Disconnecting);
+    }
+
+    cleanupResources();
+
+    if (wasActive || m_connectionState == Vpn::ConnectionState::Disconnecting) {
+        setConnectionState(Vpn::ConnectionState::Disconnected);
+    }
 }

 ErrorCode OpenVpnProtocol::prepare()
@@ -168,7 +179,7 @@ void OpenVpnProtocol::updateRouteGateway(QString line)

 ErrorCode OpenVpnProtocol::start()
 {
-    OpenVpnProtocol::stop();
+    cleanupResources();

    if (!QFileInfo::exists(configPath())) {
        setLastError(ErrorCode::OpenVpnConfigMissing);
@@ -29,6 +29,7 @@ protected slots:
    void onReadyReadDataFromManagementServer();

 private:
+    void cleanupResources();
    QString configPath() const;
    bool openVpnProcessIsRunning() const;
    bool sendTermSignal();
@@ -208,8 +208,8 @@ QString SecureServersRepository::nextAvailableServerName() const
    int i = 0;
    QString candidate;
    do {
-        i++;
-        candidate = QStringLiteral("Server %1").arg(i);
+        ++i;
+        candidate = tr("Server") + QLatin1Char(' ') + QString::number(i);
    } while (usedNames.contains(candidate));

    return candidate;
@@ -15,6 +15,8 @@ namespace amnezia
            Awg2,
            WireGuard,
            OpenVpn,
+            Cloak,
+            ShadowSocks,
            Ipsec,
            Xray,
            SSXray,
@@ -21,6 +21,8 @@ QString ContainerUtils::containerToString(DockerContainer c)
 {
    if (c == DockerContainer::None)
        return "none";
+    if (c == DockerContainer::Cloak)
+        return "amnezia-openvpn-cloak";
    if (c == DockerContainer::Awg)
        return "amnezia-awg";
    if (c == DockerContainer::Awg2)
@@ -62,6 +64,8 @@ QMap<DockerContainer, QString> ContainerUtils::containerHumanNames()
 {
    return { { DockerContainer::None, "Not installed" },
             { DockerContainer::OpenVpn, "OpenVPN" },
+             { DockerContainer::ShadowSocks, "OpenVPN over SS" },
+             { DockerContainer::Cloak, "OpenVPN over Cloak" },
             { DockerContainer::WireGuard, "WireGuard" },
             { DockerContainer::Awg, "AmneziaWG" },
             { DockerContainer::Awg2, "AmneziaWG" },
@@ -83,6 +87,10 @@ QMap<DockerContainer, QString> ContainerUtils::containerDescriptions()
    return {              { DockerContainer::OpenVpn,
               QObject::tr("OpenVPN is the most popular VPN protocol, with flexible configuration options. It uses its "
                           "own security protocol with SSL/TLS for key exchange.") },
+             { DockerContainer::ShadowSocks,
+               QObject::tr("This protocol is no longer supported.") },
+             { DockerContainer::Cloak,
+               QObject::tr("This protocol is no longer supported.") },
             { DockerContainer::WireGuard,
               QObject::tr("WireGuard - popular VPN protocol with high performance, high speed and low power "
                           "consumption.") },
@@ -194,6 +202,9 @@ QMap<DockerContainer, QString> ContainerUtils::containerDetailedDescriptions()

 ServiceType ContainerUtils::containerService(DockerContainer c)
 {
+    if (isUnsupportedContainer(c)) {
+        return ServiceType::Vpn;
+    }
    return ProtocolUtils::protocolService(defaultProtocol(c));
 }

@@ -202,6 +213,8 @@ Proto ContainerUtils::defaultProtocol(DockerContainer c)
    switch (c) {
    case DockerContainer::None: return Proto::Unknown;
    case DockerContainer::OpenVpn: return Proto::OpenVpn;
+    case DockerContainer::Cloak:
+    case DockerContainer::ShadowSocks: return Proto::Unknown;
    case DockerContainer::WireGuard: return Proto::WireGuard;
    case DockerContainer::Awg2: return Proto::Awg;
    case DockerContainer::Awg: return Proto::Awg;
@@ -252,6 +265,8 @@ bool ContainerUtils::isSupportedByCurrentPlatform(DockerContainer c)
    // macOS build using Network Extension – allow OpenVPN for parity with iOS.
    switch (c) {
    case DockerContainer::OpenVpn: return true;
+    case DockerContainer::Cloak: return false;
+    case DockerContainer::ShadowSocks: return false;
    case DockerContainer::WireGuard: return true;
    case DockerContainer::Awg2: return true;
    case DockerContainer::Awg: return true;
@@ -336,6 +351,10 @@ int ContainerUtils::easySetupOrder(DockerContainer container)

 bool ContainerUtils::isShareable(DockerContainer container)
 {
+    if (isUnsupportedContainer(container)) {
+        return false;
+    }
+
    switch (container) {
    case DockerContainer::TorWebSite: return false;
    case DockerContainer::Dns: return false;
@@ -352,6 +371,11 @@ bool ContainerUtils::isAwgContainer(DockerContainer container)
    return container == DockerContainer::Awg || container == DockerContainer::Awg2;
 }

+bool ContainerUtils::isUnsupportedContainer(DockerContainer container)
+{
+    return container == DockerContainer::Cloak || container == DockerContainer::ShadowSocks;
+}
+
 QJsonObject ContainerUtils::getProtocolConfigFromContainer(const Proto protocol, const QJsonObject &containerConfig)
 {
    QString protocolConfigString = containerConfig.value(ProtocolUtils::protoToString(protocol))
@@ -45,6 +45,8 @@ namespace amnezia

        bool isAwgContainer(DockerContainer container);

+        bool isUnsupportedContainer(DockerContainer container);
+
        QJsonObject getProtocolConfigFromContainer(const Proto protocol, const QJsonObject &containerConfig);

        int installPageOrder(DockerContainer container);
@@ -38,6 +38,8 @@ namespace amnezia
        XrayServerConfigInvalid = 215,
        XrayServerNoVlessClients = 216,
        XrayRealityKeysReadFailed = 217,
+        ServerContainerRuntimeNotSupported = 218,
+        ContainerRuntimeServiceNotRunning = 219,

        // Ssh connection errors
        SshRequestDeniedError = 300,
@@ -79,6 +81,7 @@ namespace amnezia
        ImportBackupFileUseRestoreInstead = 903,
        RestoreBackupInvalidError = 904,
        LegacyApiV1NotSupportedError = 905,
+        LegacyContainerNotSupportedError = 906,

        // Android errors
        AndroidError = 1000,
@@ -123,5 +126,3 @@ namespace amnezia
 Q_DECLARE_METATYPE(amnezia::ErrorCode)

 #endif // ERRORCODES_H
-
-
@@ -39,6 +39,8 @@ QString errorString(ErrorCode code) {
    case(ErrorCode::XrayRealityKeysReadFailed):
        errorMessage = QObject::tr("Server error: failed to read XRay Reality keys from the server");
        break;
+    case(ErrorCode::ServerContainerRuntimeNotSupported): errorMessage = QObject::tr("Server error: The default container runtime available for installation on this server is not supported.\n Install Docker Engine on the server manually and try again."); break;
+    case(ErrorCode::ContainerRuntimeServiceNotRunning): errorMessage = QObject::tr("Container runtime error: The container runtime service is not running.\n Check the container runtime service on the server, or wait about a minute and try again."); break;

    // Libssh errors
    case(ErrorCode::SshRequestDeniedError): errorMessage = QObject::tr("SSH request was denied"); break;
@@ -69,6 +71,7 @@ QString errorString(ErrorCode code) {
    case (ErrorCode::ImportBackupFileUseRestoreInstead): errorMessage = QObject::tr("Backup files cannot be imported here. Use 'Restore from backup' instead."); break;
    case (ErrorCode::RestoreBackupInvalidError): errorMessage = QObject::tr("Backup file is corrupted or has invalid format"); break;
    case (ErrorCode::LegacyApiV1NotSupportedError): errorMessage = QObject::tr("This legacy Amnezia subscription format is no longer supported"); break;
+    case (ErrorCode::LegacyContainerNotSupportedError): errorMessage = QObject::tr("This protocol is no longer supported. Please select another protocol or remove this container from the server settings."); break;
    case (ErrorCode::ImportOpenConfigError): errorMessage = QObject::tr("Unable to open config file"); break;
    case (ErrorCode::NoInstalledContainersError): errorMessage = QObject::tr("VPN Protocols is not installed.\n Please install VPN container at first"); break;

@@ -290,86 +290,6 @@ namespace libssh {
        return watcher.result();
    }

-    ErrorCode Client::scpFileDownload(const QString& remotePath, const QString& localPath)
-    {
-        // Use full path for SCP download
-        m_scpSession = ssh_scp_new(m_session, SSH_SCP_READ, remotePath.toStdString().c_str());
-
-        if (m_scpSession == nullptr) {
-            return fromLibsshErrorCode();
-        }
-
-        if (ssh_scp_init(m_scpSession) != SSH_OK) {
-            auto errorCode = fromLibsshErrorCode();
-            closeScpSession();
-            return errorCode;
-        }
-
-        QFutureWatcher<ErrorCode> watcher;
-        connect(&watcher, &QFutureWatcher<ErrorCode>::finished, this, &Client::scpFileDownloadFinished);
-        QFuture<ErrorCode> future = QtConcurrent::run([this, &remotePath, &localPath]() {
-            // Pull request - this gets file info
-            int result = ssh_scp_pull_request(m_scpSession);
-            if (result != SSH_SCP_REQUEST_NEWFILE) {
-                return fromLibsshErrorCode();
-            }
-
-            // Accept the request
-            ssh_scp_accept_request(m_scpSession);
-
-            // Get file size
-            int fileSize = ssh_scp_request_get_size(m_scpSession);
-            if (fileSize <= 0) {
-                return ErrorCode::InternalError;
-            }
-
-            // Open local file for writing
-            QFile fout(localPath);
-            if (!fout.open(QIODevice::WriteOnly)) {
-                return fromFileErrorCode(fout.error());
-            }
-
-            // Read file data in chunks
-            constexpr size_t bufferSize = 16384;
-            int transferred = 0;
-
-            while (transferred < fileSize) {
-                int chunkSize = qMin(bufferSize, static_cast<size_t>(fileSize - transferred));
-                QByteArray buffer(chunkSize, 0);
-
-                int bytesRead = ssh_scp_read(m_scpSession, buffer.data(), chunkSize);
-                if (bytesRead == SSH_ERROR) {
-                    fout.close();
-                    return fromLibsshErrorCode();
-                }
-
-                if (bytesRead != chunkSize) {
-                    fout.close();
-                    return ErrorCode::InternalError;
-                }
-
-                qint64 bytesWritten = fout.write(buffer);
-                if (bytesWritten != chunkSize) {
-                    fout.close();
-                    return fromFileErrorCode(fout.error());
-                }
-
-                transferred += bytesRead;
-            }
-
-            fout.close();
-            return ErrorCode::NoError;
-        });
-        watcher.setFuture(future);
-
-        QEventLoop wait;
-        QObject::connect(this, &Client::scpFileDownloadFinished, &wait, &QEventLoop::quit);
-        wait.exec();
-
-        closeScpSession();
-        return watcher.result();
-    }
-
    void Client::closeScpSession()
    {
        if (m_scpSession != nullptr) {
@@ -38,8 +38,6 @@ namespace libssh {
                               const QString &localPath,
                               const QString &remotePath,
                               const QString &fileDesc);
-        ErrorCode scpFileDownload(const QString &remotePath,
-                                   const QString &localPath);
        ErrorCode getDecryptedPrivateKey(const ServerCredentials &credentials, QString &decryptedPrivateKey, const std::function<QString()> &passphraseCallback);
    private:
        ErrorCode closeChannel();
@@ -56,7 +54,6 @@ namespace libssh {
    signals:
        void writeToChannelFinished();
        void scpFileCopyFinished();
-        void scpFileDownloadFinished();
    };
 }

@@ -44,11 +44,6 @@ SshSession::~SshSession()
    m_sshClient.disconnectFromHost();
 }

-void SshSession::resetConnection()
-{
-    m_sshClient.disconnectFromHost();
-}
-
 ErrorCode SshSession::runScript(const ServerCredentials &credentials, QString script,
                                const std::function<ErrorCode(const QString &, libssh::Client &)> &cbReadStdOut,
                                const std::function<ErrorCode(const QString &, libssh::Client &)> &cbReadStdErr)
@@ -47,9 +47,6 @@ public:
    ErrorCode uploadFileToHost(const ServerCredentials &credentials, const QByteArray &data, const QString &remotePath,
                               libssh::ScpOverwriteMode overwriteMode = libssh::ScpOverwriteMode::ScpOverwriteExisting);

-    /** Force-close the current SSH connection so the next operation starts fresh. */
-    void resetConnection();
-
 private:
    libssh::Client m_sshClient;
 };
@@ -25,6 +25,8 @@ set_target_properties(AmneziaVPNNetworkExtension PROPERTIES

    XCODE_ATTRIBUTE_INFOPLIST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in
    XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/../../../../Frameworks @loader_path/../../../../Frameworks"
+
+    XCODE_LINK_BUILD_PHASE_MODE KNOWN_LOCATION
 )

 if(DEPLOY)
@@ -118,10 +120,20 @@ target_include_directories(AmneziaVPNNetworkExtension PRIVATE ${CLIENT_ROOT_DIR}
 target_include_directories(AmneziaVPNNetworkExtension PRIVATE ${CMAKE_CURRENT_BINARY_DIR})

 find_package(openvpnadapter REQUIRED)
+# FIXME(ygurov): https://github.com/conan-io/conan/issues/20034
+set_property(TARGET amnezia::openvpnadapter APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+set_property(TARGET amnezia::openvpnadapter APPEND PROPERTY IMPORTED_CONFIGURATIONS MINSIZEREL)
+set_property(TARGET amnezia::openvpnadapter APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_property(TARGET amnezia::openvpnadapter APPEND PROPERTY IMPORTED_CONFIGURATIONS RELWITHDEBINFO)
 target_link_libraries(AmneziaVPNNetworkExtension PRIVATE amnezia::openvpnadapter)

 find_package(awg-apple REQUIRED)
 target_link_libraries(AmneziaVPNNetworkExtension PRIVATE amnezia::awg-apple)

 find_package(hev-socks5-tunnel REQUIRED)
+# FIXME(ygurov): https://github.com/conan-io/conan/issues/20034
+set_property(TARGET heiher::hev-socks5-tunnel APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+set_property(TARGET heiher::hev-socks5-tunnel APPEND PROPERTY IMPORTED_CONFIGURATIONS MINSIZEREL)
+set_property(TARGET heiher::hev-socks5-tunnel APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_property(TARGET heiher::hev-socks5-tunnel APPEND PROPERTY IMPORTED_CONFIGURATIONS RELWITHDEBINFO)
 target_link_libraries(AmneziaVPNNetworkExtension PRIVATE heiher::hev-socks5-tunnel)
@@ -1,7 +1,8 @@
-if which apt-get > /dev/null 2>&1; then LOCK_CMD="fuser"; LOCK_FILE="/var/lib/dpkg/lock-frontend";\
-elif which dnf > /dev/null 2>&1; then LOCK_CMD="fuser"; LOCK_FILE="/var/cache/dnf/* /var/run/dnf/* /var/lib/dnf/* /var/lib/rpm/*";\
-elif which yum > /dev/null 2>&1; then LOCK_CMD="cat"; LOCK_FILE="/var/run/yum.pid";\
-elif which zypper > /dev/null 2>&1; then LOCK_CMD="cat"; LOCK_FILE="/var/run/zypp.pid";\
-elif which pacman > /dev/null 2>&1; then LOCK_CMD="fuser"; LOCK_FILE="/var/lib/pacman/db.lck";\
-else echo "Packet manager not found"; echo "Internal error"; exit 1; fi;\
-if command -v $LOCK_CMD > /dev/null 2>&1; then sudo $LOCK_CMD $LOCK_FILE 2>/dev/null; else echo "$LOCK_CMD not installed"; fi
+if which apt-get > /dev/null 2>&1 || command -v apt-get > /dev/null 2>&1; then LOCK_CMD="fuser"; LOCK_FILE="/var/lib/dpkg/lock-frontend";\
+elif which dnf > /dev/null 2>&1 || command -v dnf > /dev/null 2>&1; then LOCK_CMD="fuser"; LOCK_FILE="/var/cache/dnf/* /var/run/dnf/* /var/lib/dnf/* /var/lib/rpm/*";\
+elif which yum > /dev/null 2>&1 || command -v yum > /dev/null 2>&1; then LOCK_CMD="cat"; LOCK_FILE="/var/run/yum.pid";\
+elif which zypper > /dev/null 2>&1 || command -v zypper > /dev/null 2>&1; then LOCK_CMD="cat"; LOCK_FILE="/var/run/zypp.pid";\
+elif which pacman > /dev/null 2>&1 || command -v pacman > /dev/null 2>&1; then LOCK_CMD="fuser"; LOCK_FILE="/var/lib/pacman/db.lck";\
+else echo "Packet manager not found"; echo "Internal error"; exit 1;\
+fi;\
+if sudo -n which $LOCK_CMD > /dev/null 2>&1 || command -v $LOCK_CMD > /dev/null 2>&1; then sudo -n $LOCK_CMD $LOCK_FILE 2>/dev/null; else echo "$LOCK_CMD not installed"; fi
@@ -1,8 +1,8 @@
-if which apt-get > /dev/null 2>&1; then pm=$(which apt-get); opt="--version";\
-elif which dnf > /dev/null 2>&1; then pm=$(which dnf); opt="--version";\
-elif which yum > /dev/null 2>&1; then pm=$(which yum); opt="--version";\
-elif which zypper > /dev/null 2>&1; then pm=$(which zypper); opt="--version";\
-elif which pacman > /dev/null 2>&1; then pm=$(which pacman); opt="--version";\
+if pm=$(which apt-get 2>/dev/null || command -v apt-get 2>/dev/null); then opt="--version";\
+elif pm=$(which dnf 2>/dev/null || command -v dnf 2>/dev/null); then opt="--version";\
+elif pm=$(which yum 2>/dev/null || command -v yum 2>/dev/null); then opt="--version";\
+elif pm=$(which zypper 2>/dev/null || command -v zypper 2>/dev/null); then opt="--version";\
+elif pm=$(which pacman 2>/dev/null || command -v pacman 2>/dev/null); then opt="--version";\
 else pm="uname"; opt="-a";\
 fi;\
 CUR_USER=$(whoami 2>/dev/null || echo $HOME | sed 's/.*\///');\
@@ -1,25 +1,34 @@
-if which apt-get > /dev/null 2>&1; then pm=$(which apt-get); silent_inst="-yq install --install-recommends"; check_pkgs="-yq update"; docker_pkg="docker.io"; dist="debian";\
-elif which dnf > /dev/null 2>&1; then pm=$(which dnf); silent_inst="-yq install"; check_pkgs="-yq check-update"; docker_pkg="docker"; dist="fedora";\
-elif which yum > /dev/null 2>&1; then pm=$(which yum); silent_inst="-y -q install"; check_pkgs="-y -q check-update"; docker_pkg="docker"; dist="centos";\
-elif which zypper > /dev/null 2>&1; then pm=$(which zypper); silent_inst="-nq install"; check_pkgs="-nq refresh"; docker_pkg="docker"; dist="opensuse";\
-elif which pacman > /dev/null 2>&1; then pm=$(which pacman); silent_inst="-S --noconfirm --noprogressbar --quiet"; check_pkgs="-Sup"; docker_pkg="docker"; dist="archlinux";\
-else echo "Packet manager not found"; exit 1; fi;\
-echo "Dist: $dist, Packet manager: $pm, Install command: $silent_inst, Check pkgs command: $check_pkgs, Docker pkg: $docker_pkg";\
+if pm=$(which apt-get 2>/dev/null || command -v apt-get 2>/dev/null); then silent_inst="-yq install --install-recommends"; what_pkg="-s install"; check_pkgs="-yq update"; docker_pkg="docker.io"; dist="debian";\
+elif pm=$(which dnf 2>/dev/null || command -v dnf 2>/dev/null); then silent_inst="-yq install"; what_pkg="--assumeno install --setopt=tsflags=test"; check_pkgs="-yq check-update"; docker_pkg="docker"; dist="fedora";\
+elif pm=$(which yum 2>/dev/null || command -v yum 2>/dev/null); then silent_inst="-y -q install"; what_pkg="--assumeno install --setopt=tsflags=test"; check_pkgs="-y -q check-update"; docker_pkg="docker"; dist="centos";\
+elif pm=$(which zypper 2>/dev/null || command -v zypper 2>/dev/null); then silent_inst="-nq install"; what_pkg="--dry-run install"; check_pkgs="-nq refresh"; docker_pkg="docker"; dist="suse";\
+elif pm=$(which pacman 2>/dev/null || command -v pacman 2>/dev/null); then silent_inst="-S --noconfirm --noprogressbar --quiet"; what_pkg="-Sp"; check_pkgs="-Sup"; docker_pkg="docker"; dist="archlinux";\
+fi;\
+echo "Dist: $dist, Packet manager: $pm, Install command: $silent_inst, What pkg command: $what_pkg, Check pkgs command: $check_pkgs, Docker pkg: $docker_pkg, Language: $LANG";\
+echo $LANG | grep -qE '^(en_US.UTF-8|C.UTF-8|C)$' || export LC_ALL=C;\
 if [ "$dist" = "debian" ]; then export DEBIAN_FRONTEND=noninteractive; fi;\
 if ! command -v sudo > /dev/null 2>&1; then $pm $check_pkgs; $pm $silent_inst sudo; fi;\
-if ! command -v fuser > /dev/null 2>&1; then sudo $pm $check_pkgs; sudo $pm $silent_inst psmisc; fi;\
-if ! command -v lsof > /dev/null 2>&1; then sudo $pm $check_pkgs; sudo $pm $silent_inst lsof; fi;\
-if ! command -v docker > /dev/null 2>&1; then \
-  sudo $pm $check_pkgs; sudo $pm $silent_inst $docker_pkg;\
-  sleep 5; sudo systemctl enable --now docker; sleep 5;\
+if ! sudo -n sh -c 'command -v which > /dev/null 2>&1'; then sudo -n $pm $check_pkgs; sudo -n $pm $silent_inst which; fi;\
+if ! sudo -n sh -c 'command -v fuser > /dev/null 2>&1'; then sudo -n $pm $check_pkgs; sudo -n $pm $silent_inst psmisc; fi;\
+if ! sudo -n sh -c 'command -v lsof > /dev/null 2>&1'; then sudo -n $pm $check_pkgs; sudo -n $pm $silent_inst lsof; fi;\
+if ! sudo -n sh -c 'command -v docker > /dev/null 2>&1'; then \
+  sudo -n $pm $check_pkgs;\
+  if ! sudo -n $pm $what_pkg $docker_pkg 2>/dev/null | grep -qi podman; then \
+    sudo -n $pm $silent_inst $docker_pkg;\
+    sleep 5; sudo -n systemctl enable --now docker; sleep 5;\
+  else \
+    echo "Container runtime is not supported";\
+    exit 1;\
+  fi;\
 fi;\
-if [ "$(cat /sys/module/apparmor/parameters/enabled 2>/dev/null)" = "Y" ]; then \
-  if ! command -v apparmor_parser > /dev/null 2>&1; then sudo $pm $check_pkgs; sudo $pm $silent_inst apparmor; fi;\
+if [ "$(sudo -n cat /sys/module/apparmor/parameters/enabled 2>/dev/null)" = "Y" ]; then \
+  if ! sudo -n sh -c 'command -v apparmor_parser > /dev/null 2>&1'; then \
+    sudo -n $pm $check_pkgs; sudo -n $pm $silent_inst apparmor;\
+  fi;\
 fi;\
-if [ "$(systemctl is-active docker)" != "active" ]; then \
-  sudo $pm $check_pkgs; sudo $pm $silent_inst $docker_pkg;\
-  sleep 5; sudo systemctl start docker; sleep 5;\
+if [ "$(sudo -n systemctl is-active docker)" != "active" ]; then \
+  sleep 5; sudo -n systemctl start docker; sleep 5;\
+  if [ "$(sudo -n systemctl is-active docker)" != "active" ]; then echo "Container runtime service not running"; fi;\
 fi;\
-if ! command -v sudo > /dev/null 2>&1; then echo "Failed to install sudo, command not found"; exit 1; fi;\
-docker --version;\
+sudo -n docker --version || docker --version;\
 uname -sr
@@ -1,5 +1,6 @@
 sudo docker ps -a | grep amnezia | awk '{print $1}' | xargs sudo docker stop;\
 sudo docker ps -a | grep amnezia | awk '{print $1}' | xargs sudo docker rm -fv;\
 sudo docker images -a --format table | grep amnezia | awk '{print $3, $1 ":" $2}' | xargs sudo docker rmi;\
+sudo docker volume ls --format '{{.Name}}' | grep '^amnezia-' | xargs -r sudo docker volume rm -f;\
 sudo docker network ls | grep amnezia-dns-net | awk '{print $1}' | xargs sudo docker network rm;\
 sudo rm -frd /opt/amnezia
@@ -1,4 +1,3 @@
 sudo docker stop $CONTAINER_NAME;\
 sudo docker rm -fv $CONTAINER_NAME;\
-sudo docker rmi $CONTAINER_NAME;\
-test "$REMOVE_CONTAINER_DATA" = "1" && sudo docker volume rm -f ${CONTAINER_NAME}-data 2>/dev/null || true
+sudo docker rmi $CONTAINER_NAME;
@@ -2880,16 +2880,6 @@ Thank you for staying with us!</source>
        <source>Add them to the application if they were not displayed</source>
        <translation>Добавить их в приложение, если они не отображаются</translation>
    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="126"/>
-        <source>Backup</source>
-        <translation>Резервное копирование</translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="127"/>
-        <source>Local copy of VPN protocols, services, all server settings and users</source>
-        <translation>Локальная копия VPN-протоколов, сервисов, всех настроек сервера и пользователей</translation>
-    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="124"/>
        <source>Reboot server</source>
@@ -3579,34 +3569,6 @@ Thank you for staying with us!</source>
        <source>Continue</source>
        <translation>Продолжить</translation>
    </message>
-    <message>
-        <source>No containers found in backup file</source>
-        <translation>В файле резервной копии не найдено контейнеров</translation>
-    </message>
-    <message>
-        <source>Installing %1 (%2/%3)...</source>
-        <translation>Устанавливается %1 (%2/%3)...</translation>
-    </message>
-    <message>
-        <source>backup.tgz</source>
-        <translation>backup.tgz</translation>
-    </message>
-    <message>
-        <source>RestoredServer</source>
-        <translation>Восстановленный сервер</translation>
-    </message>
-    <message>
-        <source>Restore from backup</source>
-        <translation>Восстановить из резервной копии</translation>
-    </message>
-    <message>
-        <source>Restoration of VPN protocols, services, all server settings and users</source>
-        <translation>Восстановление VPN-протоколов, сервисов, всех настроек сервера и пользователей</translation>
-    </message>
-    <message>
-        <source>Select Backup to Restore</source>
-        <translation>Выберите файл резервной копии</translation>
-    </message>
 </context>
 <context>
    <name>PageSetupWizardInstalling</name>
@@ -5424,131 +5386,6 @@ FileZilla или другие SFTP-клиенты, а также смонтир
        <translation>Будет установлен протокол AmneziaWG. Он обеспечивает высокую скорость соединения и гарантирует стабильную работу даже в самых сложных условиях.</translation>
    </message>
 </context>
-<context>
-    <name>PageSettingsServerBackup</name>
-    <message>
-        <source>Backup</source>
-        <translation>Резервное копирование</translation>
-    </message>
-    <message>
-        <source>Local copy of VPN protocols, services, all server settings and users.</source>
-        <translation>Локальная копия VPN-протоколов, сервисов, всех настроек сервера и пользователей.</translation>
-    </message>
-    <message>
-        <source>More about backups</source>
-        <translation>Подробнее о резервных копиях</translation>
-    </message>
-    <message>
-        <source>Create backup</source>
-        <translation>Создать резервную копию</translation>
-    </message>
-    <message>
-        <source>Restore from backup</source>
-        <translation>Восстановить из резервной копии</translation>
-    </message>
-    <message>
-        <source>Create backup and download to device?</source>
-        <translation>Создать резервную копию и скачать на устройство?</translation>
-    </message>
-    <message>
-        <source>Backup will be created on server and automatically downloaded to your device</source>
-        <translation>Резервная копия будет создана на сервере и автоматически скачана на ваше устройство</translation>
-    </message>
-    <message>
-        <source>Create server configuration backup?</source>
-        <translation>Создать резервную копию конфигурации сервера?</translation>
-    </message>
-    <message>
-        <source>This will create a backup of your server containers configuration on the server</source>
-        <translation>На сервере будет создана резервная копия конфигурации контейнеров</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Создать</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Отмена</translation>
-    </message>
-    <message>
-        <source>Select Backup to Restore</source>
-        <translation>Выберите файл резервной копии</translation>
-    </message>
-    <message>
-        <source>Backup files (*.tar.gz *.backup *.tgz *.gz)</source>
-        <translation>Файлы резервных копий (*.tar.gz *.backup *.tgz *.gz)</translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation>Сервер</translation>
-    </message>
-    <message>
-        <source>Backup created successfully: %1</source>
-        <translation>Резервная копия успешно создана: %1</translation>
-    </message>
-    <message>
-        <source>Backup downloaded successfully!\n\nSaved to:\n%1</source>
-        <translation>Резервная копия успешно скачана!\n\nСохранена в:\n%1</translation>
-    </message>
-    <message>
-        <source>Backup error: %1</source>
-        <translation>Ошибка резервного копирования: %1</translation>
-    </message>
-</context>
-<context>
-    <name>PageSettingsServerRestoreMode</name>
-    <message>
-        <source>%1 on %2</source>
-        <translation>%1 на %2</translation>
-    </message>
-    <message>
-        <source>Restore from backup</source>
-        <translation>Восстановление из резервной копии</translation>
-    </message>
-    <message>
-        <source>Add data from backup</source>
-        <translation>Добавить данные из резервной копии</translation>
-    </message>
-    <message>
-        <source>If the same protocols are already installed on the server, they will be updated. Created users and access will be saved</source>
-        <translation>Если на сервере уже установлены такие же протоколы, они будут обновлены. Созданные пользователи и доступы сохранятся</translation>
-    </message>
-    <message>
-        <source>Replace</source>
-        <translation>Заменить</translation>
-    </message>
-    <message>
-        <source>All installed protocols, users and their access will not be saved</source>
-        <translation>Все установленные протоколы, пользователи и их доступы не будут сохранены</translation>
-    </message>
-    <message>
-        <source>Backup restore error: %1</source>
-        <translation>Ошибка восстановления из резервной копии: %1</translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation>Сервер</translation>
-    </message>
-</context>
-<context>
-    <name>PageSettingsServerBackupRestored</name>
-    <message>
-        <source>%1 on &quot;%2&quot;</source>
-        <translation>%1 на &quot;%2&quot;</translation>
-    </message>
-    <message>
-        <source>Backup restored</source>
-        <translation>Резервная копия восстановлена</translation>
-    </message>
-    <message>
-        <source>To home</source>
-        <translation>На главную</translation>
-    </message>
-    <message>
-        <source>To server settings</source>
-        <translation>К настройкам сервера</translation>
-    </message>
-</context>
 <context>
    <name>main2</name>
    <message>
@@ -475,8 +475,7 @@ bool SubscriptionUiController::deactivateExternalDevice(const QString &serverId,
 void SubscriptionUiController::validateConfig()
 {
    const QString serverId = m_serversController->getDefaultServerId();
-    if (!serverId.isEmpty() && m_serversController->isLegacyApiV1Server(serverId)) {
-        emit unsupportedConnectDrawerRequested();
+    if (serverId.isEmpty()) {
        emit configValidated(false);
        return;
    }
@@ -8,6 +8,8 @@

 #include "amneziaApplication.h"
 #include "core/controllers/serversController.h"
+#include "core/models/containerConfig.h"
+#include "core/utils/containerEnum.h"

 ConnectionUiController::ConnectionUiController(ConnectionController* connectionController,
                                                ServersController* serversController,
@@ -33,7 +35,7 @@ void ConnectionUiController::openConnection()
    ErrorCode errorCode = m_connectionController->openConnection(serverId);

    if (errorCode != ErrorCode::NoError) {
-        emit connectionErrorOccurred(errorCode);
+        notifyConnectionBlocked(errorCode);
        return;
    }
 }
@@ -130,10 +132,36 @@ void ConnectionUiController::toggleConnection()
    } else if (isConnected()) {
        closeConnection();
    } else {
+        const QString serverId = m_serversController->getDefaultServerId();
+        if (serverId.isEmpty()) {
+            return;
+        }
+
+        const ErrorCode errorCode = m_connectionController->isConnectionSupported(serverId);
+        if (errorCode != ErrorCode::NoError) {
+            notifyConnectionBlocked(errorCode);
+            return;
+        }
+
        emit prepareConfig();
    }
 }

+void ConnectionUiController::notifyConnectionBlocked(ErrorCode errorCode)
+{
+    if (errorCode == ErrorCode::LegacyApiV1NotSupportedError) {
+        emit unsupportedConnectDrawerRequested();
+        return;
+    }
+
+    if (errorCode == ErrorCode::NoInstalledContainersError) {
+        emit noInstalledContainers();
+        return;
+    }
+
+    emit connectionErrorOccurred(errorCode);
+}
+
 bool ConnectionUiController::isConnectionInProgress() const
 {
    return m_isConnectionInProgress;
@@ -143,3 +171,32 @@ bool ConnectionUiController::isConnected() const
 {
    return m_isConnected;
 }
+
+bool ConnectionUiController::isRevokeBlockedDuringActiveConnection(const QString &serverId, int containerIndex,
+                                                                   const QString &clientId) const
+{
+    if (clientId.isEmpty() || (!isConnected() && !isConnectionInProgress())) {
+        return false;
+    }
+
+    if (m_serversController->getDefaultServerId() != serverId) {
+        return false;
+    }
+
+    if (static_cast<int>(m_serversController->getDefaultContainer(serverId)) != containerIndex) {
+        return false;
+    }
+
+    const auto adminConfig = m_serversController->selfHostedAdminConfig(serverId);
+    if (!adminConfig.has_value()) {
+        return false;
+    }
+
+    const QString connectionClientId =
+            adminConfig->containerConfig(static_cast<DockerContainer>(containerIndex)).protocolConfig.clientId();
+    if (connectionClientId.isEmpty()) {
+        return false;
+    }
+
+    return connectionClientId == clientId || connectionClientId.contains(clientId);
+}
@@ -35,6 +35,8 @@ public slots:
    void openConnection();
    void closeConnection();

+    bool isRevokeBlockedDuringActiveConnection(const QString &serverId, int containerIndex, const QString &clientId) const;
+
    ErrorCode getLastConnectionError();
    void onConnectionStateChanged(Vpn::ConnectionState state);

@@ -48,9 +50,12 @@ signals:
    void connectButtonClicked();
    void preparingConfig();
    void prepareConfig();
+    void unsupportedConnectDrawerRequested();
+    void noInstalledContainers();

 private:
    Vpn::ConnectionState getCurrentConnectionState();
+    void notifyConnectionBlocked(ErrorCode errorCode);

    ConnectionController* m_connectionController;
    ServersController* m_serversController;
@@ -128,6 +128,11 @@ void PageController::showOnStartup()
    }
 }

+bool PageController::shouldStartMinimized() const
+{
+    return m_settingsController->isStartMinimizedEnabled();
+}
+
 bool PageController::isTriggeredByConnectButton()
 {
    return m_isTriggeredByConnectButton;
@@ -32,9 +32,6 @@ namespace PageLoader
        PageSettingsNewsNotifications,
        PageSettingsNewsDetail,
        PageSettingsBackup,
-        PageSettingsServerBackup,
-        PageSettingsServerRestoreMode,
-        PageSettingsServerBackupRestored,
        PageSettingsAbout,
        PageSettingsLogging,
        PageSettingsSplitTunneling,
@@ -126,6 +123,7 @@ public slots:
    void updateNavigationBarColor(const int color);

    void showOnStartup();
+    bool shouldStartMinimized() const;

    bool isTriggeredByConnectButton();
    void setTriggeredByConnectButton(bool trigger);
@@ -154,7 +152,6 @@ signals:
    void goToPageSettings();
    void goToPageViewConfig();
    void goToPageSettingsServerServices();
-    void goToPageSettingsServerManagement();
    void goToPageSettingsBackup();
    void goToShareConnectionPage(QString headerText, QString configContentHeaderText, QString configCaption, QString configExtension,
                                 QString configFileName);
@@ -9,6 +9,13 @@ ExportUiController::ExportUiController(ExportController* exportController, QObje
    : QObject(parent),
      m_exportController(exportController)
 {
+    connect(m_exportController, &ExportController::revokeFinished, this, [this](ErrorCode errorCode) {
+        if (errorCode == ErrorCode::NoError) {
+            emit revokeConfigFinished();
+        } else {
+            emit exportErrorOccurred(errorCode);
+        }
+    });
 }

 void ExportUiController::generateFullAccessConfig(const QString &serverId)
@@ -92,7 +99,6 @@ void ExportUiController::updateClientManagementModel(const QString &serverId, in
 void ExportUiController::revokeConfig(int row, const QString &serverId, int containerIndex)
 {
    m_exportController->revokeConfig(row, serverId, containerIndex);
-    emit revokeConfigFinished();
 }

 void ExportUiController::renameClient(int row, const QString &clientName, const QString &serverId, int containerIndex)
@@ -75,13 +75,7 @@ InstallUiController::InstallUiController(InstallController *installController,
      m_connectionController(connectionController)
 {
    connect(m_installController, &InstallController::configValidated, this, &InstallUiController::configValidated);
-    connect(m_installController, &InstallController::validationErrorOccurred, this, [this](ErrorCode errorCode) {
-        if (errorCode == ErrorCode::NoInstalledContainersError) {
-            emit noInstalledContainers();
-        } else {
-            emit installationErrorOccurred(errorCode);
-        }
-    });
+    connect(m_installController, &InstallController::validationErrorOccurred, this, &InstallUiController::installationErrorOccurred);
 }

 InstallUiController::~InstallUiController()
@@ -217,15 +211,13 @@ void InstallUiController::scanServerForInstalledContainers(const QString &server
    emit installationErrorOccurred(errorCode);
 }

-void InstallUiController::updateContainer(const QString &serverId, int containerIndex, int protocolIndex, bool closePage)
+bool InstallUiController::buildContainerConfigFromModel(int containerIndex, int protocolIndex, ContainerConfig &containerConfig)
 {
    DockerContainer container = static_cast<DockerContainer>(containerIndex);
-    
    Proto protocolType = static_cast<Proto>(protocolIndex);
-    
-    ContainerConfig containerConfig;
+
    containerConfig.container = container;
-    
+
    switch (protocolType) {
    case Proto::Awg: {
        containerConfig.protocolConfig = m_awgConfigModel->getProtocolConfig();
@@ -271,6 +263,41 @@ void InstallUiController::updateContainer(const QString &serverId, int container
    }
 #endif
    default:
+        return false;
+    }
+    return true;
+}
+
+void InstallUiController::updateClientConfig(const QString &serverId, int containerIndex, int protocolIndex, bool closePage)
+{
+    DockerContainer container = static_cast<DockerContainer>(containerIndex);
+    Proto protocolType = static_cast<Proto>(protocolIndex);
+
+    ContainerConfig containerConfig;
+    if (!buildContainerConfigFromModel(containerIndex, protocolIndex, containerConfig)) {
+        return;
+    }
+
+    ErrorCode errorCode = m_installController->updateClientConfig(serverId, container, containerConfig);
+
+    if (errorCode == ErrorCode::NoError) {
+        ContainerConfig updatedConfig = m_serversController->getContainerConfig(serverId, container);
+        m_protocolModel->updateModel(updatedConfig);
+        updateProtocolConfigModel(serverId, static_cast<int>(container), static_cast<int>(protocolType));
+        emit updateContainerFinished(tr("Settings updated successfully"), closePage);
+        return;
+    }
+
+    emit installationErrorOccurred(errorCode);
+}
+
+void InstallUiController::updateServerConfig(const QString &serverId, int containerIndex, int protocolIndex, bool closePage)
+{
+    DockerContainer container = static_cast<DockerContainer>(containerIndex);
+    Proto protocolType = static_cast<Proto>(protocolIndex);
+
+    ContainerConfig containerConfig;
+    if (!buildContainerConfigFromModel(containerIndex, protocolIndex, containerConfig)) {
        return;
    }
    ContainerConfig oldContainerConfig = m_serversController->getContainerConfig(serverId, container);
@@ -279,14 +306,17 @@ void InstallUiController::updateContainer(const QString &serverId, int container
            || container == DockerContainer::Xray || container == DockerContainer::SSXray;

    if (asyncUpdate) {
-        emit serverIsBusy(true);
+        const bool emitBusy = container == DockerContainer::MtProxy || container == DockerContainer::Telemt;
+        if (emitBusy)
+            emit serverIsBusy(true);
        auto *watcher = new QFutureWatcher<ErrorCode>(this);
        const Proto protocolTypeCopy = protocolType;
        QObject::connect(watcher, &QFutureWatcher<ErrorCode>::finished, this,
-                         [this, watcher, serverId, container, closePage, protocolTypeCopy]() {
+                         [this, watcher, serverId, container, closePage, protocolTypeCopy, emitBusy]() {
                             const ErrorCode errorCode = watcher->result();
                             watcher->deleteLater();
-                             emit serverIsBusy(false);
+                             if (emitBusy)
+                                 emit serverIsBusy(false);

                             if (errorCode == ErrorCode::NoError) {
                                 const ContainerConfig updatedConfig =
@@ -305,13 +335,13 @@ void InstallUiController::updateContainer(const QString &serverId, int container
        QFuture<ErrorCode> future =
                QtConcurrent::run([installController, serverId, container, oldConfigCopy,
                                   newConfigCopy]() mutable -> ErrorCode {
-                    return installController->updateContainer(serverId, container, oldConfigCopy, newConfigCopy);
+                    return installController->updateServerConfig(serverId, container, oldConfigCopy, newConfigCopy);
                });
        watcher->setFuture(future);
        return;
    }

-    ErrorCode errorCode = m_installController->updateContainer(serverId, container, oldContainerConfig, containerConfig);
+    ErrorCode errorCode = m_installController->updateServerConfig(serverId, container, oldContainerConfig, containerConfig);

    if (errorCode == ErrorCode::NoError) {
        ContainerConfig updatedConfig = m_serversController->getContainerConfig(serverId, container);
@@ -64,7 +64,8 @@ public slots:

    void scanServerForInstalledContainers(const QString &serverId);

-    void updateContainer(const QString &serverId, int containerIndex, int protocolIndex, bool closePage = true);
+    void updateServerConfig(const QString &serverId, int containerIndex, int protocolIndex, bool closePage = true);
+    void updateClientConfig(const QString &serverId, int containerIndex, int protocolIndex, bool closePage = true);

    void removeServer(const QString &serverId);
    void rebootServer(const QString &serverId);
@@ -132,7 +133,6 @@ signals:
    void cachedProfileCleared(const QString &message);
    void apiConfigRemoved(const QString &message);

-    void noInstalledContainers();
    void configValidated(bool isValid);

 private:
@@ -162,6 +162,8 @@ private:
    QString m_privateKeyPassphrase;
    
    void updateProtocolConfigModel(const QString &serverId, int containerIndex, int protocolIndex);
+
+    bool buildContainerConfigFromModel(int containerIndex, int protocolIndex, ContainerConfig &containerConfig);
 };

 #endif // INSTALLUICONTROLLER_H
@@ -1,406 +0,0 @@
-#ifndef SERVERSBACKUPCONTROLLER_H
-#define SERVERSBACKUPCONTROLLER_H
-
-#include <QObject>
-#include <QString>
-#include <QDateTime>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QFileInfo>
-
-class QTemporaryFile;
-class ServersModel;
-class ServersUiController;
-class ServersController;
-class SecureQSettings;
-
-#include <QPointer>
-
-#include "core/utils/containerEnum.h"
-#include "core/utils/commonStructs.h"
-#include "core/utils/errorCodes.h"
-#include "core/utils/selfhosted/sshSession.h"
-
-using namespace amnezia;
-
-/**
- * @brief Controller for managing Amnezia VPN configuration backups
- * 
- * Uses existing ServerController and libssh::Client from Amnezia
- * Bash scripts are embedded directly in C++ code
- * Supports direct container backup via docker cp
- * 
- * Fully cross-platform: Windows, macOS, Linux, iOS, Android
- */
-class ServersBackupController : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit ServersBackupController(SecureQSettings *settings, ServersModel *serversModel,
-                                     ServersUiController *serversUiController, ServersController *serversController,
-                                     QObject *parent = nullptr);
-    ~ServersBackupController();
-
-    /**
-     * @brief Backup information
-     */
-    struct BackupInfo {
-        QString filename;
-        QString fullPath;
-        QDateTime createdAt;
-        qint64 size;
-        bool isValid;
-        QStringList containers;
-    };
-
-    enum BackupStatus {
-        Idle,
-        InProgress,
-        Success,
-        Failed
-    };
-    Q_ENUM(BackupStatus)
-
-public slots:
-    /**
-     * @brief Create backup on server (all containers)
-     * @param credentials Server credentials
-     */
-    void createBackup(const ServerCredentials &credentials);
-    
-    /**
-     * @brief Create backup and automatically download to device (for QML)
-     * @param downloadToDevice Download to device after creation?
-     * @param deleteFromServer Delete from server after download?
-     */
-    Q_INVOKABLE void createBackupWithDownload(bool downloadToDevice = true, 
-                                               bool deleteFromServer = true);
-
-    /**
-     * @brief Create backup of specific container
-     * @param credentials Server credentials
-     * @param container Container type for backup
-     */
-    void createContainerBackup(const ServerCredentials &credentials, DockerContainer container);
-    
-    /**
-     * @brief Create backup of specific container by name
-     * @param credentials Server credentials
-     * @param containerName Container name (e.g. "amnezia-awg")
-     */
-    void createBackupByName(const ServerCredentials &credentials, const QString &containerName);
-
-    /**
-     * @brief Create backup of multiple containers
-     * @param credentials Server credentials
-     * @param containers List of containers for backup
-     */
-    void createContainersBackup(const ServerCredentials &credentials, const QList<DockerContainer> &containers);
-
-    /**
-     * @brief Get list of backups from server
-     * @param credentials Server credentials
-     */
-    void fetchBackupList(const ServerCredentials &credentials);
-
-    /**
-     * @brief Restore from backup
-     * @param credentials Server credentials
-     * @param backupFilename Backup file name
-     * @param containers List of containers (empty = all)
-     * @param replaceMode If true - clears container first, then restores. If false - adds data on top of existing
-     */
-    void restoreBackup(const ServerCredentials &credentials, 
-                       const QString &backupFilename, 
-                       const QStringList &containers = QStringList(),
-                       bool replaceMode = false);
-
-    /**
-     * @brief Check backup status on server
-     * @param credentials Server credentials
-     */
-    void checkBackupStatus(const ServerCredentials &credentials);
-
-    /**
-     * @brief Download backup to local machine
-     * @param credentials Server credentials
-     * @param backupFilename Backup file name
-     * @param localPath Save path
-     */
-    void downloadBackup(const ServerCredentials &credentials,
-                        const QString &backupFilename, 
-                        const QString &localPath);
-
-    /**
-     * @brief Upload backup to server
-     * @param credentials Server credentials
-     * @param localPath Path to local file
-     * @param replaceMode Restore mode (true = replace, false = add). Saved for later use in restoreBackup
-     */
-    void uploadBackup(const ServerCredentials &credentials,
-                      const QString &localPath,
-                      bool replaceMode = false);
-    
-    // Overloaded method for setup wizard with separate credential parameters
-    Q_INVOKABLE void uploadBackupWithStrings(const QString &hostname,
-                                             const QString &username,
-                                             const QString &secretData,
-                                             const QString &localPath,
-                                             bool replaceMode = false);
-    
-    /**
-     * @brief Universal method to start restore (from QML)
-     * Automatically selects correct path depending on parameters
-     * @param isFromSetupWizard Restore from setup wizard?
-     * @param backupFilePath Path to local backup file
-     * @param replaceMode Restore mode (true = replace, false = add)
-     * @param wizardHostname Hostname for setup wizard (optional)
-     * @param wizardUsername Username for setup wizard (optional)
-     * @param wizardSecretData Secret data for setup wizard (optional)
-     */
-    Q_INVOKABLE void startRestore(bool isFromSetupWizard,
-                                   const QString &backupFilePath,
-                                   bool replaceMode,
-                                   const QString &wizardHostname = QString(),
-                                   const QString &wizardUsername = QString(),
-                                   const QString &wizardSecretData = QString());
-    
-    /**
-     * @brief Prepare restore information from backup file
-     * Parses filename, extracts IP, prepares metadata
-     * @param backupFilePath Path to backup file
-     * @return QVariantMap with keys: fileName, serverIp
-     */
-    Q_INVOKABLE QVariantMap getBackupFileInfo(const QString &backupFilePath);
-    
-    /**
-     * @brief Scan backup file and determine which containers it contains
-     * @param localPath Path to local backup file
-     * @return List of container names found in backup
-     */
-    Q_INVOKABLE QStringList scanBackupForContainers(const QString &localPath);
-    
-    /**
-     * @brief Set default server and container after restore (for setup wizard)
-     * @param isFromSetupWizard Was restore called from setup wizard
-     * @return true if successful, false if no servers or containers
-     */
-    Q_INVOKABLE bool setDefaultServerAfterRestore(bool isFromSetupWizard);
-    
-    /**
-     * @brief Install containers from backup on empty server (for setup wizard)
-     * Scans backup, adds empty server and sends signal to install containers
-     * @param backupFilePath Path to local backup file
-     * @param hostname Server hostname
-     * @param username Username for SSH
-     * @param secretData Password/key for SSH
-     */
-    Q_INVOKABLE void prepareRestoreFromBackup(const QString &backupFilePath,
-                                               const QString &hostname,
-                                               const QString &username,
-                                               const QString &secretData);
-
-    /**
-     * @brief Delete backup from server
-     * @param credentials Server credentials
-     * @param backupFilename Backup file name
-     */
-    void deleteBackup(const ServerCredentials &credentials,
-                      const QString &backupFilename);
-
-    /**
-     * @brief Set backup directory on server
-     */
-    void setBackupDirectory(const QString &directory);
-
-    /**
-     * @brief Get backup directory
-     */
-    QString backupDirectory() const { return m_backupDir; }
-
-signals:
-    /**
-     * @brief Operation status changed
-     */
-    void statusChanged(BackupStatus status);
-
-    /**
-     * @brief Operation progress (0-100)
-     */
-    void progressChanged(int percent, const QString &message);
-
-    /**
-     * @brief Backup list received
-     */
-    void backupListReceived(const QList<BackupInfo> &backups);
-
-    /**
-     * @brief Backup created successfully
-     */
-    void backupCreated(const QString &backupFilename);
-
-    /**
-     * @brief Backup restored successfully
-     */
-    void backupRestored();
-    
-    /**
-     * @brief Need to set default server and container (for setup wizard)
-     * This signal is sent after backupRestored() if restore was from setup wizard
-     */
-    void needSetDefaultServer();
-    
-    /**
-     * @brief Default server and container successfully set
-     * Can navigate to result page
-     */
-    void defaultServerAndContainerSet();
-    
-    /**
-     * @brief All containers from backup installed
-     * Can proceed to data restore
-     * @param backupFilePath Path to backup file
-     * @param hostname Hostname
-     * @param username Username  
-     * @param secretData Secret data
-     * @param serverIp IP address (for display)
-     * @param fileName File name (for display)
-     */
-    void readyForRestore(const QString &backupFilePath,
-                        const QString &hostname,
-                        const QString &username,
-                        const QString &secretData,
-                        const QString &serverIp,
-                        const QString &fileName);
-
-    /**
-     * @brief Backup downloaded
-     */
-    void backupDownloaded(const QString &localPath);
-
-    /**
-     * @brief Backup uploaded to server
-     */
-    void backupUploaded(const QString &serverPath);
-
-    /**
-     * @brief Backup status information received
-     */
-    void backupStatusReceived(const QJsonObject &status);
-
-    /**
-     * @brief Error occurred
-     */
-    void errorOccurred(const QString &errorMessage, ErrorCode errorCode);
-
-private:
-    /**
-     * @brief Get bash script for creating backup of all containers
-     * @param ipAddress Server IP address in underscored format (e.g. "192_119_110_11")
-     */
-    QString getBackupScript(const QString &ipAddress) const;
-
-    /**
-     * @brief Get bash script for creating backup of specific container
-     * @param container Container type
-     * @param ipAddress Server IP address in underscored format (e.g. "192_119_110_11")
-     */
-    QString getContainerBackupScript(DockerContainer container, const QString &ipAddress) const;
-
-    /**
-     * @brief Get bash script for creating backup of multiple containers
-     * @param containers List of containers
-     * @param ipAddress Server IP address in underscored format (e.g. "192_119_110_11")
-     */
-    QString getContainersBackupScript(const QList<DockerContainer> &containers, const QString &ipAddress) const;
-
-    /**
-     * @brief Get bash script for restore
-     * @param backupFilename Backup file name
-     * @param containers List of containers
-     * @param replaceMode If true - clears container first, then restores
-     */
-    QString getRestoreScript(const QString &backupFilename, const QStringList &containers, bool replaceMode = false) const;
-
-    /**
-     * @brief Get bash script for status check
-     */
-    QString getCheckStatusScript() const;
-
-    /**
-     * @brief Get bash script for backup list
-     */
-    QString getListBackupsScript() const;
-
-    /**
-     * @brief Parse backup list from output
-     */
-    QList<BackupInfo> parseBackupList(const QString &output);
-
-    /**
-     * @brief Parse status from output
-     */
-    QJsonObject parseBackupStatus(const QString &output);
-
-    /**
-     * @brief Handle standard output
-     */
-    ErrorCode handleStdOut(const QString &data, QString &output);
-
-    /**
-     * @brief Handle error output
-     */
-    ErrorCode handleStdErr(const QString &data, QString &error);
-
-    /**
-     * @brief Set status
-     */
-    void setStatus(BackupStatus status);
-
-    /**
-     * @brief Set progress
-     */
-    void setProgress(int percent, const QString &message);
-    
-    /**
-     * @brief Attempt to set default container (called from timer)
-     */
-    void trySetDefaultContainer();
-
-    ErrorCode runHostScript(const ServerCredentials &credentials, const QString &script,
-                            const std::function<ErrorCode(const QString &, libssh::Client &)> &cbStdOut = nullptr,
-                            const std::function<ErrorCode(const QString &, libssh::Client &)> &cbStdErr = nullptr);
-    ErrorCode downloadFileFromHost(const ServerCredentials &credentials, const QString &remotePath, const QString &localPath);
-    ErrorCode uploadFileToHostPublic(const ServerCredentials &credentials, const QString &localPath, const QString &remotePath,
-                                     libssh::ScpOverwriteMode overwriteMode = libssh::ScpOverwriteMode::ScpOverwriteExisting);
-
-private:
-    QPointer<SecureQSettings> m_settings;
-    ServersModel *m_serversModel;
-    ServersUiController *m_serversUiController;
-    ServersController *m_serversController;
-    SshSession m_sshSession;
-    BackupStatus m_status;
-    QString m_backupDir;
-    QString m_currentOutput;
-    QString m_currentError;
-    bool m_restoreReplaceMode; // Save restore mode for use after uploadBackup
-    QTemporaryFile *m_tempUploadFile; // Temp file for Android URI (to prevent deletion before upload completes)
-    
-    // For setting default container
-    int m_containerRetryCount;
-    static constexpr int m_maxContainerRetries = 3;
-    
-    // For automatic restore after upload
-    ServerCredentials m_pendingRestoreCredentials;
-    bool m_autoRestoreAfterUpload;
-    
-    // For automatic backup download/delete
-    bool m_autoDownloadAfterCreate;
-    bool m_autoDeleteAfterDownload;
-    QString m_lastCreatedBackupFilename;
-};
-
-#endif // SERVERSBACKUPCONTROLLER_H
-
@@ -156,7 +156,17 @@ void ServersUiController::updateModel()

    m_serversModel->updateModel(m_orderedServerDescriptions, defaultServerId);

-    updateContainersModel();
+    if (!m_processedServerId.isEmpty()) {
+        if (isServerFromApi(m_processedServerId)) {
+            const auto &description = serverDescriptionById(m_processedServerId);
+            if (description.isApiV2 && description.isCountrySelectionAvailable
+                && !description.apiAvailableCountries.isEmpty()) {
+                emit updateApiCountryModel();
+            }
+        } else {
+            updateContainersModel();
+        }
+    }
    updateDefaultServerContainersModel();

    if (hadServersFromGatewayBefore != hasServersFromGatewayNow) {
@@ -350,19 +360,14 @@ void ServersUiController::setProcessedServerId(const QString &serverId)
        m_processedServerId = normalizedServerId;

        if (newIndex >= 0) {
-            updateContainersModel();
-
-            for (const auto &description : m_orderedServerDescriptions) {
-                if (description.serverId != normalizedServerId) {
-                    continue;
+            if (isServerFromApi(m_processedServerId)) {
+                const auto &description = serverDescriptionById(m_processedServerId);
+                if (description.isApiV2 && description.isCountrySelectionAvailable
+                    && !description.apiAvailableCountries.isEmpty()) {
+                    emit updateApiCountryModel();
                }
-                if (description.isApiV2) {
-                    if (description.isCountrySelectionAvailable && !description.apiAvailableCountries.isEmpty()) {
-                        emit updateApiCountryModel();
-                    }
-                    emit updateApiServicesModel();
-                }
-                break;
+            } else {
+                updateContainersModel();
            }
        }

@@ -113,7 +113,6 @@ signals:
    void processedContainerIndexChanged(int index);
    void hasServersFromGatewayApiChanged();
    void updateApiCountryModel();
-    void updateApiServicesModel();

 public:
    void updateModel();
@@ -22,12 +22,10 @@

 SettingsUiController::SettingsUiController(SettingsController* settingsController,
                                         ServersController* serversController,
-                                         LanguageUiController* languageUiController,
                                         QObject *parent)
    : QObject(parent),
      m_settingsController(settingsController),
-      m_serversController(serversController),
-      m_languageUiController(languageUiController)
+      m_serversController(serversController)
 {
 #ifdef Q_OS_ANDROID
    connect(AndroidController::instance(), &AndroidController::notificationStateChanged, this, &SettingsUiController::onNotificationStateChanged);
@@ -157,13 +155,13 @@ void SettingsUiController::restoreAppConfigFromData(const QByteArray &data)
 {
    ErrorCode errorCode = m_settingsController->restoreAppConfigFromData(data);
    if (errorCode == ErrorCode::NoError) {
-        emit appLanguageChanged(
-                static_cast<LanguageSettings::AvailableLanguageEnum>(m_languageUiController->getCurrentLanguageIndex()));
+        emit appLanguageChanged();

        bool amneziaDnsEnabled = m_settingsController->isAmneziaDnsEnabled();
        emit amneziaDnsToggled(amneziaDnsEnabled);

        emit restoreBackupFinished();
+        emit autoStartChanged();
        emit startMinimizedChanged();
    } else {
        emit errorOccurred(errorCode);
@@ -178,6 +176,7 @@ QString SettingsUiController::getAppVersion()
 void SettingsUiController::clearSettings()
 {
    m_settingsController->clearSettings();
+    emit autoStartChanged();
    emit startMinimizedChanged();
    emit resetLanguageToSystem();

@@ -206,9 +205,8 @@ bool SettingsUiController::isAutoStartEnabled()
 void SettingsUiController::toggleAutoStart(bool enable)
 {
    m_settingsController->toggleAutoStart(enable);
-    if (!enable) {
-        emit startMinimizedChanged();
-    }
+    emit autoStartChanged();
+    emit startMinimizedChanged();
 }

 bool SettingsUiController::isStartMinimizedEnabled()
@@ -5,8 +5,6 @@

 #include "core/controllers/settingsController.h"
 #include "core/controllers/serversController.h"
-#include "ui/controllers/languageUiController.h"
-#include "ui/models/languageModel.h"
 #include "core/utils/errorCodes.h"
 #include "core/utils/routeModes.h"
 #include "core/utils/commonStructs.h"
@@ -17,7 +15,6 @@ class SettingsUiController : public QObject
 public:
    explicit SettingsUiController(SettingsController* settingsController,
                                 ServersController* serversController,
-                                 LanguageUiController* languageUiController,
                                 QObject *parent = nullptr);

    Q_PROPERTY(QString primaryDns READ getPrimaryDns WRITE setPrimaryDns NOTIFY primaryDnsChanged)
@@ -32,6 +29,7 @@ public:
    Q_PROPERTY(bool isDevGatewayEnv READ isDevGatewayEnv WRITE toggleDevGatewayEnv NOTIFY devGatewayEnvChanged)

    Q_PROPERTY(bool isHomeAdLabelVisible READ isHomeAdLabelVisible NOTIFY isHomeAdLabelVisibleChanged)
+    Q_PROPERTY(bool autoStartEnabled READ isAutoStartEnabled NOTIFY autoStartChanged)
    Q_PROPERTY(bool startMinimized READ isStartMinimizedEnabled NOTIFY startMinimizedChanged)

 public slots:
@@ -122,7 +120,7 @@ signals:

    void loggingDisableByWatcher();

-    void appLanguageChanged(const LanguageSettings::AvailableLanguageEnum language);
+    void appLanguageChanged();
    void resetLanguageToSystem();

    void onNotificationStateChanged();
@@ -135,12 +133,12 @@ signals:
    void activityResumed();

    void isHomeAdLabelVisibleChanged(bool visible);
+    void autoStartChanged();
    void startMinimizedChanged();

 private:
    SettingsController* m_settingsController;
    ServersController* m_serversController;
-    LanguageUiController* m_languageUiController;
 };

 #endif
@@ -168,42 +168,6 @@ void SystemController::setQmlRoot(QObject *qmlRoot)
    m_qmlRoot = qmlRoot;
 }

-QString SystemController::getFileNameFromPath(const QString &filePath)
-{
-    if (filePath.isEmpty()) {
-        return "";
-    }
-    
-#ifdef Q_OS_ANDROID
-    // Для Android URI используем специальный метод для получения имени файла
-    if (filePath.startsWith("content://")) {
-        QString fileName = AndroidController::instance()->getFileName(filePath);
-        if (!fileName.isEmpty()) {
-            return fileName;
-        }
-        // Если не удалось получить имя через ContentResolver, пытаемся извлечь из URI
-    }
-#endif
-    
-    // Для обычных путей или если Android метод не сработал
-    QFileInfo fileInfo(filePath);
-    QString fileName = fileInfo.fileName();
-    
-    // Если имя файла пустое, пытаемся извлечь из пути
-    if (fileName.isEmpty()) {
-        QStringList parts = filePath.split('/');
-        if (!parts.isEmpty()) {
-            fileName = parts.last();
-            // Декодируем URL-кодированные символы
-            if (fileName.contains('%')) {
-                fileName = QUrl::fromPercentEncoding(fileName.toUtf8());
-            }
-        }
-    }
-    
-    return fileName;
-}
-
 bool SystemController::isAuthenticated()
 {
 #ifdef Q_OS_ANDROID
@@ -18,13 +18,6 @@ public:
 public slots:
    QString getFileName(const QString &acceptLabel, const QString &nameFilter, const QString &selectedFile = "",
                        const bool isSaveMode = false, const QString &defaultSuffix = "");
-    
-    /**
-     * @brief Получить имя файла из пути или URI (для Android)
-     * @param filePath Путь к файлу или URI
-     * @return Имя файла
-     */
-    Q_INVOKABLE QString getFileNameFromPath(const QString &filePath);

    void setQmlRoot(QObject *qmlRoot);

@@ -30,7 +30,7 @@ QVariant ApiAccountInfoModel::data(const QModelIndex &index, int role) const
    switch (role) {
    case SubscriptionStatusRole: {
        if (m_accountInfoData.configType == serverConfigUtils::ConfigType::AmneziaFreeV3) {
-            return tr("Active");
+            return QStringLiteral("<p><a style=\"color: #28c840;\">%1</a>").arg(tr("Active"));
        }

        return apiUtils::isSubscriptionExpired(m_accountInfoData.subscriptionEndDate)
@@ -27,6 +27,7 @@ QVariant ClientManagementModel::data(const QModelIndex &index, int role) const
    auto userData = client.value(configKey::userData).toObject();

    switch (role) {
+    case ClientIdRole: return client.value(configKey::clientId).toString();
    case ClientNameRole: return userData.value(configKey::clientName).toString();
    case CreationDateRole: return userData.value(configKey::creationDate).toString();
    case LatestHandshakeRole: return userData.value(configKey::latestHandshake).toString();
@@ -62,6 +63,7 @@ void ClientManagementModel::updateClientName(int row, const QString &newName)
 QHash<int, QByteArray> ClientManagementModel::roleNames() const
 {
    QHash<int, QByteArray> roles;
+    roles[ClientIdRole] = "clientId";
    roles[ClientNameRole] = "clientName";
    roles[CreationDateRole] = "creationDate";
    roles[LatestHandshakeRole] = "latestHandshake";
@@ -10,7 +10,8 @@ class ClientManagementModel : public QAbstractListModel

 public:
    enum Roles {
-        ClientNameRole = Qt::UserRole + 1,
+        ClientIdRole = Qt::UserRole + 1,
+        ClientNameRole,
        CreationDateRole,
        LatestHandshakeRole,
        DataReceivedRole,
@@ -23,6 +23,10 @@ public:
    Q_INVOKABLE int containerFromString(const QString &container) const {
        return static_cast<int>(amnezia::ContainerUtils::containerFromString(container));
    }
+
+    Q_INVOKABLE bool isUnsupportedContainer(int containerIndex) const {
+        return amnezia::ContainerUtils::isUnsupportedContainer(static_cast<amnezia::DockerContainer>(containerIndex));
+    }
 };

 #endif // CONTAINERPROPS_H
@@ -67,6 +67,7 @@ QVariant ContainersModel::data(const QModelIndex &index, int role) const
    case IsCurrentlyProcessedRole: return container == static_cast<DockerContainer>(m_processedContainerIndex);
    case IsSupportedRole: return ContainerUtils::isSupportedByCurrentPlatform(container);
    case IsShareableRole: return ContainerUtils::isShareable(container);
+    case IsUnsupportedContainerRole: return ContainerUtils::isUnsupportedContainer(container);
    case IsVpnContainerRole: return ContainerUtils::containerService(container) == ServiceType::Vpn;
    case IsServiceContainerRole: return ContainerUtils::containerService(container) == ServiceType::Other;
    case IsIpsecRole: return container == DockerContainer::Ipsec;
@@ -142,7 +143,8 @@ bool ContainersModel::hasInstalledProtocols()

 bool ContainersModel::isInstallationAllowed(DockerContainer container)
 {
-    return container != DockerContainer::Awg;
+    return container != DockerContainer::Awg
+           && !ContainerUtils::isUnsupportedContainer(container);
 }

 void ContainersModel::openContainerSettings(int containerIndex)
@@ -176,6 +178,7 @@ QHash<int, QByteArray> ContainersModel::roleNames() const
    roles[IsCurrentlyProcessedRole] = "isCurrentlyProcessed";
    roles[IsSupportedRole] = "isSupported";
    roles[IsShareableRole] = "isShareable";
+    roles[IsUnsupportedContainerRole] = "isUnsupportedContainer";
    roles[IsInstallationAllowedRole] = "isInstallationAllowed";
    roles[InstallPageOrderRole] = "installPageOrder";
    
@@ -39,6 +39,8 @@ public:
        IsSupportedRole,
        IsShareableRole,

+        IsUnsupportedContainerRole,
+
        InstallPageOrderRole,
        
        // Container type check roles
@@ -4,6 +4,10 @@
 #include "core/protocols/protocolUtils.h"
 #include "core/utils/constants/configKeys.h"
 #include "core/utils/constants/protocolConstants.h"
+#include "core/utils/networkUtilities.h"
+
+#include <QHostAddress>
+#include <QRegularExpression>

 using namespace amnezia;
 using namespace ProtocolUtils;
@@ -272,7 +276,7 @@ void XrayConfigModel::updateModel(amnezia::DockerContainer container, const amne
    }

    if (!m_protocolConfig.serverConfig.isThirdPartyConfig) {
-        applyDefaultsToServerConfig(m_protocolConfig.serverConfig);
+        applyDefaultsToServerConfig(m_protocolConfig.serverConfig, false);
    }

    m_originalProtocolConfig = m_protocolConfig;
@@ -283,7 +287,7 @@ void XrayConfigModel::updateModel(amnezia::DockerContainer container, const amne
    }
 }

-void XrayConfigModel::applyDefaultsToServerConfig(amnezia::XrayServerConfig &config)
+void XrayConfigModel::applyDefaultsToServerConfig(amnezia::XrayServerConfig &config, bool fillFlowDefault)
 {
    if (config.port.isEmpty()) {
        config.port = protocols::xray::defaultPort;
@@ -306,7 +310,7 @@ void XrayConfigModel::applyDefaultsToServerConfig(amnezia::XrayServerConfig &con
        config.security = protocols::xray::defaultSecurity;
    }

-    if (config.flow.isEmpty()) {
+    if (fillFlowDefault && config.flow.isEmpty()) {
        config.flow = protocols::xray::defaultFlow;
    }

@@ -585,3 +589,87 @@ QString XrayConfigModel::mkcpDefaultWriteBufferSize()
 {
    return QString::fromLatin1(protocols::xray::defaultMkcpWriteBufferSize);
 }
+
+namespace {
+    bool isValidSingleHost(const QString &t)
+    {
+        if (t.isEmpty() || t.length() > 253) {
+            return false;
+        }
+        QHostAddress a(t);
+        if (a.protocol() == QHostAddress::IPv4Protocol) {
+            return NetworkUtilities::checkIPv4Format(t);
+        }
+        if (a.protocol() == QHostAddress::IPv6Protocol) {
+            return true;
+        }
+        static const QRegularExpression onlyDigits(QStringLiteral(R"(^\d+$)"));
+        if (onlyDigits.match(t).hasMatch()) {
+            return false;
+        }
+        QRegExp re = NetworkUtilities::domainRegExp();
+        re.setCaseSensitivity(Qt::CaseInsensitive);
+        return re.exactMatch(t);
+    }
+}
+
+bool XrayConfigModel::isValidHost(const QString &host)
+{
+    const QString t = host.trimmed();
+    if (t.isEmpty()) {
+        return true;
+    }
+    return isValidSingleHost(t);
+}
+
+bool XrayConfigModel::isValidSni(const QString &sni)
+{
+    const QString t = sni.trimmed();
+    if (t.isEmpty()) {
+        return true;
+    }
+    if (t.startsWith(QLatin1String("*."))) {
+        return isValidSingleHost(t.mid(2));
+    }
+    return isValidSingleHost(t);
+}
+
+bool XrayConfigModel::isValidPath(const QString &path)
+{
+    const QString t = path.trimmed();
+    if (t.isEmpty()) {
+        return true;
+    }
+    return t.startsWith(QLatin1Char('/'));
+}
+
+QStringList XrayConfigModel::validationErrors() const
+{
+    QStringList errs;
+    const auto &srv = m_protocolConfig.serverConfig;
+
+    if (!srv.port.isEmpty()) {
+        bool ok = false;
+        const int p = srv.port.toInt(&ok);
+        if (!ok || p < 1 || p > 65535) {
+            errs << tr("Port must be in the range of 1 to 65535");
+        }
+    }
+
+    if (srv.security == QLatin1String("tls") || srv.security == QLatin1String("reality")) {
+        if (!isValidSni(srv.sni)) {
+            errs << tr("SNI: enter a valid IP address or domain name");
+        }
+    }
+
+    if (srv.transport == QLatin1String("xhttp")) {
+        if (!isValidHost(srv.xhttp.host)) {
+            errs << tr("Host: enter a valid IP address or domain name");
+        }
+        if (!isValidPath(srv.xhttp.path)) {
+            errs << tr("Path must start with \"/\"");
+        }
+    }
+
+    return errs;
+}
@@ -118,6 +118,11 @@ public:
    Q_INVOKABLE static QString mkcpDefaultReadBufferSize();
    Q_INVOKABLE static QString mkcpDefaultWriteBufferSize();

+    Q_INVOKABLE static bool isValidHost(const QString &host);
+    Q_INVOKABLE static bool isValidSni(const QString &sni);
+    Q_INVOKABLE static bool isValidPath(const QString &path);
+    Q_INVOKABLE QStringList validationErrors() const;
+
 public slots:
    void updateModel(amnezia::DockerContainer container, const amnezia::XrayProtocolConfig& protocolConfig);
    amnezia::XrayProtocolConfig getProtocolConfig();
@@ -137,7 +142,7 @@ private:
    amnezia::XrayProtocolConfig m_protocolConfig;
    amnezia::XrayProtocolConfig m_originalProtocolConfig;

-    void applyDefaultsToServerConfig(amnezia::XrayServerConfig& config);
+    void applyDefaultsToServerConfig(amnezia::XrayServerConfig& config, bool fillFlowDefault = true);
 };

 #endif // XRAYCONFIGMODEL_H
@@ -56,14 +56,17 @@ ListViewType {
                        return
                    }

-                    if (checked) {
-                        containersDropDown.closeTriggered()
-                        ServersUiController.setDefaultContainer(ServersUiController.defaultServerId, proxyDefaultServerContainersModel.mapToSource(index))
-                    } else {
-                        ServersUiController.processedContainerIndex = proxyDefaultServerContainersModel.mapToSource(index)
+                    var containerIndex = proxyDefaultServerContainersModel.mapToSource(index)
+
+                    if (!isInstalled) {
+                        ServersUiController.processedContainerIndex = containerIndex
                        PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
                        containersDropDown.closeTriggered()
+                        return
                    }
+
+                    containersDropDown.closeTriggered()
+                    ServersUiController.setDefaultContainer(ServersUiController.defaultServerId, containerIndex)
                }

                MouseArea {
@@ -5,7 +5,6 @@ import QtQuick.Layouts
 import SortFilterProxyModel 0.2

 import PageEnum 1.0
-import ContainerProps 1.0

 import "../Controls2"
 import "../Controls2/TextTypes"
@@ -6,8 +6,36 @@ Menu {

    popupType: Popup.Native

-    onAboutToShow: blocker.enabled = true
-    onClosed: blocker.enabled = false
+    property Item inputBlocker: null
+
+    Component {
+        id: inputBlockerComponent
+
+        MouseArea {
+            anchors.fill: parent
+            preventStealing: true
+        }
+    }
+
+    onAboutToShow: {
+        if (!textObj || !textObj.window) {
+            return
+        }
+
+        const contentItem = textObj.window.contentItem
+        if (!inputBlocker) {
+            inputBlocker = inputBlockerComponent.createObject(contentItem)
+        } else {
+            inputBlocker.parent = contentItem
+        }
+    }
+
+    onClosed: {
+        if (inputBlocker) {
+            inputBlocker.destroy()
+            inputBlocker = null
+        }
+    }

    MenuItem {
        text: qsTr("C&ut")
@@ -31,11 +59,4 @@ Menu {
        enabled: textObj.length > 0
        onTriggered: textObj.selectAll()
    }
-
-    MouseArea {
-        id: blocker
-        z: 2
-        enabled: false
-        preventStealing: true
-    }
 }
@@ -42,6 +42,7 @@ Item {
    property int rootButtonTextBottomMargin: 16

    property real drawerHeight: 0.9
+    property bool fitContent: false
    property Item drawerParent
    property Component listView

@@ -219,12 +220,20 @@ Item {
        parent: drawerParent

        anchors.fill: parent
-        expandedHeight: drawerParent.height * drawerHeight
+        property real measuredContentHeight: 0
+        expandedHeight: (root.fitContent && measuredContentHeight > 0)
+            ? Math.min(measuredContentHeight, drawerParent.height * root.drawerHeight)
+            : drawerParent.height * root.drawerHeight

        expandedStateContent: Item {
            id: container
            implicitHeight: menu.expandedHeight

+            property real fitHeight: backButton.implicitHeight + titleLabel.implicitHeight
+                                     + (listViewLoader.item ? listViewLoader.item.contentHeight : 0) + 48
+            onFitHeightChanged: menu.measuredContentHeight = fitHeight
+            Component.onCompleted: menu.measuredContentHeight = fitHeight
+
            ColumnLayout {
                id: header

@@ -238,6 +247,7 @@ Item {
                }

                Header2Type {
+                    id: titleLabel
                    Layout.leftMargin: 16
                    Layout.rightMargin: 16
                    Layout.bottomMargin: 16
@@ -12,8 +12,8 @@ import "../Controls2/TextTypes"
 //   MinMaxRowType {
 //       minValue: "0"
 //       maxValue: "0"
-//       onMinChanged: someProperty = val
-//       onMaxChanged: someProperty = val
+//       onMinChanged: function(val) { someProperty = val }
+//       onMaxChanged: function(val) { someProperty = val }
 //   }
 Item {
    id: root
@@ -21,41 +21,128 @@ Item {
    property string minValue: "0"
    property string maxValue: "0"

+    property int minLimit: 0
+    property int maxLimit: 2147483647
+
+    property string hintText: root.minLimit > 0
+                              ? (root.minLimit + "–" + root.maxLimit)
+                              : ("≤ " + root.maxLimit)
+
    signal minChanged(string val)
    signal maxChanged(string val)
+    signal edited()

-    implicitHeight: row.implicitHeight
-    implicitWidth: row.implicitWidth
+    implicitHeight: col.implicitHeight
+    implicitWidth: col.implicitWidth

-    RowLayout {
-        id: row
+    function clampValue(text) {
+        if (text === "")
+            return ""
+        var n = parseInt(text, 10)
+        if (isNaN(n))
+            return ""
+        if (n < root.minLimit)
+            n = root.minLimit
+        if (n > root.maxLimit)
+            n = root.maxLimit
+        return String(n)
+    }
+
+    function capEdit(tf, holder) {
+        if (tf.text !== "" && parseInt(tf.text, 10) > root.maxLimit) {
+            tf.text = holder.lastValid
+            tf.cursorPosition = tf.text.length
+        } else {
+            holder.lastValid = tf.text
+        }
+    }
+
+    ColumnLayout {
+        id: col
        anchors.fill: parent
-        spacing: 10
+        spacing: 4

-        // Min field
-        TextFieldWithHeaderType {
+        RowLayout {
+            id: row
            Layout.fillWidth: true
-            headerText: qsTr("Min")
-            textField.text: root.minValue
-            textField.validator: IntValidator { bottom: 0 }
-            textField.onEditingFinished: {
-                if (textField.text !== root.minValue) {
-                    root.minChanged(textField.text)
+            spacing: 10
+
+            // Min field
+            TextFieldWithHeaderType {
+                id: minField
+                property string lastValid: ""
+                Layout.fillWidth: true
+                headerText: qsTr("Min")
+                textField.maximumLength: 10
+                textField.validator: RegularExpressionValidator { regularExpression: /^\d*$/ }
+                textField.onActiveFocusChanged: {
+                    if (minField.textField.activeFocus)
+                        minField.lastValid = minField.textField.text
+                }
+                textField.onTextEdited: { root.capEdit(minField.textField, minField); root.edited() }
+                textField.onEditingFinished: {
+                    var v = root.clampValue(minField.textField.text)
+                    if (v !== "" && root.maxValue !== "") {
+                        var mx = parseInt(root.maxValue, 10)
+                        if (!isNaN(mx) && parseInt(v, 10) > mx)
+                            root.maxChanged(v)
+                    }
+                    if (v !== root.minValue)
+                        root.minChanged(v)
+                    else if (minField.textField.text !== v)
+                        minField.textField.text = v
+                }
+
+                Binding {
+                    target: minField.textField
+                    property: "text"
+                    value: root.minValue
+                    when: !minField.textField.activeFocus
+                    restoreMode: Binding.RestoreNone
+                }
+            }
+
+            // Max field
+            TextFieldWithHeaderType {
+                id: maxField
+                property string lastValid: ""
+                Layout.fillWidth: true
+                headerText: qsTr("Max")
+                textField.maximumLength: 10
+                textField.validator: RegularExpressionValidator { regularExpression: /^\d*$/ }
+                textField.onActiveFocusChanged: {
+                    if (maxField.textField.activeFocus)
+                        maxField.lastValid = maxField.textField.text
+                }
+                textField.onTextEdited: { root.capEdit(maxField.textField, maxField); root.edited() }
+                textField.onEditingFinished: {
+                    var v = root.clampValue(maxField.textField.text)
+                    if (v !== "" && root.minValue !== "") {
+                        var mn = parseInt(root.minValue, 10)
+                        if (!isNaN(mn) && parseInt(v, 10) < mn)
+                            v = String(mn)
+                    }
+                    if (v !== root.maxValue)
+                        root.maxChanged(v)
+                    else if (maxField.textField.text !== v)
+                        maxField.textField.text = v
+                }
+
+                Binding {
+                    target: maxField.textField
+                    property: "text"
+                    value: root.maxValue
+                    when: !maxField.textField.activeFocus
+                    restoreMode: Binding.RestoreNone
                }
            }
        }

-        // Max field
-        TextFieldWithHeaderType {
+        SmallTextType {
+            visible: root.hintText !== ""
+            text: root.hintText
+            color: AmneziaStyle.color.mutedGray
            Layout.fillWidth: true
-            headerText: qsTr("Max")
-            textField.text: root.maxValue
-            textField.validator: IntValidator { bottom: 0 }
-            textField.onEditingFinished: {
-                if (textField.text !== root.maxValue) {
-                    root.maxChanged(textField.text)
-                }
-            }
        }
    }
 }
@@ -25,8 +25,8 @@ PageType {

        filters: [
            ValueFilter {
-                roleName: "isCurrentlyProcessed"
-                value: true
+                roleName: "serverId"
+                value: ServersUiController.processedServerId
            }
        ]
    }
@@ -440,8 +440,7 @@ PageType {
                    return
                }

-                PageController.goToPage(PageEnum.PageSetupWizardInstalling);
-                InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Awg)
+                InstallController.updateClientConfig(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Awg)
            }

            var noButtonFunction = function() {}
@@ -561,7 +561,7 @@ PageType {
                        }

                        PageController.goToPage(PageEnum.PageSetupWizardInstalling);
-                        InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Awg)
+                        InstallController.updateServerConfig(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Awg)
                    }

                    var noButtonFunction = function() {}
@@ -434,7 +434,7 @@ PageType {
                        }

                        PageController.goToPage(PageEnum.PageSetupWizardInstalling);
-                        InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.OpenVpn)
+                        InstallController.updateServerConfig(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.OpenVpn)
                    }
                    var noButtonFunction = function() {
                        if (!GC.isMobile()) {
@@ -128,8 +128,7 @@ PageType {
                            return
                        }

-                        PageController.goToPage(PageEnum.PageSetupWizardInstalling);
-                        InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.WireGuard)
+                        InstallController.updateClientConfig(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.WireGuard)
                    }
                    var noButtonFunction = function() {}
                    showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
@@ -129,7 +129,7 @@ PageType {
                        }

                        PageController.goToPage(PageEnum.PageSetupWizardInstalling);
-                        InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.WireGuard)
+                        InstallController.updateServerConfig(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.WireGuard)
                    }
                    var noButtonFunction = function() {
                        if (!GC.isMobile()) {
@@ -112,7 +112,7 @@ PageType {
                    return
                }
                PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                InstallController.updateContainer(ServersUiController.processedIndex, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
+                InstallController.updateServerConfig(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
            }
            var noButtonFunction = function () {
                if (typeof GC !== "undefined" && !GC.isMobile()) {
@@ -15,6 +15,8 @@ import "../Components"
 PageType {
    id: root

+    property bool editDirty: false
+
    BackButtonType {
        id: backButton
        anchors.top: parent.top
@@ -90,6 +92,7 @@ PageType {

                DropDownType {
                    id: tlsAlpnDropDown
+                    fitContent: true
                    Layout.fillWidth: true
                    Layout.topMargin: 16
                    Layout.leftMargin: 16
@@ -133,6 +136,7 @@ PageType {

                DropDownType {
                    id: tlsFingerprintDropDown
+                    fitContent: true
                    Layout.fillWidth: true
                    Layout.topMargin: 8
                    Layout.leftMargin: 16
@@ -175,14 +179,21 @@ PageType {
                }

                TextFieldWithHeaderType {
+                    id: sniFieldTls
                    Layout.fillWidth: true
                    Layout.leftMargin: 16
                    Layout.rightMargin: 16
                    Layout.topMargin: 8
                    headerText: qsTr("Server Name (SNI)")
                    textField.text: sni
+                    textField.validator: RegularExpressionValidator { regularExpression: /^[A-Za-z0-9.*_-]*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== sni)
                    textField.onEditingFinished: {
-                        if (textField.text !== sni) sni = textField.text
+                        var v = textField.text.trim()
+                        if (v !== sni) sni = v
+                        else if (textField.text !== v) textField.text = v
+                        sniFieldTls.errorText = XrayConfigModel.isValidSni(v) ? "" : qsTr("Enter a valid IP address or domain name")
+                        root.editDirty = false
                    }
                }
            }
@@ -195,6 +206,7 @@ PageType {

                DropDownType {
                    id: realityFingerprintDropDown
+                    fitContent: true
                    Layout.fillWidth: true
                    Layout.topMargin: 16
                    Layout.leftMargin: 16
@@ -237,14 +249,21 @@ PageType {
                }

                TextFieldWithHeaderType {
+                    id: sniFieldReality
                    Layout.fillWidth: true
                    Layout.leftMargin: 16
                    Layout.rightMargin: 16
                    Layout.topMargin: 8
                    headerText: qsTr("Server Name (SNI)")
                    textField.text: sni
+                    textField.validator: RegularExpressionValidator { regularExpression: /^[A-Za-z0-9.*_-]*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== sni)
                    textField.onEditingFinished: {
-                        if (textField.text !== sni) sni = textField.text
+                        var v = textField.text.trim()
+                        if (v !== sni) sni = v
+                        else if (textField.text !== v) textField.text = v
+                        sniFieldReality.errorText = XrayConfigModel.isValidSni(v) ? "" : qsTr("Enter a valid IP address or domain name")
+                        root.editDirty = false
                    }
                }
            }
@@ -265,10 +284,15 @@ PageType {
        anchors.rightMargin: 16
        anchors.bottomMargin: 16 + PageController.safeAreaBottomMargin

-        visible: listView.enabled && XrayConfigModel.hasUnsavedChanges
+        visible: listView.enabled && (XrayConfigModel.hasUnsavedChanges || root.editDirty)
        enabled: visible
        text: qsTr("Save")
        clickedFunc: function () {
+            var errs = XrayConfigModel.validationErrors()
+            if (errs.length > 0) {
+                PageController.showErrorMessage(errs.join("\n"))
+                return
+            }
            var headerText = qsTr("Save settings?")
            var descriptionText = qsTr("All users with whom you shared a connection with will no longer be able to connect to it.")
            var yesButtonText = qsTr("Continue")
@@ -279,7 +303,7 @@ PageType {
                    return
                }
                PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                InstallController.updateContainer(ServersUiController.processedIndex, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
+                InstallController.updateServerConfig(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
            }
            var noButtonFunction = function () {
                if (typeof GC !== "undefined" && !GC.isMobile()) {
@@ -17,6 +17,10 @@ import "../Components"
 PageType {
    id: root

+    enableTimer: false
+
+    property bool portDirty: false
+
    function formatTransport(value) {
        if (value === "raw") return "RAW (TCP)"
        if (value === "xhttp") return "XHTTP"
@@ -39,8 +43,8 @@ PageType {
        anchors.right: parent.right
        anchors.topMargin: 20 + PageController.safeAreaTopMargin

-        onFocusChanged: {
-            if (this.activeFocus) {
+        onActiveFocusChanged: {
+            if (backButton.enabled && backButton.activeFocus) {
                listView.positionViewAtBeginning()
            }
        }
@@ -60,8 +64,6 @@ PageType {
        delegate: ColumnLayout {
            width: listView.width

-            property alias focusItemId: textFieldWithHeaderType.textField
-
            spacing: 0

            Text {
@@ -107,13 +109,43 @@ PageType {
                Layout.rightMargin: 16
                enabled: listView.enabled
                headerText: qsTr("Port")
-                textField.text: port
+                subtitleText: qsTr("1–65535")
+
+                Binding {
+                    target: textFieldWithHeaderType.textField
+                    property: "text"
+                    value: port
+                    when: !textFieldWithHeaderType.textField.activeFocus
+                    restoreMode: Binding.RestoreNone
+                }
+
                textField.maximumLength: 5
-                textField.validator: IntValidator {
-                    bottom: 1; top: 65535
+                textField.validator: RegularExpressionValidator {
+                    regularExpression: /^(|\d{1,4}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])$/
+                }
+                textField.onActiveFocusChanged: {
+                    if (textField.activeFocus && textField.text === "" && port !== "") {
+                        textField.text = port
+                    }
+                }
+                textField.onTextChanged: {
+                    root.portDirty = (textField.text !== port)
                }
                textField.onEditingFinished: {
-                    if (textField.text !== port) port = textField.text
+                    var v = textFieldWithHeaderType.textField.text
+                    if (v !== "") {
+                        var n = parseInt(v, 10)
+                        if (isNaN(n) || n < 1)
+                            n = 1
+                        if (n > 65535)
+                            n = 65535
+                        v = String(n)
+                        if (textFieldWithHeaderType.textField.text !== v)
+                            textFieldWithHeaderType.textField.text = v
+                    }
+                    if (v !== port)
+                        port = v
+                    root.portDirty = false
                }
                checkEmptyText: true
            }
@@ -172,12 +204,16 @@ PageType {
                Layout.leftMargin: 16
                Layout.rightMargin: 16
                visible: listView.enabled
-                         && (XrayConfigModel.hasUnsavedChanges
-                             || textFieldWithHeaderType.textField.text !== port)
-                enabled: visible && textFieldWithHeaderType.errorText === ""
+                         && (XrayConfigModel.hasUnsavedChanges || root.portDirty)
+                enabled: visible && textFieldWithHeaderType.textField.text !== ""
                text: qsTr("Save")
                onClicked: function() {
                    forceActiveFocus()
+                    var errs = XrayConfigModel.validationErrors()
+                    if (errs.length > 0) {
+                        PageController.showErrorMessage(errs.join("\n"))
+                        return
+                    }
                    var headerText = qsTr("Save settings?")
                    var descriptionText = qsTr("All users with whom you shared a connection with will no longer be able to connect to it.")
                    var yesButtonText = qsTr("Continue")
@@ -193,7 +229,7 @@ PageType {
                        }

                        PageController.goToPage(PageEnum.PageSetupWizardInstalling);
-                        InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
+                        InstallController.updateServerConfig(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
                    }
                    var noButtonFunction = function() {
                        if (!GC.isMobile()) saveButton.forceActiveFocus()
@@ -15,6 +15,21 @@ import "../Components"
 PageType {
    id: root

+    property bool editDirty: false
+
+    function clampInt(text, lo, hi) {
+        if (text === "")
+            return ""
+        var n = parseInt(text, 10)
+        if (isNaN(n))
+            return ""
+        if (n < lo)
+            n = lo
+        if (n > hi)
+            n = hi
+        return String(n)
+    }
+
    BackButtonType {
        id: backButton
        anchors.top: parent.top
@@ -108,10 +123,16 @@ PageType {
                    Layout.rightMargin: 16
                    Layout.topMargin: 8
                    headerText: qsTr("TTI")
-                    subtitleText: qsTr("Default: %1 ms", "mKCP TTI").arg(XrayConfigModel.mkcpDefaultTti())
+                    subtitleText: qsTr("Range 10–100, default %1 ms", "mKCP TTI").arg(XrayConfigModel.mkcpDefaultTti())
                    textField.text: mkcpTti
+                    textField.maximumLength: 3
+                    textField.validator: RegularExpressionValidator { regularExpression: /^(|\d{1,2}|100)$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== mkcpTti)
                    textField.onEditingFinished: {
-                        if (textField.text !== mkcpTti) mkcpTti = textField.text
+                        var v = root.clampInt(textField.text, 10, 100)
+                        if (v !== mkcpTti) mkcpTti = v
+                        else if (textField.text !== v) textField.text = v
+                        root.editDirty = false
                    }
                }

@@ -121,10 +142,16 @@ PageType {
                    Layout.rightMargin: 16
                    Layout.topMargin: 8
                    headerText: qsTr("uplinkCapacity")
-                    subtitleText: qsTr("Default: %1 Mbit/s", "mKCP uplink").arg(XrayConfigModel.mkcpDefaultUplinkCapacity())
+                    subtitleText: qsTr("≥ 0, default %1 MB/s", "mKCP uplink").arg(XrayConfigModel.mkcpDefaultUplinkCapacity())
                    textField.text: mkcpUplinkCapacity
+                    textField.maximumLength: 10
+                    textField.validator: RegularExpressionValidator { regularExpression: /^\d*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== mkcpUplinkCapacity)
                    textField.onEditingFinished: {
-                        if (textField.text !== mkcpUplinkCapacity) mkcpUplinkCapacity = textField.text
+                        var v = root.clampInt(textField.text, 0, 2147483647)
+                        if (v !== mkcpUplinkCapacity) mkcpUplinkCapacity = v
+                        else if (textField.text !== v) textField.text = v
+                        root.editDirty = false
                    }
                }

@@ -134,10 +161,16 @@ PageType {
                    Layout.rightMargin: 16
                    Layout.topMargin: 8
                    headerText: qsTr("downlinkCapacity")
-                    subtitleText: qsTr("Default: %1 Mbit/s", "mKCP downlink").arg(XrayConfigModel.mkcpDefaultDownlinkCapacity())
+                    subtitleText: qsTr("≥ 0, default %1 MB/s", "mKCP downlink").arg(XrayConfigModel.mkcpDefaultDownlinkCapacity())
                    textField.text: mkcpDownlinkCapacity
+                    textField.maximumLength: 10
+                    textField.validator: RegularExpressionValidator { regularExpression: /^\d*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== mkcpDownlinkCapacity)
                    textField.onEditingFinished: {
-                        if (textField.text !== mkcpDownlinkCapacity) mkcpDownlinkCapacity = textField.text
+                        var v = root.clampInt(textField.text, 0, 2147483647)
+                        if (v !== mkcpDownlinkCapacity) mkcpDownlinkCapacity = v
+                        else if (textField.text !== v) textField.text = v
+                        root.editDirty = false
                    }
                }

@@ -147,10 +180,16 @@ PageType {
                    Layout.rightMargin: 16
                    Layout.topMargin: 8
                    headerText: qsTr("readBufferSize")
-                    subtitleText: qsTr("Default: %1 MiB").arg(XrayConfigModel.mkcpDefaultReadBufferSize())
+                    subtitleText: qsTr("≥ 1, default %1 MB").arg(XrayConfigModel.mkcpDefaultReadBufferSize())
                    textField.text: mkcpReadBufferSize
+                    textField.maximumLength: 10
+                    textField.validator: RegularExpressionValidator { regularExpression: /^\d*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== mkcpReadBufferSize)
                    textField.onEditingFinished: {
-                        if (textField.text !== mkcpReadBufferSize) mkcpReadBufferSize = textField.text
+                        var v = root.clampInt(textField.text, 1, 2147483647)
+                        if (v !== mkcpReadBufferSize) mkcpReadBufferSize = v
+                        else if (textField.text !== v) textField.text = v
+                        root.editDirty = false
                    }
                }

@@ -160,10 +199,16 @@ PageType {
                    Layout.rightMargin: 16
                    Layout.topMargin: 8
                    headerText: qsTr("writeBufferSize")
-                    subtitleText: qsTr("Default: %1 MiB").arg(XrayConfigModel.mkcpDefaultWriteBufferSize())
+                    subtitleText: qsTr("≥ 1, default %1 MB").arg(XrayConfigModel.mkcpDefaultWriteBufferSize())
                    textField.text: mkcpWriteBufferSize
+                    textField.maximumLength: 10
+                    textField.validator: RegularExpressionValidator { regularExpression: /^\d*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== mkcpWriteBufferSize)
                    textField.onEditingFinished: {
-                        if (textField.text !== mkcpWriteBufferSize) mkcpWriteBufferSize = textField.text
+                        var v = root.clampInt(textField.text, 1, 2147483647)
+                        if (v !== mkcpWriteBufferSize) mkcpWriteBufferSize = v
+                        else if (textField.text !== v) textField.text = v
+                        root.editDirty = false
                    }
                }

@@ -187,6 +232,7 @@ PageType {

                DropDownType {
                    id: modeDropDown
+                    fitContent: true
                    Layout.fillWidth: true
                    Layout.topMargin: 16
                    Layout.leftMargin: 16
@@ -239,31 +285,46 @@ PageType {
                }

                TextFieldWithHeaderType {
+                    id: hostField
                    Layout.fillWidth: true
                    Layout.leftMargin: 16
                    Layout.rightMargin: 16
                    Layout.topMargin: 8
                    headerText: qsTr("Host")
                    textField.text: xhttpHost
+                    textField.validator: RegularExpressionValidator { regularExpression: /^[A-Za-z0-9._:,-]*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== xhttpHost)
                    textField.onEditingFinished: {
-                        if (textField.text !== xhttpHost) xhttpHost = textField.text
+                        var v = textField.text.trim()
+                        if (v !== xhttpHost) xhttpHost = v
+                        else if (textField.text !== v) textField.text = v
+                        hostField.errorText = XrayConfigModel.isValidHost(v) ? "" : qsTr("Enter a valid IP address or domain name")
+                        root.editDirty = false
                    }
                }

                TextFieldWithHeaderType {
+                    id: pathField
                    Layout.fillWidth: true
                    Layout.leftMargin: 16
                    Layout.rightMargin: 16
                    Layout.topMargin: 8
                    headerText: qsTr("Path")
                    textField.text: xhttpPath
+                    textField.validator: RegularExpressionValidator { regularExpression: /^[A-Za-z0-9\-._~:\/?#\[\]@!$&'()*+,;=%]*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== xhttpPath)
                    textField.onEditingFinished: {
-                        if (textField.text !== xhttpPath) xhttpPath = textField.text
+                        var v = textField.text.trim()
+                        if (v !== xhttpPath) xhttpPath = v
+                        else if (textField.text !== v) textField.text = v
+                        pathField.errorText = XrayConfigModel.isValidPath(v) ? "" : qsTr("Path must start with \"/\"")
+                        root.editDirty = false
                    }
                }

                DropDownType {
                    id: headersDropDown
+                    fitContent: true
                    Layout.fillWidth: true
                    Layout.topMargin: 8
                    Layout.leftMargin: 16
@@ -307,6 +368,7 @@ PageType {

                DropDownType {
                    id: uplinkMethodDropDown
+                    fitContent: true
                    Layout.fillWidth: true
                    Layout.topMargin: 8
                    Layout.leftMargin: 16
@@ -386,6 +448,7 @@ PageType {

                DropDownType {
                    id: sessionPlacementDropDown
+                    fitContent: true
                    Layout.fillWidth: true
                    Layout.topMargin: 8
                    Layout.leftMargin: 16
@@ -429,6 +492,7 @@ PageType {

                DropDownType {
                    id: sessionKeyDropDown
+                    fitContent: true
                    Layout.fillWidth: true
                    Layout.topMargin: 8
                    Layout.leftMargin: 16
@@ -472,6 +536,7 @@ PageType {

                DropDownType {
                    id: seqPlacementDropDown
+                    fitContent: true
                    Layout.fillWidth: true
                    Layout.topMargin: 8
                    Layout.leftMargin: 16
@@ -520,13 +585,19 @@ PageType {
                    Layout.topMargin: 8
                    headerText: qsTr("SeqKey")
                    textField.text: xhttpSeqKey
+                    textField.validator: RegularExpressionValidator { regularExpression: /^[A-Za-z0-9_-]*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== xhttpSeqKey)
                    textField.onEditingFinished: {
-                        if (textField.text !== xhttpSeqKey) xhttpSeqKey = textField.text
+                        var v = textField.text.trim()
+                        if (v !== xhttpSeqKey) xhttpSeqKey = v
+                        else if (textField.text !== v) textField.text = v
+                        root.editDirty = false
                    }
                }

                DropDownType {
                    id: uplinkDataPlacementDropDown
+                    fitContent: true
                    Layout.fillWidth: true
                    Layout.topMargin: 8
                    Layout.leftMargin: 16
@@ -575,8 +646,13 @@ PageType {
                    Layout.topMargin: 8
                    headerText: qsTr("UplinkDataKey")
                    textField.text: xhttpUplinkDataKey
+                    textField.validator: RegularExpressionValidator { regularExpression: /^[A-Za-z0-9_-]*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== xhttpUplinkDataKey)
                    textField.onEditingFinished: {
-                        if (textField.text !== xhttpUplinkDataKey) xhttpUplinkDataKey = textField.text
+                        var v = textField.text.trim()
+                        if (v !== xhttpUplinkDataKey) xhttpUplinkDataKey = v
+                        else if (textField.text !== v) textField.text = v
+                        root.editDirty = false
                    }
                }

@@ -597,12 +673,16 @@ PageType {
                    Layout.rightMargin: 16
                    Layout.topMargin: 8
                    headerText: qsTr("UplinkChunkSize")
+                    subtitleText: qsTr("≥ 0 (0 = off)")
                    textField.text: xhttpUplinkChunkSize
-                    textField.validator: IntValidator {
-                        bottom: 0
-                    }
+                    textField.maximumLength: 10
+                    textField.validator: RegularExpressionValidator { regularExpression: /^\d*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== xhttpUplinkChunkSize)
                    textField.onEditingFinished: {
-                        if (textField.text !== xhttpUplinkChunkSize) xhttpUplinkChunkSize = textField.text
+                        var v = root.clampInt(textField.text, 0, 2147483647)
+                        if (v !== xhttpUplinkChunkSize) xhttpUplinkChunkSize = v
+                        else if (textField.text !== v) textField.text = v
+                        root.editDirty = false
                    }
                }

@@ -612,9 +692,16 @@ PageType {
                    Layout.rightMargin: 16
                    Layout.topMargin: 8
                    headerText: qsTr("scMaxBufferedPosts")
+                    subtitleText: qsTr("≥ 0")
                    textField.text: xhttpScMaxBufferedPosts
+                    textField.maximumLength: 10
+                    textField.validator: RegularExpressionValidator { regularExpression: /^\d*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== xhttpScMaxBufferedPosts)
                    textField.onEditingFinished: {
-                        if (textField.text !== xhttpScMaxBufferedPosts) xhttpScMaxBufferedPosts = textField.text
+                        var v = root.clampInt(textField.text, 0, 2147483647)
+                        if (v !== xhttpScMaxBufferedPosts) xhttpScMaxBufferedPosts = v
+                        else if (textField.text !== v) textField.text = v
+                        root.editDirty = false
                    }
                }

@@ -633,8 +720,9 @@ PageType {
                    Layout.rightMargin: 16
                    minValue: xhttpScMaxEachPostBytesMin
                    maxValue: xhttpScMaxEachPostBytesMax
-                    onMinChanged: xhttpScMaxEachPostBytesMin = val
-                    onMaxChanged: xhttpScMaxEachPostBytesMax = val
+                    onMinChanged: function(val) { xhttpScMaxEachPostBytesMin = val; root.editDirty = false }
+                    onMaxChanged: function(val) { xhttpScMaxEachPostBytesMax = val; root.editDirty = false }
+                    onEdited: root.editDirty = true
                }

                CaptionTextType {
@@ -652,8 +740,9 @@ PageType {
                    Layout.rightMargin: 16
                    minValue: xhttpScStreamUpServerSecsMin
                    maxValue: xhttpScStreamUpServerSecsMax
-                    onMinChanged: xhttpScStreamUpServerSecsMin = val
-                    onMaxChanged: xhttpScStreamUpServerSecsMax = val
+                    onMinChanged: function(val) { xhttpScStreamUpServerSecsMin = val; root.editDirty = false }
+                    onMaxChanged: function(val) { xhttpScStreamUpServerSecsMax = val; root.editDirty = false }
+                    onEdited: root.editDirty = true
                }

                CaptionTextType {
@@ -671,8 +760,9 @@ PageType {
                    Layout.rightMargin: 16
                    minValue: xhttpScMinPostsIntervalMsMin
                    maxValue: xhttpScMinPostsIntervalMsMax
-                    onMinChanged: xhttpScMinPostsIntervalMsMin = val
-                    onMaxChanged: xhttpScMinPostsIntervalMsMax = val
+                    onMinChanged: function(val) { xhttpScMinPostsIntervalMsMin = val; root.editDirty = false }
+                    onMaxChanged: function(val) { xhttpScMinPostsIntervalMsMax = val; root.editDirty = false }
+                    onEdited: root.editDirty = true
                }

                // ── Padding and multiplexing ──────────────────────────
@@ -728,10 +818,15 @@ PageType {
        anchors.rightMargin: 16
        anchors.bottomMargin: 16 + PageController.safeAreaBottomMargin

-        visible: listView.enabled && XrayConfigModel.hasUnsavedChanges
+        visible: listView.enabled && (XrayConfigModel.hasUnsavedChanges || root.editDirty)
        enabled: visible
        text: qsTr("Save")
        clickedFunc: function () {
+            var errs = XrayConfigModel.validationErrors()
+            if (errs.length > 0) {
+                PageController.showErrorMessage(errs.join("\n"))
+                return
+            }
            var headerText = qsTr("Save settings?")
            var descriptionText = qsTr("All users with whom you shared a connection with will no longer be able to connect to it.")
            var yesButtonText = qsTr("Continue")
@@ -742,7 +837,7 @@ PageType {
                    return
                }
                PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                InstallController.updateContainer(ServersUiController.processedIndex, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
+                InstallController.updateServerConfig(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
            }
            var noButtonFunction = function () {
                if (typeof GC !== "undefined" && !GC.isMobile()) {
@@ -15,6 +15,8 @@ import "../Components"
 PageType {
    id: root

+    property bool editDirty: false
+
    BackButtonType {
        id: backButton
        anchors.top: parent.top
@@ -61,8 +63,9 @@ PageType {
                Layout.rightMargin: 16
                minValue: xPaddingBytesMin
                maxValue: xPaddingBytesMax
-                onMinChanged: xPaddingBytesMin = val
-                onMaxChanged: xPaddingBytesMax = val
+                onMinChanged: function(val) { xPaddingBytesMin = val; root.editDirty = false }
+                onMaxChanged: function(val) { xPaddingBytesMax = val; root.editDirty = false }
+                onEdited: root.editDirty = true
            }

            Item {
@@ -81,7 +84,7 @@ PageType {
        anchors.rightMargin: 16
        anchors.bottomMargin: 16 + PageController.safeAreaBottomMargin

-        visible: listView.enabled && XrayConfigModel.hasUnsavedChanges
+        visible: listView.enabled && (XrayConfigModel.hasUnsavedChanges || root.editDirty)
        enabled: visible
        text: qsTr("Save")
        clickedFunc: function () {
@@ -95,7 +98,7 @@ PageType {
                    return
                }
                PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                InstallController.updateContainer(ServersUiController.processedIndex, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
+                InstallController.updateServerConfig(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
            }
            var noButtonFunction = function () {
                if (typeof GC !== "undefined" && !GC.isMobile()) {
@@ -15,6 +15,8 @@ import "../Components"
 PageType {
    id: root

+    property bool editDirty: false
+
    BackButtonType {
        id: backButton
        anchors.top: parent.top
@@ -78,8 +80,13 @@ PageType {
                Layout.topMargin: 16
                headerText: qsTr("xPaddingKey")
                textField.text: xPaddingKey
+                textField.validator: RegularExpressionValidator { regularExpression: /^[A-Za-z0-9_-]*$/ }
+                textField.onTextEdited: root.editDirty = (textField.text !== xPaddingKey)
                textField.onEditingFinished: {
-                    if (textField.text !== xPaddingKey) xPaddingKey = textField.text
+                    var v = textField.text.trim()
+                    if (v !== xPaddingKey) xPaddingKey = v
+                    else if (textField.text !== v) textField.text = v
+                    root.editDirty = false
                }
            }

@@ -90,13 +97,19 @@ PageType {
                Layout.topMargin: 8
                headerText: qsTr("xPaddingHeader")
                textField.text: xPaddingHeader
+                textField.validator: RegularExpressionValidator { regularExpression: /^[A-Za-z0-9_-]*$/ }
+                textField.onTextEdited: root.editDirty = (textField.text !== xPaddingHeader)
                textField.onEditingFinished: {
-                    if (textField.text !== xPaddingHeader) xPaddingHeader = textField.text
+                    var v = textField.text.trim()
+                    if (v !== xPaddingHeader) xPaddingHeader = v
+                    else if (textField.text !== v) textField.text = v
+                    root.editDirty = false
                }
            }

            DropDownType {
                id: placementDropDown
+                fitContent: true
                Layout.fillWidth: true
                Layout.topMargin: 8
                Layout.leftMargin: 16
@@ -140,6 +153,7 @@ PageType {

            DropDownType {
                id: methodDropDown
+                fitContent: true
                Layout.fillWidth: true
                Layout.topMargin: 8
                Layout.leftMargin: 16
@@ -197,7 +211,7 @@ PageType {
        anchors.rightMargin: 16
        anchors.bottomMargin: 16 + PageController.safeAreaBottomMargin

-        visible: listView.enabled && XrayConfigModel.hasUnsavedChanges
+        visible: listView.enabled && (XrayConfigModel.hasUnsavedChanges || root.editDirty)
        enabled: visible
        text: qsTr("Save")
        clickedFunc: function () {
@@ -211,7 +225,7 @@ PageType {
                    return
                }
                PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                InstallController.updateContainer(ServersUiController.processedIndex, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
+                InstallController.updateServerConfig(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
            }
            var noButtonFunction = function () {
                if (typeof GC !== "undefined" && !GC.isMobile()) {
@@ -15,6 +15,21 @@ import "../Components"
 PageType {
    id: root

+    property bool editDirty: false
+
+    function clampSigned(text) {
+        if (text === "" || text === "-")
+            return ""
+        var n = parseInt(text, 10)
+        if (isNaN(n))
+            return ""
+        if (n > 2147483647)
+            n = 2147483647
+        if (n < -2147483648)
+            n = -2147483648
+        return String(n)
+    }
+
    BackButtonType {
        id: backButton
        anchors.top: parent.top
@@ -78,8 +93,9 @@ PageType {
                    Layout.rightMargin: 16
                    minValue: xmuxMaxConcurrencyMin
                    maxValue: xmuxMaxConcurrencyMax
-                    onMinChanged: xmuxMaxConcurrencyMin = val
-                    onMaxChanged: xmuxMaxConcurrencyMax = val
+                    onMinChanged: function(val) { xmuxMaxConcurrencyMin = val; root.editDirty = false }
+                    onMaxChanged: function(val) { xmuxMaxConcurrencyMax = val; root.editDirty = false }
+                    onEdited: root.editDirty = true
                }

                // maxConnections
@@ -98,8 +114,9 @@ PageType {
                    Layout.rightMargin: 16
                    minValue: xmuxMaxConnectionsMin
                    maxValue: xmuxMaxConnectionsMax
-                    onMinChanged: xmuxMaxConnectionsMin = val
-                    onMaxChanged: xmuxMaxConnectionsMax = val
+                    onMinChanged: function(val) { xmuxMaxConnectionsMin = val; root.editDirty = false }
+                    onMaxChanged: function(val) { xmuxMaxConnectionsMax = val; root.editDirty = false }
+                    onEdited: root.editDirty = true
                }

                // cMaxReuseTimes
@@ -118,8 +135,9 @@ PageType {
                    Layout.rightMargin: 16
                    minValue: xmuxCMaxReuseTimesMin
                    maxValue: xmuxCMaxReuseTimesMax
-                    onMinChanged: xmuxCMaxReuseTimesMin = val
-                    onMaxChanged: xmuxCMaxReuseTimesMax = val
+                    onMinChanged: function(val) { xmuxCMaxReuseTimesMin = val; root.editDirty = false }
+                    onMaxChanged: function(val) { xmuxCMaxReuseTimesMax = val; root.editDirty = false }
+                    onEdited: root.editDirty = true
                }

                // hMaxRequestTimes
@@ -138,8 +156,9 @@ PageType {
                    Layout.rightMargin: 16
                    minValue: xmuxHMaxRequestTimesMin
                    maxValue: xmuxHMaxRequestTimesMax
-                    onMinChanged: xmuxHMaxRequestTimesMin = val
-                    onMaxChanged: xmuxHMaxRequestTimesMax = val
+                    onMinChanged: function(val) { xmuxHMaxRequestTimesMin = val; root.editDirty = false }
+                    onMaxChanged: function(val) { xmuxHMaxRequestTimesMax = val; root.editDirty = false }
+                    onEdited: root.editDirty = true
                }

                // hMaxReusableSecs
@@ -158,8 +177,9 @@ PageType {
                    Layout.rightMargin: 16
                    minValue: xmuxHMaxReusableSecsMin
                    maxValue: xmuxHMaxReusableSecsMax
-                    onMinChanged: xmuxHMaxReusableSecsMin = val
-                    onMaxChanged: xmuxHMaxReusableSecsMax = val
+                    onMinChanged: function(val) { xmuxHMaxReusableSecsMin = val; root.editDirty = false }
+                    onMaxChanged: function(val) { xmuxHMaxReusableSecsMax = val; root.editDirty = false }
+                    onEdited: root.editDirty = true
                }

                TextFieldWithHeaderType {
@@ -168,12 +188,16 @@ PageType {
                    Layout.rightMargin: 16
                    Layout.topMargin: 16
                    headerText: qsTr("hKeepAlivePeriod")
+                    subtitleText: qsTr("Integer, may be negative")
                    textField.text: xmuxHKeepAlivePeriod
-                    textField.validator: IntValidator {
-                        bottom: 0
-                    }
+                    textField.maximumLength: 11
+                    textField.validator: RegularExpressionValidator { regularExpression: /^-?\d*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== xmuxHKeepAlivePeriod)
                    textField.onEditingFinished: {
-                        if (textField.text !== xmuxHKeepAlivePeriod) xmuxHKeepAlivePeriod = textField.text
+                        var v = root.clampSigned(textField.text)
+                        if (v !== xmuxHKeepAlivePeriod) xmuxHKeepAlivePeriod = v
+                        else if (textField.text !== v) textField.text = v
+                        root.editDirty = false
                    }
                }
            }
@@ -194,7 +218,7 @@ PageType {
        anchors.rightMargin: 16
        anchors.bottomMargin: 16 + PageController.safeAreaBottomMargin

-        visible: listView.enabled && XrayConfigModel.hasUnsavedChanges
+        visible: listView.enabled && (XrayConfigModel.hasUnsavedChanges || root.editDirty)
        enabled: visible
        text: qsTr("Save")
        clickedFunc: function () {
@@ -208,7 +232,7 @@ PageType {
                    return
                }
                PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                InstallController.updateContainer(ServersUiController.processedIndex, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
+                InstallController.updateServerConfig(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
            }
            var noButtonFunction = function () {
                if (typeof GC !== "undefined" && !GC.isMobile()) {
@@ -179,7 +179,7 @@ PageType {
    function mtProxyScheduleUpdate(closePage) {
        var cp = closePage === undefined ? false : closePage
        Qt.callLater(function () {
-            InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.MtProxy, cp)
+            InstallController.updateServerConfig(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.MtProxy, cp)
        })
    }

@@ -285,7 +285,7 @@ PageType {
                            }

                            PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                            InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Socks5Proxy)
+                            InstallController.updateServerConfig(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Socks5Proxy)
                            tempPort = portTextField.textField.text
                            tempUsername = usernameTextField.textField.text
                            tempPassword = passwordTextField.textField.text
@@ -154,7 +154,7 @@ PageType {
    function telemtScheduleUpdate(closePage) {
        var cp = closePage === undefined ? false : closePage
        Qt.callLater(function () {
-            InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Telemt, cp)
+            InstallController.updateServerConfig(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Telemt, cp)
        })
    }

@@ -100,6 +100,12 @@ PageType {
                onLinkActivated: Qt.openUrlExternally(link)
                textFormat: Text.RichText
                text: qsTr("Use <a href=\"https://www.torproject.org/download/\" style=\"color: #FBB26A;\">Tor Browser</a> to open this URL.")
+
+                MouseArea {
+                    anchors.fill: parent
+                    acceptedButtons: Qt.NoButton
+                    cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
+                }
            }

            ParagraphTextType {
@@ -30,6 +30,16 @@ PageType {
        root.isInAppPurchase = ApiAccountInfoModel.data("isInAppPurchase")
    }

+    function selectConnectionCountry(countryIndex, countryCode, countryName) {
+        if (countryIndex === ApiCountryModel.currentIndex) {
+            return
+        }
+
+        PageController.showBusyIndicator(true)
+        SubscriptionUiController.updateServiceFromGateway(ServersUiController.processedServerId, countryCode, countryName)
+        PageController.showBusyIndicator(false)
+    }
+
    Component.onCompleted: {
        root.updateSubscriptionState()
    }
@@ -83,7 +93,7 @@ PageType {

        model: ApiCountryModel

-        currentIndex: 0
+        currentIndex: ApiCountryModel.currentIndex

        ButtonGroup {
            id: containersRadioButtonGroup
@@ -204,15 +214,7 @@ PageType {
                            return
                        }

-                        if (index !== ApiCountryModel.currentIndex) {
-                            PageController.showBusyIndicator(true)
-                            var prevIndex = ApiCountryModel.currentIndex
-                            ApiCountryModel.currentIndex = index
-                            if (!SubscriptionUiController.updateServiceFromGateway(ServersUiController.processedServerId, countryCode, countryName)) {
-                                ApiCountryModel.currentIndex = prevIndex
-                            }
-                            PageController.showBusyIndicator(false)
-                        }
+                        root.selectConnectionCountry(index, countryCode, countryName)
                    }

                    Keys.onEnterPressed: {
@@ -108,9 +108,9 @@ PageType {
                text: qsTr("Auto start")
                descriptionText: qsTr("Launch the application every time the device is starts")

-                checked: SettingsController.isAutoStartEnabled()
+                checked: SettingsController.autoStartEnabled
                onToggled: function() {
-                    if (checked !== SettingsController.isAutoStartEnabled()) {
+                    if (checked !== SettingsController.autoStartEnabled) {
                        SettingsController.toggleAutoStart(checked)
                    }
                }
@@ -154,10 +154,10 @@ PageType {
                text: qsTr("Start minimized")
                descriptionText: qsTr("Launch application minimized (works with autostart option turned on)")

-                enabled: SettingsController.isAutoStartEnabled()
+                enabled: SettingsController.autoStartEnabled
                opacity: enabled ? 1.0 : 0.5

-                checked: SettingsController.isAutoStartEnabled() && SettingsController.startMinimized
+                checked: SettingsController.autoStartEnabled && SettingsController.startMinimized
                onToggled: function() {
                    if (checked !== SettingsController.startMinimized) {
                        SettingsController.toggleStartMinimized(checked)
@@ -166,7 +166,7 @@ PageType {
            }

            DividerType {
-                visible: !GC.isMobile()
+                visible: !GC.isMobile() && ServersUiController.hasServersFromGatewayApi
            }

            SwitcherType {
@@ -1,212 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-import PageEnum 1.0
-import ProtocolEnum 1.0
-import Style 1.0
-
-import "../Controls2"
-import "../Controls2/TextTypes"
-import "../Components"
-import "../Config"
-
-PageType {
-    id: root
-
-    BackButtonType {
-        id: backButton
-
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.topMargin: 20 + SettingsController.safeAreaTopMargin
-
-        onActiveFocusChanged: {
-            if(backButton.enabled && backButton.activeFocus) {
-                flickable.contentY = 0
-            }
-        }
-    }
-
-    FlickableType {
-        id: flickable
-
-        anchors.top: backButton.bottom
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        contentHeight: contentColumn.implicitHeight
-
-        ColumnLayout {
-            id: contentColumn
-            width: flickable.width
-
-            spacing: 16
-
-            BaseHeaderType {
-                Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                Layout.topMargin: 8
-                
-                headerText: qsTr("Backup")
-            }
-
-            ParagraphTextType {
-                Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                
-                text: qsTr("Local copy of VPN protocols, services, all server settings and users.")
-                color: AmneziaStyle.color.mutedGray
-            }
-
-            Text {
-                Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                Layout.topMargin: -8
-                
-                text: qsTr("More about backups")
-                color: AmneziaStyle.color.goldenApricot
-                font.pixelSize: 14
-                
-                MouseArea {
-                    anchors.fill: parent
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: {
-                        // TODO: Open help page or show more info
-                    }
-                }
-            }
-
-            ColumnLayout {
-                Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                Layout.topMargin: 16
-                spacing: 12
-
-                BasicButtonType {
-                    Layout.fillWidth: true
-                    text: qsTr("Create backup")
-                    
-                    clickedFunc: function() {
-                        createBackup(true)
-                    }
-                }
-
-                BasicButtonType {
-                    Layout.fillWidth: true
-                    text: qsTr("Restore from backup")
-                    defaultColor: AmneziaStyle.color.transparent
-                    hoveredColor: Qt.rgba(1, 1, 1, 0.08)
-                    pressedColor: Qt.rgba(1, 1, 1, 0.12)
-                    disabledColor: AmneziaStyle.color.mutedGray
-                    textColor: AmneziaStyle.color.goldenApricot
-                    borderWidth: 1
-
-                    clickedFunc: function() {
-                        restoreBackup()
-                    }
-                }
-            }
-        }
-    }
-
-    function createBackup(shouldDownload) {
-        // Default shouldDownload = true
-        var downloadAfterCreate = (shouldDownload !== undefined) ? shouldDownload : true
-        
-        var headerText = downloadAfterCreate ? 
-            qsTr("Create backup and download to device?") :
-            qsTr("Create server configuration backup?")
-        var descriptionText = downloadAfterCreate ?
-            qsTr("Backup will be created on server and automatically downloaded to your device") :
-            qsTr("This will create a backup of your server containers configuration on the server")
-        var yesButtonText = qsTr("Create")
-        var noButtonText = qsTr("Cancel")
-
-        var yesButtonFunction = function() {
-            PageController.showBusyIndicator(true)
-            // Call C++ method that manages download and delete automatically
-            ServersBackupController.createBackupWithDownload(downloadAfterCreate, true)
-        }
-        var noButtonFunction = function() {}
-
-        showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
-    }
-
-    function restoreBackup() {
-        var filter = GC.isMobile() ? "*.gz *.tgz *.tar.gz" : "Backup files (*.tar.gz *.backup *.tgz *.gz)"
-        var localPath = SystemController.getFileName(
-            qsTr("Select Backup to Restore"), 
-            filter,
-            "",
-            false,
-            ""
-        )
-        
-        if (!localPath || localPath.length === 0) {
-            return
-        }
-        
-        // Get file information via C++
-        var fileInfo = ServersBackupController.getBackupFileInfo(localPath)
-        var fileName = fileInfo.fileName || "backup.tgz"
-        var serverIp = fileInfo.serverIp || ""
-        
-        // If IP not found in filename, use current server
-        if (!serverIp || serverIp.length === 0) {
-            serverIp = ServersUiController.serverHostName(ServersUiController.processedServerId) || ""
-        }
-
-        var serverName = ServersUiController.serverName(ServersUiController.processedServerId) || qsTr("Server")
-        
-        // Open restore mode selection page
-        var parentItem = root.parent
-        while (parentItem && parentItem.objectName !== "tabBarStackView") {
-            parentItem = parentItem.parent
-        }
-        
-        if (parentItem && typeof parentItem.push === "function") {
-            parentItem.push(PageController.getPagePath(PageEnum.PageSettingsServerRestoreMode), {
-                "backupFilePath": localPath,
-                "backupFileName": fileName,
-                "serverName": serverName,
-                "serverIp": serverIp
-            })
-        } else {
-            console.warn("Could not find StackView to navigate to restore mode page")
-        }
-    }
-
-    // ============ Backup Controller Connections ============
-
-    Connections {
-        target: ServersBackupController
-
-        function onBackupCreated(backupFilename) {
-            // If auto-download is not enabled, show success message
-            PageController.showBusyIndicator(false)
-            PageController.showNotificationMessage(qsTr("Backup created successfully: %1").arg(backupFilename))
-        }
-
-        function onBackupDownloaded(localPath) {
-            PageController.showBusyIndicator(false)
-            console.log("Backup downloaded to:", localPath)
-            PageController.showNotificationMessage(qsTr("Backup downloaded successfully!\n\nSaved to:\n%1").arg(localPath))
-        }
-
-        function onProgressChanged(percent, message) {
-            console.log("Backup progress:", percent, "%", message)
-        }
-
-        function onErrorOccurred(errorMessage, errorCode) {
-            PageController.showBusyIndicator(false)
-            PageController.showErrorMessage(qsTr("Backup error: %1").arg(errorMessage))
-        }
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
NickVs2015	53e5d63c91	fix: add core skippltgormController	2026-06-30 16:09:41 +03:00
NickVs2015	7028e48ee6	fix: use list(APPEND LIBS) instead of target_link_libraries for gamepad on Android	2026-06-30 15:39:51 +03:00
NickVs2015	f81d2f4f56	fix: add binary dir to add_subdirectory calls in 3rdparty.cmake	2026-06-25 11:02:25 +03:00
yp	5d16645b84	fix: android icons (#2725 ) * update icons android * remove comment	2026-06-24 00:08:21 +08:00
Yaroslav Gurov	203a092dc9	fix: blobs for macos-ne and codesigning of qt blobs (#2754 )	2026-06-24 00:07:42 +08:00
yp	d8b8590bc4	fix: XRay validation audit (#2749 ) * flow default and config fixes * host/SNI/path validation backend + flow-default flag * input validation, numeric limits and live Save on settings pages * MinMaxRowType clamping + DropDownType fit-content drawer	2026-06-24 00:07:26 +08:00
yp	9b8bfaa6f8	fix: regression testing vs 4.8.15.4 (#2730 ) * fixed revoke * fixed async update xray/mtproxy/telemt * fixed connect premium config * fixed autostart app hide * fixed clear profile * (6) fixed xtls-rprx-vision→empty * (7) fixed appendClient abort & fix restore admin * (8) fixed async\|clientsUpdated * fixed increment name server N * remove comment & reset file * chore: add tr to nextAvailableServerName --------- Co-authored-by: vkamn <vk@amnezia.org>	2026-06-23 23:05:58 +08:00
Yaroslav Gurov	890103a16a	fix: update amneziawg (#2743 ) * chore(conan): update amneziawg * fix(conan): use cmake 4.2+ to support MSVC26 * fix(ci/cd): use the latest cmake generator available on windows	2026-06-17 19:56:53 +07:00
yp	56ab82f87f	fix: Use shared OpenSSL on Android (#2736 )	2026-06-16 10:57:32 +07:00
lunardunno	3984acbb44	feat: updating install_docker.sh script (#2661 ) * Updating install_docker.sh script Implementing a Docker service status check. The Docker reinstall step has been removed due to the implementation of Docker service checking. Implementing locale checking and assignment. Implementation of execution of some actions through commands with sudo, to reduce delays caused by differences in the values of the PATH variable for the root user and the user included in the sudo group. Implementation of a verification step for the install containerization app to avoid installing unsupported podman-docker applications. * adding message handling to install controller Adding handling for "Containerization app is not supported" and "Service status not active" messages to the controller. * Error Codes added Error Codes added for ServerContainerizationNotSupported & DockerServiceNotActive * Adding extended descriptions of new errors * fix last line in errorCodes.h * fix last line in errorStrings.cpp * Changing the names of errors * various changes in the script The messages output for processing by the server controller have been changed: "Container runtime is not supported" and "Container runtime service is not running." The redundant check and output of the "Packet manager not found" message, as well as the interruption of script execution, have been eliminated, as this situation is handled by the server controller at an earlier stage (check_server_is_busy.sh) and only there. Added installation of the whish package if it is missing from the OS, for subsequent re-execution of the install_docker.sh and check_server_is_busy.sh scripts. Implemented an alternative method for detecting the package manager if the whish package is initially missing from the OS. The algorithm for setting the $pm variable (package manager) has been changed. * processed phrases have been changed The phrases processed by the server controller have been changed. * Attempting to use "command -v" Switching to using "command -v" instead of "which". * "which" as main, "command" as backup. * "which" as main, "command" as backup for check user * which LOCK_CMD with sudo Run the "which" with sudo to check the $LOCK_CMD variable in case the user's PATH variable has incorrect values if the user is not root and is only a member of the sudo group. * suppressing sudo password prompt * suppressing sudo password prompt * suppressing sudo password prompt install_docker.sh * Changing the phrase for check stdout "sudo:" with "not found" instead of "command not found" * Changing phrases for check stdout check_user_in_sudo.sh‎ * sudo\|docker and not found, in one line * check only sudoers	2026-06-15 22:28:38 +07:00
yp	cc404378f9	fix: remove only amnezia- prefixed docker volumes (#2728 )	2026-06-15 13:12:19 +07:00
yp	594635e5cf	fix: script remove docker volume (#2686 ) * move sudo docker volume rm -f * fix: remove unnecessary function --------- Co-authored-by: vkamn <vk@amnezia.org>	2026-06-04 22:58:39 +08:00
vkamn	f9b106cf5b	fix: various fixes (#2693 ) * fix: fixed country model update * fix: fixed context menu crush on ios * fix: fixed passphrase dialog freeze * fix: fixed country switch * fix: fixed start minimized * fix: fixed black screen after remove container * refactor: return cloak and ss only for view * fix: fixed default server change after improt while connected * fix: divider visibility * fix: fixed revoke admin user * fix: fixed language restore after backup * fix: link hover for tor settings page * fix: fixed openvpn connecntion status * fix: fixed free color status * fix: fixed client config update * chore: bump version	2026-06-04 22:45:53 +08:00
yp	a9861d18b7	fix: wrong index on xray pages (#2669 ) * test crash xray * fixed save config xray * reset file * fixed text port & reset file * fixed textFieldWithHeaderType.textField	2026-06-01 12:22:54 +08:00
lunardunno	c14138f031	fix: deleting volumes when cleaning the server (#2673 ) * Deleting volumes when cleaning the server * force the remove volumes	2026-06-01 11:54:34 +08:00