Merge branch 'fix/ui-fixes-after-merge-with-d20ed4a' of github.com:amnezia-vpn/amnezia-client into fix/ui-fixes-after-merge-with-d20ed4a

chore: page settings dns margins
update OpenVPN settings page
2026-06-23 02:00:20 +07:00 · 2025-08-09 22:21:38 +08:00 · 2025-08-09 22:20:48 +08:00 · 2025-08-09 14:19:11 +02:00 · 2025-08-08 11:45:20 +08:00
163 changed files with 7055 additions and 14077 deletions
@@ -358,7 +358,7 @@ jobs:
    - name: 'Setup xcode'
      uses: maxim-lobanov/setup-xcode@v1
      with:
-        xcode-version: '16.2.0'
+        xcode-version: '15.4.0'

    - name: 'Install Qt'
      uses: jurplel/install-qt-action@v3
@@ -402,67 +402,6 @@ jobs:
        path: deploy/build/client/AmneziaVPN.app
        retention-days: 7

-  Build-MacOS-NE:
-    runs-on: macos-latest
-
-    env:
-      QT_VERSION: 6.8.3
-
-      MAC_TEAM_ID: ${{ secrets.MAC_TEAM_ID }}
-
-      MAC_APP_CERT_CERT: ${{ secrets.MAC_APP_CERT_CERT }}
-      MAC_SIGNER_ID: ${{ secrets.MAC_SIGNER_ID }}
-      MAC_APP_CERT_PW: ${{ secrets.MAC_APP_CERT_PW }}
-
-      PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
-      PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
-      DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }}
-      DEV_AGW_ENDPOINT: ${{ secrets.DEV_AGW_ENDPOINT }}
-      DEV_S3_ENDPOINT: ${{ secrets.DEV_S3_ENDPOINT }}
-      FREE_V2_ENDPOINT: ${{ secrets.FREE_V2_ENDPOINT }}
-      PREM_V1_ENDPOINT: ${{ secrets.PREM_V1_ENDPOINT }}
-
-    steps:
-    - name: 'Setup xcode'
-      uses: maxim-lobanov/setup-xcode@v1
-      with:
-        xcode-version: '16.2.0'
-
-    - name: 'Install Qt'
-      uses: jurplel/install-qt-action@v3
-      with:
-        version: ${{ env.QT_VERSION }}
-        host: 'mac'
-        target: 'desktop'
-        arch: 'clang_64'
-        modules: 'qtremoteobjects qt5compat qtshadertools'
-        dir: ${{ runner.temp }}
-        setup-python: 'true'
-        set-env: 'true'
-        extra: '--external 7z --base ${{ env.QT_MIRROR }}'
-
-
-    - name: 'Get sources'
-      uses: actions/checkout@v4
-      with:
-        submodules: 'true'
-        fetch-depth: 10
-
-    - name: 'Setup ccache'
-      uses: hendrikmuhs/ccache-action@v1.2
-
-    - name: 'Build project'
-      run: |
-        export QT_BIN_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/macos/bin"
-        bash deploy/build_macos_ne.sh
-
-    - name: 'Upload unpacked artifact'
-      uses: actions/upload-artifact@v4
-      with:
-        name: AmneziaVPN_MacOS_unpacked
-        path: deploy/build/client/AmneziaVPN.app
-        retention-days: 7
-
 # ------------------------------------------------------

  Build-Android:
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)

 set(PROJECT AmneziaVPN)
-set(AMNEZIAVPN_VERSION 4.8.11.0)
+set(AMNEZIAVPN_VERSION 4.8.9.2)

 project(${PROJECT} VERSION ${AMNEZIAVPN_VERSION}
        DESCRIPTION "AmneziaVPN"
@@ -12,7 +12,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 2095)
+set(APP_ANDROID_VERSION_CODE 2092)

 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
    set(MZ_PLATFORM_NAME "linux")
@@ -32,19 +32,13 @@ set(QT_BUILD_TOOLS_WHEN_CROSS_COMPILING ON)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

-if(APPLE)
-    if(IOS)
-        set(CMAKE_OSX_ARCHITECTURES "arm64")
-    elseif(MACOS_NE)
-        set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
-    else()
-        set(CMAKE_OSX_ARCHITECTURES "x86_64")
-    endif()
+if(APPLE AND NOT IOS)
+    set(CMAKE_OSX_ARCHITECTURES "x86_64")
 endif()

 add_subdirectory(client)

-if(NOT IOS AND NOT ANDROID AND NOT MACOS_NE)
+if(NOT IOS AND NOT ANDROID)
    add_subdirectory(service)

    include(${CMAKE_SOURCE_DIR}/deploy/installer/config.cmake)
@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 set(PROJECT AmneziaVPN)
 project(${PROJECT})

+
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 set_property(GLOBAL PROPERTY AUTOGEN_TARGETS_FOLDER "Autogen")
 set_property(GLOBAL PROPERTY AUTOMOC_TARGETS_FOLDER "Autogen")
@@ -52,9 +53,6 @@ endif()

 qt_standard_project_setup()
 qt_add_executable(${PROJECT} MANUAL_FINALIZATION)
-target_include_directories(${PROJECT} PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
-)

 if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
    qt_add_repc_replicas(${PROJECT} ${CMAKE_CURRENT_LIST_DIR}/../ipc/ipc_interface.rep)
@@ -112,15 +110,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-if(MACOS_NE)
-    message("MACOS_NE is ON")
-    add_definitions(-DQ_OS_MAC)
-    add_definitions(-DMACOS_NE)
-    message("Add macros for MacOS Network Extension")
-else()
-    message("MACOS_NE is OFF")
-endif()
-
 include_directories(mozilla)
 include_directories(mozilla/shared)
 include_directories(mozilla/models)
@@ -150,7 +139,7 @@ if(WIN32)
 endif()

 if(APPLE)
-    cmake_policy(SET CMP0099 NEW)
+    cmake_policy(SET CMP0099 OLD)
    cmake_policy(SET CMP0114 NEW)

    if(NOT BUILD_OSX_APP_IDENTIFIER)
@@ -169,6 +158,7 @@ if(APPLE)
    set(CMAKE_XCODE_GENERATE_SCHEME FALSE)
    set(CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${BUILD_VPN_DEVELOPMENT_TEAM})
    set(CMAKE_XCODE_ATTRIBUTE_GROUP_ID_IOS ${BUILD_IOS_GROUP_IDENTIFIER})
+
 endif()

 if(LINUX AND NOT ANDROID)
@@ -176,7 +166,8 @@ if(LINUX AND NOT ANDROID)
    link_directories(${CMAKE_CURRENT_LIST_DIR}/platforms/linux)
 endif()

-if(WIN32 OR (APPLE AND NOT IOS AND NOT MACOS_NE) OR (LINUX AND NOT ANDROID))
+if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
+    message("Client desktop build")
    add_compile_definitions(AMNEZIA_DESKTOP)
 endif()

@@ -187,9 +178,7 @@ endif()
 if(IOS)
    include(cmake/ios.cmake)
    include(cmake/ios-arch-fixup.cmake)
-elseif(APPLE AND MACOS_NE)
-    include(cmake/macos_ne.cmake)
-elseif(APPLE)
+elseif(APPLE AND NOT IOS)
    include(cmake/osxtools.cmake)
    include(cmake/macos.cmake)
 endif()
@@ -210,7 +199,7 @@ elseif(APPLE AND NOT IOS)
    set(DEPLOY_PLATFORM_PATH "macos")
 endif()

-if(NOT IOS AND NOT ANDROID AND NOT MACOS_NE)
+if(NOT IOS AND NOT ANDROID)
    add_custom_command(
        TARGET ${PROJECT} POST_BUILD
        COMMAND ${CMAKE_COMMAND} -E $<IF:$<CONFIG:Debug>,copy_directory,true>
@@ -225,6 +214,7 @@ if(NOT IOS AND NOT ANDROID AND NOT MACOS_NE)
        $<TARGET_FILE_DIR:${PROJECT}>
        COMMAND_EXPAND_LISTS
    )
+
 endif()

 target_sources(${PROJECT} PRIVATE ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC} ${I18NQRC})
@@ -12,7 +12,6 @@
 #include <QTextDocument>
 #include <QTimer>
 #include <QTranslator>
-#include <QEvent>

 #include "logger.h"
 #include "ui/controllers/pageController.h"
@@ -22,12 +21,8 @@
 #include "platforms/ios/QRCodeReaderBase.h"

 #include "protocols/qml_register_protocols.h"
-#include <QtQuick/QQuickWindow>  // for QQuickWindow
-#include <QWindow>              // for qobject_cast<QWindow*>

-AmneziaApplication::AmneziaApplication(int &argc, char *argv[]) : AMNEZIA_BASE_CLASS(argc, argv),
-      m_optAutostart({QStringLiteral("a"), QStringLiteral("autostart")}, QStringLiteral("System autostart")),
-      m_optCleanup  ({QStringLiteral("c"), QStringLiteral("cleanup")}, QStringLiteral("Cleanup logs"))
+AmneziaApplication::AmneziaApplication(int &argc, char *argv[]) : AMNEZIA_BASE_CLASS(argc, argv)
 {
    setQuitOnLastWindowClosed(false);

@@ -54,6 +49,7 @@ AmneziaApplication::AmneziaApplication(int &argc, char *argv[]) : AMNEZIA_BASE_C
 AmneziaApplication::~AmneziaApplication()
 {
    m_vpnConnectionThread.quit();
+    m_vpnConnectionThread.wait(3000);

    if (m_engine) {
        QObject::disconnect(m_engine, 0, 0, 0);
@@ -67,28 +63,15 @@ void AmneziaApplication::init()

    const QUrl url(QStringLiteral("qrc:/ui/qml/main2.qml"));
    QObject::connect(
-        m_engine, &QQmlApplicationEngine::objectCreated, this,
-        [this, url](QObject *obj, const QUrl &objUrl) {
-            if (!obj && url == objUrl) {
-                QCoreApplication::exit(-1);
-                return;
-            }
-            // install filter on main window
-            if (auto win = qobject_cast<QQuickWindow*>(obj)) {
-                win->installEventFilter(this);
-                win->show();
-            }
-        },
-        Qt::QueuedConnection);
+            m_engine, &QQmlApplicationEngine::objectCreated, this,
+            [url](QObject *obj, const QUrl &objUrl) {
+                if (!obj && url == objUrl)
+                    QCoreApplication::exit(-1);
+            },
+            Qt::QueuedConnection);

    m_engine->rootContext()->setContextProperty("Debug", &Logger::Instance());

-#ifdef MACOS_NE
-    m_engine->rootContext()->setContextProperty("IsMacOsNeBuild", true);
-#else
-    m_engine->rootContext()->setContextProperty("IsMacOsNeBuild", false);
-#endif
-
    m_vpnConnection.reset(new VpnConnection(m_settings));
    m_vpnConnection->moveToThread(&m_vpnConnectionThread);
    m_vpnConnectionThread.start();
@@ -111,7 +94,7 @@ void AmneziaApplication::init()
    Logger::setServiceLogsEnabled(enabled);

 #ifdef Q_OS_WIN //TODO
-    if (m_parser.isSet(m_optAutostart))
+    if (m_parser.isSet("a"))
        m_coreController->pageController()->showOnStartup();
    else
        emit m_coreController->pageController()->raiseMainWindow();
@@ -179,12 +162,15 @@ bool AmneziaApplication::parseCommands()
    m_parser.addHelpOption();
    m_parser.addVersionOption();

-    m_parser.addOption(m_optAutostart);
-    m_parser.addOption(m_optCleanup);
-    
+    QCommandLineOption c_autostart { { "a", "autostart" }, "System autostart" };
+    m_parser.addOption(c_autostart);
+
+    QCommandLineOption c_cleanup { { "c", "cleanup" }, "Cleanup logs" };
+    m_parser.addOption(c_cleanup);
+
    m_parser.process(*this);

-    if (m_parser.isSet(m_optCleanup)) {
+    if (m_parser.isSet(c_cleanup)) {
        Logger::cleanUp();
        QTimer::singleShot(100, this, [this] { quit(); });
        exec();
@@ -193,8 +179,9 @@ bool AmneziaApplication::parseCommands()
    return true;
 }

-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS) && !defined(MACOS_NE)
-void AmneziaApplication::startLocalServer() {
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+void AmneziaApplication::startLocalServer()
+{
    const QString serverName("AmneziaVPNInstance");
    QLocalServer::removeServer(serverName);

@@ -211,22 +198,6 @@ void AmneziaApplication::startLocalServer() {
 }
 #endif

-bool AmneziaApplication::eventFilter(QObject *watched, QEvent *event)
-{
-    if (event->type() == QEvent::Close) {
-#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
-        quit();
-#else
-        if (m_coreController && m_coreController->pageController()) {
-            m_coreController->pageController()->hideMainWindow();
-        }
-#endif
-        return true; // eat the close
-    }
-    // call base QObject::eventFilter
-    return QObject::eventFilter(watched, event);
-}
-
 QQmlApplicationEngine *AmneziaApplication::qmlEngine() const
 {
    return m_engine;
@@ -7,9 +7,9 @@
 #include <QQmlContext>
 #include <QThread>
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
-  #include <QGuiApplication>
+    #include <QGuiApplication>
 #else
-  #include <QApplication>
+    #include <QApplication>
 #endif
 #include <QClipboard>

@@ -20,9 +20,9 @@
 #define amnApp (static_cast<AmneziaApplication *>(QCoreApplication::instance()))

 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
-  #define AMNEZIA_BASE_CLASS QGuiApplication
+    #define AMNEZIA_BASE_CLASS QGuiApplication
 #else
-  #define AMNEZIA_BASE_CLASS QApplication
+    #define AMNEZIA_BASE_CLASS QApplication
 #endif

 class AmneziaApplication : public AMNEZIA_BASE_CLASS
@@ -37,7 +37,7 @@ public:
    void loadFonts();
    bool parseCommands();

-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS) && !defined(MACOS_NE)
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
    void startLocalServer();
 #endif

@@ -56,15 +56,10 @@ private:

    QCommandLineParser m_parser;

-    QCommandLineOption m_optAutostart;
-    QCommandLineOption m_optCleanup;
-
    QSharedPointer<VpnConnection> m_vpnConnection;
    QThread m_vpnConnectionThread;

    QNetworkAccessManager *m_nam;
-protected:
-    bool eventFilter(QObject *watched, QEvent *event) override;
 };

 #endif // AMNEZIA_APPLICATION_H
@@ -27,15 +27,9 @@ if(WIN32)
        set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_ROOT_DIR}/windows/win32/libcrypto.lib")
    endif()
 elseif(APPLE AND NOT IOS)
-    if(MACOS_NE)
-        set(LIBSSH_LIB_PATH "${LIBSSH_ROOT_DIR}/macos/universal2/libssh.a")
-        set(ZLIB_LIB_PATH "${LIBSSH_ROOT_DIR}/macos/universal2/libz.a")
-        set(LIBSSH_INCLUDE_DIR "${LIBSSH_ROOT_DIR}/macos/universal2")
-    else()
-        set(LIBSSH_LIB_PATH "${LIBSSH_ROOT_DIR}/macos/x86_64/libssh.a")
-        set(ZLIB_LIB_PATH "${LIBSSH_ROOT_DIR}/macos/x86_64/libz.a")
-        set(LIBSSH_INCLUDE_DIR "${LIBSSH_ROOT_DIR}/macos/x86_64")
-    endif()
+    set(LIBSSH_LIB_PATH "${LIBSSH_ROOT_DIR}/macos/x86_64/libssh.a")
+    set(ZLIB_LIB_PATH "${LIBSSH_ROOT_DIR}/macos/x86_64/libz.a")
+    set(LIBSSH_INCLUDE_DIR "${LIBSSH_ROOT_DIR}/macos/x86_64")
    set(OPENSSL_INCLUDE_DIR "${OPENSSL_ROOT_DIR}/macos/include")
    set(OPENSSL_LIB_SSL_PATH "${OPENSSL_ROOT_DIR}/macos/lib/libssl.a")
    set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_ROOT_DIR}/macos/lib/libcrypto.a")
@@ -46,7 +46,6 @@ set(SOURCES ${SOURCES}
    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/iosglue.mm
    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/QRCodeReaderBase.mm
    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/QtAppDelegate.mm
-    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/AmneziaSceneDelegateHooks.mm
 )


@@ -14,7 +14,7 @@ set(LIBS ${LIBS}
    ${FW_SECURITY}
    ${FW_COREWLAN}
    ${FW_NETWORK}
-    ${FW_USER_NOTIFICATIONS}
+    ${FW_USERNOTIFICATIONS}
    ${FW_NETWORK_EXTENSION}
 )

@@ -35,8 +35,6 @@ set(SOURCES ${SOURCES}
    ${CMAKE_CURRENT_SOURCE_DIR}/ui/macos_util.mm
 )

-
-
 set(ICON_FILE ${CMAKE_CURRENT_SOURCE_DIR}/images/app.icns)
 set(MACOSX_BUNDLE_ICON_FILE app.icns)
 set_source_files_properties(${ICON_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
@@ -55,3 +53,4 @@ execute_process(
 )
 message("OSX_SDK_PATH is: ${OSX_SDK_PATH}")

+
@@ -1,168 +0,0 @@
-message("Client ==> MacOS NE build")
-
-set_target_properties(${PROJECT} PROPERTIES MACOSX_BUNDLE TRUE)
-set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15)
-
-set(APPLE_PROJECT_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
-
-enable_language(OBJC)
-enable_language(Swift)
-
-find_package(Qt6 REQUIRED COMPONENTS ShaderTools Widgets)
-# Link Qt Widgets for QWidget, QMenu, QAction etc.
-set(LIBS ${LIBS} Qt6::ShaderTools Qt6::Widgets)
-
-find_library(FW_AUTHENTICATIONSERVICES AuthenticationServices)
-find_library(FW_AVFOUNDATION AVFoundation)
-find_library(FW_FOUNDATION Foundation)
-find_library(FW_STOREKIT StoreKit)
-find_library(FW_SERVICEMGMT ServiceManagement)
-find_library(FW_USERNOTIFICATIONS UserNotifications)
-find_library(FW_NETWORKEXTENSION NetworkExtension)
-
-set(LIBS ${LIBS}
-    ${FW_AUTHENTICATIONSERVICES}
-    ${FW_AVFOUNDATION}
-    ${FW_FOUNDATION}
-    ${FW_STOREKIT}
-    ${FW_SERVICEMGMT}
-    ${FW_USERNOTIFICATIONS}
-    ${FW_NETWORKEXTENSION}
-)
-
-
-set(HEADERS ${HEADERS}
-    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/ios_controller.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/ios_controller_wrapper.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/iosnotificationhandler.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/QtAppDelegate.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/QtAppDelegate-C-Interface.h
-)
-set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/ios_controller.h PROPERTIES OBJECTIVE_CPP_HEADER TRUE)
-
-
-set(SOURCES ${SOURCES}
-    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/ios_controller.mm
-    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/ios_controller_wrapper.mm
-    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/iosnotificationhandler.mm
-    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/iosglue.mm
-    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/QRCodeReaderBase.mm
-    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/QtAppDelegate.mm
-)
-
-set(ICON_FILE ${CMAKE_CURRENT_SOURCE_DIR}/images/app.icns)
-set(MACOSX_BUNDLE_ICON_FILE app.icns)
-set_source_files_properties(${ICON_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-set(SOURCES ${SOURCES} ${ICON_FILE})
-
-
-target_include_directories(${PROJECT} PRIVATE
-    ${Qt6Gui_PRIVATE_INCLUDE_DIRS}
-    ${Qt6Widgets_PRIVATE_INCLUDE_DIRS}
-)
-
-
-set_target_properties(${PROJECT} PROPERTIES
-    XCODE_LINK_BUILD_PHASE_MODE KNOWN_LOCATION
-    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/macos/app/Info.plist.in
-    MACOSX_BUNDLE_ICON_FILE "AppIcon"
-    MACOSX_BUNDLE_INFO_STRING "AmneziaVPN"
-    MACOSX_BUNDLE_BUNDLE_NAME "AmneziaVPN"
-    MACOSX_BUNDLE_BUNDLE_VERSION "${CMAKE_PROJECT_VERSION_TWEAK}"
-    MACOSX_BUNDLE_LONG_VERSION_STRING "${APPLE_PROJECT_VERSION}-${CMAKE_PROJECT_VERSION_TWEAK}"
-    MACOSX_BUNDLE_SHORT_VERSION_STRING "${APPLE_PROJECT_VERSION}"
-    XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "${BUILD_IOS_APP_IDENTIFIER}"
-    XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/macos/app/app.entitlements"
-    XCODE_ATTRIBUTE_MARKETING_VERSION "${APPLE_PROJECT_VERSION}"
-    XCODE_ATTRIBUTE_CURRENT_PROJECT_VERSION "${CMAKE_PROJECT_VERSION_TWEAK}"
-    XCODE_ATTRIBUTE_PRODUCT_NAME "AmneziaVPN"
-    XCODE_ATTRIBUTE_BUNDLE_INFO_STRING "AmneziaVPN"
-    XCODE_GENERATE_SCHEME TRUE
-    XCODE_ATTRIBUTE_ENABLE_BITCODE "NO"
-    XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon"
-    XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2"
-    XCODE_EMBED_FRAMEWORKS_CODE_SIGN_ON_COPY "NO"
-    XCODE_EMBED_FRAMEWORKS_REMOVE_HEADERS_ON_COPY "YES"
-    XCODE_ATTRIBUTE_MACOSX_DEPLOYMENT_TARGET "11.0"
-
-    XCODE_LINK_BUILD_PHASE_MODE KNOWN_LOCATION
-    XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/../Frameworks"
-    XCODE_EMBED_APP_EXTENSIONS AmneziaVPNNetworkExtension
-)
-
-if(DEPLOY)
-    set_target_properties(${PROJECT} PROPERTIES
-        XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Distribution"
-        XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY[variant=Debug] "Apple Development"
-        XCODE_ATTRIBUTE_CODE_SIGN_STYLE Manual
-        XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "distr macos.org.amnezia.AmneziaVPN"
-        XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "dev macos.org.amnezia.AmneziaVPN"
-    )
-else()
-    set_target_properties(${PROJECT} PROPERTIES
-        XCODE_ATTRIBUTE_CODE_SIGN_STYLE Automatic
-    )
-endif()
-
-set_target_properties(${PROJECT} PROPERTIES
-    XCODE_ATTRIBUTE_SWIFT_VERSION "5.0"
-    XCODE_ATTRIBUTE_CLANG_ENABLE_MODULES "YES"
-    XCODE_ATTRIBUTE_SWIFT_PRECOMPILE_BRIDGING_HEADER "NO"
-    XCODE_ATTRIBUTE_SWIFT_OBJC_INTERFACE_HEADER_NAME "AmneziaVPN-Swift.h"
-    XCODE_ATTRIBUTE_SWIFT_OBJC_INTEROP_MODE "objcxx"
-)
-set_target_properties(${PROJECT} PROPERTIES
-    XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "X7UJ388FXK"
-)
-target_include_directories(${PROJECT} PRIVATE ${CMAKE_CURRENT_LIST_DIR})
-target_compile_options(${PROJECT} PRIVATE
-    -DGROUP_ID=\"${BUILD_IOS_GROUP_IDENTIFIER}\"
-    -DVPN_NE_BUNDLEID=\"${BUILD_IOS_APP_IDENTIFIER}.network-extension\"
-)
-
-set(WG_APPLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rd/amneziawg-apple/Sources)
-
-target_sources(${PROJECT} PRIVATE
-    ${WG_APPLE_SOURCE_DIR}/WireGuardKitC/x25519.c
-    ${CLIENT_ROOT_DIR}/platforms/ios/LogController.swift
-    ${CLIENT_ROOT_DIR}/platforms/ios/Log.swift
-    ${CLIENT_ROOT_DIR}/platforms/ios/LogRecord.swift
-    ${CLIENT_ROOT_DIR}/platforms/ios/ScreenProtection.swift
-    ${CLIENT_ROOT_DIR}/platforms/ios/VPNCController.swift
-)
-
-target_sources(${PROJECT} PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/macos/app/Images.xcassets
-    ${CMAKE_CURRENT_SOURCE_DIR}/ios/app/PrivacyInfo.xcprivacy
-)
-
-set_property(TARGET ${PROJECT} APPEND PROPERTY RESOURCE
-    ${CMAKE_CURRENT_SOURCE_DIR}/macos/app/Images.xcassets
-    ${CMAKE_CURRENT_SOURCE_DIR}/ios/app/PrivacyInfo.xcprivacy
-)
-
-add_subdirectory(macos/networkextension)
-add_dependencies(${PROJECT} AmneziaVPNNetworkExtension)
-
-get_target_property(QtCore_location Qt6::Core LOCATION)
-message("QtCore_location")
-message(${QtCore_location})
-
-get_filename_component(QT_BIN_DIR_DETECTED "${QtCore_location}/../../../../../bin" ABSOLUTE)
-
-set_property(TARGET ${PROJECT} PROPERTY XCODE_EMBED_FRAMEWORKS
-    "${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/apple/OpenVPNAdapter-macos/OpenVPNAdapter.framework"
-)
-
-set(CMAKE_XCODE_ATTRIBUTE_FRAMEWORK_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/apple/OpenVPNAdapter-macos)
-target_link_libraries("AmneziaVPNNetworkExtension" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/apple/OpenVPNAdapter-macos/OpenVPNAdapter.framework")
-
-add_custom_command(TARGET ${PROJECT} POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E make_directory
-            $<TARGET_BUNDLE_DIR:AmneziaVPN>/Contents/Frameworks
-    COMMAND /usr/bin/find "$<TARGET_BUNDLE_DIR:AmneziaVPN>/Contents/Frameworks/OpenVPNAdapter.framework" -name "*.sha256" -delete
-    COMMAND /usr/bin/codesign --force --sign "Apple Distribution"
-            "$<TARGET_BUNDLE_DIR:AmneziaVPN>/Contents/Frameworks/OpenVPNAdapter.framework/Versions/Current/OpenVPNAdapter"
-    COMMAND ${QT_BIN_DIR_DETECTED}/macdeployqt $<TARGET_BUNDLE_DIR:AmneziaVPN> -appstore-compliant -qmldir=${CMAKE_CURRENT_SOURCE_DIR}
-    COMMENT "Signing OpenVPNAdapter framework"
-)
@@ -36,9 +36,10 @@ set(HEADERS ${HEADERS}
    ${CLIENT_ROOT_DIR}/mozilla/shared/ipaddress.h
    ${CLIENT_ROOT_DIR}/mozilla/shared/leakdetector.h
    ${CLIENT_ROOT_DIR}/mozilla/controllerimpl.h
+    ${CLIENT_ROOT_DIR}/mozilla/localsocketcontroller.h
 )

-if(NOT IOS AND NOT MACOS_NE)
+if(NOT IOS)
    set(HEADERS ${HEADERS}
        ${CLIENT_ROOT_DIR}/platforms/ios/QRCodeReaderBase.h
    )
@@ -85,28 +86,15 @@ set(SOURCES ${SOURCES}
    ${CLIENT_ROOT_DIR}/mozilla/models/server.cpp
    ${CLIENT_ROOT_DIR}/mozilla/shared/ipaddress.cpp
    ${CLIENT_ROOT_DIR}/mozilla/shared/leakdetector.cpp
+    ${CLIENT_ROOT_DIR}/mozilla/localsocketcontroller.cpp
 )

-if(NOT IOS AND NOT MACOS_NE)
+if(NOT IOS)
    set(SOURCES ${SOURCES}
        ${CLIENT_ROOT_DIR}/platforms/ios/QRCodeReaderBase.cpp
    )
 endif()

-# Include native macOS platform helpers (dock/status-item)
-if(APPLE AND NOT IOS)
-    list(APPEND HEADERS
-        ${CLIENT_ROOT_DIR}/platforms/macos/macosutils.h
-        ${CLIENT_ROOT_DIR}/platforms/macos/macosstatusicon.h
-        ${CLIENT_ROOT_DIR}/ui/macos_util.h
-    )
-    list(APPEND SOURCES
-        ${CLIENT_ROOT_DIR}/platforms/macos/macosutils.mm
-        ${CLIENT_ROOT_DIR}/platforms/macos/macosstatusicon.mm
-        ${CLIENT_ROOT_DIR}/ui/macos_util.mm
-    )
-endif()
-
 if(NOT ANDROID)
    set(SOURCES ${SOURCES}
        ${CLIENT_ROOT_DIR}/ui/notificationhandler.cpp
@@ -187,13 +175,11 @@ if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
        ${CLIENT_ROOT_DIR}/protocols/wireguardprotocol.h
        ${CLIENT_ROOT_DIR}/protocols/xrayprotocol.h
        ${CLIENT_ROOT_DIR}/protocols/awgprotocol.h
-        ${CLIENT_ROOT_DIR}/mozilla/localsocketcontroller.h
    )

    set(SOURCES ${SOURCES}
        ${CLIENT_ROOT_DIR}/core/ipcclient.cpp
        ${CLIENT_ROOT_DIR}/core/privileged_process.cpp
-        ${CLIENT_ROOT_DIR}/mozilla/localsocketcontroller.cpp
        ${CLIENT_ROOT_DIR}/ui/systemtray_notificationhandler.cpp
        ${CLIENT_ROOT_DIR}/protocols/openvpnprotocol.cpp
        ${CLIENT_ROOT_DIR}/protocols/openvpnovercloakprotocol.cpp
@@ -131,7 +131,7 @@ QString OpenVpnConfigurator::processConfigWithLocalSettings(const QPair<QString,

               // no redirect-gateway
        } else if (m_settings->routeMode() == Settings::VpnAllExceptSites) {
-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS) && !defined(MACOS_NE)
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
            config.append("\nredirect-gateway ipv6 !ipv4 bypass-dhcp\n");
            // Prevent ipv6 leak
 #endif
@@ -8,7 +8,7 @@
 #include <QTemporaryFile>
 #include <QThread>
 #include <qtimer.h>
-#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) || defined(MACOS_NE)
+#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
    #include <QGuiApplication>
 #else
    #include <QApplication>
@@ -24,7 +24,7 @@ SshConfigurator::SshConfigurator(std::shared_ptr<Settings> settings, const QShar

 QString SshConfigurator::convertOpenSShKey(const QString &key)
 {
-#if !defined(Q_OS_IOS) && !defined(MACOS_NE)
+#ifndef Q_OS_IOS
    QProcess p;
    p.setProcessChannelMode(QProcess::MergedChannels);

@@ -67,10 +67,9 @@ QString SshConfigurator::convertOpenSShKey(const QString &key)
 #endif
 }

-// DEAD CODE.
 void SshConfigurator::openSshTerminal(const ServerCredentials &credentials)
 {
-#if !defined(Q_OS_IOS) && !defined(MACOS_NE)
+#ifndef Q_OS_IOS
    QProcess *p = new QProcess();
    p->setProcessChannelMode(QProcess::SeparateChannels);

@@ -102,7 +101,7 @@ QProcessEnvironment SshConfigurator::prepareEnv()
    pathEnvVar.clear();
    pathEnvVar.prepend(QDir::toNativeSeparators(QApplication::applicationDirPath()) + "\\cygwin;");
    pathEnvVar.prepend(QDir::toNativeSeparators(QApplication::applicationDirPath()) + "\\openvpn;");
-#elif defined(Q_OS_MACX) && !defined(MACOS_NE)
+#elif defined(Q_OS_MACX)
    pathEnvVar.prepend(QDir::toNativeSeparators(QApplication::applicationDirPath()) + "/Contents/MacOS");
 #endif

@@ -261,7 +261,6 @@ bool ContainerProps::isSupportedByCurrentPlatform(DockerContainer c)
    return true;

 #elif defined(Q_OS_IOS)
-    // Standard iOS build (without Network Extension limitations)
    switch (c) {
    case DockerContainer::WireGuard: return true;
    case DockerContainer::OpenVpn: return true;
@@ -270,23 +269,7 @@ bool ContainerProps::isSupportedByCurrentPlatform(DockerContainer c)
    case DockerContainer::Cloak: return true;
    case DockerContainer::SSXray: return true;
        //    case DockerContainer::ShadowSocks: return true;
-    default:
-        return false;
-    }
-
-#elif defined(MACOS_NE)
-    // macOS build using Network Extension – hide OpenVPN-based containers
-    switch (c) {
-    case DockerContainer::WireGuard: return true;
-    case DockerContainer::Awg: return true;
-    case DockerContainer::Xray: return true;
-    case DockerContainer::SSXray: return true;
-    case DockerContainer::OpenVpn:
-    case DockerContainer::Cloak:
-    case DockerContainer::ShadowSocks:
-        return false;
-    default:
-        return false;
+    default: return false;
    }
 #elif defined(Q_OS_MAC)
    switch (c) {
@@ -23,7 +23,7 @@ namespace

 bool apiUtils::isSubscriptionExpired(const QString &subscriptionEndDate)
 {
-    QDateTime now = QDateTime::currentDateTimeUtc();
+    QDateTime now = QDateTime::currentDateTime();
    QDateTime endDate = QDateTime::fromString(subscriptionEndDate, Qt::ISODateWithMs);
    return endDate < now;
 }
@@ -26,8 +26,9 @@ CoreController::CoreController(const QSharedPointer<VpnConnection> &vpnConnectio

    initNotificationHandler();

+    auto locale = m_settings->getAppLanguage();
    m_translator.reset(new QTranslator());
-    updateTranslator(m_settings->getAppLanguage());
+    updateTranslator(locale);
 }

 void CoreController::initModels()
@@ -232,7 +233,7 @@ void CoreController::initSignalHandlers()

 void CoreController::initNotificationHandler()
 {
-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+#ifndef Q_OS_ANDROID
    m_notificationHandler.reset(NotificationHandler::create(nullptr));

    connect(m_vpnConnection.get(), &VpnConnection::connectionStateChanged, m_notificationHandler.get(),
@@ -5,7 +5,7 @@
 #include <QQmlContext>
 #include <QThread>

-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+#ifndef Q_OS_ANDROID
    #include "ui/systemtray_notificationhandler.h"
 #endif

@@ -48,7 +48,7 @@
 #include "ui/models/services/socks5ProxyConfigModel.h"
 #include "ui/models/sites_model.h"

-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+#ifndef Q_OS_ANDROID
    #include "ui/notificationhandler.h"
 #endif

@@ -97,7 +97,7 @@ private:
    QSharedPointer<VpnConnection> m_vpnConnection;
    QSharedPointer<QTranslator> m_translator;

-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+#ifndef Q_OS_ANDROID
    QScopedPointer<NotificationHandler> m_notificationHandler;
 #endif

@@ -60,9 +60,8 @@ ErrorCode GatewayController::get(const QString &endpoint, QByteArray &responseBo
    QNetworkRequest request;
    request.setTransferTimeout(m_requestTimeoutMsecs);
    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-    request.setRawHeader(QString("X-Client-Request-ID").toUtf8(), QUuid::createUuid().toString(QUuid::WithoutBraces).toUtf8());

-    request.setUrl(QString(endpoint).arg(m_proxyUrl.isEmpty() ? m_gatewayEndpoint : m_proxyUrl));
+    request.setUrl(QString(endpoint).arg(m_gatewayEndpoint));

    // bypass killSwitch exceptions for API-gateway
 #ifdef AMNEZIA_DESKTOP
@@ -123,9 +122,8 @@ ErrorCode GatewayController::post(const QString &endpoint, const QJsonObject api
    QNetworkRequest request;
    request.setTransferTimeout(m_requestTimeoutMsecs);
    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-    request.setRawHeader(QString("X-Client-Request-ID").toUtf8(), QUuid::createUuid().toString(QUuid::WithoutBraces).toUtf8());

-    request.setUrl(endpoint.arg(m_proxyUrl.isEmpty() ? m_gatewayEndpoint : m_proxyUrl));
+    request.setUrl(endpoint.arg(m_gatewayEndpoint));

    // bypass killSwitch exceptions for API-gateway
 #ifdef AMNEZIA_DESKTOP
@@ -346,14 +344,11 @@ void GatewayController::bypassProxy(const QString &endpoint, QNetworkReply *repl
    std::mt19937 generator(randomDevice());
    std::shuffle(proxyUrls.begin(), proxyUrls.end(), generator);

+    QEventLoop wait;
+    QList<QSslError> sslErrors;
    QByteArray responseBody;

-    auto bypassFunction = [this](const QString &endpoint, const QString &proxyUrl, QNetworkReply *reply,
-                                 std::function<QNetworkReply *(const QString &url)> requestFunction,
-                                 std::function<bool(QNetworkReply * reply, const QList<QSslError> &sslErrors)> replyProcessingFunction) {
-        QEventLoop wait;
-        QList<QSslError> sslErrors;
-
+    for (const QString &proxyUrl : proxyUrls) {
        qDebug() << "go to the next proxy endpoint";
        reply->deleteLater(); // delete the previous reply
        reply = requestFunction(endpoint.arg(proxyUrl));
@@ -363,50 +358,6 @@ void GatewayController::bypassProxy(const QString &endpoint, QNetworkReply *repl
        wait.exec();

        if (replyProcessingFunction(reply, sslErrors)) {
-            return true;
-        }
-        return false;
-    };
-
-    if (m_proxyUrl.isEmpty()) {
-        QNetworkRequest request;
-        request.setTransferTimeout(1000);
-        request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-
-        QEventLoop wait;
-        QList<QSslError> sslErrors;
-        QNetworkReply *reply;
-
-        for (const QString &proxyUrl : proxyUrls) {
-            request.setUrl(proxyUrl + "lmbd-health");
-            reply = amnApp->networkManager()->get(request);
-
-            connect(reply, &QNetworkReply::finished, &wait, &QEventLoop::quit);
-            connect(reply, &QNetworkReply::sslErrors, [this, &sslErrors](const QList<QSslError> &errors) { sslErrors = errors; });
-            wait.exec();
-
-            if (reply->error() == QNetworkReply::NetworkError::NoError) {
-                reply->deleteLater();
-
-                m_proxyUrl = proxyUrl;
-                if (!m_proxyUrl.isEmpty()) {
-                    break;
-                }
-            } else {
-                reply->deleteLater();
-            }
-        }
-    }
-
-    if (!m_proxyUrl.isEmpty()) {
-        if (bypassFunction(endpoint, m_proxyUrl, reply, requestFunction, replyProcessingFunction)) {
-            return;
-        }
-    }
-
-    for (const QString &proxyUrl : proxyUrls) {
-        if (bypassFunction(endpoint, proxyUrl, reply, requestFunction, replyProcessingFunction)) {
-            m_proxyUrl = proxyUrl;
            break;
        }
    }
@@ -32,8 +32,6 @@ private:
    QString m_gatewayEndpoint;
    bool m_isDevEnvironment = false;
    bool m_isStrictKillSwitchEnabled = false;
-
-    inline static QString m_proxyUrl;
 };

 #endif // GATEWAYCONTROLLER_H
@@ -197,8 +197,12 @@ ErrorCode ServerController::uploadFileToHost(const ServerCredentials &credential
        return error;
    }

-    // Write directly via SCP without creating a temporary local file.
-    error = m_sshClient.scpWriteBuffer(overwriteMode, data, remotePath, "non_desc");
+    QTemporaryFile localFile;
+    localFile.open();
+    localFile.write(data);
+    localFile.close();
+
+    error = m_sshClient.scpFileCopy(overwriteMode, localFile.fileName(), remotePath, "non_desc");

    if (error != ErrorCode::NoError) {
        return error;
@@ -120,7 +120,6 @@ namespace amnezia
        ApiNotFoundError = 1109,
        ApiMigrationError = 1110,
        ApiUpdateRequestError = 1111,
-        ApiSubscriptionExpiredError = 1112,

        // QFile errors
        OpenError = 1200,
@@ -77,7 +77,6 @@ QString errorString(ErrorCode code) {
    case (ErrorCode::ApiNotFoundError): errorMessage = QObject::tr("Error when retrieving configuration from API"); break;
    case (ErrorCode::ApiMigrationError): errorMessage = QObject::tr("A migration error has occurred. Please contact our technical support"); break;
    case (ErrorCode::ApiUpdateRequestError): errorMessage = QObject::tr("Please update the application to use this feature"); break;
-    case (ErrorCode::ApiSubscriptionExpiredError): errorMessage = QObject::tr("Your Amnezia Premium subscription has expired.\n Please check your email for renewal instructions.\n If you haven't received an email, please contact our support."); break;

    // QFile errors
    case(ErrorCode::OpenError): errorMessage = QObject::tr("QFile error: The file could not be opened"); break;
@@ -18,12 +18,6 @@ bool IpcClient::isSocketConnected() const
    return m_isSocketConnected;
 }

-void IpcClient::close()
-{
-    if (m_localSocket)
-        m_localSocket->close();
-}
-
 IpcClient *IpcClient::Instance()
 {
    return m_instance;
@@ -23,7 +23,6 @@ public:
   static QSharedPointer<PrivilegedProcess> CreatePrivilegedProcess();

   bool isSocketConnected() const;
-   void close();

 signals:

@@ -23,7 +23,7 @@
    #include <sys/socket.h>
    #include <unistd.h>
 #endif
-#if defined(Q_OS_MAC) && !defined(Q_OS_IOS) && !defined(MACOS_NE)
+#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
    #include <sys/param.h>
    #include <sys/sysctl.h>
    #include <sys/socket.h>
@@ -390,7 +390,7 @@ QString NetworkUtilities::getGatewayAndIface()
    close(sock);
    return gateway_address;
 #endif
-#if defined(Q_OS_MAC) && !defined(Q_OS_IOS) && !defined(MACOS_NE)
+#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
    QString gateway;
    int mib[] = {CTL_NET, PF_ROUTE, 0, 0, NET_RT_FLAGS, RTF_GATEWAY};
    int afinet_type[] = {AF_INET, AF_INET6};
@@ -4,7 +4,6 @@
 #include <QtConcurrent>

 #include <fstream>
-#include <algorithm>

 #ifdef Q_OS_WINDOWS
 const uint32_t S_IRWXU = 0644;
@@ -291,54 +290,6 @@ namespace libssh {
        return watcher.result();
    }

-    ErrorCode Client::scpWriteBuffer(const ScpOverwriteMode overwriteMode, const QByteArray &data, const QString &remotePath, const QString &fileDesc)
-    {
-        m_scpSession = ssh_scp_new(m_session, SSH_SCP_WRITE, 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::scpWriteBufferFinished);
-        QFuture<ErrorCode> future = QtConcurrent::run([this, overwriteMode, &data, &remotePath, &fileDesc]() {
-            const int accessType = O_WRONLY | O_CREAT | overwriteMode;
-            const int totalSize = data.size();
-
-            int result = ssh_scp_push_file(m_scpSession, remotePath.toStdString().c_str(), totalSize, accessType);
-            if (result != SSH_OK) {
-                return fromLibsshErrorCode();
-            }
-
-            constexpr int bufferSize = 16384;
-            int transferred = 0;
-            while (transferred < totalSize) {
-                const int chunkSize = std::min(bufferSize, totalSize - transferred);
-                result = ssh_scp_write(m_scpSession, data.constData() + transferred, chunkSize);
-                if (result != SSH_OK) {
-                    return fromLibsshErrorCode();
-                }
-                transferred += chunkSize;
-            }
-
-            return ErrorCode::NoError;
-        });
-        watcher.setFuture(future);
-
-        QEventLoop wait;
-        QObject::connect(this, &Client::scpWriteBufferFinished, &wait, &QEventLoop::quit);
-        wait.exec();
-
-        closeScpSession();
-        return watcher.result();
-    }
-
    void Client::closeScpSession()
    {
        if (m_scpSession != nullptr) {
@@ -36,11 +36,6 @@ namespace libssh {
                               const QString &localPath,
                               const QString &remotePath,
                               const QString &fileDesc);
-        // Copy data directly without a temporary local file
-        ErrorCode scpWriteBuffer(const ScpOverwriteMode overwriteMode,
-                                 const QByteArray &data,
-                                 const QString &remotePath,
-                                 const QString &fileDesc);
        ErrorCode getDecryptedPrivateKey(const ServerCredentials &credentials, QString &decryptedPrivateKey, const std::function<QString()> &passphraseCallback);
    private:
        ErrorCode closeChannel();
@@ -57,7 +52,6 @@ namespace libssh {
    signals:
        void writeToChannelFinished();
        void scpFileCopyFinished();
-        void scpWriteBufferFinished();
    };
 }

@@ -101,10 +101,10 @@ QString InterfaceConfig::toWgConf(const QMap<QString, QString>& extra) const {
    out << "MTU = " << m_deviceMTU << "\n";
  }

-  if (!m_primaryDnsServer.isEmpty()) {
+  if (!m_primaryDnsServer.isNull()) {
    QStringList dnsServers;
    dnsServers.append(m_primaryDnsServer);
-    if (!m_secondaryDnsServer.isEmpty()) {
+    if (!m_secondaryDnsServer.isNull()) {
        dnsServers.append(m_secondaryDnsServer);
    }
    // If the DNS is not the Gateway, it's a user defined DNS
@@ -8,7 +8,7 @@
 #include <QList>
 #include <QMap>
 #include <QString>
-#include <QMap>
+
 #include "ipaddress.h"

 class QJsonObject;
@@ -32,41 +32,17 @@
 	<false/>
 	<key>UILaunchStoryboardName</key>
 	<string>AmneziaVPNLaunchScreen</string>
-	<key>UIApplicationSceneManifest</key>
-	<dict>
-		<key>UIApplicationSupportsMultipleScenes</key>
-		<true/>
-		<key>UISceneConfigurations</key>
-		<dict>
-			<key>UIWindowSceneSessionRoleApplication</key>
-			<array>
-				<dict>
-					<key>UISceneClassName</key>
-					<string>UIWindowScene</string>
-					<key>UISceneConfigurationName</key>
-					<string>Default Configuration</string>
-					<key>UISceneDelegateClassName</key>
-					<string>QIOSWindowSceneDelegate</string>
-				</dict>
-			</array>
-		</dict>
-	</dict>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array/>
 	<key>UIRequiresFullScreen</key>
-	<false/>
+	<true/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 		<string>UIInterfaceOrientationPortrait</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
+	<array/>
 	<key>UIUserInterfaceStyle</key>
 	<string>Light</string>
 	<key>com.wireguard.ios.app_group_id</key>
@@ -1,68 +1,6 @@
 {
-  "images": [
-    {
-      "idiom": "mac",
-      "size": "16x16",
-      "scale": "1x",
-      "filename": "16.png"
-    },
-    {
-      "idiom": "mac",
-      "size": "16x16",
-      "scale": "2x",
-      "filename": "16@2x.png"
-    },
-    {
-      "idiom": "mac",
-      "size": "32x32",
-      "scale": "1x",
-      "filename": "32.png"
-    },
-    {
-      "idiom": "mac",
-      "size": "32x32",
-      "scale": "2x",
-      "filename": "32@2x.png"
-    },
-    {
-      "idiom": "mac",
-      "size": "128x128",
-      "scale": "1x",
-      "filename": "128.png"
-    },
-    {
-      "idiom": "mac",
-      "size": "128x128",
-      "scale": "2x",
-      "filename": "128@2x.png"
-    },
-    {
-      "idiom": "mac",
-      "size": "256x256",
-      "scale": "1x",
-      "filename": "256.png"
-    },
-    {
-      "idiom": "mac",
-      "size": "256x256",
-      "scale": "2x",
-      "filename": "256@2x.png"
-    },
-    {
-      "idiom": "mac",
-      "size": "512x512",
-      "scale": "1x",
-      "filename": "512.png"
-    },
-    {
-      "idiom": "mac",
-      "size": "512x512",
-      "scale": "2x",
-      "filename": "512@2x.png"
-    }
-  ],
-  "info": {
-    "version": 1,
-    "author": "xcode"
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
  }
 }
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleAllowMixedLocalizations</key>
-	<true/>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleDisplayName</key>
-	<string>${QT_INTERNAL_DOLLAR_VAR}{PRODUCT_NAME}</string>
-	<key>CFBundleExecutable</key>
-	<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
-	<key>CFBundleIdentifier</key>
-	<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
-	<key>CFBundleVersion</key>
-	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
-	<key>ITSAppUsesNonExemptEncryption</key>
-	<false/>
-        <key>LSApplicationCategoryType</key>
-	<string>public.app-category.utilities</string>
-
-	<key>LSMinimumSystemVersion</key>
-	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
-	<key>LSSupportsOpeningDocumentsInPlace</key>
-	<true/>
-	<key>com.wireguard.ios.app_group_id</key>
-	<string>group.org.amnezia.AmneziaVPN</string>
-	<key>NSCameraUsageDescription</key>
-	<string>Amnezia VPN needs access to the camera for reading QR-codes.</string>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<false/>
-		<key>NSAllowsLocalNetworking</key>
-		<true/>
-	</dict>
-	<key>CFBundleIcons</key>
-        <dict/>
-	<key>UTImportedTypeDeclarations</key>
-	<array>
-		<dict>
-			<key>UTTypeConformsTo</key>
-			<array>
-				<string>public.data</string>
-			</array>
-			<key>UTTypeDescription</key>
-			<string>Amnezia VPN config</string>
-			<key>UTTypeIconFiles</key>
-			<array/>
-			<key>UTTypeIdentifier</key>
-			<string>org.amnezia.AmneziaVPN.amnezia-config</string>
-			<key>UTTypeTagSpecification</key>
-			<dict>
-				<key>public.filename-extension</key>
-				<array>
-					<string>vpn</string>
-				</array>
-				<key>public.mime-type</key>
-				<array>
-					<string>text/plain</string>
-				</array>
-			</dict>
-		</dict>
-                <dict>
-                        <key>UTTypeConformsTo</key>
-                        <array>
-                                <string>public.data</string>
-                        </array>
-                        <key>UTTypeDescription</key>
-                        <string>WireGuard config</string>
-                        <key>UTTypeIconFiles</key>
-                        <array/>
-                        <key>UTTypeIdentifier</key>
-                        <string>org.amnezia.AmneziaVPN.wireguard-config</string>
-                        <key>UTTypeTagSpecification</key>
-                        <dict>
-                                <key>public.filename-extension</key>
-                                <array>
-                                        <string>conf</string>
-                                        <string>cfg</string>
-                                </array>
-                                <key>public.mime-type</key>
-                                <array>
-                                        <string>text/plain</string>
-                                </array>
-                        </dict>
-                </dict>
-                <dict>
-                        <key>UTTypeConformsTo</key>
-                        <array>
-                                <string>public.data</string>
-                        </array>
-                        <key>UTTypeDescription</key>
-                        <string>OpenVPN config</string>
-                        <key>UTTypeIconFiles</key>
-                        <array/>
-                        <key>UTTypeIdentifier</key>
-                        <string>org.amnezia.AmneziaVPN.openvpn-config</string>
-                        <key>UTTypeTagSpecification</key>
-                        <dict>
-                                <key>public.filename-extension</key>
-                                <array>
-                                        <string>ovpn</string>
-                                </array>
-                                <key>public.mime-type</key>
-                                <array>
-                                        <string>text/plain</string>
-                                </array>
-                        </dict>
-                </dict>
-                <dict>
-                        <key>UTTypeConformsTo</key>
-                        <array>
-                                <string>public.data</string>
-                        </array>
-                        <key>UTTypeDescription</key>
-                        <string>AmneziaVPN backup file</string>
-                        <key>UTTypeIconFiles</key>
-                        <array/>
-                        <key>UTTypeIdentifier</key>
-                        <string>org.amnezia.AmneziaVPN.backup-config</string>
-                        <key>UTTypeTagSpecification</key>
-                        <dict>
-                                <key>public.filename-extension</key>
-                                <array>
-                                        <string>backup</string>
-                                </array>
-                                <key>public.mime-type</key>
-                                <array>
-                                        <string>text/plain</string>
-                                </array>
-                        </dict>
-                </dict>
-	</array>
-        <key>CFBundleDocumentTypes</key>
-        <array>
-                <dict>
-                        <key>CFBundleTypeName</key>
-                        <string>Amnezia VPN config</string>
-                        <key>LSHandlerRank</key>
-                        <string>Alternate</string>
-                        <key>LSItemContentTypes</key>
-                        <array>
-                                <string>org.amnezia.AmneziaVPN.amnezia-config</string>
-                                <string>org.amnezia.AmneziaVPN.wireguard-config</string>
-                                <string>org.amnezia.AmneziaVPN.openvpn-config</string>
-                                <string>org.amnezia.AmneziaVPN.backup-config</string>
-                        </array>
-                </dict>
-        </array>
-        <key>NSExtensions</key>
-        <array>
-        <dict>
-                <key>NSExtensionPointIdentifier</key>
-                <string>com.apple.networkextension.packet-tunnel</string>
-                <key>NSExtensionPrincipalClass</key>
-                <string>$(PRODUCT_MODULE_NAME).PacketTunnelProvider</string>
-        </dict>
-        </array>
-
-</dict>
-</plist>
@@ -2,40 +2,34 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>com.apple.developer.networking.custom-protocol</key>
-	<true/>
+	<key>com.apple.application-identifier</key>
+	<string>$(DEVELOPMENT_TEAM).$(APP_ID_MACOS)</string>
+
 	<key>com.apple.developer.networking.networkextension</key>
 	<array>
-		<string>app-proxy-provider</string>
 		<string>packet-tunnel-provider</string>
-		<string>dns-settings</string>
-		<string>relay</string>
-		<string>content-filter-provider</string>
-		<string>dns-proxy</string>
 	</array>
-	<key>com.apple.developer.system-extension.install</key>
-	<true/>
-	<key>com.apple.developer.networking.vpn.api</key>
-	<array>
-		<string>allow-vpn</string>
-	</array>
-	<key>com.apple.security.app-sandbox</key>
-	<true/>
-	<key>com.apple.security.application-groups</key>
-	<array>
-		<string>group.org.amnezia.AmneziaVPN</string>
-	</array>
-	<key>com.apple.security.files.user-selected.read-only</key>
-	<true/>
-	<key>com.apple.security.files.user-selected.read-write</key>
-	<true/>
-	<key>com.apple.security.network.client</key>
-	<true/>
-	<key>com.apple.security.network.server</key>
-	<true/>
+
 	<key>keychain-access-groups</key>
 	<array>
 		<string>$(DEVELOPMENT_TEAM).*</string>
 	</array>
+
+	<key>com.apple.developer.team-identifier</key>
+	<string>$(DEVELOPMENT_TEAM)</string>
+
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>$(DEVELOPMENT_TEAM).$(GROUP_ID_MACOS)</string>
+	</array>
+
+	<key>com.apple.security.network.client</key>
+	<true/>
+
+	<key>com.apple.security.network.server</key>
+	<true/>
 </dict>
 </plist>
@@ -2,30 +2,41 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>com.apple.developer.networking.custom-protocol</key>
-	<true/>
+	<key>com.apple.application-identifier</key>
+	<string>$(DEVELOPMENT_TEAM).$(NETEXT_ID_MACOS)</string>
+
 	<key>com.apple.developer.networking.networkextension</key>
 	<array>
-		<string>dns-settings</string>
-		<string>relay</string>
 		<string>packet-tunnel-provider</string>
-		<string>content-filter-provider</string>
-		<string>dns-proxy</string>
-		<string>app-proxy-provider</string>
 	</array>
-	<key>com.apple.developer.networking.vpn.api</key>
+
+	<key>keychain-access-groups</key>
 	<array>
-		<string>allow-vpn</string>
+		<string>$(DEVELOPMENT_TEAM).*</string>
 	</array>
+
+	<key>com.apple.developer.team-identifier</key>
+	<string>$(DEVELOPMENT_TEAM)</string>
+
+	<key>com.apple.developer.system-extension.install</key>
+	<true/>
+
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
+
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.org.amnezia.AmneziaVPN</string>
+		<string>$(DEVELOPMENT_TEAM).$(GROUP_ID_MACOS)</string>
 	</array>
+
 	<key>com.apple.security.network.client</key>
 	<true/>
+
 	<key>com.apple.security.network.server</key>
 	<true/>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.private.network.socket-delegate</key>
+	<true/>
 </dict>
 </plist>
@@ -1,138 +0,0 @@
-enable_language(Swift)
-message("Client message >> macos build >> AmneziaVPNNetworkExtension")
-set(CLIENT_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../..)
-
-add_executable(AmneziaVPNNetworkExtension)
-
-message("executable_path is: @executable_path/../../Frameworks")
-set_target_properties(AmneziaVPNNetworkExtension PROPERTIES
-    XCODE_PRODUCT_TYPE com.apple.product-type.app-extension
-    # MACOSX_BUNDLE YES
-    BUNDLE_EXTENSION appex
-    MACOSX_BUNDLE_SHORT_VERSION_STRING "${APPLE_PROJECT_VERSION}"
-    MACOSX_BUNDLE_INFO_STRING "AmneziaVPNNetworkExtension"
-    MACOSX_BUNDLE_BUNDLE_NAME "AmneziaVPNNetworkExtension"
-    XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "${BUILD_IOS_APP_IDENTIFIER}.network-extension"
-    XCODE_ATTRIBUTE_PRODUCT_BUNDLE_NAME "${BUILD_IOS_APP_IDENTIFIER}.network-extension"
-    XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${CMAKE_CURRENT_SOURCE_DIR}/AmneziaVPNNetworkExtension.entitlements
-    XCODE_ATTRIBUTE_MARKETING_VERSION "${APP_MAJOR_VERSION}"
-    XCODE_ATTRIBUTE_CURRENT_PROJECT_VERSION "${BUILD_ID}"
-    XCODE_ATTRIBUTE_PRODUCT_NAME "AmneziaVPNNetworkExtension"
-
-    XCODE_ATTRIBUTE_APPLICATION_EXTENSION_API_ONLY "YES"
-    XCODE_ATTRIBUTE_ENABLE_BITCODE "NO"
-    XCODE_ATTRIBUTE_MACOSX_DEPLOYMENT_TARGET "11.0"
-
-    XCODE_ATTRIBUTE_INFOPLIST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in
-    XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/../../../../Frameworks @loader_path/../../../../Frameworks"
-)
-
-if(DEPLOY)
-    message("DEPLOY is ON")
-    set_target_properties(AmneziaVPNNetworkExtension PROPERTIES
-        XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Distribution"
-        XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY[variant=Debug] "Apple Development"
-        XCODE_ATTRIBUTE_CODE_SIGN_STYLE Manual
-        XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "distr macos.org.amnezia.amneziaVPN.NE"
-        XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "dev macos.org.amnezia.amneziaVPN.NE"
-    )
-else()
-    set_target_properties(AmneziaVPNNetworkExtension PROPERTIES
-        XCODE_ATTRIBUTE_CODE_SIGN_STYLE Automatic
-    )
-endif()
-
-set_target_properties(AmneziaVPNNetworkExtension PROPERTIES
-    XCODE_ATTRIBUTE_SWIFT_VERSION "5.0"
-    XCODE_ATTRIBUTE_CLANG_ENABLE_MODULES "YES"
-    XCODE_ATTRIBUTE_SWIFT_OBJC_BRIDGING_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/WireGuardNetworkExtension-Bridging-Header.h"
-    XCODE_ATTRIBUTE_SWIFT_OPTIMIZATION_LEVEL "-Onone"
-    XCODE_ATTRIBUTE_SWIFT_PRECOMPILE_BRIDGING_HEADER "NO"
-)
-
-set_target_properties("AmneziaVPNNetworkExtension" PROPERTIES
-    XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "X7UJ388FXK"
-)
-
-find_library(FW_ASSETS_LIBRARY AssetsLibrary)
-find_library(FW_MOBILE_CORE MobileCoreServices)
-find_library(FW_UI_KIT UIKit)
-find_library(FW_LIBRESOLV libresolv.9.tbd)
-
-
-# Set the root directory
-set(CLIENT_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../..)
-
-target_link_libraries(AmneziaVPNNetworkExtension PRIVATE ${FW_LIBRESOLV})
-
-target_compile_options(AmneziaVPNNetworkExtension PRIVATE -DGROUP_ID=\"${BUILD_IOS_GROUP_IDENTIFIER}\")
-target_compile_options(AmneziaVPNNetworkExtension PRIVATE -DNETWORK_EXTENSION=1)
-
-set(WG_APPLE_SOURCE_DIR ${CLIENT_ROOT_DIR}/3rd/amneziawg-apple/Sources)
-
-message("WG_APPLE_SOURCE_DIR is: ${WG_APPLE_SOURCE_DIR}")
-message("CLIENT_ROOT_DIR is: ${CLIENT_ROOT_DIR}")
-
-target_sources(AmneziaVPNNetworkExtension PRIVATE
-    ${WG_APPLE_SOURCE_DIR}/WireGuardKit/WireGuardAdapter.swift
-    ${WG_APPLE_SOURCE_DIR}/WireGuardKit/PacketTunnelSettingsGenerator.swift
-    ${WG_APPLE_SOURCE_DIR}/WireGuardKit/DNSResolver.swift
-    ${WG_APPLE_SOURCE_DIR}/WireGuardNetworkExtension/ErrorNotifier.swift
-    ${WG_APPLE_SOURCE_DIR}/Shared/Keychain.swift
-    ${WG_APPLE_SOURCE_DIR}/Shared/Model/TunnelConfiguration+WgQuickConfig.swift
-    ${WG_APPLE_SOURCE_DIR}/Shared/Model/NETunnelProviderProtocol+Extension.swift
-    ${WG_APPLE_SOURCE_DIR}/Shared/Model/String+ArrayConversion.swift
-    ${WG_APPLE_SOURCE_DIR}/WireGuardKit/TunnelConfiguration.swift
-    ${WG_APPLE_SOURCE_DIR}/WireGuardKit/IPAddressRange.swift
-    ${WG_APPLE_SOURCE_DIR}/WireGuardKit/Endpoint.swift
-    ${WG_APPLE_SOURCE_DIR}/WireGuardKit/DNSServer.swift
-    ${WG_APPLE_SOURCE_DIR}/WireGuardKit/InterfaceConfiguration.swift
-    ${WG_APPLE_SOURCE_DIR}/WireGuardKit/PeerConfiguration.swift
-    ${WG_APPLE_SOURCE_DIR}/Shared/FileManager+Extension.swift
-    ${WG_APPLE_SOURCE_DIR}/WireGuardKitC/x25519.c
-    ${WG_APPLE_SOURCE_DIR}/WireGuardKit/Array+ConcurrentMap.swift
-    ${WG_APPLE_SOURCE_DIR}/WireGuardKit/IPAddress+AddrInfo.swift
-    ${WG_APPLE_SOURCE_DIR}/WireGuardKit/PrivateKey.swift
-    ${CLIENT_ROOT_DIR}/platforms/ios/HevSocksTunnel.swift
-    ${CLIENT_ROOT_DIR}/platforms/ios/NELogController.swift
-    ${CLIENT_ROOT_DIR}/platforms/ios/Log.swift
-    ${CLIENT_ROOT_DIR}/platforms/ios/LogRecord.swift
-    ${CLIENT_ROOT_DIR}/platforms/ios/PacketTunnelProvider.swift
-    ${CLIENT_ROOT_DIR}/platforms/ios/PacketTunnelProvider+WireGuard.swift
-    ${CLIENT_ROOT_DIR}/platforms/ios/PacketTunnelProvider+OpenVPN.swift
-    ${CLIENT_ROOT_DIR}/platforms/ios/PacketTunnelProvider+Xray.swift
-    ${CLIENT_ROOT_DIR}/platforms/ios/WGConfig.swift
-    ${CLIENT_ROOT_DIR}/platforms/ios/iosglue.mm
-    ${CLIENT_ROOT_DIR}/platforms/ios/XrayConfig.swift
-)
-
-target_sources(AmneziaVPNNetworkExtension PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/PrivacyInfo.xcprivacy
-)
-
-set_property(TARGET AmneziaVPNNetworkExtension APPEND PROPERTY RESOURCE
-    ${CMAKE_CURRENT_SOURCE_DIR}/PrivacyInfo.xcprivacy
-)
-
-## Build wireguard-go-version.h
-execute_process(
-    COMMAND go list -m golang.zx2c4.com/wireguard
-    WORKING_DIRECTORY ${CLIENT_ROOT_DIR}/3rd/wireguard-apple/Sources/WireGuardKitGo
-    OUTPUT_VARIABLE WG_VERSION_FULL
-)
-string(REGEX REPLACE ".*v\([0-9.]*\).*" "\\1" WG_VERSION_STRING 1.1.1)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/wireguard-go-version.h.in
-               ${CMAKE_CURRENT_BINARY_DIR}/wireguard-go-version.h)
-target_sources(AmneziaVPNNetworkExtension PRIVATE
-    ${CMAKE_CURRENT_BINARY_DIR}/wireguard-go-version.h)
-
-target_include_directories(AmneziaVPNNetworkExtension PRIVATE ${CLIENT_ROOT_DIR})
-target_include_directories(AmneziaVPNNetworkExtension PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-
-target_link_libraries(AmneziaVPNNetworkExtension PRIVATE ${CLIENT_ROOT_DIR}/3rd-prebuilt/3rd-prebuilt/wireguard/macos/universal2/libwg-go.a)
-
-message(${CLIENT_ROOT_DIR})
-message(${CLIENT_ROOT_DIR}/3rd-prebuilt/3rd-prebuilt/xray/HevSocks5Tunnel.xcframework/macos-arm64_x86_64/libhev-socks5-tunnel.a)
-target_link_libraries(AmneziaVPNNetworkExtension PRIVATE ${CLIENT_ROOT_DIR}/3rd-prebuilt/3rd-prebuilt/xray/HevSocks5Tunnel.xcframework/macos-arm64_x86_64/libhev-socks5-tunnel.a)
-
-target_include_directories(AmneziaVPNNetworkExtension PRIVATE ${CLIENT_ROOT_DIR}/3rd-prebuilt/3rd-prebuilt/xray/HevSocks5Tunnel.xcframework/macos-arm64_x86_64/Headers)
@@ -3,32 +3,27 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
 	<string>AmneziaVPNNetworkExtension</string>
-
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.amnezia.AmneziaVPN.network-extension</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>AmneziaVPNNetworkExtension</string>
+	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>${APPLE_PROJECT_VERSION}</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>${CMAKE_PROJECT_VERSION_TWEAK}</string>
-
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
-
 	<key>LSMinimumSystemVersion</key>
-	<string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string>
-
-	<key>CFBundleDisplayName</key>
-	<string>AmneziaVPNNetworkExtension</string>
-
+	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
@@ -36,11 +31,5 @@
 		<key>NSExtensionPrincipalClass</key>
 		<string>$(PRODUCT_MODULE_NAME).PacketTunnelProvider</string>
 	</dict>
-
-	<key>com.wireguard.ios.app_group_id</key>
-	<string>group.org.amnezia.AmneziaVPN</string>
-
-	<key>com.wireguard.macos.app_group_id</key>
-	<string>${BUILD_VPN_DEVELOPMENT_TEAM}.group.org.amnezia.AmneziaVPN</string>
 </dict>
 </plist>
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>NSPrivacyAccessedAPITypes</key>
-	<array>
-		<dict>
-			<key>NSPrivacyAccessedAPIType</key>
-			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
-			<key>NSPrivacyAccessedAPITypeReasons</key>
-			<array>
-				<string>1C8F.1</string>
-			</array>
-		</dict>
-		<dict>
-			<key>NSPrivacyAccessedAPIType</key>
-			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
-			<key>NSPrivacyAccessedAPITypeReasons</key>
-			<array>
-				<string>C617.1</string>
-			</array>
-		</dict>
-	</array>
-</dict>
-</plist>
@@ -1,10 +1,10 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
+
+#include "macos/gobridge/wireguard.h"
 #include "wireguard-go-version.h"
-#include "3rd/amneziawg-apple/Sources/WireGuardKitGo/wireguard.h"
-#include "3rd/amneziawg-apple/Sources/WireGuardKitC/WireGuardKitC.h"
+#include "3rd/awg-apple/Sources/WireGuardKitC/WireGuardKitC.h"

 #include <stdbool.h>
 #include <stdint.h>
@@ -23,8 +23,3 @@ bool key_from_hex(uint8_t key[WG_KEY_LEN], const char* hex);
 bool key_eq(const uint8_t key1[WG_KEY_LEN], const uint8_t key2[WG_KEY_LEN]);

 void write_msg_to_log(const char* tag, const char* msg);
-
-// init function definition in C 
-void hev_socks5_tunnel_quit(void);
-// Updated function definition in C
-int hev_socks5_tunnel_main(const char* configFile, int fd);
@@ -1,3 +0,0 @@
-#ifndef WIREGUARD_GO_VERSION
-#define WIREGUARD_GO_VERSION "@WG_VERSION_STRING@"
-#endif // WIREGUARD_GO_VERSION
@@ -15,7 +15,7 @@
    #include "platforms/ios/QtAppDelegate-C-Interface.h"
 #endif

-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS) && !defined(MACOS_NE)
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
 bool isAnotherInstanceRunning()
 {
    QLocalSocket socket;
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])

    AmneziaApplication app(argc, argv);

-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS) && !defined(MACOS_NE)
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
    if (isAnotherInstanceRunning()) {
        QTimer::singleShot(1000, &app, [&]() { app.quit(); });
        return app.exec();
@@ -5,9 +5,6 @@

 #include <stdint.h>

-#include <QCoreApplication>
-#include <QDateTime>
-#include <QDebug>
 #include <QDir>
 #include <QFileInfo>
 #include <QHostAddress>
@@ -15,13 +12,12 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonValue>
-#include <QLocalSocket>
-#include <QObject>
 #include <QStandardPaths>
-#include <QTimer>

+#include "ipaddress.h"
 #include "leakdetector.h"
 #include "logger.h"
+#include "models/server.h"
 #include "daemon/daemonerrors.h"

 #include "protocols/protocols_defs.h"
@@ -119,6 +115,7 @@ void LocalSocketController::daemonConnected() {
 }

 void LocalSocketController::activate(const QJsonObject &rawConfig) {
+
  QString protocolName = rawConfig.value("protocol").toString();

  int splitTunnelType = rawConfig.value("splitTunnelType").toInt();
@@ -135,16 +132,13 @@ void LocalSocketController::activate(const QJsonObject &rawConfig) {
  //  json.insert("hopindex", QJsonValue((double)hop.m_hopindex));
  json.insert("privateKey", wgConfig.value(amnezia::config_key::client_priv_key));
  json.insert("deviceIpv4Address", wgConfig.value(amnezia::config_key::client_ip));
-  m_deviceIpv4 = wgConfig.value(amnezia::config_key::client_ip).toString();

  // set up IPv6 unique-local-address, ULA, with "fd00::/8" prefix, not globally routable.
  // this will be default IPv6 gateway, OS recognizes that IPv6 link is local and switches to IPv4.
  // Otherwise some OSes (Linux) try IPv6 forever and hang.
  // https://en.wikipedia.org/wiki/Unique_local_address (RFC 4193)
  // https://man7.org/linux/man-pages/man5/gai.conf.5.html
-
-  // simply "dead::1" is globally-routable, don't use it
-  json.insert("deviceIpv6Address", "fd58:baa6:dead::1");
+  json.insert("deviceIpv6Address", "fd58:baa6:dead::1"); // simply "dead::1" is globally-routable, don't use it

  json.insert("serverPublicKey", wgConfig.value(amnezia::config_key::server_pub_key));
  json.insert("serverPskKey", wgConfig.value(amnezia::config_key::psk_key));
@@ -226,6 +220,7 @@ void LocalSocketController::activate(const QJsonObject &rawConfig) {

  json.insert("allowedIPAddressRanges", jsAllowedIPAddesses);

+
  QJsonArray jsExcludedAddresses;
  jsExcludedAddresses.append(wgConfig.value(amnezia::config_key::hostName));
  if (splitTunnelType == 2) {
@@ -269,13 +264,13 @@ void LocalSocketController::activate(const QJsonObject &rawConfig) {
             && !wgConfig.value(amnezia::config_key::junkPacketMaxSize).isUndefined()
             && !wgConfig.value(amnezia::config_key::initPacketJunkSize).isUndefined()
             && !wgConfig.value(amnezia::config_key::responsePacketJunkSize).isUndefined()
-             // && !wgConfig.value(amnezia::config_key::cookieReplyPacketJunkSize).isUndefined()
-             // && !wgConfig.value(amnezia::config_key::transportPacketJunkSize).isUndefined()
+             && !wgConfig.value(amnezia::config_key::cookieReplyPacketJunkSize).isUndefined()
+             && !wgConfig.value(amnezia::config_key::transportPacketJunkSize).isUndefined()
             && !wgConfig.value(amnezia::config_key::initPacketMagicHeader).isUndefined()
             && !wgConfig.value(amnezia::config_key::responsePacketMagicHeader).isUndefined()
             && !wgConfig.value(amnezia::config_key::underloadPacketMagicHeader).isUndefined()
             && !wgConfig.value(amnezia::config_key::transportPacketMagicHeader).isUndefined()
-/*             && !wgConfig.value(amnezia::config_key::specialJunk1).isUndefined()
+             && !wgConfig.value(amnezia::config_key::specialJunk1).isUndefined()
             && !wgConfig.value(amnezia::config_key::specialJunk2).isUndefined()
             && !wgConfig.value(amnezia::config_key::specialJunk3).isUndefined()
             && !wgConfig.value(amnezia::config_key::specialJunk4).isUndefined()
@@ -283,27 +278,27 @@ void LocalSocketController::activate(const QJsonObject &rawConfig) {
             && !wgConfig.value(amnezia::config_key::controlledJunk1).isUndefined()
             && !wgConfig.value(amnezia::config_key::controlledJunk2).isUndefined()
             && !wgConfig.value(amnezia::config_key::controlledJunk3).isUndefined()
-             && !wgConfig.value(amnezia::config_key::specialHandshakeTimeout).isUndefined()*/) {
+             && !wgConfig.value(amnezia::config_key::specialHandshakeTimeout).isUndefined()) {
    json.insert(amnezia::config_key::junkPacketCount, wgConfig.value(amnezia::config_key::junkPacketCount));
    json.insert(amnezia::config_key::junkPacketMinSize, wgConfig.value(amnezia::config_key::junkPacketMinSize));
    json.insert(amnezia::config_key::junkPacketMaxSize, wgConfig.value(amnezia::config_key::junkPacketMaxSize));
    json.insert(amnezia::config_key::initPacketJunkSize, wgConfig.value(amnezia::config_key::initPacketJunkSize));
    json.insert(amnezia::config_key::responsePacketJunkSize, wgConfig.value(amnezia::config_key::responsePacketJunkSize));
-    // json.insert(amnezia::config_key::cookieReplyPacketJunkSize, wgConfig.value(amnezia::config_key::cookieReplyPacketJunkSize));
-    // json.insert(amnezia::config_key::transportPacketJunkSize, wgConfig.value(amnezia::config_key::transportPacketJunkSize));
+    json.insert(amnezia::config_key::cookieReplyPacketJunkSize, wgConfig.value(amnezia::config_key::cookieReplyPacketJunkSize));
+    json.insert(amnezia::config_key::transportPacketJunkSize, wgConfig.value(amnezia::config_key::transportPacketJunkSize));
    json.insert(amnezia::config_key::initPacketMagicHeader, wgConfig.value(amnezia::config_key::initPacketMagicHeader));
    json.insert(amnezia::config_key::responsePacketMagicHeader, wgConfig.value(amnezia::config_key::responsePacketMagicHeader));
    json.insert(amnezia::config_key::underloadPacketMagicHeader, wgConfig.value(amnezia::config_key::underloadPacketMagicHeader));
    json.insert(amnezia::config_key::transportPacketMagicHeader, wgConfig.value(amnezia::config_key::transportPacketMagicHeader));
-    // json.insert(amnezia::config_key::specialJunk1, wgConfig.value(amnezia::config_key::specialJunk1));
-    // json.insert(amnezia::config_key::specialJunk2, wgConfig.value(amnezia::config_key::specialJunk2));
-    // json.insert(amnezia::config_key::specialJunk3, wgConfig.value(amnezia::config_key::specialJunk3));
-    // json.insert(amnezia::config_key::specialJunk4, wgConfig.value(amnezia::config_key::specialJunk4));
-    // json.insert(amnezia::config_key::specialJunk5, wgConfig.value(amnezia::config_key::specialJunk5));
-    // json.insert(amnezia::config_key::controlledJunk1, wgConfig.value(amnezia::config_key::controlledJunk1));
-    // json.insert(amnezia::config_key::controlledJunk2, wgConfig.value(amnezia::config_key::controlledJunk2));
-    // json.insert(amnezia::config_key::controlledJunk3, wgConfig.value(amnezia::config_key::controlledJunk3));
-    // json.insert(amnezia::config_key::specialHandshakeTimeout, wgConfig.value(amnezia::config_key::specialHandshakeTimeout));
+    json.insert(amnezia::config_key::specialJunk1, wgConfig.value(amnezia::config_key::specialJunk1));
+    json.insert(amnezia::config_key::specialJunk2, wgConfig.value(amnezia::config_key::specialJunk2));
+    json.insert(amnezia::config_key::specialJunk3, wgConfig.value(amnezia::config_key::specialJunk3));
+    json.insert(amnezia::config_key::specialJunk4, wgConfig.value(amnezia::config_key::specialJunk4));
+    json.insert(amnezia::config_key::specialJunk5, wgConfig.value(amnezia::config_key::specialJunk5));
+    json.insert(amnezia::config_key::controlledJunk1, wgConfig.value(amnezia::config_key::controlledJunk1));
+    json.insert(amnezia::config_key::controlledJunk2, wgConfig.value(amnezia::config_key::controlledJunk2));
+    json.insert(amnezia::config_key::controlledJunk3, wgConfig.value(amnezia::config_key::controlledJunk3));
+    json.insert(amnezia::config_key::specialHandshakeTimeout, wgConfig.value(amnezia::config_key::specialHandshakeTimeout));
  }

  write(json);
@@ -454,7 +449,6 @@ void LocalSocketController::parseCommand(const QByteArray& command) {
  }

  if (type == "status") {
-
    QJsonValue serverIpv4Gateway = obj.value("serverIpv4Gateway");
    if (!serverIpv4Gateway.isString()) {
      logger.error() << "Unexpected serverIpv4Gateway value";
@@ -499,11 +493,6 @@ void LocalSocketController::parseCommand(const QByteArray& command) {

    logger.debug() << "Handshake completed with:"
                   << pubkey.toString();
-
-    checkStatus();
-
-    emit statusUpdated("", m_deviceIpv4, 0, 0);
-
    emit connected(pubkey.toString());
    return;
  }
@@ -12,7 +12,6 @@

 #include "controllerimpl.h"

-
 class QJsonObject;

 class LocalSocketController final : public ControllerImpl {
@@ -59,7 +58,6 @@ class LocalSocketController final : public ControllerImpl {

  QByteArray m_buffer;

-  QString m_deviceIpv4;
  std::function<void(const QString&)> m_logCallback = nullptr;

  QTimer m_initializingTimer;
@@ -11,6 +11,7 @@
 #include "logger.h"
 //#include "mozillavpn.h"
 #include "networkwatcherimpl.h"
+#include "platforms/dummy/dummynetworkwatcher.h"
 //#include "settingsholder.h"

 #ifdef MZ_WINDOWS
@@ -50,7 +51,7 @@ NetworkWatcher::NetworkWatcher() { MZ_COUNT_CTOR(NetworkWatcher); }
 NetworkWatcher::~NetworkWatcher() { MZ_COUNT_DTOR(NetworkWatcher); }

 void NetworkWatcher::initialize() {
-  logger.debug() << "Initialize NetworkWatcher";
+  logger.debug() << "Initialize";

 #if defined(MZ_WINDOWS)
  m_impl = new WindowsNetworkWatcher(this);
@@ -68,45 +69,59 @@ void NetworkWatcher::initialize() {
  m_impl = new DummyNetworkWatcher(this);
 #endif

-
  connect(m_impl, &NetworkWatcherImpl::unsecuredNetwork, this,
          &NetworkWatcher::unsecuredNetwork);
  connect(m_impl, &NetworkWatcherImpl::networkChanged, this,
          &NetworkWatcher::networkChange);
-  connect(m_impl, &NetworkWatcherImpl::sleepMode, this,
-          &NetworkWatcher::onSleepMode);
+
  m_impl->initialize();

-  // Enable sleep/wake monitoring for VPN auto-reconnection
-  logger.debug() << "Starting NetworkWatcher for sleep/wake monitoring";
-  logger.debug() << "About to call m_impl->start()";
-  try {
+
+// TODO: IMPL FOR AMNEZIA
+#if 0
+  SettingsHolder* settingsHolder = SettingsHolder::instance();
+  Q_ASSERT(settingsHolder);
+
+  m_active = settingsHolder->unsecuredNetworkAlert() ||
+             settingsHolder->captivePortalAlert();
+  m_reportUnsecuredNetwork = settingsHolder->unsecuredNetworkAlert();
+  if (m_active) {
    m_impl->start();
-    logger.debug() << "m_impl->start() completed successfully";
-  } catch (const std::exception& e) {
-    logger.error() << "Exception in m_impl->start():" << e.what();
-  } catch (...) {
-    logger.error() << "Unknown exception in m_impl->start()";
  }
-  m_active = true;
-  m_reportUnsecuredNetwork = false; // Disable unsecured network alerts for Amnezia
+
+  connect(settingsHolder, &SettingsHolder::unsecuredNetworkAlertChanged, this,
+          &NetworkWatcher::settingsChanged);
+  connect(settingsHolder, &SettingsHolder::captivePortalAlertChanged, this,
+          &NetworkWatcher::settingsChanged);
+
+#endif
 }

 void NetworkWatcher::settingsChanged() {
-  // For Amnezia: Keep NetworkWatcher always active for sleep/wake monitoring
-  logger.debug() << "NetworkWatcher settings changed - keeping sleep monitoring active";
-}
+// TODO: IMPL FOR AMNEZIA
+#if 0
+  SettingsHolder* settingsHolder = SettingsHolder::instance();
+  m_active = settingsHolder->unsecuredNetworkAlert() ||
+             settingsHolder->captivePortalAlert();
+  m_reportUnsecuredNetwork = settingsHolder->unsecuredNetworkAlert();

-void NetworkWatcher::onSleepMode()
-{
-  logger.debug() << "Resumed from sleep mode";
-  emit sleepMode();
+  if (m_active) {
+    logger.debug()
+        << "Starting Network Watcher; Reporting of Unsecured Networks: "
+        << m_reportUnsecuredNetwork;
+    m_impl->start();
+  } else {
+    logger.debug() << "Stopping Network Watcher";
+    m_impl->stop();
+  }
+#endif
 }

 void NetworkWatcher::unsecuredNetwork(const QString& networkName,
                                      const QString& networkId) {
  logger.debug() << "Unsecured network:" << logger.sensitive(networkName)
                 << "id:" << logger.sensitive(networkId);
+
 #ifndef UNIT_TEST
  if (!m_reportUnsecuredNetwork) {
    logger.debug() << "Disabled. Ignoring unsecured network";
@@ -29,13 +29,10 @@ public:
    // false to restore.
    void simulateDisconnection(bool simulatedDisconnection);

-    void onSleepMode();
-
    QNetworkInformation::Reachability getReachability();

 signals:
    void networkChange();
-    void sleepMode();

 private:
    void settingsChanged();
@@ -41,8 +41,6 @@ signals:
    // TODO: Only windows-networkwatcher has this, the other plattforms should
    // too.
    void networkChanged(QString newBSSID);
-    void sleepMode();
-

 private:
    bool m_active = false;
@@ -41,7 +41,6 @@ void PingHelper::start(const QString& serverIpv4Gateway,

  m_gateway = QHostAddress(serverIpv4Gateway);
  m_source = QHostAddress(deviceIpv4Address.section('/', 0, 0));
-
  m_pingSender = PingSenderFactory::create(m_source, this);

  // Some platforms require root access to send and receive ICMP pings. If
@@ -54,10 +53,8 @@ void PingHelper::start(const QString& serverIpv4Gateway,

  connect(m_pingSender, &PingSender::recvPing, this, &PingHelper::pingReceived,
          Qt::QueuedConnection);
-  connect(m_pingSender, &PingSender::criticalPingError, this, [this]() {
-        logger.info() << "Encountered Unrecoverable ping error";
-      emit connectionLose();
-  });
+  connect(m_pingSender, &PingSender::criticalPingError, this,
+          []() { logger.info() << "Encountered Unrecoverable ping error"; });

  // Reset the ping statistics
  m_sequence = 0;
@@ -33,8 +33,6 @@ class PingHelper final : public QObject {

 signals:
  void pingSentAndReceived(qint64 msec);
-  void connectionLose();
-

 private:
  void nextPing();
@@ -5,26 +5,27 @@
 #include "pingsenderfactory.h"

 #if defined(MZ_LINUX) || defined(MZ_ANDROID)
-    #  include "platforms/linux/linuxpingsender.h"
+//#  include "platforms/linux/linuxpingsender.h"
 #elif defined(MZ_MACOS) || defined(MZ_IOS)
-    #  include "platforms/macos/macospingsender.h"
+#  include "platforms/macos/macospingsender.h"
 #elif defined(MZ_WINDOWS)
-    #  include "platforms/windows/windowspingsender.h"
-#elif defined(MZ_WASM) || defined(UNIT_TEST)
-    #  include "platforms/dummy/dummypingsender.h"
+#  include "platforms/windows/windowspingsender.h"
+#elif defined(MZ_DUMMY) || defined(UNIT_TEST)
+#  include "platforms/dummy/dummypingsender.h"
 #else
-    #  error "Unsupported platform"
+#  error "Unsupported platform"
 #endif

 PingSender* PingSenderFactory::create(const QHostAddress& source,
                                      QObject* parent) {
 #if defined(MZ_LINUX) || defined(MZ_ANDROID)
-    return new LinuxPingSender(source, parent);
+    return nullptr;
+    //  return new LinuxPingSender(source, parent);
 #elif defined(MZ_MACOS) || defined(MZ_IOS)
-    return new MacOSPingSender(source, parent);
+  return new MacOSPingSender(source, parent);
 #elif defined(MZ_WINDOWS)
-    return new WindowsPingSender(source, parent);
+  return new WindowsPingSender(source, parent);
 #else
-    return new DummyPingSender(source, parent);
+  return new DummyPingSender(source, parent);
 #endif
 }
@@ -10,10 +10,9 @@ class QHostAddress;
 class QObject;

 class PingSenderFactory final {
-public:
-    PingSenderFactory() = delete;
-    static PingSender* create(const QHostAddress& source, QObject* parent);
+ public:
+  PingSenderFactory() = delete;
+  static PingSender* create(const QHostAddress& source, QObject* parent);
 };

-
 #endif  // PINGSENDERFACTORY_H
@@ -1,82 +0,0 @@
-#import <UIKit/UIKit.h>
-#import <objc/runtime.h>
-#include <dispatch/dispatch.h>
-
-#include <QByteArray>
-#include <QFile>
-#include <QString>
-
-#include "ios_controller.h"
-
-using SceneOpenURLContexts = void (*)(id, SEL, UIScene *, NSSet<UIOpenURLContext *> *);
-
-static SceneOpenURLContexts g_originalSceneOpenURLContexts = nullptr;
-
-static void amnezia_handleURL(NSURL *url)
-{
-    if (!url || !url.isFileURL) {
-        return;
-    }
-
-    QString filePath(url.path.UTF8String);
-    if (filePath.isEmpty()) {
-        return;
-    }
-
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        if (filePath.contains("backup")) {
-            IosController::Instance()->importBackupFromOutside(filePath);
-            return;
-        }
-
-        QFile file(filePath);
-        if (!file.open(QIODevice::ReadOnly)) {
-            return;
-        }
-
-        const QByteArray data = file.readAll();
-        IosController::Instance()->importConfigFromOutside(QString::fromUtf8(data));
-    });
-}
-
-static void amnezia_scene_openURLContexts(id self, SEL _cmd, UIScene *scene, NSSet<UIOpenURLContext *> *contexts)
-{
-    if (g_originalSceneOpenURLContexts) {
-        g_originalSceneOpenURLContexts(self, _cmd, scene, contexts);
-    }
-
-    if (!contexts || contexts.count == 0) {
-        return;
-    }
-
-    if (@available(iOS 13.0, *)) {
-        for (UIOpenURLContext *context in contexts) {
-            amnezia_handleURL(context.URL);
-        }
-    }
-}
-
-@interface AmneziaSceneDelegateHooks : NSObject
-@end
-
-@implementation AmneziaSceneDelegateHooks
-
-+ (void)load
-{
-    Class cls = objc_getClass("QIOSWindowSceneDelegate");
-    if (!cls) {
-        return;
-    }
-
-    SEL selector = @selector(scene:openURLContexts:);
-    Method method = class_getInstanceMethod(cls, selector);
-    if (method) {
-        g_originalSceneOpenURLContexts = reinterpret_cast<SceneOpenURLContexts>(method_getImplementation(method));
-        method_setImplementation(method, reinterpret_cast<IMP>(amnezia_scene_openURLContexts));
-    } else {
-        const char *types = "v@:@@";
-        class_addMethod(cls, selector, reinterpret_cast<IMP>(amnezia_scene_openURLContexts), types);
-    }
-}
-
-@end
@@ -73,7 +73,7 @@ extension PacketTunnelProvider {
        startHandler = completionHandler
        ovpnAdapter?.connect(using: packetFlow)
    }
-
+    
    func handleOpenVPNStatusMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)? = nil) {
        guard let completionHandler = completionHandler else { return }
        let bytesin = ovpnAdapter?.transportStatistics.bytesIn
@@ -112,19 +112,9 @@ extension PacketTunnelProvider {
                }
            }

-            let lastHandshakeString = settingsDictionary["last_handshake_time_sec"]
-            let lastHandshake: Int64
-
-            if let lastHandshakeValue = lastHandshakeString, let handshakeValue = Int64(lastHandshakeValue) {
-                lastHandshake = handshakeValue
-            } else {
-                lastHandshake = -2  // Return an error if there is no value for `last_handshake_time_sec`
-            }
-
            let response: [String: Any] = [
                "rx_bytes": settingsDictionary["rx_bytes"] ?? "0",
-                "tx_bytes": settingsDictionary["tx_bytes"] ?? "0",
-                "last_handshake_time_sec": lastHandshake
+                "tx_bytes": settingsDictionary["tx_bytes"] ?? "0"
            ]

            completionHandler(try? JSONSerialization.data(withJSONObject: response, options: []))
@@ -1,4 +1,3 @@
-#if !MACOS_NE
 #include "QRCodeReaderBase.h"

 #import <UIKit/UIKit.h>
@@ -109,19 +108,3 @@ void QRCodeReader::startReading() {
 void QRCodeReader::stopReading() {
    [m_qrCodeReader stopReading];
 }
-#else
-#include "QRCodeReaderBase.h"
-
-QRCodeReader::QRCodeReader()
-{
-
-}
-
-QRect QRCodeReader::cameraSize() {
-    return QRect();
-}
-
-void QRCodeReader::startReading() {}
-void QRCodeReader::stopReading() {}
-void QRCodeReader::setCameraSize(QRect) {}
-#endif
@@ -1,6 +1,5 @@
-#if !MACOS_NE
 #import <UIKit/UIKit.h>
-#endif
+
@interface QIOSApplicationDelegate
@end

@@ -5,7 +5,7 @@


@implementation QIOSApplicationDelegate (AmneziaVPNDelegate)
-#if !MACOS_NE
+
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
    [application setMinimumBackgroundFetchInterval: UIApplicationBackgroundFetchIntervalMinimum];
@@ -57,5 +57,5 @@
    }
    return NO;
 }
-#endif
+
@end
@@ -1,13 +1,3 @@
-#if MACOS_NE
-public func toggleScreenshots(_ isEnabled: Bool) {
-  
-}
-
-class ScreenProtection {
-
-
-}
-#else
 import UIKit

 public func toggleScreenshots(_ isEnabled: Bool) {
@@ -100,4 +90,3 @@ struct ProtectionPair {
    textField.removeFromSuperview()
  }
 }
-#endif
@@ -46,7 +46,6 @@ public:
    void disconnectVpn();

    void vpnStatusDidChange(void *pNotification);
-    
    void vpnConfigurationDidChange(void *pNotification);

    void getBackendLogs(std::function<void(const QString &)> &&callback);
@@ -27,51 +27,15 @@ const char* MessageKey::isOnDemand = "is-on-demand";
 const char* MessageKey::SplitTunnelType = "SplitTunnelType";
 const char* MessageKey::SplitTunnelSites = "SplitTunnelSites";

-#if !MACOS_NE
 static UIViewController* getViewController() {
-    UIApplication *application = [UIApplication sharedApplication];
-
-    if (@available(iOS 13.0, *)) {
-        for (UIScene *scene in application.connectedScenes) {
-            if (scene.activationState != UISceneActivationStateForegroundActive) {
-                continue;
-            }
-
-            if (![scene isKindOfClass:[UIWindowScene class]]) {
-                continue;
-            }
-
-            UIWindowScene *windowScene = (UIWindowScene *)scene;
-
-            for (UIWindow *window in windowScene.windows) {
-                if (window.isKeyWindow && window.rootViewController) {
-                    return window.rootViewController;
-                }
-            }
-
-            for (UIWindow *window in windowScene.windows) {
-                if (!window.isHidden && window.rootViewController) {
-                    return window.rootViewController;
-                }
-            }
-        }
-    }
-
-    for (UIWindow *window in application.windows) {
-        if (window.isKeyWindow && window.rootViewController) {
+    NSArray *windows = [[UIApplication sharedApplication]windows];
+    for (UIWindow *window in windows) {
+        if (window.isKeyWindow) {
            return window.rootViewController;
        }
    }
-
-    for (UIWindow *window in application.windows) {
-        if (window.rootViewController) {
-            return window.rootViewController;
-        }
-    }
-
    return nil;
 }
-#endif

 Vpn::ConnectionState iosStatusToState(NEVPNStatus status) {
  switch (status) {
@@ -285,21 +249,6 @@ void IosController::checkStatus()
    sendVpnExtensionMessage(message, [&](NSDictionary* response){
        uint64_t txBytes = [response[@"tx_bytes"] intValue];
        uint64_t rxBytes = [response[@"rx_bytes"] intValue];
-        
-        uint64_t last_handshake_time_sec = 0;
-#if !MACOS_NE
-        if (response[@"last_handshake_time_sec"] && ![response[@"last_handshake_time_sec"] isKindOfClass:[NSNull class]]) {
-            last_handshake_time_sec = [response[@"last_handshake_time_sec"] intValue];
-        } else {
-            qDebug() << "Key last_handshake_time_sec is missing or null";
-        }
-
-        if (last_handshake_time_sec < 0) {
-            disconnectVpn();
-            qDebug() << "Invalid handshake time, disconnecting VPN.";
-        }
-#endif
-
        emit bytesChanged(rxBytes - m_rxBytes, txBytes - m_txBytes);
        m_rxBytes = rxBytes;
        m_txBytes = txBytes;
@@ -854,14 +803,14 @@ bool IosController::shareText(const QStringList& filesToSend) {
        NSURL *logFileUrl = [[NSURL alloc] initFileURLWithPath:filesToSend[i].toNSString()];
        [sharingItems addObject:logFileUrl];
    }
-#if !MACOS_NE
+
    UIViewController *qtController = getViewController();
    if (!qtController) return;

    UIActivityViewController *activityController = [[UIActivityViewController alloc] initWithActivityItems:sharingItems applicationActivities:nil];
-#endif
+
    __block bool isAccepted = false;
-#if !MACOS_NE
+
    [activityController setCompletionWithItemsHandler:^(NSString *activityType, BOOL completed, NSArray *returnedItems, NSError *activityError) {
        isAccepted = completed;
        emit finished();
@@ -874,7 +823,6 @@ bool IosController::shareText(const QStringList& filesToSend) {
        popController.sourceRect = CGRectMake(100, 100, 100, 100);
    }

-#endif
    QEventLoop wait;
    QObject::connect(this, &IosController::finished, &wait, &QEventLoop::quit);
    wait.exec();
@@ -883,7 +831,6 @@ bool IosController::shareText(const QStringList& filesToSend) {
 }

 QString IosController::openFile() {
-#if !MACOS_NE
    UIDocumentPickerViewController *documentPicker = [[UIDocumentPickerViewController alloc] initWithDocumentTypes:@[@"public.item"] inMode:UIDocumentPickerModeOpen];

    DocumentPickerDelegate *documentPickerDelegate = [[DocumentPickerDelegate alloc] init];
@@ -894,9 +841,8 @@ QString IosController::openFile() {

    [qtController presentViewController:documentPicker animated:YES completion:nil];

-#endif
    __block QString filePath;
-#if !MACOS_NE
+
    documentPickerDelegate.documentPickerClosedCallback = ^(NSString *path) {
        if (path) {
            filePath = QString::fromUtf8(path.UTF8String);
@@ -905,7 +851,7 @@ QString IosController::openFile() {
        }
        emit finished();
    };
-#endif
+
    QEventLoop wait;
    QObject::connect(this, &IosController::finished, &wait, &QEventLoop::quit);
    wait.exec();
@@ -1,11 +1,7 @@
 #import <NetworkExtension/NetworkExtension.h>
 #import <NetworkExtension/NETunnelProviderSession.h>
 #import <Foundation/Foundation.h>
-
-#if !MACOS_NE
 #include <UIKit/UIKit.h>
-#endif
-
 #include <Security/Security.h>

 class IosController;
@@ -21,10 +17,9 @@ class IosController;
@end

 typedef void (^DocumentPickerClosedCallback)(NSString *path);
-#if !MACOS_NE
+
@interface DocumentPickerDelegate : NSObject <UIDocumentPickerDelegate>

@property (nonatomic, copy) DocumentPickerClosedCallback documentPickerClosedCallback;

@end
-#endif
@@ -26,8 +26,7 @@

@end

-#if !MACOS_NE
-@implementation DocumentPickerDelegate
+@implementation DocumentPickerDelegate 

 - (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocumentsAtURLs:(NSArray<NSURL *> *)urls {
    for (NSURL *url in urls) {
@@ -43,5 +42,4 @@
    }
 }

-@end
-#endif
+@end
@@ -34,9 +34,6 @@ void IOSNetworkWatcher::initialize() {
  });
  nw_path_monitor_start(m_networkMonitor);

-  // Call start() to initialize sleep/wake monitoring (will call MacOSNetworkWatcher::start() if this is macOS)
-  this->start();
-  
  //TODO IMPL FOR AMNEZIA
 }

@@ -6,8 +6,6 @@

 #import <UserNotifications/UserNotifications.h>
 #import <Foundation/Foundation.h>
-
-#if !MACOS_NE
 #import <UIKit/UIKit.h>

@interface IOSNotificationDelegate
@@ -89,86 +87,3 @@ void IOSNotificationHandler::notify(NotificationHandler::Message type, const QSt
             }
           }];
 }
-#else
-
-// Removed the UIResponder and UIApplicationDelegate references as these are not available in macOS
-@interface IOSNotificationDelegate
-    : NSObject <UNUserNotificationCenterDelegate> {
-  IOSNotificationHandler* m_iosNotificationHandler;
-}
-@end
-
-@implementation IOSNotificationDelegate
-
- (id)initWithObject:(IOSNotificationHandler*)notification {
-  self = [super init];  // Removed `super init` as it refers to UIResponder, which is iOS specific
-  if (self) {
-    m_iosNotificationHandler = notification;
-  }
-  return self;
-}
-
- (void)userNotificationCenter:(UNUserNotificationCenter*)center
-       willPresentNotification:(UNNotification*)notification
-         withCompletionHandler:
-             (void (^)(UNNotificationPresentationOptions options))completionHandler {
-  Q_UNUSED(center)
-  completionHandler(UNNotificationPresentationOptionList | UNNotificationPresentationOptionBanner);
-}
-
- (void)userNotificationCenter:(UNUserNotificationCenter*)center
-    didReceiveNotificationResponse:(UNNotificationResponse*)response
-             withCompletionHandler:(void (^)())completionHandler {
-  Q_UNUSED(center)
-  Q_UNUSED(response)
-  completionHandler();
-}
-@end
-
-IOSNotificationHandler::IOSNotificationHandler(QObject* parent) : NotificationHandler(parent) {
-
-  UNUserNotificationCenter* center = [UNUserNotificationCenter currentNotificationCenter];
-  [center requestAuthorizationWithOptions:(UNAuthorizationOptionSound | UNAuthorizationOptionAlert |
-                                           UNAuthorizationOptionBadge)
-                        completionHandler:^(BOOL granted, NSError* _Nullable error) {
-                          Q_UNUSED(granted);
-                          if (!error) {
-                            m_delegate = [[IOSNotificationDelegate alloc] initWithObject:this];
-                          }
-                        }];
-}
-
-IOSNotificationHandler::~IOSNotificationHandler() { }
-
-void IOSNotificationHandler::notify(NotificationHandler::Message type, const QString& title,
-                                    const QString& message, int timerMsec) {
-  Q_UNUSED(type);
-
-  if (!m_delegate) {
-    return;
-  }
-
-  UNMutableNotificationContent* content = [[UNMutableNotificationContent alloc] init];
-  content.title = title.toNSString();
-  content.body = message.toNSString();
-  content.sound = [UNNotificationSound defaultSound];
-
-  int timerSec = timerMsec / 1000;
-  UNTimeIntervalNotificationTrigger* trigger =
-      [UNTimeIntervalNotificationTrigger triggerWithTimeInterval:timerSec repeats:NO];
-
-  UNNotificationRequest* request = [UNNotificationRequest requestWithIdentifier:@"amneziavpn"
-                                                                        content:content
-                                                                        trigger:trigger];
-
-  UNUserNotificationCenter* center = [UNUserNotificationCenter currentNotificationCenter];
-  center.delegate = (id<UNUserNotificationCenterDelegate>)m_delegate;
-
-  [center addNotificationRequest:request
-           withCompletionHandler:^(NSError* _Nullable error) {
-             if (error) {
-               NSLog(@"Local Notification failed");
-             }
-           }];
-}
-#endif
@@ -41,9 +41,6 @@ void LinuxNetworkWatcher::initialize() {
  connect(m_worker, &LinuxNetworkWatcherWorker::unsecuredNetwork, this,
          &LinuxNetworkWatcher::unsecuredNetwork);

-  connect(m_worker, &LinuxNetworkWatcherWorker::sleepMode, this,
-          &NetworkWatcherImpl::sleepMode);
-
  // Let's wait a few seconds to allow the UI to be fully loaded and shown.
  // This is not strictly needed, but it's better for user experience because
  // it makes the UI faster to appear, plus it gives a bit of delay between the
@@ -33,21 +33,7 @@
 #define NM_802_11_AP_SEC_WEAK_CRYPTO \
  (NM_802_11_AP_SEC_PAIR_WEP40 | NM_802_11_AP_SEC_PAIR_WEP104)

-
-enum NMState {
-    NM_STATE_UNKNOWN = 0,
-    NM_STATE_ASLEEP = 10,
-    NM_STATE_DISCONNECTED = 20,
-    NM_STATE_DISCONNECTING = 30,
-    NM_STATE_CONNECTING = 40,
-    NM_STATE_CONNECTED_LOCAL = 50,
-    NM_STATE_CONNECTED_SITE = 60,
-    NM_STATE_CONNECTED_GLOBAL = 70
-};
-
-
 constexpr const char* DBUS_NETWORKMANAGER = "org.freedesktop.NetworkManager";
-constexpr const char* DBUS_NETWORKMANAGER_PATH = "/org/freedesktop/NetworkManager";

 namespace {
 Logger logger("LinuxNetworkWatcherWorker");
@@ -87,7 +73,7 @@ void LinuxNetworkWatcherWorker::initialize() {
  // documentation:
  // https://developer.gnome.org/NetworkManager/stable/gdbus-org.freedesktop.NetworkManager.html

-  QDBusInterface nm(DBUS_NETWORKMANAGER, DBUS_NETWORKMANAGER_PATH,
+  QDBusInterface nm(DBUS_NETWORKMANAGER, "/org/freedesktop/NetworkManager",
                    DBUS_NETWORKMANAGER, QDBusConnection::systemBus());
  if (!nm.isValid()) {
    logger.error()
@@ -122,12 +108,6 @@ void LinuxNetworkWatcherWorker::initialize() {
        SLOT(propertyChanged(QString, QVariantMap, QStringList)));
  }

-  QDBusConnection::systemBus().connect(DBUS_NETWORKMANAGER,
-                                       DBUS_NETWORKMANAGER_PATH,
-                                       DBUS_NETWORKMANAGER,
-                                       "StateChanged",
-                                       this, SLOT(NMStateChanged(quint32)));
-
  if (m_devicePaths.isEmpty()) {
    logger.warning() << "No wifi devices found";
    return;
@@ -193,16 +173,5 @@ void LinuxNetworkWatcherWorker::checkDevices() {
      emit unsecuredNetwork(ssid, bssid);
      break;
    }
-
  }
 }
-
-void LinuxNetworkWatcherWorker::NMStateChanged(quint32 state)
-{
-  if (state == NM_STATE_ASLEEP) {
-    emit sleepMode();
-  }
-
-  logger.debug() << "NMStateChanged " << state;
-}
-
@@ -23,7 +23,6 @@ class LinuxNetworkWatcherWorker final : public QObject {

 signals:
  void unsecuredNetwork(const QString& networkName, const QString& networkId);
-  void sleepMode();

 public slots:
  void initialize();
@@ -31,7 +30,6 @@ class LinuxNetworkWatcherWorker final : public QObject {
 private slots:
  void propertyChanged(QString interface, QVariantMap properties,
                       QStringList list);
-  void NMStateChanged(quint32 state);

 private:
  // We collect the list of DBus wifi network device paths during the
@@ -1,185 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "linuxpingsender.h"
-
-#include <arpa/inet.h>
-#include <errno.h>
-#include <linux/filter.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/ip_icmp.h>
-#include <sys/socket.h>
-#include <unistd.h>
-
-#include <QSocketNotifier>
-#include <QtEndian>
-
-#include "leakdetector.h"
-#include "logger.h"
-#include "qhostaddress.h"
-
-namespace {
-Logger logger("LinuxPingSender");
-}
-
-int LinuxPingSender::createSocket() {
-  // Try creating an ICMP socket. This would be the ideal choice, but it can
-  // fail depending on the kernel config (see: sys.net.ipv4.ping_group_range)
-  m_socket = socket(AF_INET, SOCK_DGRAM, IPPROTO_ICMP);
-  if (m_socket >= 0) {
-    m_ident = 0;
-    return m_socket;
-  }
-  if ((errno != EPERM) && (errno != EACCES)) {
-    return -1;
-  }
-
-  // As a fallback, create a raw socket, which requires root permissions
-  // or CAP_NET_RAW to be granted to the VPN client.
-  m_socket = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
-  if (m_socket < 0) {
-    return -1;
-  }
-  m_ident = getpid() & 0xffff;
-
-  // Attach a BPF filter to discard everything but replies to our echo.
-  struct sock_filter bpf_prog[] = {
-      BPF_STMT(BPF_LDX | BPF_B | BPF_MSH, 0), /* Skip IP header. */
-      BPF_STMT(BPF_LD | BPF_H | BPF_IND, 4),  /* Load icmp echo ident */
-      BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, m_ident, 1, 0), /* Ours? */
-      BPF_STMT(BPF_RET | BPF_K, 0), /* Unexpected identifier. Reject. */
-      BPF_STMT(BPF_LD | BPF_B | BPF_IND, 0), /* Load icmp type */
-      BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, ICMP_ECHOREPLY, 1, 0), /* Echo? */
-      BPF_STMT(BPF_RET | BPF_K, 0),   /* Unexpected type. Reject. */
-      BPF_STMT(BPF_RET | BPF_K, ~0U), /* Packet passes the filter. */
-  };
-  struct sock_fprog filter = {
-      .len = sizeof(bpf_prog) / sizeof(struct sock_filter),
-      .filter = bpf_prog,
-  };
-  setsockopt(m_socket, SOL_SOCKET, SO_ATTACH_FILTER, &filter, sizeof(filter));
-
-  return m_socket;
-}
-
-LinuxPingSender::LinuxPingSender(const QHostAddress& source, QObject* parent)
-    : PingSender(parent) {
-  MZ_COUNT_CTOR(LinuxPingSender);
-
-  logger.debug() << "LinuxPingSender(" + logger.sensitive(source.toString()) +
-                        ") created";
-
-  m_socket = createSocket();
-  if (m_socket < 0) {
-    logger.error() << "Socket creation error: " << strerror(errno);
-    return;
-  }
-
-  quint32 ipv4addr = INADDR_ANY;
-  if (!source.isNull()) {
-    ipv4addr = source.toIPv4Address();
-  }
-  struct sockaddr_in addr;
-  memset(&addr, 0, sizeof addr);
-  addr.sin_family = AF_INET;
-  addr.sin_addr.s_addr = qToBigEndian<quint32>(ipv4addr);
-
-  if (bind(m_socket, (struct sockaddr*)&addr, sizeof(addr)) != 0) {
-    close(m_socket);
-    m_socket = -1;
-    logger.error() << "bind error:" << strerror(errno);
-    return;
-  }
-
-  m_notifier = new QSocketNotifier(m_socket, QSocketNotifier::Read, this);
-  if (m_ident) {
-    connect(m_notifier, &QSocketNotifier::activated, this,
-            &LinuxPingSender::rawSocketReady);
-  } else {
-    connect(m_notifier, &QSocketNotifier::activated, this,
-            &LinuxPingSender::icmpSocketReady);
-  }
-}
-
-LinuxPingSender::~LinuxPingSender() {
-  MZ_COUNT_DTOR(LinuxPingSender);
-  if (m_socket >= 0) {
-    close(m_socket);
-  }
-}
-
-void LinuxPingSender::sendPing(const QHostAddress& dest, quint16 sequence) {
-  quint32 ipv4dest = dest.toIPv4Address();
-  struct sockaddr_in addr;
-  memset(&addr, 0, sizeof(addr));
-  addr.sin_family = AF_INET;
-  addr.sin_addr.s_addr = qToBigEndian<quint32>(ipv4dest);
-
-  struct icmphdr packet;
-  memset(&packet, 0, sizeof(packet));
-  packet.type = ICMP_ECHO;
-  packet.un.echo.id = htons(m_ident);
-  packet.un.echo.sequence = htons(sequence);
-  packet.checksum = inetChecksum(&packet, sizeof(packet));
-
-  int rc = sendto(m_socket, &packet, sizeof(packet), 0, (struct sockaddr*)&addr,
-                  sizeof(addr));
-  if (rc < 0) {
-    logger.error() << "failed to send:" << strerror(errno);
-    if (errno == ENETUNREACH) {
-        emit criticalPingError();
-    }
-  }
-}
-
-void LinuxPingSender::icmpSocketReady() {
-  socklen_t slen = 0;
-  unsigned char data[2048];
-  int rc = recvfrom(m_socket, data, sizeof(data), MSG_DONTWAIT, NULL, &slen);
-  if (rc <= 0) {
-    logger.error() << "recvfrom failed:" << strerror(errno);
-    return;
-  }
-
-  struct icmphdr packet;
-  if (rc >= (int)sizeof(packet)) {
-    memcpy(&packet, data, sizeof(packet));
-    if (packet.type == ICMP_ECHOREPLY) {
-      emit recvPing(htons(packet.un.echo.sequence));
-    }
-  }
-}
-
-void LinuxPingSender::rawSocketReady() {
-  socklen_t slen = 0;
-  unsigned char data[2048];
-  int rc = recvfrom(m_socket, data, sizeof(data), MSG_DONTWAIT, NULL, &slen);
-  if (rc <= 0) {
-    logger.error() << "recvfrom failed:" << strerror(errno);
-    return;
-  }
-
-  // Check the IP header
-  const struct iphdr* ip = (struct iphdr*)data;
-  int iphdrlen = ip->ihl * 4;
-  if (rc < iphdrlen || iphdrlen < (int)sizeof(struct iphdr)) {
-    logger.error() << "malformed IP packet:" << strerror(errno);
-    return;
-  }
-
-  // Check the ICMP packet
-  struct icmphdr packet;
-  if (inetChecksum(data + iphdrlen, rc - iphdrlen) != 0) {
-    logger.warning() << "invalid checksum";
-    return;
-  }
-  if (rc >= (iphdrlen + (int)sizeof(packet))) {
-    memcpy(&packet, data + iphdrlen, sizeof(packet));
-    quint16 id = htons(m_ident);
-    if ((packet.type == ICMP_ECHOREPLY) && (packet.un.echo.id == id)) {
-      emit recvPing(htons(packet.un.echo.sequence));
-    }
-  }
-}
@@ -1,39 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef LINUXPINGSENDER_H
-#define LINUXPINGSENDER_H
-
-#include <QObject>
-
-#include "../client/mozilla/pingsender.h"
-
-class QSocketNotifier;
-
-class LinuxPingSender final : public PingSender {
-  Q_OBJECT
-  Q_DISABLE_COPY_MOVE(LinuxPingSender)
-
- public:
-  LinuxPingSender(const QHostAddress& source, QObject* parent = nullptr);
-  ~LinuxPingSender();
-
-  bool isValid() override { return (m_socket >= 0); };
-
-  void sendPing(const QHostAddress& dest, quint16 sequence) override;
-
- private:
-  int createSocket();
-
- private slots:
-  void rawSocketReady();
-  void icmpSocketReady();
-
- private:
-  QSocketNotifier* m_notifier = nullptr;
-  int m_socket = -1;
-  quint16 m_ident = 0;
-};
-
-#endif  // LINUXPINGSENDER_H
@@ -10,31 +10,8 @@
 #include "../ios/iosnetworkwatcher.h"
 #include "networkwatcherimpl.h"

-#include <IOKit/pwr_mgt/IOPMLib.h>
-#include <IOKit/IOMessage.h>
-
-
 class QString;

-// Inspired by https://ladydebug.com/blog/2020/05/21/programmatically-capture-energy-saver-event-on-mac/
-class PowerNotificationsListener
-{
-public:
-    PowerNotificationsListener(class MacOSNetworkWatcher* watcher) : m_watcher(watcher) {}
-    void registerForNotifications();
-    void cleanup();
-
-private:
-    static void sleepWakeupCallBack(void *refParam, io_service_t service, natural_t messageType, void *messageArgument);
-
-private:
-    class MacOSNetworkWatcher* m_watcher = nullptr;
-    IONotificationPortRef notifyPortRef = nullptr; // notification port allocated by IORegisterForSystemPower
-    io_object_t notifierObj = IO_OBJECT_NULL; // notifier object, used to deregister later
-    io_connect_t rootPowerDomain = IO_OBJECT_NULL; // a reference to the Root Power Domain IOService
-};
-
-
 class MacOSNetworkWatcher final : public IOSNetworkWatcher {
 public:
  MacOSNetworkWatcher(QObject* parent);
@@ -48,7 +25,6 @@ class MacOSNetworkWatcher final : public IOSNetworkWatcher {

 private:
  void* m_delegate = nullptr;
-  PowerNotificationsListener m_powerlistener;
 };

 #endif  // MACOSNETWORKWATCHER_H
@@ -6,11 +6,6 @@
 #include "leakdetector.h"
 #include "logger.h"

-#include <QProcess>
-#include <QMetaObject>
-#include <pthread.h>
-#include <iostream>
-
 #import <CoreWLAN/CoreWLAN.h>
 #import <Network/Network.h>

@@ -18,37 +13,6 @@ namespace {
 Logger logger("MacOSNetworkWatcher");
 }

-// Global variables for CFRunLoop thread
-static pthread_t g_powerThread;
-static CFRunLoopRef g_powerRunLoop = nullptr;
-static bool g_shouldStopPowerThread = false;
-static PowerNotificationsListener* g_powerListener = nullptr;
-
-// Thread function for dedicated CFRunLoop
-void* powerMonitoringThread(void* arg) {
-    logger.debug() << "Power monitoring thread started";
-    
-    PowerNotificationsListener* listener = static_cast<PowerNotificationsListener*>(arg);
-    
-    // Get the runloop for this thread
-    g_powerRunLoop = CFRunLoopGetCurrent();
-    
-    // Register for power notifications in this thread
-    listener->registerForNotifications();
-    
-    // Run the CFRunLoop - this will block until CFRunLoopStop is called
-    while (!g_shouldStopPowerThread) {
-        CFRunLoopRunInMode(kCFRunLoopDefaultMode, 1.0, true);
-    }
-    
-    // Cleanup
-    listener->cleanup();
-    g_powerRunLoop = nullptr;
-    
-    logger.debug() << "Power monitoring thread finished";
-    return nullptr;
-}
-
@interface MacOSNetworkWatcherDelegate : NSObject <CWEventDelegate> {
  MacOSNetworkWatcher* m_watcher;
 }
@@ -74,138 +38,12 @@ void* powerMonitoringThread(void* arg) {

@end

-void PowerNotificationsListener::registerForNotifications()
-{
-    logger.debug() << "Registering for system power notifications in dedicated thread";
-    
-    rootPowerDomain = IORegisterForSystemPower(this, &notifyPortRef, sleepWakeupCallBack, &notifierObj);
-    if (rootPowerDomain == IO_OBJECT_NULL) {
-        logger.error() << "Failed to register for system power notifications!";
-        return;
-    }
-
-    // Add the notification port to the current runloop (dedicated thread)
-    CFRunLoopAddSource(CFRunLoopGetCurrent(), IONotificationPortGetRunLoopSource(notifyPortRef), kCFRunLoopCommonModes);
-    logger.debug() << "Power notifications registered successfully";
-}
-
-void PowerNotificationsListener::cleanup()
-{
-    if (notifyPortRef != nullptr) {
-        CFRunLoopRemoveSource(CFRunLoopGetCurrent(), IONotificationPortGetRunLoopSource(notifyPortRef), kCFRunLoopCommonModes);
-        IONotificationPortDestroy(notifyPortRef);
-        notifyPortRef = nullptr;
-    }
-    
-    if (notifierObj != IO_OBJECT_NULL) {
-        IODeregisterForSystemPower(&notifierObj);
-        notifierObj = IO_OBJECT_NULL;
-    }
-    
-    if (rootPowerDomain != IO_OBJECT_NULL) {
-        IOServiceClose(rootPowerDomain);
-        rootPowerDomain = IO_OBJECT_NULL;
-    }
-}
-
-void PowerNotificationsListener::sleepWakeupCallBack(void *refParam, io_service_t service, natural_t messageType, void *messageArgument)
-{
-	Q_UNUSED(service)
-
-    auto listener = static_cast<PowerNotificationsListener *>(refParam);
-
-    logger.debug() << "Power callback received, messageType:" << messageType;
-    switch (messageType) {
-    case kIOMessageCanSystemSleep:
-        /* Idle sleep is about to kick in. This message will not be sent for forced sleep.
-         * Applications have a chance to prevent sleep by calling IOCancelPowerChange.
-         * Most applications should not prevent idle sleep. Power Management waits up to
-         * 30 seconds for you to either allow or deny idle sleep. If you don’t acknowledge
-         * this power change by calling either IOAllowPowerChange or IOCancelPowerChange,
-         * the system will wait 30 seconds then go to sleep.
-         */
-
-        logger.debug() << "System power message: can system sleep?";
-
-        // Uncomment to cancel idle sleep
-        // IOCancelPowerChange(thiz->rootPowerDomain, reinterpret_cast<long>(messageArgument));
-
-        // Allow idle sleep
-        IOAllowPowerChange(listener->rootPowerDomain, reinterpret_cast<long>(messageArgument));
-        break;
-
-    case kIOMessageSystemWillNotSleep:
-        /* Announces that the system has retracted a previous attempt to sleep; it
-         * follows `kIOMessageCanSystemSleep`.
-         */
-        logger.debug() << "System power message: system will NOT sleep.";
-        break;
-
-    case kIOMessageSystemWillSleep:
-        /* The system WILL go to sleep. If you do not call IOAllowPowerChange or
-         * IOCancelPowerChange to acknowledge this message, sleep will be delayed by
-         * 30 seconds.
-         *
-         * NOTE: If you call IOCancelPowerChange to deny sleep it returns kIOReturnSuccess,
-         * however the system WILL still go to sleep.
-         */
-
-        logger.debug() << "System power message: system WILL sleep";
-        IOAllowPowerChange(listener->rootPowerDomain, reinterpret_cast<long>(messageArgument));
-        break;
-
-    case kIOMessageSystemWillPowerOn:
-        /* Announces that the system is beginning to power the device tree; most devices
-         * are still unavailable at this point.
-         */
-        /* From the documentation:
-         *
-         * - kIOMessageSystemWillPowerOn is delivered at early wakeup time, before most hardware
-         * has been powered on. Be aware that any attempts to access disk, network, the display,
-         * etc. may result in errors or blocking your process until those resources become
-         * available.
-         *
-         * So we do NOT log this event.
-         */
-        break;
-
-    case kIOMessageSystemHasPoweredOn:
-        /* Announces that the system and its devices have woken up. */
-        logger.debug() << "System has powered on - emitting sleepMode signal from dedicated CFRunLoop thread";
-        if (listener->m_watcher) {
-            // Use QMetaObject::invokeMethod for thread-safe signal emission
-            QMetaObject::invokeMethod(listener->m_watcher, "sleepMode", Qt::QueuedConnection);
-        }
-        break;
-
-    default:
-        logger.debug() << "System power message: other event: " << messageType;
-        /* Not a system sleep and wake notification. */
-        break;
-    }
-}
-
-MacOSNetworkWatcher::MacOSNetworkWatcher(QObject* parent) : IOSNetworkWatcher(parent), m_powerlistener(this) {
+MacOSNetworkWatcher::MacOSNetworkWatcher(QObject* parent) : IOSNetworkWatcher(parent) {
  MZ_COUNT_CTOR(MacOSNetworkWatcher);
 }

 MacOSNetworkWatcher::~MacOSNetworkWatcher() {
  MZ_COUNT_DTOR(MacOSNetworkWatcher);
-  
-  // Stop the dedicated power monitoring thread
-  if (g_powerListener) {
-    logger.debug() << "Stopping dedicated power monitoring thread";
-    g_shouldStopPowerThread = true;
-    
-    if (g_powerRunLoop) {
-      CFRunLoopStop(g_powerRunLoop);
-    }
-    
-    // Wait for thread to finish
-    pthread_join(g_powerThread, nullptr);
-    g_powerListener = nullptr;
-  }
-  
  if (m_delegate) {
    CWWiFiClient* client = CWWiFiClient.sharedWiFiClient;
    if (!client) {
@@ -228,20 +66,6 @@ void MacOSNetworkWatcher::start() {
    logger.debug() << "Delegate already registered";
    return;
  }
-  
-  // Start dedicated power monitoring thread with CFRunLoop
-  if (!g_powerListener) {
-    g_powerListener = &m_powerlistener;
-    g_shouldStopPowerThread = false;
-    
-    int result = pthread_create(&g_powerThread, nullptr, powerMonitoringThread, &m_powerlistener);
-    if (result != 0) {
-      logger.error() << "Failed to create power monitoring thread:" << result;
-      g_powerListener = nullptr;
-    } else {
-      logger.debug() << "Power monitoring enabled";
-    }
-  } 

  CWWiFiClient* client = CWWiFiClient.sharedWiFiClient;
  if (!client) {
@@ -253,8 +77,6 @@ void MacOSNetworkWatcher::start() {
  m_delegate = [[MacOSNetworkWatcherDelegate alloc] initWithObject:this];
  [client setDelegate:static_cast<MacOSNetworkWatcherDelegate*>(m_delegate)];
  [client startMonitoringEventWithType:CWEventTypeBSSIDDidChange error:nullptr];
-  
-  logger.debug() << "MacOSNetworkWatcher started successfully";
 }

 void MacOSNetworkWatcher::checkInterface() {
@@ -265,70 +87,42 @@ void MacOSNetworkWatcher::checkInterface() {
    return;
  }

-  // Use wdutil to get reliable WiFi information
-  QProcess process;
-  process.start("wdutil", QStringList() << "info");
-  process.waitForFinished(5000);
-  
-  QString output = process.readAllStandardOutput();
-  QString errorOutput = process.readAllStandardError();
-  
-  logger.debug() << "wdutil exit code:" << process.exitCode();
-  
-  if (process.exitCode() != 0) {
-    logger.debug() << "wdutil failed with exit code:" << process.exitCode();
+  CWWiFiClient* client = CWWiFiClient.sharedWiFiClient;
+  if (!client) {
+    logger.debug() << "Unable to retrieve the CWWiFiClient shared instance";
    return;
  }
-  
-  // Parse wdutil output to find WiFi connection info
-  QStringList lines = output.split('\n');
-  QString ssid, interfaceName, security;
-  bool wifiSectionFound = false;
-  
-  for (int i = 0; i < lines.size(); i++) {
-    QString trimmedLine = lines[i].trimmed();
-    
-    if (trimmedLine == "WIFI") {
-      wifiSectionFound = true;
-      continue;
-    }
-    
-    if (wifiSectionFound) {
-      // Stop parsing when we reach next section header (all caps after separator line)
-      if (trimmedLine.startsWith("————————")) {
-        if (i + 1 < lines.size()) {
-          QString nextLine = lines[i + 1].trimmed();
-          if (!nextLine.isEmpty() && nextLine.length() > 2 && nextLine.toUpper() == nextLine && nextLine != "WIFI") {
-            break;
-          }
-        }
-        continue; // Skip separator lines
-      }
-      
-      if (trimmedLine.startsWith("Interface Name")) {
-        QStringList parts = trimmedLine.split(":");
-        if (parts.size() >= 2) {
-          interfaceName = parts[1].trimmed();
-        }
-      } else if (trimmedLine.startsWith("SSID")) {
-        QStringList parts = trimmedLine.split(":");
-        if (parts.size() >= 2) {
-          ssid = parts[1].trimmed();
-        }
-      } else if (trimmedLine.startsWith("Security")) {
-        QStringList parts = trimmedLine.split(":");
-        if (parts.size() >= 2) {
-          security = parts[1].trimmed();
-        }
-      }
-    }
+
+  CWInterface* interface = [client interface];
+  if (!interface) {
+    logger.debug() << "No default wifi interface";
+    return;
  }
-  
-  if (!ssid.isEmpty() && !interfaceName.isEmpty()) {
-    logger.debug() << "Found active WiFi connection on" << interfaceName 
-                   << "SSID:" << ssid << "Security:" << security;
-  } else {
-    logger.debug() << "No active WiFi connection found";
+
+  if (![interface powerOn]) {
+    logger.debug() << "The interface is off";
+    return;
  }
+
+  NSString* ssidNS = [interface ssid];
+  if (!ssidNS) {
+    logger.debug() << "WiFi is not in used";
+    return;
+  }
+
+  QString ssid = QString::fromNSString(ssidNS);
+  if (ssid.isEmpty()) {
+    logger.debug() << "WiFi doesn't have a valid SSID";
+    return;
+  }
+
+  CWSecurity security = [interface security];
+  if (security == kCWSecurityNone || security == kCWSecurityWEP) {
+    logger.debug() << "Unsecured network found!";
+    emit unsecuredNetwork(ssid, ssid);
+    return;
+  }
+
+  logger.debug() << "Secure WiFi interface";
 }

@@ -22,6 +22,7 @@
 #include "logger.h"
 #include "platforms/windows/daemon/windowsfirewall.h"
 #include "platforms/windows/daemon/windowssplittunnel.h"
+#include "platforms/windows/windowscommons.h"
 #include "windowsfirewall.h"

 #include "core/networkUtilities.h"
@@ -32,28 +32,9 @@ WindowsNetworkWatcher::~WindowsNetworkWatcher() {
  }
 }

-LRESULT WindowsNetworkWatcher::PowerWndProcCallback(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
-  auto obj = reinterpret_cast<WindowsNetworkWatcher*>(GetWindowLongPtr(hwnd, GWLP_USERDATA));
-  if (!obj){
-    logger.debug() << "obj not casted";
-    return DefWindowProc(hwnd, uMsg, wParam, lParam);
-  }
-  switch (uMsg) {
-  case WM_POWERBROADCAST:
-    if (wParam == PBT_APMRESUMESUSPEND) {
-        emit obj->sleepMode();
-    }
-    break;
-  default:
-    return DefWindowProc(hwnd, uMsg, wParam, lParam);
-  }
-  return 0;
-}
-
 void WindowsNetworkWatcher::initialize() {
  logger.debug() << "initialize";

-
  DWORD negotiatedVersion;
  if (WlanOpenHandle(2, nullptr, &negotiatedVersion, &m_wlanHandle) !=
      ERROR_SUCCESS) {
@@ -70,25 +51,6 @@ void WindowsNetworkWatcher::initialize() {
    return;
  }

-  const wchar_t* className = L"PowerMonitorClass";
-  WNDCLASS wc = { 0 };
-  wc.lpfnWndProc = &WindowsNetworkWatcher::PowerWndProcCallback;
-  wc.hInstance = GetModuleHandle(NULL);
-  wc.lpszClassName = className;
-  wc.cbWndExtra = sizeof(WindowsNetworkWatcher*);
-
-  if (!RegisterClass(&wc)) {
-    logger.debug() << "Failed to register window class in createPowerMonitorWindow.";
-    return;
-  }
-
-  HWND hwnd = CreateWindowEx(0, className, L"Power Monitor", 0, 0, 0, 0, 0, NULL, NULL, GetModuleHandle(NULL), static_cast<LPVOID>(this));
-  if (!hwnd) {
-    logger.debug() << "Failed to create window in createPowerMonitorWindow.";
-    return;
-  }
-  SetWindowLongPtr(hwnd, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
-
  logger.debug() << "callback registered";
 }

@@ -175,4 +137,4 @@ void WindowsNetworkWatcher::processWlan(PWLAN_NOTIFICATION_DATA data) {
  logger.debug() << "Unsecure network:" << logger.sensitive(ssid)
                 << "id:" << logger.sensitive(bssid);
  emit unsecuredNetwork(ssid, bssid);
-}
+}
@@ -19,7 +19,6 @@ class WindowsNetworkWatcher final : public NetworkWatcherImpl {

 private:
  static void wlanCallback(PWLAN_NOTIFICATION_DATA data, PVOID context);
-  static LRESULT PowerWndProcCallback(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);

  void processWlan(PWLAN_NOTIFICATION_DATA data);

@@ -179,7 +179,6 @@ void WindowsPingSender::pingEventReady() {
      return;
    }
    QString errmsg = WindowsUtils::getErrorMessage();
-    emit criticalPingError();
    logger.error() << "No ping reply. Code: " << error
                   << " Message: " << errmsg;
    return;
@@ -30,6 +30,7 @@ Ikev2Protocol::Ikev2Protocol(const QJsonObject &configuration, QObject* parent)
 Ikev2Protocol::~Ikev2Protocol()
 {
    qDebug() << "IpsecProtocol::~IpsecProtocol()";
+    disconnect_vpn();
    Ikev2Protocol::stop();
 }

@@ -37,7 +38,7 @@ void Ikev2Protocol::stop()
 {
    setConnectionState(Vpn::ConnectionState::Disconnecting);
    {
-        if (!disconnect_vpn()){
+        if (! disconnect_vpn() ){
            qDebug()<<"We don't disconnect";
            setConnectionState(Vpn::ConnectionState::Error);
        }
@@ -310,9 +311,7 @@ bool Ikev2Protocol::connect_to_vpn(const QString & vpn_name){
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 bool Ikev2Protocol::disconnect_vpn(){
    if ( hRasConn != nullptr ){
-        auto ret = RasHangUp(hRasConn);
-        qDebug() << "RasHangUp " << ret;
-        if (ret != ERROR_SUCCESS)
+        if ( RasHangUp(hRasConn) != ERROR_SUCCESS)
            return false;
    }
    QThread::msleep(3000);
@@ -192,7 +192,7 @@ namespace amnezia

            constexpr char defaultPort[] = "51820";

-#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) || defined(MACOS_NE)
+#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
            constexpr char defaultMtu[] = "1280";
 #else
            constexpr char defaultMtu[] = "1376";
@@ -212,7 +212,7 @@ namespace amnezia
        namespace awg
        {
            constexpr char defaultPort[] = "55424";
-#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) || defined(MACOS_NE)
+#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
            constexpr char defaultMtu[] = "1280";
 #else
            constexpr char defaultMtu[] = "1376";
@@ -4,7 +4,7 @@
 #include "core/errorstrings.h"
 #include "vpnprotocol.h"

-#if defined(Q_OS_WINDOWS) || defined(Q_OS_MACX) and !defined MACOS_NE || (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID))
+#if defined(Q_OS_WINDOWS) || defined(Q_OS_MACX) || (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID))
    #include "openvpnovercloakprotocol.h"
    #include "openvpnprotocol.h"
    #include "shadowsocksvpnprotocol.h"
@@ -103,18 +103,13 @@ QString VpnProtocol::vpnGateway() const
    return m_vpnGateway;
 }

-QString VpnProtocol::vpnLocalAddress() const
-{
-    return m_vpnLocalAddress;
-}
-
 VpnProtocol *VpnProtocol::factory(DockerContainer container, const QJsonObject &configuration)
 {
    switch (container) {
 #if defined(Q_OS_WINDOWS)
    case DockerContainer::Ipsec: return new Ikev2Protocol(configuration);
 #endif
-#if defined(Q_OS_WINDOWS) || defined(Q_OS_MACX) and !defined MACOS_NE || (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID))
+#if defined(Q_OS_WINDOWS) || defined(Q_OS_MACX) || (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID))
    case DockerContainer::OpenVpn: return new OpenVpnProtocol(configuration);
    case DockerContainer::Cloak: return new OpenVpnOverCloakProtocol(configuration);
    case DockerContainer::ShadowSocks: return new ShadowSocksVpnProtocol(configuration);
@@ -63,7 +63,6 @@ public:

    QString routeGateway() const;
    QString vpnGateway() const;
-    QString vpnLocalAddress() const;

    static VpnProtocol* factory(amnezia::DockerContainer container, const QJsonObject &configuration);

@@ -17,13 +17,6 @@ WireguardProtocol::WireguardProtocol(const QJsonObject &configuration, QObject *
            [this](const QString &pubkey, const QDateTime &connectionTimestamp) {
                emit connectionStateChanged(Vpn::ConnectionState::Connected);
            });
-    connect(m_impl.get(), &ControllerImpl::statusUpdated, this,
-            [this](const QString& serverIpv4Gateway,
-                   const QString& deviceIpv4Address, uint64_t txBytes,
-                   uint64_t rxBytes) {
-                m_vpnLocalAddress = deviceIpv4Address;
-            });
-
    connect(m_impl.get(), &ControllerImpl::disconnected, this,
            [this]() { emit connectionStateChanged(Vpn::ConnectionState::Disconnected); });
    m_impl->initialize(nullptr, nullptr);
@@ -1,519 +0,0 @@
-#!/bin/sh
-
-LOG_DATE=$(date -u +'%Y%m%d-%H%M%S')
-SCRIPT_DIR=$(dirname "$0")
-LOG_FILE="${SCRIPT_DIR}/server-diagnostics-${LOG_DATE}.log"
-
-# Logging function (sh compatible)
-log_and_display() {
-    if [ "$1" = "-n" ]; then
-        shift
-        printf "%s" "$*" | tee -a "$LOG_FILE"
-    else
-        echo "$1" | tee -a "$LOG_FILE"
-    fi
-}
-
-# Redirect stderr to stdout for logging
-exec 2>&1
-
-header() {
-    log_and_display ""
-    log_and_display "=== $1 ==="
-}
-
-# Pause for cancellation
-log_and_display ""
-log_and_display "VPN Server Diagnostics will start in 9s. Press Ctrl+C to cancel."
-sleep 9
-
-log_and_display ""
-header "STARTING VPN SERVER DIAGNOSTICS"
-log_and_display ""
-
-# ------------------------------------------------------------------------------
-# 1. Basic system information
-# ------------------------------------------------------------------------------
-header "System Information"
-
-# Uptime
-UPTIME_STR=$(awk '{printf "%d:%02d:%02d", int($1/3600), int(($1%3600)/60), int($1%60)}' /proc/uptime 2>/dev/null || echo "unknown")
-    log_and_display "Uptime (H:M:S): $UPTIME_STR"
-
-# Date/time UTC
-DATE_UTC=$(date -u +'%d %b %Y|%T' 2>/dev/null || echo "unknown")
-    log_and_display "Date|Time (UTC): $DATE_UTC"
-
-# Init system (PID 1)
-INIT_NAME=$(cat /proc/1/status 2>/dev/null | head -1 | awk '{print $2}' 2>/dev/null || echo "unknown")
-    log_and_display "Init system (PID 1): $INIT_NAME"
-
-# Locale
-if echo "$LANG" | grep -E '^(en_US.UTF-8|C.UTF-8|C)$' >/dev/null 2>&1; then
-  log_and_display "Locale: $LANG"
-else
-  log_and_display "Locale: $LANG (not en_US.UTF-8, C.UTF-8 or C)"
-fi
-
-# ------------------------------------------------------------------------------
-# 2. Package manager detection
-# ------------------------------------------------------------------------------
-header "Package Manager Information"
-
-if command -v apt-get >/dev/null 2>&1; then
-  log_and_display "Package Manager: APT"
-  PM="apt-get"
-  PM_VER_OPT="--version"
-  DOCKER_PKG="docker.io"
-elif command -v dnf >/dev/null 2>&1; then
-  log_and_display "Package Manager: DNF"
-  PM="dnf"
-  PM_VER_OPT="--version"
-  DOCKER_PKG="docker"
-elif command -v yum >/dev/null 2>&1; then
-  log_and_display "Package Manager: YUM"
-  PM="yum"
-  PM_VER_OPT="--version"
-  DOCKER_PKG="docker"
-elif command -v zypper >/dev/null 2>&1; then
-  log_and_display "Package Manager: ZYPPER"
-  PM="zypper"
-  PM_VER_OPT="--version"
-  DOCKER_PKG="docker"
-elif command -v pacman >/dev/null 2>&1; then
-  log_and_display "Package Manager: PACMAN"
-  PM="pacman"
-  PM_VER_OPT="--version"
-  DOCKER_PKG="docker"
-elif command -v opkg >/dev/null 2>&1; then
-  log_and_display "Package Manager: OPKG - Not supported on this platform"
-  PM="opkg"
-  PM_VER_OPT="--version"
-  DOCKER_PKG="docker"
-else
-  log_and_display "Package Manager: Unknown"
-  # fallback
-  PM="uname"
-  PM_VER_OPT="-a"
-  DOCKER_PKG="docker"
-fi
-
-# Check package versions
-log_and_display ""
-log_and_display "Package versions:"
-
-# Check sudo
-if [ "$PM" = "apt-get" ]; then
-  sudo_version=$(dpkg -s "sudo" 2>/dev/null | grep '^Version:' | awk '{print $2}' || echo "not installed")
-elif [ "$PM" = "dnf" ] || [ "$PM" = "yum" ] || [ "$PM" = "zypper" ]; then
-  sudo_version=$(rpm -q "sudo" 2>/dev/null || echo "not installed")
-elif [ "$PM" = "pacman" ]; then
-  sudo_version=$(pacman -Q "sudo" 2>/dev/null || echo "not installed")
-elif [ "$PM" = "opkg" ]; then
-  sudo_version=$(opkg info "sudo" 2>/dev/null | grep '^Version:' | awk '{print $2}' || echo "not installed")
-else
-  sudo_version="unknown"
-fi
-log_and_display "  sudo: $sudo_version"
-
-# Check Docker package
-if [ "$PM" = "apt-get" ]; then
-  docker_pkg_version=$(dpkg -s "$DOCKER_PKG" 2>/dev/null | grep '^Version:' | awk '{print $2}' || echo "not installed")
-elif [ "$PM" = "dnf" ] || [ "$PM" = "yum" ] || [ "$PM" = "zypper" ]; then
-  docker_pkg_version=$(rpm -q "$DOCKER_PKG" 2>/dev/null || echo "not installed")
-elif [ "$PM" = "pacman" ]; then
-  docker_pkg_version=$(pacman -Q "$DOCKER_PKG" 2>/dev/null || echo "not installed")
-elif [ "$PM" = "opkg" ]; then
-  docker_pkg_version=$(opkg info "$DOCKER_PKG" 2>/dev/null | grep '^Version:' | awk '{print $2}' || echo "not installed")
-else
-  docker_pkg_version="unknown"
-fi
-log_and_display "  $DOCKER_PKG: $docker_pkg_version"
-
-# Check lsof
-if [ "$PM" = "apt-get" ]; then
-  lsof_version=$(dpkg -s "lsof" 2>/dev/null | grep '^Version:' | awk '{print $2}' || echo "not installed")
-elif [ "$PM" = "dnf" ] || [ "$PM" = "yum" ] || [ "$PM" = "zypper" ]; then
-  lsof_version=$(rpm -q "lsof" 2>/dev/null || echo "not installed")
-elif [ "$PM" = "pacman" ]; then
-  lsof_version=$(pacman -Q "lsof" 2>/dev/null || echo "not installed")
-elif [ "$PM" = "opkg" ]; then
-  lsof_version=$(opkg info "lsof" 2>/dev/null | grep '^Version:' | awk '{print $2}' || echo "not installed")
-else
-  lsof_version="unknown"
-fi
-log_and_display "  lsof: $lsof_version"
-
-# ------------------------------------------------------------------------------
-# 3. Additional system information (hostnamectl / /proc/version)
-# ------------------------------------------------------------------------------
-header "OS / Kernel Information"
-
-if command -v hostnamectl >/dev/null 2>&1; then
-  hostnamectl 2>/dev/null | grep -E 'Operating System:|Virtualization:|Kernel:|Architecture:' | sed 's/^[ \t]*//;s/:/: /' | while read line; do
-    log_and_display "  $line"
-  done
-else
-  log_and_display "Operating System: $(cat /proc/version 2>/dev/null || echo 'unknown')"
-fi
-
-# CPU threads
-CPU_THREADS=$(nproc 2>/dev/null || grep -c "^processor" /proc/cpuinfo 2>/dev/null || echo "unknown")
-log_and_display "  CPU threads: $CPU_THREADS"
-
-# ------------------------------------------------------------------------------
-# 4. Memory (RAM) check
-# ------------------------------------------------------------------------------
-header "Memory Information"
-
-if command -v free >/dev/null 2>&1; then
-  # Remove extra spaces in header
-  free -h 2>/dev/null | tee -a "$LOG_FILE" || log_and_display "  Error getting memory info"
-elif command -v vmstat >/dev/null 2>&1; then
-  vmstat -S M -s 2>/dev/null | grep -iE 'total memory|total swap' | sed 's/ *//' | tee -a "$LOG_FILE" || log_and_display "  Error getting memory info"
-else
-  grep -iE 'MemTotal|SwapTotal' /proc/meminfo 2>/dev/null | sed 's/ \+/ /' | tee -a "$LOG_FILE" || log_and_display "  Error getting memory info"
-fi
-
-if command -v free >/dev/null 2>&1; then
-  log_and_display ""
-  log_and_display "Detailed Memory Info:"
-  free -h 2>/dev/null | awk 'NR==2{printf "  Used: %s / %s (%.1f%%)\n", $3, $2, $3/$2*100}' 2>/dev/null | tee -a "$LOG_FILE" || log_and_display "  Error calculating memory usage"
-free -h 2>/dev/null | awk 'NR==3{printf "  Swap: %s / %s (%.1f%%)\n", $3, $2, $2>0 ? $3/$2*100 : 0}' 2>/dev/null | tee -a "$LOG_FILE" || log_and_display "  Error calculating swap usage"
-fi
-
-# Disk usage
-header "Disk Usage"
-df -h 2>/dev/null | awk '
-BEGIN {print "  Filesystem   Size  Used Avail Use% Mounted"}
-NR>1 {printf "  %-10s %5s %5s %5s %4s %s\n", $1, $2, $3, $4, $5, $6}' | tee -a "$LOG_FILE" || log_and_display "  Error getting disk usage"
-
-# ------------------------------------------------------------------------------
-# 5. Current user and sudo check
-# ------------------------------------------------------------------------------
-header "User Check"
-
-CUR_USER=$(whoami 2>/dev/null || echo ~ | sed 's/.*\///')
-USER_GROUP=$(groups "$CUR_USER" 2>/dev/null || echo "")
-USER_GOOD=0
-
-log_and_display -n "Current user: $CUR_USER => "
-
-if [ "$CUR_USER" = "root" ]; then
-  log_and_display "passed.. (is root)"
-  USER_GOOD="r" # root
-else
-  if echo "$USER_GROUP" | grep -qE '(^|[[:space:]])sudo($|[[:space:]])'; then
-    log_and_display "passed.. (in sudo group)"
-    USER_GOOD=1
-  elif echo "$USER_GROUP" | grep -qE '(^|[[:space:]])wheel($|[[:space:]])'; then
-    log_and_display "passed.. (in wheel group)"
-    USER_GOOD=1
-  elif echo "$USER_GROUP" | grep -qE '(^|[[:space:]])docker($|[[:space:]])'; then
-    log_and_display "failed.. (only in docker group)"
-    USER_GOOD="d"
-  else
-    log_and_display "failed.. (not a member of the sudo or wheel groups)"
-    USER_GOOD=0
-  fi
-fi
-
-# Check if password is required for sudo
-if [ "$USER_GOOD" = "0" ] || [ "$USER_GOOD" = "d" ]; then
-  log_and_display -n "Passwd request: "
-  log_and_display "check skipped (not sudoer)"
-else
-  if command -v sudo >/dev/null 2>&1; then
-    # Try sudo without password - more thorough check
-    PASSWD_REQUEST=$(sudo -K 2>&1 && sudo -nu $CUR_USER $PM $PM_VER_OPT 2>&1 >/dev/null && sudo -n $PM $PM_VER_OPT 2>&1 >/dev/null)
-    if [ -n "$PASSWD_REQUEST" ]; then
-      USER_GOOD=0
-      log_and_display -n "Passwd request: "
-      log_and_display "failed.. ($PASSWD_REQUEST)" \
-        | sed "s/$CUR_USER/User/g;s/$(hostname 2>/dev/null || echo 'Server')/Server/g;s/ user / /g"
-    else
-      log_and_display -n "Passwd request: "
-      log_and_display "passed.. (not required)"
-    fi
-  else
-    if [ "$USER_GOOD" = "r" ]; then
-      log_and_display -n "Passwd request: "
-      log_and_display "check skipped (sudo not installed, but root user)"
-    else
-      log_and_display "Warning! The sudo package must be pre-installed!"
-      USER_GOOD=0
-    fi
-  fi
-fi
-
-# Home directory check
-log_and_display -n "Home dir: "
-if cd ~ 2>/dev/null; then
-  log_and_display "passed.. (accessible)"
-else
-  log_and_display "failed.. (not accessible)"
-fi
-log_and_display "Default shell: $SHELL"
-
-# ------------------------------------------------------------------------------
-# 6. Important components check (sudo, lsof, fuser, apparmor)
-# ------------------------------------------------------------------------------
-header "Component Checks"
-
-log_and_display -n "    sudo: "
-if command -v sudo >/dev/null 2>&1; then
-  log_and_display "passed.. (installed)"
-else
-  log_and_display "not installed"
-fi
-
-log_and_display -n "    lsof: "
-if command -v lsof >/dev/null 2>&1; then
-  log_and_display "passed.. (installed)"
-else
-  log_and_display "not installed"
-fi
-
-log_and_display -n "   fuser: "
-if command -v fuser >/dev/null 2>&1; then
-  log_and_display "passed.. (installed)"
-else
-  log_and_display "psmisc not installed"
-fi
-
-log_and_display -n "apparmor: "
-AA_ENABLED=$(cat /sys/module/apparmor/parameters/enabled 2>/dev/null || echo "N")
-if [ "$AA_ENABLED" = "Y" ]; then
-  if command -v apparmor_parser >/dev/null 2>&1; then
-    log_and_display "passed.. (used)"
-  else
-    log_and_display "failed.. (installation required)"
-  fi
-else
-  if command -v apparmor_parser >/dev/null 2>&1; then
-    log_and_display "passed.. (not used)"
-  else
-    log_and_display "passed.. (not required)"
-  fi
-fi
-
-# ------------------------------------------------------------------------------
-# 7. SELinux check
-# ------------------------------------------------------------------------------
-header "SELinux Check"
-
-if command -v getenforce >/dev/null 2>&1; then
-  SELINUX_STATUS=$(getenforce 2>/dev/null || echo "unknown")
-  if [ "$SELINUX_STATUS" = "Enforcing" ]; then
-    log_and_display "SELinux status: $SELINUX_STATUS (strict mode)"
-  elif [ "$SELINUX_STATUS" = "Permissive" ]; then
-    log_and_display "SELinux status: $SELINUX_STATUS (permissive mode)"
-  else
-    log_and_display "SELinux status: $SELINUX_STATUS (disabled)"
-  fi
-else
-  log_and_display "SELinux: not found (or not applicable)"
-fi
-
-# ------------------------------------------------------------------------------
-# 8. Docker + Docker/Podman service check
-# ------------------------------------------------------------------------------
-header "Docker / Podman Status"
-CHECK_CONTAINERS=0
-
-if ! command -v docker >/dev/null 2>&1; then
-  log_and_display "Docker: $DOCKER_PKG not installed"
-else
-  # If user is in sudoers, use sudo without password
-  if [ "$USER_GOOD" = "1" ]; then
-    SUD="sudo -n"
-  elif [ "$USER_GOOD" = "r" ]; then
-    SUD="" # root
-  else
-    SUD=""
-  fi
-
-  DOCKER_VERSION=$($SUD docker -v 2>/dev/null || echo 'docker -v error')
-  log_and_display "Installed: $DOCKER_VERSION"
-
-  # Check for podman
-  if echo "$DOCKER_VERSION" | grep -qi "podman"; then
-    log_and_display "  WARNING: Podman detected - not supported at the moment!"
-    log_and_display "  Podman (podman-docker) is not supported and is installed by mistake"
-    docker_service="podman.socket"
-  else
-    docker_service="docker.service"
-  fi
-  log_and_display "  service: $docker_service"
-
-  # Check status
-  if command -v systemctl >/dev/null 2>&1; then
-    docker_status=$(systemctl is-active "$docker_service" 2>/dev/null || echo "unknown")
-    docker_loading=$(systemctl is-enabled "$docker_service" 2>/dev/null || echo "unknown")
-  else
-    docker_status="unknown (systemctl not found)"
-    docker_loading="unknown"
-  fi
-  
-  if [ "$docker_status" = "active" ]; then
-    log_and_display "   status: passed.. ($docker_status)"
-    CHECK_CONTAINERS=1
-  else
-    log_and_display "   status: incorrect.. ($docker_status)"
-    CHECK_CONTAINERS=0
-  fi
-
-  if [ "$docker_loading" = "enabled" ]; then
-    log_and_display "  loading: good (startup $docker_loading)"
-  else
-    log_and_display "  loading: bad (startup $docker_loading)"
-  fi
-fi
-
-# ------------------------------------------------------------------------------
-# 9. Docker pull test + container check with improved Docker Hub verification
-# ------------------------------------------------------------------------------
-header "Docker Hub: pull hello-world test"
-
-if [ "$CHECK_CONTAINERS" = "1" ] && [ "$USER_GOOD" != "0" ]; then
-  # First check Docker Hub availability
-  log_and_display "Checking Docker Hub connectivity..."
-  
-  # Try to execute docker pull with timeout
-  if timeout 30 $SUD docker pull docker.io/library/hello-world >/dev/null 2>&1; then
-    log_and_display "Docker Hub: available"
-    
-    # Start container for testing
-    if $SUD docker run --rm docker.io/library/hello-world >/dev/null 2>&1; then
-      log_and_display "Hello-world container: successfully started and completed"
-    else
-      log_and_display "Hello-world container: startup error"
-    fi
-  else
-    log_and_display "Docker Hub: unavailable or blocked (possibly exceeded download limit)"
-    log_and_display "Docker Hub has download limits, try again later"
-  fi
-  
-  log_and_display ""
-  total_cont=$($SUD docker ps -aq 2>/dev/null | wc -l || echo "0")
-  active_cont=$($SUD docker ps -q 2>/dev/null | wc -l || echo "0")
-  amnezia_cont=$($SUD docker ps -a 2>/dev/null | grep -c amnezia || echo "0")
-
-  log_and_display "Containers check: Total $total_cont / Active $active_cont / Amnezia $amnezia_cont"
-  $SUD docker ps -a --format "{{.Names}} ({{.Image}}) ({{.Status}}) ({{.Ports}})" 2>/dev/null | grep amnezia || true
-  
-  # Peers check
-  if $SUD docker ps 2>/dev/null | grep -qE '\<(amnezia-awg|amnezia-wireguard)\>'; then
-    log_and_display ""
-    log_and_display "Peers check (beta):"
-    if $SUD docker ps 2>/dev/null | grep -q amnezia-awg; then
-      AMNEZIA_WG_CONTAINER=$($SUD docker ps 2>/dev/null | grep amnezia-awg | awk '{print $1}' | head -1)
-      if [ -n "$AMNEZIA_WG_CONTAINER" ]; then
-        WG_PEERS=$($SUD docker exec -it "$AMNEZIA_WG_CONTAINER" wg show 2>/dev/null | grep -c 'peer' || echo "0")
-        log_and_display "AmneziaWG peers: $WG_PEERS"
-      fi
-    fi
-    if $SUD docker ps 2>/dev/null | grep -q amnezia-wireguard; then
-      WIREGUARD_CONTAINER=$($SUD docker ps 2>/dev/null | grep amnezia-wireguard | awk '{print $1}' | head -1)
-      if [ -n "$WIREGUARD_CONTAINER" ]; then
-        WG_PEERS=$($SUD docker exec -it "$WIREGUARD_CONTAINER" wg show 2>/dev/null | grep -c 'peer' || echo "0")
-        log_and_display "WireGuard peers: $WG_PEERS"
-      fi
-    fi
-  fi
-else
-  log_and_display "skipped.."
-fi
-
-# ------------------------------------------------------------------------------
-# 10. Additional improvements
-# ------------------------------------------------------------------------------
-#
-# 10.1. CPU and memory load check (Load average, top processes)
-#
-header "CPU & Memory usage (top)"
-
-# Load average (last 1,5,15 minutes)
-LOAD_AVG=$(uptime 2>/dev/null | awk -F'load average:' '{print $2}' || echo "unknown")
-log_and_display "Load average: $LOAD_AVG"
-
-log_and_display ""
-log_and_display "Top 5 processes by CPU:"
-ps aux 2>/dev/null | sort -k3 -nr | head -n 6 | awk '{printf "%s %s %s %s %s\n", $1,$2,$3"%",$4"%",$11}' | column -t 2>/dev/null | tee -a "$LOG_FILE" || log_and_display "  Error getting CPU processes"
-
-log_and_display ""
-log_and_display "Top 5 processes by MEM:"
-ps aux 2>/dev/null | sort -k4 -nr | head -n 6 | awk '{printf "%s %s %s %s %s\n", $1,$2,$3"%",$4"%",$11}' | column -t 2>/dev/null | tee -a "$LOG_FILE" || log_and_display "  Error getting MEM processes"
-
-# 10.2. System logs check (latest critical messages)
-header "Last 10 critical/error messages (journalctl)"
-
-if command -v journalctl >/dev/null 2>&1; then
-  journalctl -p 3 -n 10 --no-pager 2>/dev/null | tee -a "$LOG_FILE" || log_and_display "  Error getting system logs"
-else
-  log_and_display "journalctl not found (non-systemd system?)"
-fi
-
-# 10.3. System package versions check (examples)
-
-# Open ports check
-header "Network Ports Check"
-if command -v netstat >/dev/null 2>&1; then
-  log_and_display "Listening ports:"
-  netstat -tlnp 2>/dev/null | grep LISTEN | head -10 | while read line; do
-    log_and_display "  $line"
-  done
-elif command -v ss >/dev/null 2>&1; then
-  log_and_display "Listening ports:"
-  ss -tlnp 2>/dev/null | head -10 | while read line; do
-    log_and_display "  $line"
-  done
-else
-  log_and_display "netstat/ss not found"
-fi
-
-# SSH check
-header "SSH Service Check"
-if command -v systemctl >/dev/null 2>&1; then
-  ssh_status=$(systemctl is-active ssh 2>/dev/null || systemctl is-active sshd 2>/dev/null || echo "not found")
-  if [ "$ssh_status" = "active" ]; then
-    log_and_display "SSH service: $ssh_status"
-  else
-    log_and_display "SSH service: $ssh_status"
-  fi
-else
-  log_and_display "systemctl not found"
-fi
-
-# Time check
-header "Time Synchronization"
-if command -v timedatectl >/dev/null 2>&1; then
-  timedatectl status 2>/dev/null | grep -E "System clock|NTP service" | while read line; do
-    log_and_display "  $line"
-  done
-else
-  log_and_display "  System time: $(date 2>/dev/null || echo 'unknown')"
-fi
-
-# Kernel check
-header "Kernel Information"
-log_and_display "Kernel version: $(uname -r 2>/dev/null || echo 'unknown')"
-log_and_display "Kernel architecture: $(uname -m 2>/dev/null || echo 'unknown')"
-if [ -f /proc/cmdline ]; then
-  log_and_display "Kernel parameters:"
-  cat /proc/cmdline 2>/dev/null | tr ' ' '\n' | head -5 | while read param; do
-    log_and_display "  $param"
-  done
-fi
-
-# ------------------------------------------------------------------------------
-# Completion
-# ------------------------------------------------------------------------------
-log_and_display ""
-header "FINISH"
-log_and_display ""
-log_and_display "Diagnostics completed. Log saved to: $LOG_FILE"
-log_and_display ""
-
-# Variable cleanup
-pm="" && opt="" && docker_pkg="" && CUR_USER="" && USER_GOOD="" && USER_GROUP="" && PASSWD_REQUEST="" && CHECK_CONTAINERS="" && SUD="" && docker_service="" && docker_status="" && docker_loading="" 
@@ -174,7 +174,7 @@ public:

    QLocale getAppLanguage()
    {
-        QString localeStr = m_settings.value("Conf/appLanguage", QLocale::system().name()).toString();
+        QString localeStr = m_settings.value("Conf/appLanguage").toString();
        return QLocale(localeStr);
    };
    void setAppLanguage(QLocale locale)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
vladimir.kuznetsov	ab4f454c19	Merge branch 'fix/ui-fixes-after-merge-with-d20ed4a' of github.com:amnezia-vpn/amnezia-client into fix/ui-fixes-after-merge-with-d20ed4a	2025-08-09 22:21:38 +08:00
vladimir.kuznetsov	e96dfe5800	chore: page settings dns margins	2025-08-09 22:20:48 +08:00
Cyril Anisimov	768c51dbbe	update OpenVPN settings page	2025-08-09 14:19:11 +02:00
vladimir.kuznetsov	5acbdd7af6	fix: ui fixes after merge with `d20ed4a`	2025-08-08 11:45:20 +08:00