force C.UTF-8 assignment

Force C.UTF-8 if the system language is other than en_US.
Temporary simplification of script stopping for moby and podman.
Stop script execution if Docker is not active.

.github/workflows/deploy.yml

@@ -14,8 +14,8 @@ jobs:
     runs-on: ubuntu-20.04
 
     env:
-      QT_VERSION: 6.6.2
-      QIF_VERSION: 4.7
+      QT_VERSION: 6.5.1
+      QIF_VERSION: 4.6
 
     steps:
     - name: 'Install Qt'
@@ -65,13 +65,6 @@ jobs:
         path: deploy/AppDir
         retention-days: 7
 
-    - name: 'Upload translations artifact'
-      uses: actions/upload-artifact@v4
-      with:
-        name: AmneziaVPN_translations
-        path: client/translations
-        retention-days: 7
-
 # ------------------------------------------------------
 
   Build-Windows:
@@ -79,8 +72,8 @@ jobs:
     runs-on: windows-latest
 
     env:
-      QT_VERSION: 6.6.2
-      QIF_VERSION: 4.7
+      QT_VERSION: 6.5.1
+      QIF_VERSION: 4.6
       BUILD_ARCH: 64
 
     steps:
@@ -141,7 +134,7 @@ jobs:
     runs-on: macos-13
 
     env:
-      QT_VERSION: 6.6.2
+      QT_VERSION: 6.5.2
       CC: cc
       CXX: c++
 
@@ -240,7 +233,7 @@ jobs:
     - name: 'Setup xcode'
       uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: '14.3.1'
+        xcode-version: '13.4'
 
     - name: 'Install Qt'
       uses: jurplel/install-qt-action@v3
@@ -252,15 +245,10 @@ jobs:
         modules: 'qtremoteobjects qt5compat qtshadertools'
         dir: ${{ runner.temp }}
         setup-python: 'true'
+        tools: 'tools_ifw'
         set-env: 'true'
         extra: '--external 7z --base ${{ env.QT_MIRROR }}'
 
-    - name: 'Install Qt Installer Framework ${{ env.QIF_VERSION }}'
-      run: |
-        mkdir -pv ${{ runner.temp }}/Qt/Tools/QtInstallerFramework
-        wget https://qt.amzsvc.com/tools/ifw/${{ env.QIF_VERSION }}.zip
-        unzip ${{ env.QIF_VERSION }}.zip -d ${{ runner.temp }}/Qt/Tools/QtInstallerFramework/
-
     - name: 'Get sources'
       uses: actions/checkout@v4
       with:
@@ -298,7 +286,7 @@ jobs:
 
     env:
       ANDROID_BUILD_PLATFORM: android-34
-      QT_VERSION: 6.6.2
+      QT_VERSION: 6.6.1
       QT_MODULES: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
 
     steps:

.gitignore

@@ -131,6 +131,3 @@ client/3rd/ShadowSocks/ss_ios.xcconfig
 
 # UML generated pics
 out/
-
-# CMake files
-CMakeFiles/

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 
-project(${PROJECT} VERSION 4.6.0.4
+project(${PROJECT} VERSION 4.4.0.0
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )
@@ -11,7 +11,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 55)
+set(APP_ANDROID_VERSION_CODE 45)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     set(MZ_PLATFORM_NAME "linux")

README.md

@@ -6,52 +6,28 @@
 
 Amnezia is an open-source VPN client, with a key feature that enables you to deploy your own VPN server on your server.
 
-![Image](https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/uipic4.png)
-
-<br>
-
-<a href="https://github.com/amnezia-vpn/amnezia-client/releases/download/4.6.0.3/AmneziaVPN_4.6.0.3_x64.exe"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/win.png" width="150" style="max-width: 100%;"></a> 
-<a href="https://github.com/amnezia-vpn/amnezia-client/releases/download/4.6.0.3/AmneziaVPN_4.6.0.3.dmg"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/mac.png" width="150" style="max-width: 100%;"></a> 
-<a href="https://github.com/amnezia-vpn/amnezia-client/releases/download/4.6.0.3/AmneziaVPN_Linux_4.6.0.3.tar.zip"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/lin.png" width="150" style="max-width: 100%;"></a>
-<a href="https://github.com/amnezia-vpn/amnezia-client/releases/tag/4.6.0.3"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/andr.png" width="150" style="max-width: 100%;"></a>
-
-<br>
-
-<a href="https://play.google.com/store/search?q=amnezia+vpn&c=apps"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/play.png" width="150" style="max-width: 100%;"></a>
-<a href="https://apps.apple.com/us/app/amneziavpn/id1600529900"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/apl.png" width="150" style="max-width: 100%;"></a>
-
-
-[All releases](https://github.com/amnezia-vpn/amnezia-client/releases)
-
-<br>
-
-
 ## Features
-
-- Very easy to use - enter your IP address, SSH login, and password, and Amnezia will automatically install VPN docker containers to your server and connect to the VPN.
-- OpenVPN, Shadowsocks, WireGuard, and IKEv2 protocols support.
+- Very easy to use - enter your ip address, ssh login and password, and Amnezia will automatically install VPN docker containers to your server and connect to VPN.
+- OpenVPN, ShadowSocks, WireGuard, IKEv2 protocols support.
 - Masking VPN with OpenVPN over Cloak plugin
-- Split tunneling support - add any sites to the client to enable VPN only for them (only for desktops)
+- Split tunneling support - add any sites to client to enable VPN only for them (only for desktops)
 - Windows, MacOS, Linux, Android, iOS releases.
 
 ## Links
-
-- [https://amnezia.org](https://amnezia.org) - project website  
-- [https://www.reddit.com/r/AmneziaVPN](https://www.reddit.com/r/AmneziaVPN) - Reddit  
-- [https://t.me/amnezia_vpn_en](https://t.me/amnezia_vpn_en) - Telegram support channel (English) 
-- [https://t.me/amnezia_vpn_ir](https://t.me/amnezia_vpn_ir) - Telegram support channel (Farsi) 
-- [https://t.me/amnezia_vpn_mm](https://t.me/amnezia_vpn_mm) - Telegram support channel (Myanmar)  
-- [https://t.me/amnezia_vpn](https://t.me/amnezia_vpn) - Telegram support channel (Russian)  
+[https://amnezia.org](https://amnezia.org) - project website  
+[https://www.reddit.com/r/AmneziaVPN](https://www.reddit.com/r/AmneziaVPN) - Reddit  
+[https://t.me/amnezia_vpn_en](https://t.me/amnezia_vpn_en) - Telegram support channel (English)  
+[https://t.me/amnezia_vpn](https://t.me/amnezia_vpn) - Telegram support channel (Russian)  
 
 ## Tech
 
-AmneziaVPN uses several open-source projects to work:
+AmneziaVPN uses a number of open source projects to work:
 
 - [OpenSSL](https://www.openssl.org/)
 - [OpenVPN](https://openvpn.net/)
-- [Shadowsocks](https://shadowsocks.org/)
+- [ShadowSocks](https://shadowsocks.org/)
 - [Qt](https://www.qt.io/)
-- [LibSsh](https://libssh.org) - forked from Qt Creator
+- [LibSsh](https://libssh.org) - forked form Qt Creator
 - and more...
 
 ## Checking out the source code
@@ -66,29 +42,15 @@ git submodule update --init --recursive
 
 Want to contribute? Welcome!
 
-### Help with translations
-
-Download the most actual translation files.
-
-Go to ["Actions" tab](https://github.com/amnezia-vpn/amnezia-client/actions?query=is%3Asuccess+branch%3Adev), click on the first line.
-Then scroll down to the "Artifacts" section and download "AmneziaVPN_translations".
-
-Unzip this file.
-Each *.ts file contains strings for one corresponding language.
-
-Translate or correct some strings in one or multiple *.ts files and commit them back to this repository into the ``client/translations`` folder.
-You can do it via a web-interface or any other method you're familiar with.
-
 ### Building sources and deployment
+Look deploy folder for build scripts. 
 
-Check deploy folder for build scripts. 
-
-### How to build an iOS app from source code on MacOS
+### How to build iOS app from source code on MacOS
 
 1. First, make sure you have [XCode](https://developer.apple.com/xcode/) installed, at least version 14 or higher.
 
-2. We use QT to generate the XCode project. We need QT version 6.6.2. Install QT for MacOS [here](https://doc.qt.io/qt-6/macos.html) or [QT Online Installer](https://www.qt.io/download-open-source). Required modules:
-   - MacOS
+2. We use QT to generate the XCode project. we need QT version 6.6.1. Install QT for macos in [here](https://doc.qt.io/qt-6/macos.html) or [QT Online Installer](https://www.qt.io/download-open-source). Required modules:
+   - macOS
    - iOS
    - Qt 5 Compatibility Module
    - Qt Shader Tools
@@ -97,18 +59,18 @@ Check deploy folder for build scripts.
      - Qt Multimedia
      - Qt Remote Objects 
 
-3. Install CMake if required. We recommend CMake version 3.25. You can install CMake [here](https://cmake.org/download/)
+3. Install cmake is require. We recommend cmake version 3.25. You can install cmake in [here](https://cmake.org/download/)
 
-4. You also need to install go >= v1.16. If you don't have it installed already,
+4. You also need to install go >= v1.16. If you don't have it done already,
 download go from the [official website](https://golang.org/dl/) or use Homebrew. 
-The latest version is recommended. Install gomobile
+Latest version is recommended. Install gomobile
 ```bash
 export PATH=$PATH:~/go/bin
 go install golang.org/x/mobile/cmd/gomobile@latest
 gomobile init
 ```
 
-5. Build the project
+5. Build project
 ```bash
 export QT_BIN_DIR="<PATH-TO-QT-FOLDER>/Qt/<QT-VERSION>/ios/bin"
 export QT_MACOS_ROOT_DIR="<PATH-TO-QT-FOLDER>/Qt/<QT-VERSION>/macos"
@@ -126,64 +88,62 @@ of the bin folder where gomobile was installed. Usually, it's in `GOPATH`.
 export PATH=$(PATH):/path/to/GOPATH/bin
 ```
 
-6. Open the XCode project. You can then run /test/archive/ship the app.
+5. Open XCode project. You can then run/test/archive/ship the app.
 
-If the build fails with the following error
+If build fails with the following error
 ```
 make: *** 
 [$(PROJECTDIR)/client/build/AmneziaVPN.build/Debug-iphoneos/wireguard-go-bridge/goroot/.prepared] 
 Error 1
 ```
-Add a user-defined variable to both AmneziaVPN and WireGuardNetworkExtension targets' build settings with
+Add a user defined variable to both AmneziaVPN and WireGuardNetworkExtension targets' build settings with
 key `PATH` and value `${PATH}/path/to/bin/folder/with/go/executable`, e.g. `${PATH}:/usr/local/go/bin`.
 
-if the above error persists on your M1 Mac, then most probably you need to install arch based CMake 
+if above error still persists on you M1 Mac, then most probably you need to install arch based cmake 
 ```
 arch -arm64 brew install cmake
 ```
 
-Build might fail with the "source files not found" error the first time you try it, because the modern XCode build system compiles dependencies in parallel, and some dependencies end up being built after the ones that
-require them. In this case, simply restart the build.
+Build might fail with "source files not found" error the first time you try it, because modern XCode build system compiles
+dependencies in parallel, and some dependencies end up being built after the ones that
+require them. In this case simply restart the build.
 
 ## How to build the Android app
-
-_Tested on Mac OS_
+_tested on Mac OS_
 
 The Android app has the following requirements:
 * JDK 11
 * Android platform SDK 33
-* CMake 3.25.0
+* cmake 3.25.0
 
-After you have installed QT, QT Creator, and Android Studio, you need to configure QT Creator correctly. Click in the top menu bar on `QT Creator` -> `Preferences` -> `Devices` and select the tab `Android`. 
-    * set path to JDK 11
+After you have installed QT, QT Creator and Android Studio installed, you need to configure QT Creator correctly. Click in the top menu bar on `QT Creator` -> `Preferences` -> `Devices` and select the tab `Android`. 
+    * set path to jdk 11
     * set path to Android SDK ($ANDROID_HOME)
 
-In case you get errors regarding missing SDK or 'SDK manager not running', you cannot fix them by correcting the paths. If you have some spare GBs on your disk, you can let QT Creator install all requirements by choosing an empty folder for `Android SDK location` and clicking on `Set Up SDK`. Be aware: This will install a second Android SDK and NDK on your machine! 
-Double-check that the right CMake version is configured:  Click on `QT Creator` -> `Preferences` and click on the side menu on `Kits`. Under the center content view's `Kits` tab, you'll find an entry for `CMake Tool`. If the default selected CMake version is lower than 3.25.0, install on your system CMake >= 3.25.0 and choose `System CMake at <path>` from the drop-down list. If this entry is missing, you either have not installed CMake yet or QT Creator hasn't found the path to it. In that case, click in the preferences window on the side menu item `CMake`, then on the tab `Tools` in the center content view, and finally on the button `Add` to set the path to your installed CMake. 
-Please make sure that you have selected Android Platform SDK 33 for your project: click in the main view's side menu on `Projects`, and on the left, you'll see a section `Build & Run` showing different Android build targets. You can select any of them, Amnezia VPN's project setup is designed in a way that all Android targets will be built. Click on the targets submenu item `Build` and scroll in the center content view to `Build Steps`. Click on `Details` at the end of the headline `Build Android APK` (the `Details` button might be hidden in case the QT Creator Window is not running in full screen!). Here we are: Choose `android-33` as `Android Build Platform SDK`.
+In case you get errors regarding missing SDK or 'sdkmanager not running', you cannot fix them by correcting the paths and you have some spare GBs on your disk, you can let QT Creator install all requirements by choosing an empty folder for `Android SDK location` and click on `Set Up SDK`. Be aware: This will install a second Android SDK and NDK on your machine! 
 
-That's it! You should be ready to compile the project from QT Creator!
+Double check that the right cmake version is configured:  Click on `QT Creator` -> `Preferences` and click on the side menu on `Kits`. Under the center content view's `Kits` tab you'll find an entry `CMake Tool`. If the default selected CMake version is lower than 3.25.0, install on your system CMake >= 3.25.0 and choose `System CMake at <path>` from the drop down list. If this entry is missing, you either have not installed CMake yet or QT Creator hasn't found the path to it. In that case click in the preferences window on the side menu item `CMake`, then on the tab `Tools`in the center content view and finally on the Button `Add` to set the path to your installed CMake. 
+
+Please make sure that you have selected Android Platform SDK 33 for your project: click in the main view's side menu on on `Projects`, on the left you'll see a section `Build & Run` showing different Android build targets. You can select any of them, Amnezia VPN's project setup is designed in a way that always all Android targets will be build. Click on the targets submenu item `Build` and scroll in the center content view to `Build Steps`. Click on `Details` at the end of the headline `Build Android APK` (The `Details` button might be hidden in case QT Creator Window is not running in full screen!). Here we are: choose `android-33` as `Android Build platform SDK`.
+
+That's it you should be ready to compile the project from QT Creator!
 
 ### Development flow
+After you've hit the build button, QT-Creator copies the whole project to a folder in the repositories parent directory. The folder should look something like `build-amnezia-client-Android_Qt_<version>_Clang_<architecture>-<BuildType>`.
+If you want to develop Amnezia VPNs Android components written in Kotlin, such as components using system APIs, you need to import the generated project in Android Studio with `build-amnezia-client-Android_Qt_<version>_Clang_<architecture>-<BuildType>/client/android-build` as the projects root directory. While you should be able to compile the generated project from Android Studio, you cannot work directly in the repository's Android project. So whenever you are confident with your work in the generated project, you'll need to copy and paste the affected files to the corresponding path in the repositories Android project so that you can add and commit your changes!
 
-After you've hit the build button, QT-Creator copies the whole project to a folder in the repository parent directory. The folder should look something like `build-amnezia-client-Android_Qt_<version>_Clang_<architecture>-<BuildType>`.
-If you want to develop Amnezia VPNs Android components written in Kotlin, such as components using system APIs, you need to import the generated project in Android Studio with `build-amnezia-client-Android_Qt_<version>_Clang_<architecture>-<BuildType>/client/android-build` as the projects root directory. While you should be able to compile the generated project from Android Studio, you cannot work directly in the repository's Android project. So whenever you are confident with your work in the generated project, you'll need to copy and paste the affected files to the corresponding path in the repository's Android project so that you can add and commit your changes!
-
-You may face compiling issues in QT Creator after you've worked in Android Studio on the generated project. Just do a `./gradlew clean` in the generated project's root directory (`<path>/client/android-build/.`) and you should be good to go.
+You may face compiling issues in QT Creator after you've worked in Android Studio on the generated project. Just do a `./gradlew clean` in the generated project's root directory (`<path>/client/android-build/.`) and you should be good to continue.
 
 ## License
-
-GPL v3.0
+GPL v.3
 
 ## Donate
-
-Patreon: [https://www.patreon.com/amneziavpn](https://www.patreon.com/amneziavpn)
-
-USDT BEP20: 0x6abD576765a826f87D1D95183438f9408C901bE4 <br>
-USDT TRC20: TELAitazF1MZGmiNjTcnxDjEiH5oe7LC9d <br>
+Bitcoin: bc1qn9rhsffuxwnhcuuu4qzrwp4upkrq94xnh8r26u  
 XMR: 48spms39jt1L2L5vyw2RQW6CXD6odUd4jFu19GZcDyKKQV9U88wsJVjSbL4CfRys37jVMdoaWVPSvezCQPhHXUW5UKLqUp3  
+payeer.com: P2561305  
+ko-fi.com: [https://ko-fi.com/amnezia_vpn](https://ko-fi.com/amnezia_vpn)  
 
-## Acknowledgments
 
+## etc
 This project is tested with BrowserStack.
 We express our gratitude to [BrowserStack](https://www.browserstack.com) for supporting our project.

client/3rd/QJsonStruct/.gitignore

@@ -1,2 +0,0 @@
-*.user
-build/

client/3rd/QJsonStruct/CMakeLists.txt

@@ -1,19 +0,0 @@
-cmake_minimum_required(VERSION 3.5)
-
-project(QJsonStruct LANGUAGES CXX)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-option(BUILD_TESTING ON)
-
-include(QJsonStruct.cmake)
-find_package(Qt5 COMPONENTS Core REQUIRED)
-
-if(BUILD_TESTING)
-    include(CTest)
-    add_subdirectory(test)
-endif()

client/3rd/QJsonStruct/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020 Qv2ray Workgroup
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

client/3rd/QJsonStruct/QJsonIO.hpp

@@ -1,190 +0,0 @@
-#pragma once
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QJsonValue>
-#include <QList>
-#include <tuple>
-
-enum class QJsonIOPathType
-{
-    JSONIO_MODE_ARRAY,
-    JSONIO_MODE_OBJECT
-};
-
-typedef QPair<QString, QJsonIOPathType> QJsonIONodeType;
-
-struct QJsonIOPath : QList<QJsonIONodeType>
-{
-    template<typename type1, typename type2, typename... types>
-    QJsonIOPath(const type1 t1, const type2 t2, const types... ts)
-    {
-        AppendPath(t1);
-        AppendPath(t2);
-        (AppendPath(ts), ...);
-    }
-
-    void AppendPath(size_t index)
-    {
-        append({ QString::number(index), QJsonIOPathType::JSONIO_MODE_ARRAY });
-    }
-
-    void AppendPath(const QString &key)
-    {
-        append({ key, QJsonIOPathType::JSONIO_MODE_OBJECT });
-    }
-
-    template<typename t>
-    QJsonIOPath &operator<<(const t &str)
-    {
-        AppendPath(str);
-        return *this;
-    }
-
-    template<typename t>
-    QJsonIOPath &operator+=(const t &val)
-    {
-        AppendPath(val);
-        return *this;
-    }
-
-    QJsonIOPath &operator<<(const QJsonIOPath &other)
-    {
-        for (const auto &x : other)
-            this->append(x);
-        return *this;
-    }
-
-    template<typename t>
-    QJsonIOPath &operator<<(const t &val) const
-    {
-        auto _new = *this;
-        return _new << val;
-    }
-
-    template<typename t>
-    QJsonIOPath operator+(const t &val) const
-    {
-        auto _new = *this;
-        return _new << val;
-    }
-
-    QJsonIOPath operator+(const QJsonIOPath &other) const
-    {
-        auto _new = *this;
-        for (const auto &x : other)
-            _new.append(x);
-        return _new;
-    }
-};
-
-class QJsonIO
-{
-  public:
-    const static inline QJsonValue Null = QJsonValue::Null;
-    const static inline QJsonValue Undefined = QJsonValue::Undefined;
-
-    template<typename current_key_type, typename... t_other_types>
-    static QJsonValue GetValue(const QJsonValue &parent, const current_key_type &current, const t_other_types &...other)
-    {
-        if constexpr (sizeof...(t_other_types) == 0)
-            if constexpr (std::is_integral_v<current_key_type>)
-                return parent.toArray()[current];
-            else
-                return parent.toObject()[current];
-        else if constexpr (std::is_integral_v<current_key_type>)
-            return GetValue(parent.toArray()[current], other...);
-        else
-            return GetValue(parent.toObject()[current], other...);
-    }
-
-    template<typename... key_types_t>
-    static QJsonValue GetValue(QJsonValue value, const std::tuple<key_types_t...> &keys, const QJsonValue &defaultValue = Undefined)
-    {
-        std::apply([&](auto &&...args) { ((value = value[args]), ...); }, keys);
-        return value.isUndefined() ? defaultValue : value;
-    }
-
-    template<typename parent_type, typename t_value_type, typename current_key_type, typename... t_other_key_types>
-    static void SetValue(parent_type &parent, const t_value_type &val, const current_key_type &current, const t_other_key_types &...other)
-    {
-        // If current parent is an array, increase its size to fit the "key"
-        if constexpr (std::is_integral_v<current_key_type>)
-            for (auto i = parent.size(); i <= current; i++)
-                parent.insert(i, {});
-
-        // If the t_other_key_types has nothing....
-        // Means we have reached the end of recursion.
-        if constexpr (sizeof...(t_other_key_types) == 0)
-            parent[current] = val;
-        else if constexpr (std::is_integral_v<typename std::tuple_element_t<0, std::tuple<t_other_key_types...>>>)
-        {
-            // Means we still have many keys
-            // So this element is an array.
-            auto _array = parent[current].toArray();
-            SetValue(_array, val, other...);
-            parent[current] = _array;
-        }
-        else
-        {
-            auto _object = parent[current].toObject();
-            SetValue(_object, val, other...);
-            parent[current] = _object;
-        }
-    }
-
-    static QJsonValue GetValue(const QJsonValue &parent, const QJsonIOPath &path, const QJsonValue &defaultValue = QJsonIO::Undefined)
-    {
-        QJsonValue val = parent;
-        for (const auto &[k, t] : path)
-        {
-            if (t == QJsonIOPathType::JSONIO_MODE_ARRAY)
-                val = val.toArray()[k.toInt()];
-            else
-                val = val.toObject()[k];
-        }
-        return val.isUndefined() ? defaultValue : val;
-    }
-
-    template<typename parent_type, typename value_type>
-    static void SetValue(parent_type &parent, const value_type &t, const QJsonIOPath &path)
-    {
-        QList<std::tuple<QString, QJsonIOPathType, QJsonValue>> _stack;
-        QJsonValue lastNode = parent;
-        for (const auto &[key, type] : path)
-        {
-            _stack.prepend({ key, type, lastNode });
-            if (type == QJsonIOPathType::JSONIO_MODE_ARRAY)
-                lastNode = lastNode.toArray().at(key.toInt());
-            else
-                lastNode = lastNode.toObject()[key];
-        }
-
-        lastNode = t;
-
-        for (const auto &[key, type, node] : _stack)
-        {
-            if (type == QJsonIOPathType::JSONIO_MODE_ARRAY)
-            {
-                const auto index = key.toInt();
-                auto nodeArray = node.toArray();
-                for (auto i = nodeArray.size(); i <= index; i++)
-                    nodeArray.insert(i, {});
-                nodeArray[index] = lastNode;
-                lastNode = nodeArray;
-            }
-            else
-            {
-                auto nodeObject = node.toObject();
-                nodeObject[key] = lastNode;
-                lastNode = nodeObject;
-            }
-        }
-
-        if constexpr (std::is_same_v<parent_type, QJsonObject>)
-            parent = lastNode.toObject();
-        else if constexpr (std::is_same_v<parent_type, QJsonArray>)
-            parent = lastNode.toArray();
-        else
-            Q_UNREACHABLE();
-    }
-};

client/3rd/QJsonStruct/QJsonStruct.cmake

@@ -1,5 +0,0 @@
-include_directories(${CMAKE_CURRENT_LIST_DIR})
-
-set(QJSONSTRUCT_SOURCES
-    ${CMAKE_CURRENT_LIST_DIR}/QJsonStruct.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/QJsonIO.hpp)

client/3rd/QJsonStruct/QJsonStruct.hpp

@@ -1,215 +0,0 @@
-#pragma once
-#include "macroexpansion.hpp"
-
-#ifndef _X
-    #include <QJsonArray>
-    #include <QJsonObject>
-    #include <QList>
-    #include <QVariant>
-#endif
-
-/// macro to define an operator==
-#define ___JSONSTRUCT_DEFAULT_COMPARE_IMPL(x) (this->x == ___another___instance__.x) &&
-#define JSONSTRUCT_COMPARE(CLASS, ...)                                                                                                               \
-    bool operator==(const CLASS &___another___instance__) const                                                                                      \
-    {                                                                                                                                                \
-        return FOR_EACH(___JSONSTRUCT_DEFAULT_COMPARE_IMPL, __VA_ARGS__) true;                                                                       \
-    }
-
-// ============================================================================================
-// Load JSON IMPL
-#define ___DESERIALIZE_FROM_JSON_CONVERT_B_FUNC_IMPL(name) name::loadJson(___json_object_);
-#define ___DESERIALIZE_FROM_JSON_CONVERT_A_FUNC(name) ___DESERIALIZE_FROM_JSON_CONVERT_F_FUNC(name)
-#define ___DESERIALIZE_FROM_JSON_CONVERT_B_FUNC(...) FOREACH_CALL_FUNC_3(___DESERIALIZE_FROM_JSON_CONVERT_B_FUNC_IMPL, __VA_ARGS__)
-#define ___DESERIALIZE_FROM_JSON_CONVERT_F_FUNC(name)                                                                                                \
-    if (___json_object_.toObject().contains(#name))                                                                                                  \
-    {                                                                                                                                                \
-        JsonStructHelper::Deserialize(this->name, ___json_object_.toObject()[#name]);                                                                \
-    }                                                                                                                                                \
-    else                                                                                                                                             \
-    {                                                                                                                                                \
-        this->name = ___qjsonstruct_default_check.name;                                                                                              \
-    }
-
-// ============================================================================================
-// To JSON IMPL
-#define ___SERIALIZE_TO_JSON_CONVERT_F_FUNC(name)                                                                                                    \
-    if (!(___qjsonstruct_default_check.name == this->name))                                                                                          \
-    {                                                                                                                                                \
-        ___json_object_.insert(#name, JsonStructHelper::Serialize(name));                                                                            \
-    }
-#define ___SERIALIZE_TO_JSON_CONVERT_A_FUNC(name) ___json_object_.insert(#name, JsonStructHelper::Serialize(name));
-#define ___SERIALIZE_TO_JSON_CONVERT_B_FUNC_IMPL(name) JsonStructHelper::MergeJson(___json_object_, name::toJson());
-#define ___SERIALIZE_TO_JSON_CONVERT_B_FUNC(...) FOREACH_CALL_FUNC_3(___SERIALIZE_TO_JSON_CONVERT_B_FUNC_IMPL, __VA_ARGS__)
-
-// ============================================================================================
-// Load JSON Wrapper
-#define ___DESERIALIZE_FROM_JSON_CONVERT_FUNC_DECL_A(...) FOREACH_CALL_FUNC_2(___DESERIALIZE_FROM_JSON_CONVERT_A_FUNC, __VA_ARGS__)
-#define ___DESERIALIZE_FROM_JSON_CONVERT_FUNC_DECL_F(...) FOREACH_CALL_FUNC_2(___DESERIALIZE_FROM_JSON_CONVERT_F_FUNC, __VA_ARGS__)
-#define ___DESERIALIZE_FROM_JSON_CONVERT_FUNC_DECL_B(...) FOREACH_CALL_FUNC_2(___DESERIALIZE_FROM_JSON_CONVERT_B_FUNC, __VA_ARGS__)
-#define ___DESERIALIZE_FROM_JSON_EXTRACT_B_F(name_option) ___DESERIALIZE_FROM_JSON_CONVERT_FUNC_DECL_##name_option
-
-// ============================================================================================
-// To JSON Wrapper
-#define ___SERIALIZE_TO_JSON_CONVERT_FUNC_DECL_A(...) FOREACH_CALL_FUNC_2(___SERIALIZE_TO_JSON_CONVERT_A_FUNC, __VA_ARGS__)
-#define ___SERIALIZE_TO_JSON_CONVERT_FUNC_DECL_F(...) FOREACH_CALL_FUNC_2(___SERIALIZE_TO_JSON_CONVERT_F_FUNC, __VA_ARGS__)
-#define ___SERIALIZE_TO_JSON_CONVERT_FUNC_DECL_B(...) FOREACH_CALL_FUNC_2(___SERIALIZE_TO_JSON_CONVERT_B_FUNC, __VA_ARGS__)
-#define ___SERIALIZE_TO_JSON_EXTRACT_B_F(name_option) ___SERIALIZE_TO_JSON_CONVERT_FUNC_DECL_##name_option
-
-// ============================================================================================
-#define JSONSTRUCT_REGISTER_NOCOPYMOVE(___class_type_, ...)                                                                                          \
-    void loadJson(const QJsonValue &___json_object_)                                                                                                 \
-    {                                                                                                                                                \
-        ___class_type_ ___qjsonstruct_default_check;                                                                                                 \
-        FOREACH_CALL_FUNC(___DESERIALIZE_FROM_JSON_EXTRACT_B_F, __VA_ARGS__);                                                                        \
-    }                                                                                                                                                \
-    [[nodiscard]] const QJsonObject toJson() const                                                                                                   \
-    {                                                                                                                                                \
-        ___class_type_ ___qjsonstruct_default_check;                                                                                                 \
-        QJsonObject ___json_object_;                                                                                                                 \
-        FOREACH_CALL_FUNC(___SERIALIZE_TO_JSON_EXTRACT_B_F, __VA_ARGS__);                                                                            \
-        return ___json_object_;                                                                                                                      \
-    }
-
-#define JSONSTRUCT_REGISTER(___class_type_, ...)                                                                                                     \
-    JSONSTRUCT_REGISTER_NOCOPYMOVE(___class_type_, __VA_ARGS__);                                                                                     \
-    [[nodiscard]] static auto fromJson(const QJsonValue &___json_object_)                                                                            \
-    {                                                                                                                                                \
-        ___class_type_ _t;                                                                                                                           \
-        _t.loadJson(___json_object_);                                                                                                                \
-        return _t;                                                                                                                                   \
-    }
-
-#define ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(type, convert_func)                                                                                \
-    static void Deserialize(type &t, const QJsonValue &d)                                                                                            \
-    {                                                                                                                                                \
-        t = d.convert_func;                                                                                                                          \
-    }
-
-class JsonStructHelper
-{
-  public:
-    static void MergeJson(QJsonObject &mergeTo, const QJsonObject &mergeIn)
-    {
-        for (const auto &key : mergeIn.keys())
-            mergeTo[key] = mergeIn.value(key);
-    }
-    //
-    template<typename T>
-    static void Deserialize(T &t, const QJsonValue &d)
-    {
-        if constexpr (std::is_enum_v<T>)
-            t = (T) d.toInt();
-        else if constexpr (std::is_same_v<T, QJsonObject>)
-            t = d.toObject();
-        else if constexpr (std::is_same_v<T, QJsonArray>)
-            t = d.toArray();
-        else
-            t.loadJson(d);
-    }
-
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(QString, toString());
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(QChar, toVariant().toChar());
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(std::string, toString().toStdString());
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(std::wstring, toString().toStdWString());
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(bool, toBool());
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(double, toDouble());
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(float, toVariant().toFloat());
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(int, toInt());
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(long, toVariant().toLongLong());
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(long long, toVariant().toLongLong());
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(unsigned int, toVariant().toUInt());
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(unsigned long, toVariant().toULongLong());
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(unsigned long long, toVariant().toULongLong());
-
-    template<typename T>
-    static void Deserialize(QList<T> &t, const QJsonValue &d)
-    {
-        t.clear();
-        for (const auto &val : d.toArray())
-        {
-            T data;
-            Deserialize(data, val);
-            t.push_back(data);
-        }
-    }
-
-    template<typename TKey, typename TValue>
-    static void Deserialize(QMap<TKey, TValue> &t, const QJsonValue &d)
-    {
-        t.clear();
-        const auto &jsonObject = d.toObject();
-        TKey keyVal;
-        TValue valueVal;
-        for (const auto &key : jsonObject.keys())
-        {
-            Deserialize(keyVal, key);
-            Deserialize(valueVal, jsonObject.value(key));
-            t.insert(keyVal, valueVal);
-        }
-    }
-
-    // =========================== Store Json Data ===========================
-
-    template<typename T>
-    static QJsonValue Serialize(const T &t)
-    {
-        if constexpr (std::is_enum_v<T>)
-            return (int) t;
-        else if constexpr (std::is_same_v<T, QJsonObject> || std::is_same_v<T, QJsonArray>)
-            return t;
-        else
-            return t.toJson();
-    }
-
-#define pure_func(x) (x)
-#define ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(type)                                                                                             \
-    static QJsonValue Serialize(const type &t)                                                                                                       \
-    {                                                                                                                                                \
-        return QJsonValue(t);                                                                                                                        \
-    }
-    ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(int);
-    ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(bool);
-    ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(QJsonArray);
-    ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(QJsonObject);
-    ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(QString);
-    ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(long long);
-    ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(float);
-    ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(double);
-
-#define ___DECL_JSON_STRUCT_STORE_VARIANT_TYPE_FUNC(type, func)                                                                                      \
-    static QJsonValue Serialize(const type &t)                                                                                                       \
-    {                                                                                                                                                \
-        return QJsonValue::fromVariant(func);                                                                                                        \
-    }
-
-    ___DECL_JSON_STRUCT_STORE_VARIANT_TYPE_FUNC(std::string, QString::fromStdString(t))
-    ___DECL_JSON_STRUCT_STORE_VARIANT_TYPE_FUNC(std::wstring, QString::fromStdWString(t))
-    ___DECL_JSON_STRUCT_STORE_VARIANT_TYPE_FUNC(long, QVariant::fromValue<long>(t))
-    ___DECL_JSON_STRUCT_STORE_VARIANT_TYPE_FUNC(unsigned int, QVariant::fromValue<unsigned int>(t))
-    ___DECL_JSON_STRUCT_STORE_VARIANT_TYPE_FUNC(unsigned long, QVariant::fromValue<unsigned long>(t))
-    ___DECL_JSON_STRUCT_STORE_VARIANT_TYPE_FUNC(unsigned long long, QVariant::fromValue<unsigned long long>(t))
-
-    template<typename TValue>
-    static QJsonValue Serialize(const QMap<QString, TValue> &t)
-    {
-        QJsonObject mapObject;
-        for (const auto &key : t.keys())
-        {
-            auto valueVal = Serialize(t.value(key));
-            mapObject.insert(key, valueVal);
-        }
-        return mapObject;
-    }
-
-    template<typename T>
-    static QJsonValue Serialize(const QList<T> &t)
-    {
-        QJsonArray listObject;
-        for (const auto &item : t)
-        {
-            listObject.push_back(Serialize(item));
-        }
-        return listObject;
-    }
-};

client/3rd/QJsonStruct/macroexpansion.hpp

@@ -1,74 +0,0 @@
-#pragma once
-
-#define CONCATENATE1(arg1, arg2) CONCATENATE2(arg1, arg2)
-#define CONCATENATE2(arg1, arg2) arg1##arg2
-#define CONCATENATE(x, y) x##y
-
-#define EXPAND(...) __VA_ARGS__
-#define FOR_EACH_1(what, x, ...) what(x)
-#define FOR_EACH_2(what, x, ...) what(x) EXPAND(FOR_EACH_1(what, __VA_ARGS__))
-#define FOR_EACH_3(what, x, ...) what(x) EXPAND(FOR_EACH_2(what, __VA_ARGS__))
-#define FOR_EACH_4(what, x, ...) what(x) EXPAND(FOR_EACH_3(what, __VA_ARGS__))
-#define FOR_EACH_5(what, x, ...) what(x) EXPAND(FOR_EACH_4(what, __VA_ARGS__))
-#define FOR_EACH_6(what, x, ...) what(x) EXPAND(FOR_EACH_5(what, __VA_ARGS__))
-#define FOR_EACH_7(what, x, ...) what(x) EXPAND(FOR_EACH_6(what, __VA_ARGS__))
-#define FOR_EACH_8(what, x, ...) what(x) EXPAND(FOR_EACH_7(what, __VA_ARGS__))
-#define FOR_EACH_9(what, x, ...) what(x) EXPAND(FOR_EACH_8(what, __VA_ARGS__))
-#define FOR_EACH_10(what, x, ...) what(x) EXPAND(FOR_EACH_9(what, __VA_ARGS__))
-#define FOR_EACH_11(what, x, ...) what(x) EXPAND(FOR_EACH_10(what, __VA_ARGS__))
-#define FOR_EACH_12(what, x, ...) what(x) EXPAND(FOR_EACH_11(what, __VA_ARGS__))
-#define FOR_EACH_13(what, x, ...) what(x) EXPAND(FOR_EACH_12(what, __VA_ARGS__))
-#define FOR_EACH_14(what, x, ...) what(x) EXPAND(FOR_EACH_13(what, __VA_ARGS__))
-#define FOR_EACH_15(what, x, ...) what(x) EXPAND(FOR_EACH_14(what, __VA_ARGS__))
-#define FOR_EACH_16(what, x, ...) what(x) EXPAND(FOR_EACH_15(what, __VA_ARGS__))
-
-#define FOR_EACH_NARG(...) FOR_EACH_NARG_(__VA_ARGS__, FOR_EACH_RSEQ_N())
-#define FOR_EACH_NARG_(...) EXPAND(FOR_EACH_ARG_N(__VA_ARGS__))
-#define FOR_EACH_ARG_N(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, N, ...) N
-#define FOR_EACH_RSEQ_N() 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0
-
-#define FOR_EACH_(N, what, ...) EXPAND(CONCATENATE(FOR_EACH_, N)(what, __VA_ARGS__))
-#define FOR_EACH(what, ...) FOR_EACH_(FOR_EACH_NARG(__VA_ARGS__), what, __VA_ARGS__)
-#define FOREACH_CALL_FUNC(func, ...) FOR_EACH(func, __VA_ARGS__)
-
-// Bad hack ==========================================================================================================================
-#define _2X_FOR_EACH_1(what, x, ...) what(x)
-#define _2X_FOR_EACH_2(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_1(what, __VA_ARGS__))
-#define _2X_FOR_EACH_3(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_2(what, __VA_ARGS__))
-#define _2X_FOR_EACH_4(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_3(what, __VA_ARGS__))
-#define _2X_FOR_EACH_5(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_4(what, __VA_ARGS__))
-#define _2X_FOR_EACH_6(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_5(what, __VA_ARGS__))
-#define _2X_FOR_EACH_7(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_6(what, __VA_ARGS__))
-#define _2X_FOR_EACH_8(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_7(what, __VA_ARGS__))
-#define _2X_FOR_EACH_9(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_8(what, __VA_ARGS__))
-#define _2X_FOR_EACH_10(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_9(what, __VA_ARGS__))
-#define _2X_FOR_EACH_11(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_10(what, __VA_ARGS__))
-#define _2X_FOR_EACH_12(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_11(what, __VA_ARGS__))
-#define _2X_FOR_EACH_13(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_12(what, __VA_ARGS__))
-#define _2X_FOR_EACH_14(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_13(what, __VA_ARGS__))
-#define _2X_FOR_EACH_15(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_14(what, __VA_ARGS__))
-#define _2X_FOR_EACH_16(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_15(what, __VA_ARGS__))
-#define _2X_FOR_EACH_(N, what, ...) EXPAND(CONCATENATE(_2X_FOR_EACH_, N)(what, __VA_ARGS__))
-#define _2X_FOR_EACH(what, ...) _2X_FOR_EACH_(FOR_EACH_NARG(__VA_ARGS__), what, __VA_ARGS__)
-#define FOREACH_CALL_FUNC_2(func, ...) _2X_FOR_EACH(func, __VA_ARGS__)
-
-// Bad hack ==========================================================================================================================
-#define _3X_FOR_EACH_1(what, x, ...) what(x)
-#define _3X_FOR_EACH_2(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_1(what, __VA_ARGS__))
-#define _3X_FOR_EACH_3(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_2(what, __VA_ARGS__))
-#define _3X_FOR_EACH_4(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_3(what, __VA_ARGS__))
-#define _3X_FOR_EACH_5(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_4(what, __VA_ARGS__))
-#define _3X_FOR_EACH_6(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_5(what, __VA_ARGS__))
-#define _3X_FOR_EACH_7(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_6(what, __VA_ARGS__))
-#define _3X_FOR_EACH_8(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_7(what, __VA_ARGS__))
-#define _3X_FOR_EACH_9(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_8(what, __VA_ARGS__))
-#define _3X_FOR_EACH_10(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_9(what, __VA_ARGS__))
-#define _3X_FOR_EACH_11(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_10(what, __VA_ARGS__))
-#define _3X_FOR_EACH_12(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_11(what, __VA_ARGS__))
-#define _3X_FOR_EACH_13(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_12(what, __VA_ARGS__))
-#define _3X_FOR_EACH_14(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_13(what, __VA_ARGS__))
-#define _3X_FOR_EACH_15(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_14(what, __VA_ARGS__))
-#define _3X_FOR_EACH_16(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_15(what, __VA_ARGS__))
-#define _3X_FOR_EACH_(N, what, ...) EXPAND(CONCATENATE(_3X_FOR_EACH_, N)(what, __VA_ARGS__))
-#define _3X_FOR_EACH(what, ...) _3X_FOR_EACH_(FOR_EACH_NARG(__VA_ARGS__), what, __VA_ARGS__)
-#define FOREACH_CALL_FUNC_3(func, ...) _3X_FOR_EACH(func, __VA_ARGS__)

client/3rd/QJsonStruct/test/CMakeLists.txt

@@ -1,16 +0,0 @@
-function(QJSONSTRUCT_ADD_TEST TEST_NAME TEST_SOURCE)
-    add_executable(${TEST_NAME} ${TEST_SOURCE} catch.hpp ${QJSONSTRUCT_SOURCES})
-    target_include_directories(${TEST_NAME}
-        PRIVATE
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-        )
-    target_link_libraries(
-        ${TEST_NAME}
-        PRIVATE
-        Qt::Core
-        )
-    add_test(NAME QJSONSTRUCT_TEST_${TEST_NAME} COMMAND $<TARGET_FILE:${TEST_NAME}> -s)
-endfunction()
-
-QJSONSTRUCT_ADD_TEST(serialization serialize/main.cpp)
-#QJSONSTRUCT_ADD_TEST(serialize_strings serialize/strings.cpp)

client/3rd/QJsonStruct/test/TestIO.hpp

@@ -1,45 +0,0 @@
-#pragma once
-#include "QJsonStruct.hpp"
-#ifndef _X
-    #include <QList>
-    #include <QString>
-    #include <QStringList>
-#endif
-
-struct BaseStruct
-{
-    QString baseStr;
-    int o;
-    JSONSTRUCT_REGISTER(BaseStruct, F(baseStr, o))
-};
-
-struct BaseStruct2
-{
-    QString baseStr2;
-    int o2;
-    JSONSTRUCT_REGISTER(BaseStruct, F(baseStr2, o2))
-};
-struct TestInnerStruct
-    : BaseStruct
-    , BaseStruct2
-{
-    QJsonObject jobj;
-    QJsonArray jarray;
-    QString str;
-    JSONSTRUCT_REGISTER(TestInnerStruct, B(BaseStruct, BaseStruct2), F(str, jobj, jarray))
-};
-
-struct JsonIOTest
-{
-    QString str;
-    QList<int> listOfNumber;
-    QList<bool> listOfBool;
-    QList<QString> listOfString;
-    QList<QList<QString>> listOfListOfString;
-
-    QMap<QString, QString> map;
-    TestInnerStruct inner;
-
-    JSONSTRUCT_REGISTER(JsonIOTest, F(str, listOfNumber, listOfBool, listOfString, listOfListOfString, map, inner));
-    JsonIOTest(){};
-};

client/3rd/QJsonStruct/test/TestOut.hpp

@@ -1,19 +0,0 @@
-#pragma once
-#include "QJsonStruct.hpp"
-
-struct SubData
-{
-    QString subString;
-    JSONSTRUCT_REGISTER_TOJSON(subString)
-};
-
-struct ToJsonOnlyData
-{
-    QString x;
-    int y;
-    int z;
-    QList<int> ints;
-    SubData sub;
-    QMap<QString, SubData> subs;
-    JSONSTRUCT_REGISTER_TOJSON(x, y, z, sub, ints, subs)
-};

client/3rd/QJsonStruct/test/main.cpp

@@ -1,70 +0,0 @@
-#include "QJsonIO.hpp"
-#include "QJsonStruct.hpp"
-#include "TestIO.hpp"
-#include "TestOut.hpp"
-
-#include <QCoreApplication>
-#include <QJsonDocument>
-#include <iostream>
-
-int main(int argc, char *argv[])
-{
-    Q_UNUSED(argc)
-    Q_UNUSED(argv)
-
-    {
-        ToJsonOnlyData data;
-        data.x = "1string";
-        data.y = 2;
-        data.ints << 0;
-        data.ints << 100;
-        data.ints << 900;
-        data.sub.subString = "subs";
-        data.subs["subs-1"] = { "subs1-data" };
-        data.subs["subs-2"] = { "subs2-data" };
-        data.subs["subs-3"] = { "subs3-data" };
-        data.z = 3;
-        auto x = data.toJson();
-        std::cout << QJsonDocument(x).toJson().toStdString() << std::endl;
-    }
-    //
-    {
-        auto f = JsonIOTest::fromJson( //
-            QJsonObject{
-                { "inner", QJsonObject{ { "str", "innerString" },                                 //
-                                        { "jobj", QJsonObject{ { "key", "value" } } },            //
-                                        { "jarray", QJsonArray{ "array0", "array1", "array2" } }, //
-                                        { "baseStr", "baseInnerString" } } },                     //
-                { "str", "data1" },                                                               //
-                { "map", QJsonObject{ { "mapStr", "mapData" } } },                                //
-                { "listOfString", QJsonArray{ "1", "2", "3", "4", "5" } },                        //
-                { "listOfNumber", QJsonArray{ 1, 2, 3, 4, 5 } },                                  //
-                { "listOfBool", QJsonArray{ true, false, false, true, true } },                   //
-                { "listOfListOfString", QJsonArray{ QJsonArray{ "1" },                            //
-                                                    QJsonArray{ "1", "2" },                       //
-                                                    QJsonArray{ "1", "2", "3" },                  //
-                                                    QJsonArray{ "1", "2", "3", "4" },             //
-                                                    QJsonArray{ "1", "2", "3", "4", "5" } } },    //
-            });
-        auto x = f.toJson();
-        std::cout << QJsonDocument(x).toJson().toStdString() << std::endl;
-    }
-    {
-        QJsonObject obj{
-            { "inner", QJsonObject{ { "str", "innerString" }, { "baseStr", "baseInnerString" } } }, //
-            { "str", "data1" },                                                                     //
-            { "map", QJsonObject{ { "mapStr", "mapData" } } },                                      //
-            { "listOfString", QJsonArray{ "1", "2", "3", "4", "5" } },                              //
-            { "listOfNumber", QJsonArray{ 1, 2, 3, 4, 5 } },                                        //
-            { "listOfBool", QJsonArray{ true, false, false, true, true } },                         //
-            { "listOfListOfString", QJsonArray{ QJsonArray{ "1" },                                  //
-                                                QJsonArray{ "1", "2" },                             //
-                                                QJsonArray{ "1", "2", "3" },                        //
-                                                QJsonArray{ "1", "2", "3", "4" },                   //
-                                                QJsonArray{ "1", "2", "3", "4", "5" } } },          //
-        };
-        auto y = QJsonIO::GetValue(obj, std::tuple{ "listOfListOfString", 2 });
-        y.toObject();
-    }
-    return 0;
-}

client/3rd/QJsonStruct/test/serialize/main.cpp

@@ -1,181 +0,0 @@
-#include "QJsonStruct.hpp"
-#define CATCH_CONFIG_MAIN
-#include "catch.hpp"
-
-const static inline auto INT_TEST_MAX = std::numeric_limits<int>::max() - 1;
-const static inline auto INT_TEST_MIN = -(std::numeric_limits<int>::min() + 1);
-
-#define SINGLE_ELEMENT_CLASS_DECL(CLASS, TYPE, field, defaultvalue, existance)                                                                       \
-    class CLASS                                                                                                                                      \
-    {                                                                                                                                                \
-      public:                                                                                                                                        \
-        TYPE field = defaultvalue;                                                                                                                   \
-        JSONSTRUCT_REGISTER(CLASS, existance(field));                                                                                                \
-    };
-
-// SINGLE_ELEMENT_REQUIRE( CLASS_NAME , TYPE , FIELD , DEFAULT_VALUE , SET VALUE , CHECK VALUE )
-#define SINGLE_ELEMENT_REQUIRE(CLASS, TYPE, field, defaultvalue, value, checkvalue, existance)                                                       \
-    SINGLE_ELEMENT_CLASS_DECL(CLASS, TYPE, field, defaultvalue, existance);                                                                          \
-    CLASS CLASS##_class;                                                                                                                             \
-    CLASS##_class.field = value;                                                                                                                     \
-    REQUIRE(CLASS##_class.toJson()[#field] == checkvalue);
-
-using namespace std;
-SCENARIO("Test Serialization", "[Serialize]")
-{
-    GIVEN("Single Element")
-    {
-        const static QList<QString> defaultList{ "entry 1", "entry 2" };
-        const static QMap<QString, QString> defaultMap{ { "key1", "value1" }, { "key2", "value2" } };
-        typedef QMap<QString, QString> QStringQStringMap;
-
-        WHEN("Serialize a single element")
-        {
-            const static QStringQStringMap setValueMap{ { "newkey1", "newvalue1" } };
-            const static QJsonObject setValueJson{ { "newkey1", QJsonValue{ "newvalue1" } } };
-
-            SINGLE_ELEMENT_REQUIRE(QStringTest_Empty, QString, a, "empty", "", "", F);
-            SINGLE_ELEMENT_REQUIRE(QStringTest, QString, a, "empty", "Some QString", "Some QString", F);
-            SINGLE_ELEMENT_REQUIRE(QStringTest_WithQoutes, QString, a, "empty", "\"", "\"", F);
-            SINGLE_ELEMENT_REQUIRE(QStringTest_zint, int, a, -10, 0, 0, F);
-            SINGLE_ELEMENT_REQUIRE(QStringTest_nint, int, a, -10, 1, 1, F);
-            SINGLE_ELEMENT_REQUIRE(QStringTest_pint, int, a, -10, -1, -1, F);
-            SINGLE_ELEMENT_REQUIRE(QStringTest_pmint, int, a, -1, INT_TEST_MAX, INT_TEST_MAX, F);
-            SINGLE_ELEMENT_REQUIRE(QStringTest_zmint, int, a, -1, INT_TEST_MIN, INT_TEST_MIN, F);
-            SINGLE_ELEMENT_REQUIRE(QStringTest_zuint, uint, a, -10, 0, 0, F);
-            SINGLE_ELEMENT_REQUIRE(QStringTest_puint, uint, a, -10, 1, 1, F);
-            SINGLE_ELEMENT_REQUIRE(BoolTest_True, bool, a, false, true, true, F);
-            SINGLE_ELEMENT_REQUIRE(BoolTest_False, bool, a, true, false, false, F);
-            SINGLE_ELEMENT_REQUIRE(StdStringTest, string, a, "def", "std::string _test", "std::string _test", F);
-            SINGLE_ELEMENT_REQUIRE(QListTest, QList<QString>, a, defaultList, { "newEntry" }, QJsonArray{ "newEntry" }, F);
-            SINGLE_ELEMENT_REQUIRE(QMapTest, QStringQStringMap, a, defaultMap, {}, QJsonObject{}, F);
-            SINGLE_ELEMENT_REQUIRE(QMapValueTest, QStringQStringMap, a, defaultMap, setValueMap, setValueJson, F);
-        }
-
-        WHEN("Serialize a default value")
-        {
-            SINGLE_ELEMENT_REQUIRE(DefaultQString, QString, a, "defaultvalue", "defaultvalue", QJsonValue::Undefined, F);
-            SINGLE_ELEMENT_REQUIRE(DefaultInteger, int, a, 12345, 12345, QJsonValue::Undefined, F);
-            SINGLE_ELEMENT_REQUIRE(DefaultList, QList<QString>, a, defaultList, defaultList, QJsonValue::Undefined, F);
-            SINGLE_ELEMENT_REQUIRE(DefaultMap, QStringQStringMap, a, defaultMap, defaultMap, QJsonValue::Undefined, F);
-        }
-
-        WHEN("Serialize a force existance default value")
-        {
-            const static QJsonArray defaultListJson{ "entry 1", "entry 2" };
-            const static QJsonObject defaultMapJson{ { "key1", "value1" }, { "key2", "value2" } };
-            SINGLE_ELEMENT_REQUIRE(DefaultQString, QString, a, "defaultvalue", "defaultvalue", "defaultvalue", A);
-            SINGLE_ELEMENT_REQUIRE(DefaultInteger, int, a, 12345, 12345, 12345, A);
-            SINGLE_ELEMENT_REQUIRE(DefaultList, QList<QString>, a, defaultList, defaultList, defaultListJson, A);
-            SINGLE_ELEMENT_REQUIRE(DefaultMap, QStringQStringMap, a, defaultMap, defaultMap, defaultMapJson, A);
-        }
-    }
-
-    GIVEN("Multiple Simple Elements")
-    {
-        WHEN("Can Omit Default Value")
-        {
-            class MultipleNonDefaultElementTestClass
-            {
-              public:
-                QString astring;
-                int integer = 0;
-                double adouble = 0.0;
-                QList<QString> myList;
-                JSONSTRUCT_REGISTER(MultipleNonDefaultElementTestClass, F(astring, integer, adouble, myList))
-            };
-            MultipleNonDefaultElementTestClass instance;
-            const auto json = instance.toJson();
-            REQUIRE(json["astring"] == QJsonValue::Undefined);
-            REQUIRE(json["integer"] == QJsonValue::Undefined);
-            REQUIRE(json["adouble"] == QJsonValue::Undefined);
-            REQUIRE(json["myList"] == QJsonValue::Undefined);
-        }
-
-        WHEN("Forcing Existance")
-        {
-            class MultipleNonDefaultExistanceElementTestClass
-            {
-              public:
-                QString astring;
-                int integer = 0;
-                double adouble = 0.0;
-                QList<QString> myList;
-                JSONSTRUCT_REGISTER(MultipleNonDefaultExistanceElementTestClass, A(astring, integer, adouble, myList))
-            };
-            MultipleNonDefaultExistanceElementTestClass instance;
-            const auto json = instance.toJson();
-            REQUIRE(json["astring"] == "");
-            REQUIRE(json["integer"] == 0);
-            REQUIRE(json["adouble"] == 0.0);
-            REQUIRE(json["myList"] == QJsonArray{});
-        }
-    }
-
-    GIVEN("Nested Elements")
-    {
-        WHEN("Can Omit Default Value")
-        {
-            class Parent
-            {
-                class NestedChild
-                {
-                    class NestedChild2
-                    {
-                      public:
-                        int childChildInt = 13579;
-                        JSONSTRUCT_COMPARE(NestedChild2, childChildInt)
-                        JSONSTRUCT_REGISTER(NestedChild2, F(childChildInt))
-                    };
-
-                  public:
-                    int childInt = 54321;
-                    QString childQString = "A QString";
-                    NestedChild2 anotherChild;
-                    JSONSTRUCT_COMPARE(NestedChild, childInt, childQString, anotherChild)
-                    JSONSTRUCT_REGISTER(NestedChild, F(childInt, childQString, anotherChild))
-                };
-
-              public:
-                int parentInt = 12345;
-                NestedChild child;
-                JSONSTRUCT_REGISTER(Parent, F(parentInt, child))
-            };
-
-            WHEN("Omitted whole child element")
-            {
-                Parent parent;
-                const auto json = parent.toJson();
-                REQUIRE(json["parentInt"] == QJsonValue::Undefined);
-                REQUIRE(json["child"] == QJsonValue::Undefined);
-            }
-
-            WHEN("Omitted one element in the child")
-            {
-                const auto childJson = QJsonObject{ { "childInt", 1314 } };
-                Parent parent;
-                parent.child.childInt = 1314;
-                const auto json = parent.toJson();
-                REQUIRE(json["parentInt"] == QJsonValue::Undefined);
-                REQUIRE(json["child"] == childJson);
-                REQUIRE(json["child"]["childInt"] == 1314);
-                REQUIRE(json["child"]["childQString"] == QJsonValue::Undefined);
-                REQUIRE(json["child"]["child"]["anotherChild"] == QJsonValue::Undefined);
-            }
-
-            WHEN("Omitted one element in the child child")
-            {
-                Parent parent;
-                parent.child.childInt = 1314;
-                parent.child.anotherChild.childChildInt = 97531;
-                const auto json = parent.toJson();
-                REQUIRE(json["parentInt"] == QJsonValue::Undefined);
-                REQUIRE(json["child"]["childInt"] == 1314);
-                REQUIRE(json["child"]["childQString"] == QJsonValue::Undefined);
-                const QJsonObject childChild{ { "childChildInt", 97531 } };
-                REQUIRE(json["child"]["anotherChild"] == childChild);
-                REQUIRE(json["child"]["anotherChild"]["childChildInt"] == 97531);
-            }
-        }
-    }
-}

client/3rd/QSimpleCrypto/include/QX509.h

@@ -72,7 +72,7 @@ namespace QSimpleCrypto
         /// \param notAfter - X509 end date.
         /// \return Returns OpenSSL X509 structure or nullptr, if error happened. Returned value must be cleaned up with 'X509_free' to avoid memory leak.
         ///
-        X509* generateSelfSignedCertificate(RSA* rsa, const QMap<QByteArray, QByteArray>& additionalData,
+        X509* generateSelfSignedCertificate(const RSA* rsa, const QMap<QByteArray, QByteArray>& additionalData,
             const QByteArray& certificateFileName = "", const EVP_MD* md = EVP_sha512(),
             const long& serialNumber = 1, const long& version = x509LastVersion,
             const long& notBefore = 0, const long& notAfter = oneYear);

client/3rd/QSimpleCrypto/sources/QX509.cpp

@@ -139,7 +139,7 @@ X509* QSimpleCrypto::QX509::verifyCertificate(X509* x509, X509_STORE* store)
 /// \param notAfter - X509 end date.
 /// \return Returns OpenSSL X509 structure or nullptr, if error happened. Returned value must be cleaned up with 'X509_free' to avoid memory leak.
 ///
-X509* QSimpleCrypto::QX509::generateSelfSignedCertificate(RSA* rsa, const QMap<QByteArray, QByteArray>& additionalData,
+X509* QSimpleCrypto::QX509::generateSelfSignedCertificate(const RSA* rsa, const QMap<QByteArray, QByteArray>& additionalData,
     const QByteArray& certificateFileName, const EVP_MD* md,
     const long& serialNumber, const long& version,
     const long& notBefore, const long& notAfter)

client/CMakeLists.txt

@@ -15,15 +15,6 @@ set(PACKAGES
     Core5Compat Concurrent LinguistTools
 )
 
-execute_process(
-  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-  COMMAND git rev-parse --short HEAD
-  OUTPUT_VARIABLE GIT_COMMIT_HASH
-  OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-add_definitions(-DGIT_COMMIT_HASH="${GIT_COMMIT_HASH}")
-
 if(IOS)
     set(PACKAGES ${PACKAGES} Multimedia)
 endif()
@@ -63,14 +54,9 @@ qt6_add_resources(QRC ${QRC} ${CMAKE_CURRENT_LIST_DIR}/resources.qrc)
 set(CMAKE_AUTORCC ON)
 
 set(AMNEZIAVPN_TS_FILES
-    ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_ru_RU.ts
+    ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_ru.ts
     ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_zh_CN.ts
     ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_fa_IR.ts
-    ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_ar_EG.ts
-    ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_my_MM.ts
-    ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_uk_UA.ts
-    ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_ur_PK.ts
-    ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_hi_IN.ts
 )
 
 file(GLOB_RECURSE AMNEZIAVPN_TS_SOURCES *.qrc *.cpp *.h *.ui)
@@ -122,20 +108,16 @@ set(HEADERS ${HEADERS}
     ${CMAKE_CURRENT_LIST_DIR}/core/errorstrings.h
     ${CMAKE_CURRENT_LIST_DIR}/core/scripts_registry.h
     ${CMAKE_CURRENT_LIST_DIR}/core/server_defs.h
-    ${CMAKE_CURRENT_LIST_DIR}/core/controllers/apiController.h
     ${CMAKE_CURRENT_LIST_DIR}/core/controllers/serverController.h
-    ${CMAKE_CURRENT_LIST_DIR}/core/controllers/vpnConfigurationController.h
     ${CMAKE_CURRENT_LIST_DIR}/protocols/protocols_defs.h
     ${CMAKE_CURRENT_LIST_DIR}/protocols/qml_register_protocols.h
+    ${CMAKE_CURRENT_LIST_DIR}/ui/notificationhandler.h
     ${CMAKE_CURRENT_LIST_DIR}/ui/pages.h
     ${CMAKE_CURRENT_LIST_DIR}/ui/property_helper.h
     ${CMAKE_CURRENT_LIST_DIR}/ui/qautostart.h
     ${CMAKE_CURRENT_LIST_DIR}/protocols/vpnprotocol.h
     ${CMAKE_CURRENT_BINARY_DIR}/version.h
     ${CMAKE_CURRENT_LIST_DIR}/core/sshclient.h
-    ${CMAKE_CURRENT_LIST_DIR}/core/networkUtilities.h
-    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/serialization.h
-    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/transfer.h
 )
 
 # Mozilla headres
@@ -153,16 +135,11 @@ include_directories(mozilla/models)
 
 if(NOT IOS)
     set(HEADERS ${HEADERS}
+        ${CMAKE_CURRENT_LIST_DIR}/platforms/ios/MobileUtils.h
         ${CMAKE_CURRENT_LIST_DIR}/platforms/ios/QRCodeReaderBase.h
     )
 endif()
 
-if(NOT ANDROID)
-    set(HEADERS ${HEADERS}
-        ${CMAKE_CURRENT_LIST_DIR}/ui/notificationhandler.h
-    )
-endif()
-
 set(SOURCES ${SOURCES}
     ${CMAKE_CURRENT_LIST_DIR}/migrations.cpp
     ${CMAKE_CURRENT_LIST_DIR}/amnezia_application.cpp
@@ -170,22 +147,12 @@ set(SOURCES ${SOURCES}
     ${CMAKE_CURRENT_LIST_DIR}/core/errorstrings.cpp
     ${CMAKE_CURRENT_LIST_DIR}/core/scripts_registry.cpp
     ${CMAKE_CURRENT_LIST_DIR}/core/server_defs.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/core/controllers/apiController.cpp
     ${CMAKE_CURRENT_LIST_DIR}/core/controllers/serverController.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/core/controllers/vpnConfigurationController.cpp
     ${CMAKE_CURRENT_LIST_DIR}/protocols/protocols_defs.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/ui/notificationhandler.cpp
     ${CMAKE_CURRENT_LIST_DIR}/ui/qautostart.cpp
     ${CMAKE_CURRENT_LIST_DIR}/protocols/vpnprotocol.cpp
     ${CMAKE_CURRENT_LIST_DIR}/core/sshclient.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/core/networkUtilities.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/outbound.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/inbound.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/ss.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/ssd.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/vless.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/trojan.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/vmess.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/vmess_new.cpp
 )
 
 # Mozilla sources
@@ -202,16 +169,11 @@ endif()
 
 if(NOT IOS)
     set(SOURCES ${SOURCES}
+        ${CMAKE_CURRENT_LIST_DIR}/platforms/ios/MobileUtils.cpp
         ${CMAKE_CURRENT_LIST_DIR}/platforms/ios/QRCodeReaderBase.cpp
     )
 endif()
 
-if(NOT ANDROID)
-    set(SOURCES ${SOURCES}
-        ${CMAKE_CURRENT_LIST_DIR}/ui/notificationhandler.cpp
-    )
-endif()
-
 file(GLOB COMMON_FILES_H CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/*.h)
 file(GLOB COMMON_FILES_CPP CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/*.cpp)
 
@@ -320,7 +282,6 @@ if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
         ${CMAKE_CURRENT_LIST_DIR}/protocols/openvpnovercloakprotocol.h
         ${CMAKE_CURRENT_LIST_DIR}/protocols/shadowsocksvpnprotocol.h
         ${CMAKE_CURRENT_LIST_DIR}/protocols/wireguardprotocol.h
-        ${CMAKE_CURRENT_LIST_DIR}/protocols/xrayprotocol.h
         ${CMAKE_CURRENT_LIST_DIR}/protocols/awgprotocol.h
     )
 
@@ -332,7 +293,6 @@ if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
         ${CMAKE_CURRENT_LIST_DIR}/protocols/openvpnovercloakprotocol.cpp
         ${CMAKE_CURRENT_LIST_DIR}/protocols/shadowsocksvpnprotocol.cpp
         ${CMAKE_CURRENT_LIST_DIR}/protocols/wireguardprotocol.cpp
-        ${CMAKE_CURRENT_LIST_DIR}/protocols/xrayprotocol.cpp
         ${CMAKE_CURRENT_LIST_DIR}/protocols/awgprotocol.cpp
     )
 endif()

client/amnezia_application.cpp

@@ -9,15 +9,14 @@
 #include <QTextDocument>
 #include <QTimer>
 #include <QTranslator>
+
 #include <QQuickItem>
 
 #include "logger.h"
-#include "ui/models/installedAppsModel.h"
 #include "version.h"
 
 #include "platforms/ios/QRCodeReaderBase.h"
 #if defined(Q_OS_ANDROID)
-    #include "core/installedAppsImageProvider.h"
     #include "platforms/android/android_controller.h"
 #endif
 
@@ -25,14 +24,13 @@
 
 #if defined(Q_OS_IOS)
     #include "platforms/ios/ios_controller.h"
-    #include <AmneziaVPN-Swift.h>
 #endif
 
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
 AmneziaApplication::AmneziaApplication(int &argc, char *argv[]) : AMNEZIA_BASE_CLASS(argc, argv)
 #else
-AmneziaApplication::AmneziaApplication(int &argc, char *argv[], bool allowSecondary, SingleApplication::Options options, int timeout,
-                                       const QString &userData)
+AmneziaApplication::AmneziaApplication(int &argc, char *argv[], bool allowSecondary, SingleApplication::Options options,
+                                       int timeout, const QString &userData)
     : SingleApplication(argc, argv, allowSecondary, options, timeout, userData)
 #endif
 {
@@ -45,17 +43,16 @@ AmneziaApplication::AmneziaApplication(int &argc, char *argv[], bool allowSecond
         s.setValue("permFixed", true);
     }
 
-    QString configLoc1 = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation).first() + "/" + ORGANIZATION_NAME + "/"
-            + APPLICATION_NAME + ".conf";
+    QString configLoc1 = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation).first() + "/"
+            + ORGANIZATION_NAME + "/" + APPLICATION_NAME + ".conf";
     QFile::setPermissions(configLoc1, QFileDevice::ReadOwner | QFileDevice::WriteOwner);
 
-    QString configLoc2 = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation).first() + "/" + ORGANIZATION_NAME + "/"
-            + APPLICATION_NAME + "/" + APPLICATION_NAME + ".conf";
+    QString configLoc2 = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation).first() + "/"
+            + ORGANIZATION_NAME + "/" + APPLICATION_NAME + "/" + APPLICATION_NAME + ".conf";
     QFile::setPermissions(configLoc2, QFileDevice::ReadOwner | QFileDevice::WriteOwner);
 #endif
 
     m_settings = std::shared_ptr<Settings>(new Settings);
-    m_nam = new QNetworkAccessManager(this);
 }
 
 AmneziaApplication::~AmneziaApplication()
@@ -84,7 +81,8 @@ void AmneziaApplication::init()
 
     m_engine->rootContext()->setContextProperty("Debug", &Logger::Instance());
 
-    m_vpnConnection.reset(new VpnConnection(m_settings));
+    m_configurator = std::shared_ptr<VpnConfigurator>(new VpnConfigurator(m_settings, this));
+    m_vpnConnection.reset(new VpnConnection(m_settings, m_configurator));
     m_vpnConnection->moveToThread(&m_vpnConnectionThread);
     m_vpnConnectionThread.start();
 
@@ -99,18 +97,12 @@ void AmneziaApplication::init()
     AndroidController::instance()->setSaveLogs(m_settings->isSaveLogs());
     connect(m_settings.get(), &Settings::saveLogsChanged, AndroidController::instance(), &AndroidController::setSaveLogs);
 
-    AndroidController::instance()->setScreenshotsEnabled(m_settings->isScreenshotsEnabled());
-    connect(m_settings.get(), &Settings::screenshotsEnabledChanged, AndroidController::instance(), &AndroidController::setScreenshotsEnabled);
-
-    connect(m_settings.get(), &Settings::serverRemoved, AndroidController::instance(), &AndroidController::resetLastServer);
-
-    connect(m_settings.get(), &Settings::settingsCleared, []() { AndroidController::instance()->resetLastServer(-1); });
-
-    connect(AndroidController::instance(), &AndroidController::initConnectionState, this, [this](Vpn::ConnectionState state) {
-        m_connectionController->onConnectionStateChanged(state);
-        if (m_vpnConnection)
-            m_vpnConnection->restoreConnection();
-    });
+    connect(AndroidController::instance(), &AndroidController::initConnectionState, this,
+            [this](Vpn::ConnectionState state) {
+                m_connectionController->onConnectionStateChanged(state);
+                if (m_vpnConnection)
+                    m_vpnConnection->restoreConnection();
+            });
     if (!AndroidController::instance()->initialize()) {
         qFatal("Android controller initialization failed");
     }
@@ -120,8 +112,6 @@ void AmneziaApplication::init()
         m_importController->extractConfigFromData(data);
         m_pageController->goToPageViewConfig();
     });
-
-    m_engine->addImageProvider(QLatin1String("installedAppImage"), new InstalledAppsImageProvider);
 #endif
 
 #ifdef Q_OS_IOS
@@ -137,27 +127,22 @@ void AmneziaApplication::init()
         m_pageController->goToPageSettingsBackup();
         m_settingsController->importBackupFromOutside(filePath);
     });
-
-    QTimer::singleShot(0, this, [this]() { AmneziaVPN::toggleScreenshots(m_settings->isScreenshotsEnabled()); });
-
-    connect(m_settings.get(), &Settings::screenshotsEnabledChanged, [](bool enabled) { AmneziaVPN::toggleScreenshots(enabled); });
 #endif
 
-#ifndef Q_OS_ANDROID
     m_notificationHandler.reset(NotificationHandler::create(nullptr));
 
     connect(m_vpnConnection.get(), &VpnConnection::connectionStateChanged, m_notificationHandler.get(),
             &NotificationHandler::setConnectionState);
 
-    connect(m_notificationHandler.get(), &NotificationHandler::raiseRequested, m_pageController.get(), &PageController::raiseMainWindow);
+    connect(m_notificationHandler.get(), &NotificationHandler::raiseRequested, m_pageController.get(),
+            &PageController::raiseMainWindow);
     connect(m_notificationHandler.get(), &NotificationHandler::connectRequested, m_connectionController.get(),
-            static_cast<void (ConnectionController::*)()>(&ConnectionController::openConnection));
+            &ConnectionController::openConnection);
     connect(m_notificationHandler.get(), &NotificationHandler::disconnectRequested, m_connectionController.get(),
             &ConnectionController::closeConnection);
-    connect(this, &AmneziaApplication::translationsUpdated, m_notificationHandler.get(), &NotificationHandler::onTranslationsUpdated);
-#endif
+    connect(this, &AmneziaApplication::translationsUpdated, m_notificationHandler.get(),
+            &NotificationHandler::onTranslationsUpdated);
 
-    m_engine->addImportPath("qrc:/ui/qml/Modules/");
     m_engine->load(url);
     m_systemController->setQmlRoot(m_engine->rootObjects().value(0));
 
@@ -229,8 +214,7 @@ void AmneziaApplication::registerTypes()
     qmlRegisterSingletonType(QUrl("qrc:/ui/qml/Filters/ContainersModelFilters.qml"), "ContainersModelFilters", 1, 0,
                              "ContainersModelFilters");
 
-    qmlRegisterType<InstalledAppsModel>("InstalledAppsModel", 1, 0, "InstalledAppsModel");
-
+    //
     Vpn::declareQmlVpnConnectionStateEnum();
     PageLoader::declareQmlPageEnum();
 }
@@ -302,15 +286,10 @@ void AmneziaApplication::initModels()
     m_containersModel.reset(new ContainersModel(this));
     m_engine->rootContext()->setContextProperty("ContainersModel", m_containersModel.get());
 
-    m_defaultServerContainersModel.reset(new ContainersModel(this));
-    m_engine->rootContext()->setContextProperty("DefaultServerContainersModel", m_defaultServerContainersModel.get());
-
     m_serversModel.reset(new ServersModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("ServersModel", m_serversModel.get());
-    connect(m_serversModel.get(), &ServersModel::containersUpdated, m_containersModel.get(), &ContainersModel::updateModel);
-    connect(m_serversModel.get(), &ServersModel::defaultServerContainersUpdated, m_defaultServerContainersModel.get(),
+    connect(m_serversModel.get(), &ServersModel::containersUpdated, m_containersModel.get(),
             &ContainersModel::updateModel);
-    m_serversModel->resetModel();
 
     m_languageModel.reset(new LanguageModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("LanguageModel", m_languageModel.get());
@@ -320,9 +299,6 @@ void AmneziaApplication::initModels()
     m_sitesModel.reset(new SitesModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("SitesModel", m_sitesModel.get());
 
-    m_appSplitTunnelingModel.reset(new AppSplitTunnelingModel(m_settings, this));
-    m_engine->rootContext()->setContextProperty("AppSplitTunnelingModel", m_appSplitTunnelingModel.get());
-
     m_protocolsModel.reset(new ProtocolsModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("ProtocolsModel", m_protocolsModel.get());
 
@@ -341,9 +317,6 @@ void AmneziaApplication::initModels()
     m_awgConfigModel.reset(new AwgConfigModel(this));
     m_engine->rootContext()->setContextProperty("AwgConfigModel", m_awgConfigModel.get());
 
-    m_xrayConfigModel.reset(new XrayConfigModel(this));
-    m_engine->rootContext()->setContextProperty("XrayConfigModel", m_xrayConfigModel.get());
-
 #ifdef Q_OS_WINDOWS
     m_ikev2ConfigModel.reset(new Ikev2ConfigModel(this));
     m_engine->rootContext()->setContextProperty("Ikev2ConfigModel", m_ikev2ConfigModel.get());
@@ -352,40 +325,32 @@ void AmneziaApplication::initModels()
     m_sftpConfigModel.reset(new SftpConfigModel(this));
     m_engine->rootContext()->setContextProperty("SftpConfigModel", m_sftpConfigModel.get());
 
-    m_socks5ConfigModel.reset(new Socks5ProxyConfigModel(this));
-    m_engine->rootContext()->setContextProperty("Socks5ProxyConfigModel", m_socks5ConfigModel.get());
-
     m_clientManagementModel.reset(new ClientManagementModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("ClientManagementModel", m_clientManagementModel.get());
     connect(m_clientManagementModel.get(), &ClientManagementModel::adminConfigRevoked, m_serversModel.get(),
             &ServersModel::clearCachedProfile);
+
+    connect(m_configurator.get(), &VpnConfigurator::newVpnConfigCreated, this,
+            [this](const QString &clientId, const QString &clientName, const DockerContainer container,
+                   ServerCredentials credentials) {
+                m_serversModel->reloadContainerConfig();
+                m_clientManagementModel->appendClient(clientId, clientName, container, credentials);
+                emit m_configurator->clientModelUpdated();
+            });
 }
 
 void AmneziaApplication::initControllers()
 {
-    m_connectionController.reset(
-            new ConnectionController(m_serversModel, m_containersModel, m_clientManagementModel, m_vpnConnection, m_settings));
+    m_connectionController.reset(new ConnectionController(m_serversModel, m_containersModel, m_vpnConnection));
     m_engine->rootContext()->setContextProperty("ConnectionController", m_connectionController.get());
 
-    connect(m_connectionController.get(), qOverload<const QString &>(&ConnectionController::connectionErrorOccurred), this, [this](const QString &errorMessage) {
-        emit m_pageController->showErrorMessage(errorMessage);
-        emit m_vpnConnection->connectionStateChanged(Vpn::ConnectionState::Disconnected);
-    });
-
-    connect(m_connectionController.get(), qOverload<ErrorCode>(&ConnectionController::connectionErrorOccurred), this, [this](ErrorCode errorCode) {
-      emit m_pageController->showErrorMessage(errorCode);
-      emit m_vpnConnection->connectionStateChanged(Vpn::ConnectionState::Disconnected);
-    });
-
-    connect(m_connectionController.get(), &ConnectionController::connectButtonClicked, m_connectionController.get(),
-            &ConnectionController::toggleConnection, Qt::QueuedConnection);
-
-    connect(this, &AmneziaApplication::translationsUpdated, m_connectionController.get(), &ConnectionController::onTranslationsUpdated);
+    connect(this, &AmneziaApplication::translationsUpdated, m_connectionController.get(),
+            &ConnectionController::onTranslationsUpdated);
 
     m_pageController.reset(new PageController(m_serversModel, m_settings));
     m_engine->rootContext()->setContextProperty("PageController", m_pageController.get());
 
-    m_installController.reset(new InstallController(m_serversModel, m_containersModel, m_protocolsModel, m_clientManagementModel, m_settings));
+    m_installController.reset(new InstallController(m_serversModel, m_containersModel, m_protocolsModel, m_settings));
     m_engine->rootContext()->setContextProperty("InstallController", m_installController.get());
     connect(m_installController.get(), &InstallController::passphraseRequestStarted, m_pageController.get(),
             &PageController::showPassphraseRequestDrawer);
@@ -397,23 +362,30 @@ void AmneziaApplication::initControllers()
     m_importController.reset(new ImportController(m_serversModel, m_containersModel, m_settings));
     m_engine->rootContext()->setContextProperty("ImportController", m_importController.get());
 
-    m_exportController.reset(new ExportController(m_serversModel, m_containersModel, m_clientManagementModel, m_settings));
+    m_exportController.reset(new ExportController(m_serversModel, m_containersModel, m_clientManagementModel,
+                                                  m_settings, m_configurator));
     m_engine->rootContext()->setContextProperty("ExportController", m_exportController.get());
 
     m_settingsController.reset(
-            new SettingsController(m_serversModel, m_containersModel, m_languageModel, m_sitesModel, m_appSplitTunnelingModel, m_settings));
+            new SettingsController(m_serversModel, m_containersModel, m_languageModel, m_sitesModel, m_settings));
     m_engine->rootContext()->setContextProperty("SettingsController", m_settingsController.get());
     if (m_settingsController->isAutoConnectEnabled() && m_serversModel->getDefaultServerIndex() >= 0) {
         QTimer::singleShot(1000, this, [this]() { m_connectionController->openConnection(); });
     }
-    connect(m_settingsController.get(), &SettingsController::amneziaDnsToggled, m_serversModel.get(), &ServersModel::toggleAmneziaDns);
+    connect(m_settingsController.get(), &SettingsController::amneziaDnsToggled, m_serversModel.get(),
+            &ServersModel::toggleAmneziaDns);
 
     m_sitesController.reset(new SitesController(m_settings, m_vpnConnection, m_sitesModel));
     m_engine->rootContext()->setContextProperty("SitesController", m_sitesController.get());
 
-    m_appSplitTunnelingController.reset(new AppSplitTunnelingController(m_settings, m_appSplitTunnelingModel));
-    m_engine->rootContext()->setContextProperty("AppSplitTunnelingController", m_appSplitTunnelingController.get());
-
     m_systemController.reset(new SystemController(m_settings));
     m_engine->rootContext()->setContextProperty("SystemController", m_systemController.get());
+
+    m_apiController.reset(new ApiController(m_serversModel, m_containersModel));
+    m_engine->rootContext()->setContextProperty("ApiController", m_apiController.get());
+    connect(m_apiController.get(), &ApiController::updateStarted, this,
+            [this]() { emit m_vpnConnection->connectionStateChanged(Vpn::ConnectionState::Connecting); });
+    connect(m_apiController.get(), &ApiController::errorOccurred, this,
+            [this]() { emit m_vpnConnection->connectionStateChanged(Vpn::ConnectionState::Disconnected); });
+    connect(m_apiController.get(), &ApiController::updateFinished, m_connectionController.get(), &ConnectionController::toggleConnection);
 }

client/amnezia_application.h

@@ -2,7 +2,6 @@
 #define AMNEZIA_APPLICATION_H
 
 #include <QCommandLineParser>
-#include <QNetworkAccessManager>
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
 #include <QThread>
@@ -15,6 +14,8 @@
 #include "settings.h"
 #include "vpnconnection.h"
 
+#include "configurators/vpn_configurator.h"
+
 #include "ui/controllers/connectionController.h"
 #include "ui/controllers/exportController.h"
 #include "ui/controllers/importController.h"
@@ -23,13 +24,11 @@
 #include "ui/controllers/settingsController.h"
 #include "ui/controllers/sitesController.h"
 #include "ui/controllers/systemController.h"
-#include "ui/controllers/appSplitTunnelingController.h"
+#include "ui/controllers/apiController.h"
 #include "ui/models/containers_model.h"
 #include "ui/models/languageModel.h"
 #include "ui/models/protocols/cloakConfigModel.h"
-#ifndef Q_OS_ANDROID
-    #include "ui/notificationhandler.h"
-#endif
+#include "ui/notificationhandler.h"
 #ifdef Q_OS_WINDOWS
     #include "ui/models/protocols/ikev2ConfigModel.h"
 #endif
@@ -37,14 +36,11 @@
 #include "ui/models/protocols/openvpnConfigModel.h"
 #include "ui/models/protocols/shadowsocksConfigModel.h"
 #include "ui/models/protocols/wireguardConfigModel.h"
-#include "ui/models/protocols/xrayConfigModel.h"
 #include "ui/models/protocols_model.h"
 #include "ui/models/servers_model.h"
 #include "ui/models/services/sftpConfigModel.h"
-#include "ui/models/services/socks5ProxyConfigModel.h"
 #include "ui/models/sites_model.h"
 #include "ui/models/clientManagementModel.h"
-#include "ui/models/appSplitTunnelingModel.h"
 
 #define amnApp (static_cast<AmneziaApplication *>(QCoreApplication::instance()))
 
@@ -77,7 +73,6 @@ public:
     bool parseCommands();
 
     QQmlApplicationEngine *qmlEngine() const;
-    QNetworkAccessManager *manager() { return m_nam; }
 
 signals:
     void translationsUpdated();
@@ -88,6 +83,7 @@ private:
 
     QQmlApplicationEngine *m_engine {};
     std::shared_ptr<Settings> m_settings;
+    std::shared_ptr<VpnConfigurator> m_configurator;
 
     QSharedPointer<ContainerProps> m_containerProps;
     QSharedPointer<ProtocolProps> m_protocolProps;
@@ -96,18 +92,15 @@ private:
     QCommandLineParser m_parser;
 
     QSharedPointer<ContainersModel> m_containersModel;
-    QSharedPointer<ContainersModel> m_defaultServerContainersModel;
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<LanguageModel> m_languageModel;
     QSharedPointer<ProtocolsModel> m_protocolsModel;
     QSharedPointer<SitesModel> m_sitesModel;
-    QSharedPointer<AppSplitTunnelingModel> m_appSplitTunnelingModel;
     QSharedPointer<ClientManagementModel> m_clientManagementModel;
 
     QScopedPointer<OpenVpnConfigModel> m_openVpnConfigModel;
     QScopedPointer<ShadowSocksConfigModel> m_shadowSocksConfigModel;
     QScopedPointer<CloakConfigModel> m_cloakConfigModel;
-    QScopedPointer<XrayConfigModel> m_xrayConfigModel;    
     QScopedPointer<WireGuardConfigModel> m_wireGuardConfigModel;
     QScopedPointer<AwgConfigModel> m_awgConfigModel;
 #ifdef Q_OS_WINDOWS
@@ -115,13 +108,10 @@ private:
 #endif
 
     QScopedPointer<SftpConfigModel> m_sftpConfigModel;
-    QScopedPointer<Socks5ProxyConfigModel> m_socks5ConfigModel;
 
     QSharedPointer<VpnConnection> m_vpnConnection;
     QThread m_vpnConnectionThread;
-#ifndef Q_OS_ANDROID
     QScopedPointer<NotificationHandler> m_notificationHandler;
-#endif
 
     QScopedPointer<ConnectionController> m_connectionController;
     QScopedPointer<PageController> m_pageController;
@@ -131,9 +121,7 @@ private:
     QScopedPointer<SettingsController> m_settingsController;
     QScopedPointer<SitesController> m_sitesController;
     QScopedPointer<SystemController> m_systemController;
-    QScopedPointer<AppSplitTunnelingController> m_appSplitTunnelingController;
-
-    QNetworkAccessManager *m_nam;
+    QScopedPointer<ApiController> m_apiController;
 };
 
 #endif // AMNEZIA_APPLICATION_H

client/android/AndroidManifest.xml

@@ -22,9 +22,11 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="28" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" tools:ignore="QueryAllPackagesPermission" />
+
+    <!-- Enable when VPN-per-app mode will be implemented -->
+    <!-- <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/> -->
 
     <application
         android:name=".AmneziaApplication"
@@ -54,10 +56,6 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
 
-            <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
-            </intent-filter>
-
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="-- %%INSERT_APP_LIB_NAME%% --" />
@@ -136,58 +134,17 @@
         </activity>
 
         <service
-            android:name=".AwgService"
-            android:process=":amneziaAwgService"
+            android:name=".AmneziaVpnService"
+            android:process=":amneziaVpnService"
             android:permission="android.permission.BIND_VPN_SERVICE"
-            android:foregroundServiceType="systemExempted"
-            android:exported="false"
-            tools:ignore="ForegroundServicePermission">
+            android:foregroundServiceType="specialUse"
+            android:exported="false">
 
             <intent-filter>
                 <action android:name="android.net.VpnService" />
             </intent-filter>
-        </service>
 
-        <service
-            android:name=".OpenVpnService"
-            android:process=":amneziaOpenVpnService"
-            android:permission="android.permission.BIND_VPN_SERVICE"
-            android:foregroundServiceType="systemExempted"
-            android:exported="false"
-            tools:ignore="ForegroundServicePermission">
-
-            <intent-filter>
-                <action android:name="android.net.VpnService" />
-            </intent-filter>
-        </service>
-
-        <service
-            android:name=".XrayService"
-            android:process=":amneziaXrayService"
-            android:permission="android.permission.BIND_VPN_SERVICE"
-            android:foregroundServiceType="systemExempted"
-            android:exported="false"
-            tools:ignore="ForegroundServicePermission">
-
-            <intent-filter>
-                <action android:name="android.net.VpnService" />
-            </intent-filter>
-        </service>
-
-        <service
-            android:name=".AmneziaTileService"
-            android:process=":amneziaTileService"
-            android:icon="@drawable/ic_amnezia_round"
-            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
-            android:exported="true">
-
-            <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.service.quicksettings.TOGGLEABLE_TILE"
-                android:value="true" />
+            <property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE" android:value="vpn" />
         </service>
 
         <provider

client/android/awg/src/main/kotlin/Awg.kt

@@ -64,9 +64,8 @@ class Awg : Wireguard() {
         val configDataJson = config.getJSONObject("awg_config_data")
         val configData = parseConfigData(configDataJson.getString("config"))
         return AwgConfig.build {
-            configWireguard(configData, configDataJson)
+            configWireguard(configData)
             configSplitTunneling(config)
-            configAppSplitTunneling(config)
             configData["Jc"]?.let { setJc(it.toInt()) }
             configData["Jmin"]?.let { setJmin(it.toInt()) }
             configData["Jmax"]?.let { setJmax(it.toInt()) }

client/android/build.gradle.kts

@@ -3,7 +3,6 @@ import com.android.build.gradle.internal.api.BaseVariantOutputImpl
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.kotlin.serialization)
     id("property-delegate")
 }
 
@@ -69,12 +68,6 @@ android {
             }
             signingConfig = signingConfigs["release"]
         }
-
-        create("fdroid") {
-            initWith(getByName("release"))
-            signingConfig = null
-            matchingFallbacks += "release"
-        }
     }
 
     splits {
@@ -105,6 +98,7 @@ android {
 }
 
 dependencies {
+    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar", "*.aar"))))
     implementation(project(":qt"))
     implementation(project(":utils"))
     implementation(project(":protocolApi"))
@@ -112,12 +106,9 @@ dependencies {
     implementation(project(":awg"))
     implementation(project(":openvpn"))
     implementation(project(":cloak"))
-    implementation(project(":xray"))
     implementation(libs.androidx.core)
     implementation(libs.androidx.activity)
     implementation(libs.kotlinx.coroutines)
-    implementation(libs.kotlinx.serialization.protobuf)
     implementation(libs.bundles.androidx.camera)
     implementation(libs.google.mlkit)
-    implementation(libs.androidx.datastore)
 }

client/android/cloak/src/main/kotlin/Cloak.kt

@@ -3,6 +3,9 @@ package org.amnezia.vpn.protocol.cloak
 import android.util.Base64
 import net.openvpn.ovpn3.ClientAPI_Config
 import org.amnezia.vpn.protocol.openvpn.OpenVpn
+import org.amnezia.vpn.protocol.openvpn.OpenVpnConfig
+import org.amnezia.vpn.util.net.InetNetwork
+import org.amnezia.vpn.util.net.parseInetAddress
 import org.json.JSONObject
 
 /**
@@ -51,6 +54,13 @@ class Cloak : OpenVpn() {
         return openVpnConfig
     }
 
+    override fun configPluggableTransport(configBuilder: OpenVpnConfig.Builder, config: JSONObject) {
+        // exclude remote server ip from vpn routes
+        val remoteServer = config.getString("hostName")
+        val remoteServerAddress = InetNetwork(parseInetAddress(remoteServer))
+        configBuilder.excludeRoute(remoteServerAddress)
+    }
+
     private fun checkCloakJson(cloakConfigJson: JSONObject): JSONObject {
         cloakConfigJson.put("NumConn", 1)
         cloakConfigJson.put("ProxyMethod", "openvpn")

client/android/gradle/libs.versions.toml

@@ -6,9 +6,7 @@ androidx-activity = "1.8.1"
 androidx-annotation = "1.7.0"
 androidx-camera = "1.3.0"
 androidx-security-crypto = "1.1.0-alpha06"
-androidx-datastore = "1.1.0-beta01"
 kotlinx-coroutines = "1.7.3"
-kotlinx-serialization = "1.6.3"
 google-mlkit = "17.2.0"
 
 [libraries]
@@ -20,9 +18,7 @@ androidx-camera-camera2 = { module = "androidx.camera:camera-camera2", version.r
 androidx-camera-lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "androidx-camera" }
 androidx-camera-view = { module = "androidx.camera:camera-view", version.ref = "androidx-camera" }
 androidx-security-crypto = { module = "androidx.security:security-crypto-ktx", version.ref = "androidx-security-crypto" }
-androidx-datastore = { module = "androidx.datastore:datastore-preferences", version.ref = "androidx-datastore" }
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" }
-kotlinx-serialization-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf", version.ref = "kotlinx-serialization" }
 google-mlkit = { module = "com.google.mlkit:barcode-scanning", version.ref = "google-mlkit" }
 
 [bundles]
@@ -37,4 +33,3 @@ androidx-camera = [
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin"}

client/android/openvpn/src/main/kotlin/org/amnezia/vpn/protocol/openvpn/OpenVpn.kt

@@ -1,19 +1,19 @@
 package org.amnezia.vpn.protocol.openvpn
 
+import android.content.Context
 import android.net.VpnService.Builder
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 import net.openvpn.ovpn3.ClientAPI_Config
 import org.amnezia.vpn.protocol.BadConfigException
 import org.amnezia.vpn.protocol.Protocol
+import org.amnezia.vpn.protocol.ProtocolState
 import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTED
 import org.amnezia.vpn.protocol.Statistics
 import org.amnezia.vpn.protocol.VpnStartException
-import org.amnezia.vpn.util.net.InetNetwork
 import org.amnezia.vpn.util.net.getLocalNetworks
-import org.amnezia.vpn.util.net.parseInetAddress
 import org.json.JSONObject
 
 /**
@@ -35,6 +35,7 @@ import org.json.JSONObject
 
 open class OpenVpn : Protocol() {
 
+    private lateinit var context: Context
     private var openVpnClient: OpenVpnClient? = null
     private lateinit var scope: CoroutineScope
 
@@ -50,11 +51,10 @@ open class OpenVpn : Protocol() {
             return Statistics.EMPTY_STATISTICS
         }
 
-    override fun internalInit() {
-        if (!isInitialized) loadSharedLibrary(context, "ovpn3")
-        if (this::scope.isInitialized) {
-            scope.cancel()
-        }
+    override fun initialize(context: Context, state: MutableStateFlow<ProtocolState>, onError: (String) -> Unit) {
+        super.initialize(context, state, onError)
+        loadSharedLibrary(context, "ovpn3")
+        this.context = context
         scope = CoroutineScope(Dispatchers.IO)
     }
 
@@ -77,15 +77,8 @@ open class OpenVpn : Protocol() {
                 if (evalConfig.error) {
                     throw BadConfigException("OpenVPN config parse error: ${evalConfig.message}")
                 }
-
-                // exclude remote server ip from vpn routes
-                val remoteServer = config.getString("hostName")
-                val remoteServerAddress = InetNetwork(parseInetAddress(remoteServer))
-                configBuilder.excludeRoute(remoteServerAddress)
-
                 configPluggableTransport(configBuilder, config)
                 configBuilder.configSplitTunneling(config)
-                configBuilder.configAppSplitTunneling(config)
 
                 scope.launch {
                     val status = client.connect()

client/android/protocolApi/src/main/kotlin/Protocol.kt

@@ -27,21 +27,14 @@ private const val SPLIT_TUNNEL_EXCLUDE = 2
 abstract class Protocol {
 
     abstract val statistics: Statistics
-    protected lateinit var context: Context
     protected lateinit var state: MutableStateFlow<ProtocolState>
     protected lateinit var onError: (String) -> Unit
-    protected var isInitialized: Boolean = false
 
-    fun initialize(context: Context, state: MutableStateFlow<ProtocolState>, onError: (String) -> Unit) {
-        this.context = context
+    open fun initialize(context: Context, state: MutableStateFlow<ProtocolState>, onError: (String) -> Unit) {
         this.state = state
         this.onError = onError
-        internalInit()
-        isInitialized = true
     }
 
-    protected abstract fun internalInit()
-
     abstract fun startVpn(config: JSONObject, vpnBuilder: Builder, protect: (Int) -> Boolean)
 
     abstract fun stopVpn()
@@ -71,22 +64,6 @@ abstract class Protocol {
         }
     }
 
-    protected fun ProtocolConfig.Builder.configAppSplitTunneling(config: JSONObject) {
-        val splitTunnelType = config.optInt("appSplitTunnelType")
-        if (splitTunnelType == SPLIT_TUNNEL_DISABLE) return
-        val splitTunnelApps = config.getJSONArray("splitTunnelApps")
-        val appHandlerFunc = when (splitTunnelType) {
-            SPLIT_TUNNEL_INCLUDE -> ::includeApplication
-            SPLIT_TUNNEL_EXCLUDE -> ::excludeApplication
-
-            else -> throw BadConfigException("Unexpected value of the 'appSplitTunnelType' parameter: $splitTunnelType")
-        }
-
-        for (i in 0 until splitTunnelApps.length()) {
-            appHandlerFunc(splitTunnelApps.getString(i))
-        }
-    }
-
     protected open fun buildVpnInterface(config: ProtocolConfig, vpnBuilder: Builder) {
         vpnBuilder.setSession(VPN_SESSION_NAME)
 
@@ -112,27 +89,20 @@ abstract class Protocol {
             vpnBuilder.addSearchDomain(it)
         }
 
-        for ((inetNetwork, include) in config.routes) {
-            if (include) {
-                Log.d(TAG, "addRoute: $inetNetwork")
-                vpnBuilder.addRoute(inetNetwork)
-            } else {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                    Log.d(TAG, "excludeRoute: $inetNetwork")
-                    vpnBuilder.excludeRoute(inetNetwork)
-                } else {
-                    Log.e(TAG, "Trying to exclude route $inetNetwork on old Android")
-                }
+        for (addr in config.routes) {
+            Log.d(TAG, "addRoute: $addr")
+            vpnBuilder.addRoute(addr)
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            for (addr in config.excludedRoutes) {
+                Log.d(TAG, "excludeRoute: $addr")
+                vpnBuilder.excludeRoute(addr)
             }
         }
 
-        for (app in config.includedApplications) {
-            Log.d(TAG, "addAllowedApplication")
-            vpnBuilder.addAllowedApplication(app)
-        }
-
         for (app in config.excludedApplications) {
-            Log.d(TAG, "addDisallowedApplication")
+            Log.d(TAG, "addDisallowedApplication: $app")
             vpnBuilder.addDisallowedApplication(app)
         }
 

client/android/protocolApi/src/main/kotlin/ProtocolConfig.kt

@@ -12,10 +12,10 @@ open class ProtocolConfig protected constructor(
     val addresses: Set<InetNetwork>,
     val dnsServers: Set<InetAddress>,
     val searchDomain: String?,
-    val routes: Set<Route>,
+    val routes: Set<InetNetwork>,
+    val excludedRoutes: Set<InetNetwork>,
     val includedAddresses: Set<InetNetwork>,
     val excludedAddresses: Set<InetNetwork>,
-    val includedApplications: Set<String>,
     val excludedApplications: Set<String>,
     val httpProxy: ProxyInfo?,
     val allowAllAF: Boolean,
@@ -28,9 +28,9 @@ open class ProtocolConfig protected constructor(
         builder.dnsServers,
         builder.searchDomain,
         builder.routes,
+        builder.excludedRoutes,
         builder.includedAddresses,
         builder.excludedAddresses,
-        builder.includedApplications,
         builder.excludedApplications,
         builder.httpProxy,
         builder.allowAllAF,
@@ -41,10 +41,10 @@ open class ProtocolConfig protected constructor(
     open class Builder(blockingMode: Boolean) {
         internal val addresses: MutableSet<InetNetwork> = hashSetOf()
         internal val dnsServers: MutableSet<InetAddress> = hashSetOf()
-        internal val routes: MutableSet<Route> = mutableSetOf()
+        internal val routes: MutableSet<InetNetwork> = hashSetOf()
+        internal val excludedRoutes: MutableSet<InetNetwork> = hashSetOf()
         internal val includedAddresses: MutableSet<InetNetwork> = hashSetOf()
         internal val excludedAddresses: MutableSet<InetNetwork> = hashSetOf()
-        internal val includedApplications: MutableSet<String> = hashSetOf()
         internal val excludedApplications: MutableSet<String> = hashSetOf()
 
         internal var searchDomain: String? = null
@@ -74,21 +74,13 @@ open class ProtocolConfig protected constructor(
 
         fun setSearchDomain(domain: String) = apply { this.searchDomain = domain }
 
-        fun addRoute(route: InetNetwork) = apply { this.routes += Route(route, true) }
-        fun addRoutes(routes: Collection<InetNetwork>) = apply { this.routes += routes.map { Route(it, true) } }
-
-        fun excludeRoute(route: InetNetwork) = apply { this.routes += Route(route, false) }
-        fun excludeRoutes(routes: Collection<InetNetwork>) = apply { this.routes += routes.map { Route(it, false) } }
-
-        fun removeRoute(route: InetNetwork) = apply { this.routes.removeIf { it.inetNetwork == route } }
+        fun addRoute(route: InetNetwork) = apply { this.routes += route }
+        fun addRoutes(routes: Collection<InetNetwork>) = apply { this.routes += routes }
+        fun removeRoute(route: InetNetwork) = apply { this.routes.remove(route) }
         fun clearRoutes() = apply { this.routes.clear() }
 
-        fun prependRoutes(block: Builder.() -> Unit) = apply {
-            val savedRoutes = mutableListOf<Route>().apply { addAll(routes) }
-            routes.clear()
-            block()
-            routes.addAll(savedRoutes)
-        }
+        fun excludeRoute(route: InetNetwork) = apply { this.excludedRoutes += route }
+        fun excludeRoutes(routes: Collection<InetNetwork>) = apply { this.excludedRoutes += routes }
 
         fun includeAddress(addr: InetNetwork) = apply { this.includedAddresses += addr }
         fun includeAddresses(addresses: Collection<InetNetwork>) = apply { this.includedAddresses += addresses }
@@ -96,9 +88,6 @@ open class ProtocolConfig protected constructor(
         fun excludeAddress(addr: InetNetwork) = apply { this.excludedAddresses += addr }
         fun excludeAddresses(addresses: Collection<InetNetwork>) = apply { this.excludedAddresses += addresses }
 
-        fun includeApplication(application: String) = apply { this.includedApplications += application }
-        fun includeApplications(applications: Collection<String>) = apply { this.includedApplications += applications }
-
         fun excludeApplication(application: String) = apply { this.excludedApplications += application }
         fun excludeApplications(applications: Collection<String>) = apply { this.excludedApplications += applications }
 
@@ -122,46 +111,37 @@ open class ProtocolConfig protected constructor(
                 // remove default routes, if any
                 removeRoute(InetNetwork("0.0.0.0", 0))
                 removeRoute(InetNetwork("::", 0))
-                removeRoute(InetNetwork("2000::", 3))
-                prependRoutes {
-                    addRoutes(includedAddresses)
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+                    // for older versions of Android, add the default route to the excluded routes
+                    // to correctly build the excluded subnets list later
+                    excludeRoute(InetNetwork("0.0.0.0", 0))
                 }
+                addRoutes(includedAddresses)
             } else if (excludedAddresses.isNotEmpty()) {
-                prependRoutes {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    // default routes are required for split tunneling in newer versions of Android
                     addRoute(InetNetwork("0.0.0.0", 0))
-                    addRoute(InetNetwork("2000::", 3))
-                    excludeRoutes(excludedAddresses)
+                    addRoute(InetNetwork("::", 0))
                 }
+                excludeRoutes(excludedAddresses)
             }
         }
 
-        private fun processRoutes() {
-            // replace ::/0 as it may cause LAN connection issues
-            val ipv6DefaultRoute = InetNetwork("::", 0)
-            if (routes.removeIf { it.include && it.inetNetwork == ipv6DefaultRoute }) {
-                prependRoutes {
-                    addRoute(InetNetwork("2000::", 3))
-                }
-            }
-            // for older versions of Android, build a list of subnets without excluded routes
-            // and add them to routes
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU && routes.any { !it.include }) {
+        private fun processExcludedRoutes() {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU && excludedRoutes.isNotEmpty()) {
+                // todo: rewrite, taking into account the current routes
+                // for older versions of Android, build a list of subnets without excluded routes
+                // and add them to routes
                 val ipRangeSet = IpRangeSet()
-                routes.forEach {
-                    if (it.include) ipRangeSet.add(IpRange(it.inetNetwork))
-                    else ipRangeSet.remove(IpRange(it.inetNetwork))
-                }
                 ipRangeSet.remove(IpRange("127.0.0.0", 8))
-                ipRangeSet.remove(IpRange("::1", 128))
-                routes.clear()
+                excludedRoutes.forEach {
+                    ipRangeSet.remove(IpRange(it))
+                }
+                // remove default routes, if any
+                removeRoute(InetNetwork("0.0.0.0", 0))
+                removeRoute(InetNetwork("::", 0))
                 ipRangeSet.subnets().forEach(::addRoute)
-            }
-            // filter ipv4 and ipv6 loopback addresses
-            val ipv6Loopback = InetNetwork("::1", 128)
-            routes.removeIf {
-                it.include &&
-                    if (it.inetNetwork.isIpv4) it.inetNetwork.address.address[0] == 127.toByte()
-                    else it.inetNetwork == ipv6Loopback
+                addRoute(InetNetwork("2000::", 3))
             }
         }
 
@@ -179,7 +159,7 @@ open class ProtocolConfig protected constructor(
 
         protected fun configBuild() {
             processSplitTunneling()
-            processRoutes()
+            processExcludedRoutes()
             validate()
         }
 
@@ -191,5 +171,3 @@ open class ProtocolConfig protected constructor(
             Builder(blockingMode).apply(block).build()
     }
 }
-
-data class Route(val inetNetwork: InetNetwork, val include: Boolean)

client/android/protocolApi/src/main/kotlin/ProtocolState.kt

@@ -2,9 +2,9 @@ package org.amnezia.vpn.protocol
 
 // keep synchronized with client/platforms/android/android_controller.h ConnectionState
 enum class ProtocolState {
-    DISCONNECTED,
     CONNECTED,
     CONNECTING,
+    DISCONNECTED,
     DISCONNECTING,
     RECONNECTING,
     UNKNOWN

client/android/protocolApi/src/main/kotlin/Status.kt

@@ -28,10 +28,6 @@ fun Bundle.putStatus(status: Status) {
     putInt(STATE_KEY, status.state.ordinal)
 }
 
-fun Bundle.putStatus(state: ProtocolState) {
-    putInt(STATE_KEY, state.ordinal)
-}
-
 fun Bundle.getStatus(): Status =
     Status.build {
         setState(ProtocolState.entries[getInt(STATE_KEY)])

client/android/qt/build.gradle.kts

@@ -21,5 +21,5 @@ android {
 }
 
 dependencies {
-    implementation(fileTree(mapOf("dir" to "../libs", "include" to listOf("*.jar"))))
+    implementation(fileTree(mapOf("dir" to "../libs", "include" to listOf("*.jar", "*.aar"))))
 }

client/android/res/values-ru/strings.xml

@@ -1,26 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="disconnected">Не подключено</string>
-    <string name="connected">Подключено</string>
-    <string name="connecting">Подключение…</string>
-    <string name="disconnecting">Отключение…</string>
-    <string name="reconnecting">Переподключение…</string>
-    <string name="connect">Подключиться</string>
-    <string name="disconnect">Отключиться</string>
-    <string name="ok">ОК</string>
-    <string name="cancel">Отмена</string>
-    <string name="yes">Да</string>
-    <string name="no">Нет</string>
-
-    <string name="vpnGranted">VPN-подключение разрешено</string>
-    <string name="vpnSetupFailed">Ошибка настройки VPN</string>
-    <string name="vpnSetupFailedMessage">Чтобы подключиться к AmneziaVPN необходимо:\n\n- Разрешить приложению подключаться к сети VPN\n- Отключить функцию \"Постоянная VPN\" для всех остальных VPN-приложений в системных настройках VPN</string>
-    <string name="openVpnSettings">Открыть настройки VPN</string>
-
-    <string name="notificationChannelDescription">Уведомления сервиса AmneziaVPN</string>
-    <string name="notificationDialogTitle">Сервис AmneziaVPN</string>
-    <string name="notificationDialogMessage">Показывать статус VPN в строке состояния?</string>
-    <string name="notificationSettingsDialogTitle">Настройки уведомлений</string>
-    <string name="notificationSettingsDialogMessage">Для показа уведомлений необходимо включить уведомления в системных настройках</string>
-    <string name="openNotificationSettings">Открыть настройки уведомлений</string>
-</resources>

client/android/res/values/strings.xml

@@ -1,26 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="disconnected">Not connected</string>
-    <string name="connected">Connected</string>
-    <string name="connecting">Connecting…</string>
-    <string name="disconnecting">Disconnecting…</string>
-    <string name="reconnecting">Reconnecting…</string>
-    <string name="connect">Connect</string>
-    <string name="disconnect">Disconnect</string>
-    <string name="ok">OK</string>
-    <string name="cancel">Cancel</string>
-    <string name="yes">Yes</string>
-    <string name="no">No</string>
-
-    <string name="vpnGranted">VPN permission granted</string>
-    <string name="vpnSetupFailed">VPN setup error</string>
-    <string name="vpnSetupFailedMessage">To connect to AmneziaVPN, please do the following:\n\n- Allow the app to set up a VPN connection\n- Disable Always-on VPN for any other VPN app in the VPN system settings</string>
-    <string name="openVpnSettings">Open VPN settings</string>
-
-    <string name="notificationChannelDescription">AmneziaVPN service notification</string>
-    <string name="notificationDialogTitle">AmneziaVPN service</string>
-    <string name="notificationDialogMessage">Show the VPN state in the status bar?</string>
-    <string name="notificationSettingsDialogTitle">Notification settings</string>
-    <string name="notificationSettingsDialogMessage">To show notifications, you must enable notifications in the system settings</string>
-    <string name="openNotificationSettings">Open notification settings</string>
-</resources>

client/android/settings.gradle.kts

@@ -36,8 +36,6 @@ include(":wireguard")
 include(":awg")
 include(":openvpn")
 include(":cloak")
-include(":xray")
-include(":xray:libXray")
 
 // get values from gradle or local properties
 val androidBuildToolsVersion: String by gradleProperties

client/android/src/org/amnezia/vpn/AmneziaActivity.kt

@@ -1,76 +1,56 @@
 package org.amnezia.vpn
 
-import android.Manifest
-import android.app.AlertDialog
-import android.app.NotificationManager
-import android.content.BroadcastReceiver
 import android.content.ComponentName
 import android.content.Intent
 import android.content.Intent.EXTRA_MIME_TYPES
 import android.content.Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY
 import android.content.ServiceConnection
 import android.content.pm.PackageManager
-import android.graphics.Bitmap
+import android.net.Uri
 import android.net.VpnService
-import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.IBinder
 import android.os.Looper
 import android.os.Message
 import android.os.Messenger
-import android.provider.Settings
-import android.view.WindowManager.LayoutParams
 import android.webkit.MimeTypeMap
 import android.widget.Toast
 import androidx.annotation.MainThread
-import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat
 import java.io.IOException
 import kotlin.LazyThreadSafetyMode.NONE
 import kotlin.text.RegexOption.IGNORE_CASE
-import AppListProvider
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.async
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.withContext
+import org.amnezia.vpn.protocol.ProtocolState
 import org.amnezia.vpn.protocol.getStatistics
 import org.amnezia.vpn.protocol.getStatus
 import org.amnezia.vpn.qt.QtAndroidController
 import org.amnezia.vpn.util.Log
-import org.amnezia.vpn.util.Prefs
-import org.json.JSONException
-import org.json.JSONObject
 import org.qtproject.qt.android.bindings.QtActivity
 
 private const val TAG = "AmneziaActivity"
-const val ACTIVITY_MESSENGER_NAME = "Activity"
 
 private const val CHECK_VPN_PERMISSION_ACTION_CODE = 1
 private const val CREATE_FILE_ACTION_CODE = 2
 private const val OPEN_FILE_ACTION_CODE = 3
-private const val CHECK_NOTIFICATION_PERMISSION_ACTION_CODE = 4
-
-private const val PREFS_NOTIFICATION_PERMISSION_ASKED = "NOTIFICATION_PERMISSION_ASKED"
+private const val BIND_SERVICE_TIMEOUT = 1000L
 
 class AmneziaActivity : QtActivity() {
 
     private lateinit var mainScope: CoroutineScope
     private val qtInitialized = CompletableDeferred<Unit>()
-    private var vpnProto: VpnProto? = null
     private var isWaitingStatus = true
     private var isServiceConnected = false
     private var isInBoundState = false
-    private var notificationStateReceiver: BroadcastReceiver? = null
     private lateinit var vpnServiceMessenger: IpcMessenger
-
-    private val actionResultHandlers = mutableMapOf<Int, ActivityResultHandler>()
-    private val permissionRequestHandlers = mutableMapOf<Int, PermissionRequestHandler>()
+    private var tmpFileContentToSave: String = ""
 
     private val vpnServiceEventHandler: Handler by lazy(NONE) {
         object : Handler(Looper.getMainLooper()) {
@@ -78,17 +58,25 @@ class AmneziaActivity : QtActivity() {
                 val event = msg.extractIpcMessage<ServiceEvent>()
                 Log.d(TAG, "Handle event: $event")
                 when (event) {
-                    ServiceEvent.STATUS_CHANGED -> {
-                        msg.data?.getStatus()?.let { (state) ->
-                            Log.d(TAG, "Handle protocol state: $state")
-                            QtAndroidController.onVpnStateChanged(state.ordinal)
-                        }
+                    ServiceEvent.CONNECTED -> {
+                        QtAndroidController.onVpnConnected()
+                    }
+
+                    ServiceEvent.DISCONNECTED -> {
+                        QtAndroidController.onVpnDisconnected()
+                        doUnbindService()
+                    }
+
+                    ServiceEvent.RECONNECTING -> {
+                        QtAndroidController.onVpnReconnecting()
                     }
 
                     ServiceEvent.STATUS -> {
                         if (isWaitingStatus) {
                             isWaitingStatus = false
-                            msg.data?.getStatus()?.let { QtAndroidController.onStatus(it) }
+                            msg.data?.getStatus()?.let { (state) ->
+                                QtAndroidController.onStatus(state.ordinal)
+                            }
                         }
                     }
 
@@ -99,7 +87,7 @@ class AmneziaActivity : QtActivity() {
                     }
 
                     ServiceEvent.ERROR -> {
-                        msg.data?.getString(MSG_ERROR)?.let { error ->
+                        msg.data?.getString(ERROR_MSG)?.let { error ->
                             Log.e(TAG, "From VpnService: $error")
                         }
                         // todo: add error reporting to Qt
@@ -121,15 +109,14 @@ class AmneziaActivity : QtActivity() {
                 // get a messenger from the service to send actions to the service
                 vpnServiceMessenger.set(Messenger(service))
                 // send a messenger to the service to process service events
-                vpnServiceMessenger.send(
-                    Action.REGISTER_CLIENT.packToMessage {
-                        putString(MSG_CLIENT_NAME, ACTIVITY_MESSENGER_NAME)
-                    },
-                    replyTo = activityMessenger
-                )
+                vpnServiceMessenger.send {
+                    Action.REGISTER_CLIENT.packToMessage().apply {
+                        replyTo = activityMessenger
+                    }
+                }
                 isServiceConnected = true
                 if (isWaitingStatus) {
-                    vpnServiceMessenger.send(Action.REQUEST_STATUS, replyTo = activityMessenger)
+                    vpnServiceMessenger.send(Action.REQUEST_STATUS)
                 }
             }
 
@@ -139,18 +126,20 @@ class AmneziaActivity : QtActivity() {
                 vpnServiceMessenger.reset()
                 isWaitingStatus = true
                 QtAndroidController.onServiceDisconnected()
-                doBindService()
             }
 
             override fun onBindingDied(name: ComponentName?) {
                 Log.w(TAG, "Binding to the ${name?.flattenToString()} unexpectedly died")
                 doUnbindService()
-                QtAndroidController.onServiceDisconnected()
                 doBindService()
             }
         }
     }
 
+    private data class CheckVpnPermissionCallbacks(val onSuccess: () -> Unit, val onFail: () -> Unit)
+
+    private var checkVpnPermissionCallbacks: CheckVpnPermissionCallbacks? = null
+
     /**
      * Activity overloaded methods
      */
@@ -158,40 +147,11 @@ class AmneziaActivity : QtActivity() {
         super.onCreate(savedInstanceState)
         Log.d(TAG, "Create Amnezia activity: $intent")
         mainScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
-        val proto = mainScope.async(Dispatchers.IO) {
-            VpnStateStore.getVpnState().vpnProto
-        }
         vpnServiceMessenger = IpcMessenger(
-            "VpnService",
-            onDeadObjectException = {
-                doUnbindService()
-                QtAndroidController.onServiceDisconnected()
-                doBindService()
-            }
+            onDeadObjectException = ::doUnbindService,
+            messengerName = "VpnService"
         )
-        registerBroadcastReceivers()
         intent?.let(::processIntent)
-        runBlocking { vpnProto = proto.await() }
-    }
-
-    private fun registerBroadcastReceivers() {
-        notificationStateReceiver = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            registerBroadcastReceiver(
-                arrayOf(
-                    NotificationManager.ACTION_NOTIFICATION_CHANNEL_BLOCK_STATE_CHANGED,
-                    NotificationManager.ACTION_APP_BLOCK_STATE_CHANGED
-                )
-            ) {
-                Log.d(
-                    TAG, "Notification state changed: ${it?.action}, blocked = " +
-                        "${it?.getBooleanExtra(NotificationManager.EXTRA_BLOCKED_STATE, false)}"
-                )
-                mainScope.launch {
-                    qtInitialized.await()
-                    QtAndroidController.onNotificationStateChanged()
-                }
-            }
-        } else null
     }
 
     override fun onNewIntent(intent: Intent?) {
@@ -219,63 +179,62 @@ class AmneziaActivity : QtActivity() {
         Log.d(TAG, "Start Amnezia activity")
         mainScope.launch {
             qtInitialized.await()
-            vpnProto?.let { proto ->
-                if (AmneziaVpnService.isRunning(applicationContext, proto.processName)) {
-                    doBindService()
-                }
-            }
+            doBindService()
         }
     }
 
     override fun onStop() {
         Log.d(TAG, "Stop Amnezia activity")
         doUnbindService()
-        QtAndroidController.onServiceDisconnected()
         super.onStop()
     }
 
     override fun onDestroy() {
         Log.d(TAG, "Destroy Amnezia activity")
-        unregisterBroadcastReceiver(notificationStateReceiver)
-        notificationStateReceiver = null
         mainScope.cancel()
         super.onDestroy()
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        Log.d(TAG, "Process activity result, code: ${actionCodeToString(requestCode)}, " +
-                "resultCode: $resultCode, data: $data")
-        actionResultHandlers[requestCode]?.let { handler ->
-            when (resultCode) {
-                RESULT_OK -> handler.onSuccess(data)
-                else -> handler.onFail(data)
+        when (requestCode) {
+            CREATE_FILE_ACTION_CODE -> {
+                when (resultCode) {
+                    RESULT_OK -> {
+                        data?.data?.let { uri ->
+                            alterDocument(uri)
+                        }
+                    }
+                }
             }
-            handler.onAny(data)
-            actionResultHandlers.remove(requestCode)
-        } ?: super.onActivityResult(requestCode, resultCode, data)
-    }
 
-    private fun startActivityForResult(intent: Intent, requestCode: Int, handler: ActivityResultHandler) {
-        actionResultHandlers[requestCode] = handler
-        startActivityForResult(intent, requestCode)
-    }
-
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
-        Log.d(TAG, "Process permission result, code: ${actionCodeToString(requestCode)}, " +
-                "permissions: ${permissions.contentToString()}, results: ${grantResults.contentToString()}")
-        permissionRequestHandlers[requestCode]?.let { handler ->
-            if (grantResults.isNotEmpty()) {
-                if (grantResults[0] == PackageManager.PERMISSION_GRANTED) handler.onSuccess()
-                else handler.onFail()
+            OPEN_FILE_ACTION_CODE -> {
+                when (resultCode) {
+                    RESULT_OK -> data?.data?.toString() ?: ""
+                    else -> ""
+                }.let { uri ->
+                    QtAndroidController.onFileOpened(uri)
+                }
             }
-            handler.onAny()
-            permissionRequestHandlers.remove(requestCode)
-        } ?: super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-    }
 
-    private fun requestPermission(permission: String, requestCode: Int, handler: PermissionRequestHandler) {
-        permissionRequestHandlers[requestCode] = handler
-        requestPermissions(arrayOf(permission), requestCode)
+            CHECK_VPN_PERMISSION_ACTION_CODE -> {
+                when (resultCode) {
+                    RESULT_OK -> {
+                        Log.d(TAG, "Vpn permission granted")
+                        Toast.makeText(this, "Vpn permission granted", Toast.LENGTH_LONG).show()
+                        checkVpnPermissionCallbacks?.run { onSuccess() }
+                    }
+
+                    else -> {
+                        Log.w(TAG, "Vpn permission denied, resultCode: $resultCode")
+                        Toast.makeText(this, "Vpn permission denied", Toast.LENGTH_LONG).show()
+                        checkVpnPermissionCallbacks?.run { onFail() }
+                    }
+                }
+                checkVpnPermissionCallbacks = null
+            }
+
+            else -> super.onActivityResult(requestCode, resultCode, data)
+        }
     }
 
     /**
@@ -284,12 +243,11 @@ class AmneziaActivity : QtActivity() {
     @MainThread
     private fun doBindService() {
         Log.d(TAG, "Bind service")
-        vpnProto?.let { proto ->
-            Intent(this, proto.serviceClass).also {
-                bindService(it, serviceConnection, BIND_ABOVE_CLIENT and BIND_AUTO_CREATE)
-            }
-            isInBoundState = true
+        Intent(this, AmneziaVpnService::class.java).also {
+            bindService(it, serviceConnection, BIND_ABOVE_CLIENT)
         }
+        isInBoundState = true
+        handleBindTimeout()
     }
 
     @MainThread
@@ -297,147 +255,95 @@ class AmneziaActivity : QtActivity() {
         if (isInBoundState) {
             Log.d(TAG, "Unbind service")
             isWaitingStatus = true
-            isServiceConnected = false
-            vpnServiceMessenger.send(Action.UNREGISTER_CLIENT, activityMessenger)
+            QtAndroidController.onServiceDisconnected()
             vpnServiceMessenger.reset()
+            isServiceConnected = false
             isInBoundState = false
             unbindService(serviceConnection)
         }
     }
 
+    private fun handleBindTimeout() {
+        mainScope.launch {
+            if (isWaitingStatus) {
+                delay(BIND_SERVICE_TIMEOUT)
+                if (isWaitingStatus && !isServiceConnected) {
+                    Log.d(TAG, "Bind timeout, reset connection status")
+                    isWaitingStatus = false
+                    QtAndroidController.onStatus(ProtocolState.DISCONNECTED.ordinal)
+                }
+            }
+        }
+    }
+
     /**
      * Methods of starting and stopping VpnService
      */
+    private fun checkVpnPermissionAndStart(vpnConfig: String) {
+        checkVpnPermission(
+            onSuccess = { startVpn(vpnConfig) },
+            onFail = QtAndroidController::onVpnPermissionRejected
+        )
+    }
+
     @MainThread
-    private fun checkVpnPermission(onPermissionGranted: () -> Unit) {
+    private fun checkVpnPermission(onSuccess: () -> Unit, onFail: () -> Unit) {
         Log.d(TAG, "Check VPN permission")
-        VpnService.prepare(applicationContext)?.let { intent ->
-            startActivityForResult(intent, CHECK_VPN_PERMISSION_ACTION_CODE, ActivityResultHandler(
-                onSuccess = {
-                    Log.d(TAG, "Vpn permission granted")
-                    Toast.makeText(this@AmneziaActivity, resources.getText(R.string.vpnGranted), Toast.LENGTH_LONG).show()
-                    onPermissionGranted()
-                },
-                onFail = {
-                    Log.w(TAG, "Vpn permission denied")
-                    showOnVpnPermissionRejectDialog()
-                    mainScope.launch {
-                        qtInitialized.await()
-                        QtAndroidController.onVpnPermissionRejected()
-                    }
-                }
-            ))
-        } ?: onPermissionGranted()
-    }
-
-    private fun showOnVpnPermissionRejectDialog() {
-        AlertDialog.Builder(this)
-            .setTitle(R.string.vpnSetupFailed)
-            .setMessage(R.string.vpnSetupFailedMessage)
-            .setNegativeButton(R.string.ok) { _, _ -> }
-            .setPositiveButton(R.string.openVpnSettings) { _, _ ->
-                startActivity(Intent(Settings.ACTION_VPN_SETTINGS))
-            }
-            .show()
-    }
-
-    private fun checkNotificationPermission(onChecked: () -> Unit) {
-        Log.d(TAG, "Check notification permission")
-        if (
-            !isNotificationPermissionGranted() &&
-            !Prefs.load<Boolean>(PREFS_NOTIFICATION_PERMISSION_ASKED)
-        ) {
-            showNotificationPermissionDialog(onChecked)
-        } else {
-            onChecked()
+        VpnService.prepare(applicationContext)?.let {
+            checkVpnPermissionCallbacks = CheckVpnPermissionCallbacks(onSuccess, onFail)
+            startActivityForResult(it, CHECK_VPN_PERMISSION_ACTION_CODE)
+            return
         }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.TIRAMISU)
-    private fun showNotificationPermissionDialog(onChecked: () -> Unit) {
-        AlertDialog.Builder(this)
-            .setTitle(R.string.notificationDialogTitle)
-            .setMessage(R.string.notificationDialogMessage)
-            .setNegativeButton(R.string.no) { _, _ ->
-                Prefs.save(PREFS_NOTIFICATION_PERMISSION_ASKED, true)
-                onChecked()
-            }
-            .setPositiveButton(R.string.yes) { _, _ ->
-                val saveAsked: () -> Unit = {
-                    Prefs.save(PREFS_NOTIFICATION_PERMISSION_ASKED, true)
-                }
-                requestPermission(
-                    Manifest.permission.POST_NOTIFICATIONS,
-                    CHECK_NOTIFICATION_PERMISSION_ACTION_CODE,
-                    PermissionRequestHandler(
-                        onSuccess = saveAsked,
-                        onFail = saveAsked,
-                        onAny = onChecked
-                    )
-                )
-            }
-            .show()
+        onSuccess()
     }
 
     @MainThread
     private fun startVpn(vpnConfig: String) {
-        getVpnProto(vpnConfig)?.let { proto ->
-            Log.d(TAG, "Proto from config: $proto, current proto: $vpnProto")
-            if (isServiceConnected) {
-                if (proto.serviceClass == vpnProto?.serviceClass) {
-                    vpnProto = proto
-                    connectToVpn(vpnConfig)
-                    return
-                }
-                doUnbindService()
-            }
-            vpnProto = proto
+        if (isServiceConnected) {
+            connectToVpn(vpnConfig)
+        } else {
             isWaitingStatus = false
-            startVpnService(vpnConfig, proto)
+            startVpnService(vpnConfig)
             doBindService()
-        } ?: QtAndroidController.onServiceError()
-    }
-
-    private fun getVpnProto(vpnConfig: String): VpnProto? = try {
-        require(vpnConfig.isNotBlank()) { "Blank VPN config" }
-        VpnProto.get(JSONObject(vpnConfig).getString("protocol"))
-    } catch (e: JSONException) {
-        Log.e(TAG, "Invalid VPN config json format: ${e.message}")
-        null
-    } catch (e: IllegalArgumentException) {
-        Log.e(TAG, "Protocol not found: ${e.message}")
-        null
+        }
     }
 
     private fun connectToVpn(vpnConfig: String) {
         Log.d(TAG, "Connect to VPN")
         vpnServiceMessenger.send {
             Action.CONNECT.packToMessage {
-                putString(MSG_VPN_CONFIG, vpnConfig)
+                putString(VPN_CONFIG, vpnConfig)
             }
         }
     }
 
-    private fun startVpnService(vpnConfig: String, proto: VpnProto) {
-        Log.d(TAG, "Start VPN service: $proto")
-        Intent(this, proto.serviceClass).apply {
-            putExtra(MSG_VPN_CONFIG, vpnConfig)
+    private fun startVpnService(vpnConfig: String) {
+        Log.d(TAG, "Start VPN service")
+        Intent(this, AmneziaVpnService::class.java).apply {
+            putExtra(VPN_CONFIG, vpnConfig)
         }.also {
-            try {
-                ContextCompat.startForegroundService(this, it)
-            } catch (e: SecurityException) {
-                Log.e(TAG, "Failed to start ${proto.serviceClass.simpleName}: $e")
-                QtAndroidController.onServiceError()
-            }
+            ContextCompat.startForegroundService(this, it)
         }
     }
 
-    @MainThread
     private fun disconnectFromVpn() {
         Log.d(TAG, "Disconnect from VPN")
         vpnServiceMessenger.send(Action.DISCONNECT)
     }
 
+    // saving file
+    private fun alterDocument(uri: Uri) {
+        try {
+            contentResolver.openOutputStream(uri)?.use { os ->
+                os.bufferedWriter().use { it.write(tmpFileContentToSave) }
+            }
+        } catch (e: IOException) {
+            e.printStackTrace()
+        }
+
+        tmpFileContentToSave = ""
+    }
+
     /**
      * Methods called by Qt
      */
@@ -451,11 +357,7 @@ class AmneziaActivity : QtActivity() {
     fun start(vpnConfig: String) {
         Log.v(TAG, "Start VPN")
         mainScope.launch {
-            checkVpnPermission {
-                checkNotificationPermission {
-                    startVpn(vpnConfig)
-                }
-            }
+            checkVpnPermissionAndStart(vpnConfig)
         }
     }
 
@@ -467,46 +369,18 @@ class AmneziaActivity : QtActivity() {
         }
     }
 
-    @Suppress("unused")
-    fun resetLastServer(index: Int) {
-        Log.v(TAG, "Reset server: $index")
-        mainScope.launch {
-            VpnStateStore.store {
-                if (index == -1 || it.serverIndex == index) {
-                    VpnState.defaultState
-                } else if (it.serverIndex > index) {
-                    it.copy(serverIndex = it.serverIndex - 1)
-                } else {
-                    it
-                }
-            }
-        }
-    }
-
     @Suppress("unused")
     fun saveFile(fileName: String, data: String) {
         Log.d(TAG, "Save file $fileName")
         mainScope.launch {
+            tmpFileContentToSave = data
+
             Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
                 addCategory(Intent.CATEGORY_OPENABLE)
                 type = "text/*"
                 putExtra(Intent.EXTRA_TITLE, fileName)
             }.also {
-                startActivityForResult(it, CREATE_FILE_ACTION_CODE, ActivityResultHandler(
-                    onSuccess = {
-                        it?.data?.let { uri ->
-                            Log.d(TAG, "Save file to $uri")
-                            try {
-                                contentResolver.openOutputStream(uri)?.use { os ->
-                                    os.bufferedWriter().use { it.write(data) }
-                                }
-                            } catch (e: IOException) {
-                                Log.e(TAG, "Failed to save file $uri: $e")
-                                // todo: send error to Qt
-                            }
-                        }
-                    }
-                ))
+                startActivityForResult(it, CREATE_FILE_ACTION_CODE)
             }
         }
     }
@@ -514,47 +388,38 @@ class AmneziaActivity : QtActivity() {
     @Suppress("unused")
     fun openFile(filter: String?) {
         Log.v(TAG, "Open file with filter: $filter")
-        mainScope.launch {
-            val mimeTypes = if (!filter.isNullOrEmpty()) {
-                val extensionRegex = "\\*\\.([a-z0-9]+)".toRegex(IGNORE_CASE)
-                val mime = MimeTypeMap.getSingleton()
-                extensionRegex.findAll(filter).map {
-                    it.groups[1]?.value?.let { mime.getMimeTypeFromExtension(it) } ?: "*/*"
-                }.toSet()
-            } else emptySet()
 
-            Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
-                addCategory(Intent.CATEGORY_OPENABLE)
-                Log.v(TAG, "File mimyType filter: $mimeTypes")
-                if ("*/*" in mimeTypes) {
+        val mimeTypes = if (!filter.isNullOrEmpty()) {
+            val extensionRegex = "\\*\\.[a-z .]+".toRegex(IGNORE_CASE)
+            val mime = MimeTypeMap.getSingleton()
+            extensionRegex.findAll(filter).map {
+                mime.getMimeTypeFromExtension(it.value.drop(2))
+            }.filterNotNull().toSet()
+        } else emptySet()
+
+        Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+            addCategory(Intent.CATEGORY_OPENABLE)
+            Log.v(TAG, "File mimyType filter: $mimeTypes")
+            when (mimeTypes.size) {
+                1 -> type = mimeTypes.first()
+
+                in 2..Int.MAX_VALUE -> {
                     type = "*/*"
-                } else {
-                    when (mimeTypes.size) {
-                        1 -> type = mimeTypes.first()
-
-                        in 2..Int.MAX_VALUE -> {
-                            type = "*/*"
-                            putExtra(EXTRA_MIME_TYPES, mimeTypes.toTypedArray())
-                        }
-
-                        else -> type = "*/*"
-                    }
+                    putExtra(EXTRA_MIME_TYPES, mimeTypes.toTypedArray())
                 }
-            }.also {
-                startActivityForResult(it, OPEN_FILE_ACTION_CODE, ActivityResultHandler(
-                    onSuccess = {
-                        val uri = it?.data?.toString() ?: ""
-                        Log.d(TAG, "Open file: $uri")
-                        mainScope.launch {
-                            qtInitialized.await()
-                            QtAndroidController.onFileOpened(uri)
-                        }
-                    }
-                ))
+
+                else -> type = "*/*"
             }
+        }.also {
+            startActivityForResult(it, OPEN_FILE_ACTION_CODE)
         }
     }
 
+    @Suppress("unused")
+    fun setNotificationText(title: String, message: String, timerSec: Int) {
+        Log.v(TAG, "Set notification text")
+    }
+
     @Suppress("unused")
     fun isCameraPresent(): Boolean = applicationContext.packageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA)
 
@@ -568,12 +433,12 @@ class AmneziaActivity : QtActivity() {
 
     @Suppress("unused")
     fun setSaveLogs(enabled: Boolean) {
-        Log.v(TAG, "Set save logs: $enabled")
+        Log.d(TAG, "Set save logs: $enabled")
         mainScope.launch {
             Log.saveLogs = enabled
             vpnServiceMessenger.send {
                 Action.SET_SAVE_LOGS.packToMessage {
-                    putBoolean(MSG_SAVE_LOGS, enabled)
+                    putBoolean(SAVE_LOGS, enabled)
                 }
             }
         }
@@ -588,117 +453,6 @@ class AmneziaActivity : QtActivity() {
     @Suppress("unused")
     fun clearLogs() {
         Log.v(TAG, "Clear logs")
-        mainScope.launch {
-            Log.clearLogs()
-        }
-    }
-
-    @Suppress("unused")
-    fun setScreenshotsEnabled(enabled: Boolean) {
-        Log.v(TAG, "Set screenshots enabled: $enabled")
-        mainScope.launch {
-            val flag = if (enabled) 0 else LayoutParams.FLAG_SECURE
-            window.setFlags(flag, LayoutParams.FLAG_SECURE)
-        }
-    }
-
-    @Suppress("unused")
-    fun minimizeApp() {
-        Log.v(TAG, "Minimize application")
-        mainScope.launch {
-            moveTaskToBack(false)
-        }
-    }
-
-    @Suppress("unused")
-    fun getAppList(): String {
-        Log.v(TAG, "Get app list")
-        var appList = ""
-        runBlocking {
-            mainScope.launch {
-                withContext(Dispatchers.IO) {
-                    appList = AppListProvider.getAppList(packageManager, packageName)
-                }
-            }.join()
-        }
-        return appList
-    }
-
-    @Suppress("unused")
-    fun getAppIcon(packageName: String, width: Int, height: Int): Bitmap {
-        Log.v(TAG, "Get app icon")
-        return AppListProvider.getAppIcon(packageManager, packageName, width, height)
-    }
-
-    @Suppress("unused")
-    fun isNotificationPermissionGranted(): Boolean = applicationContext.isNotificationPermissionGranted()
-
-    @Suppress("unused")
-    fun requestNotificationPermission() {
-        val shouldShowPreRequest = shouldShowRequestPermissionRationale(Manifest.permission.POST_NOTIFICATIONS)
-        requestPermission(
-            Manifest.permission.POST_NOTIFICATIONS,
-            CHECK_NOTIFICATION_PERMISSION_ACTION_CODE,
-            PermissionRequestHandler(
-                onSuccess = {
-                    mainScope.launch {
-                        Prefs.save(PREFS_NOTIFICATION_PERMISSION_ASKED, true)
-                        vpnServiceMessenger.send(Action.NOTIFICATION_PERMISSION_GRANTED)
-                        qtInitialized.await()
-                        QtAndroidController.onNotificationStateChanged()
-                    }
-                },
-                onFail = {
-                    if (!Prefs.load<Boolean>(PREFS_NOTIFICATION_PERMISSION_ASKED)) {
-                        Prefs.save(PREFS_NOTIFICATION_PERMISSION_ASKED, true)
-                    } else {
-                        val shouldShowPostRequest =
-                            shouldShowRequestPermissionRationale(Manifest.permission.POST_NOTIFICATIONS)
-                        if (!shouldShowPreRequest && !shouldShowPostRequest) {
-                            showNotificationSettingsDialog()
-                        }
-                    }
-                }
-            )
-        )
-    }
-
-    private fun showNotificationSettingsDialog() {
-        AlertDialog.Builder(this)
-            .setTitle(R.string.notificationSettingsDialogTitle)
-            .setMessage(R.string.notificationSettingsDialogMessage)
-            .setNegativeButton(R.string.cancel) { _, _ -> }
-            .setPositiveButton(R.string.openNotificationSettings) { _, _ ->
-                startActivity(Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS).apply {
-                    putExtra(Settings.EXTRA_APP_PACKAGE, packageName)
-                })
-            }
-            .show()
-    }
-
-    /**
-     * Utils methods
-     */
-    companion object {
-        private fun actionCodeToString(actionCode: Int): String =
-            when (actionCode) {
-                CHECK_VPN_PERMISSION_ACTION_CODE -> "CHECK_VPN_PERMISSION"
-                CREATE_FILE_ACTION_CODE -> "CREATE_FILE"
-                OPEN_FILE_ACTION_CODE -> "OPEN_FILE"
-                CHECK_NOTIFICATION_PERMISSION_ACTION_CODE -> "CHECK_NOTIFICATION_PERMISSION"
-                else -> actionCode.toString()
-            }
+        Log.clearLogs()
     }
 }
-
-private class ActivityResultHandler(
-    val onSuccess: (data: Intent?) -> Unit = {},
-    val onFail: (data: Intent?) -> Unit = {},
-    val onAny: (data: Intent?) -> Unit = {}
-)
-
-private class PermissionRequestHandler(
-    val onSuccess: () -> Unit = {},
-    val onFail: () -> Unit = {},
-    val onAny: () -> Unit = {}
-)

client/android/src/org/amnezia/vpn/AmneziaApplication.kt

@@ -3,11 +3,14 @@ package org.amnezia.vpn
 import androidx.camera.camera2.Camera2Config
 import androidx.camera.core.CameraSelector
 import androidx.camera.core.CameraXConfig
+import androidx.core.app.NotificationChannelCompat.Builder
+import androidx.core.app.NotificationManagerCompat
 import org.amnezia.vpn.util.Log
 import org.amnezia.vpn.util.Prefs
 import org.qtproject.qt.android.bindings.QtApplication
 
 private const val TAG = "AmneziaApplication"
+const val NOTIFICATION_CHANNEL_ID: String = "org.amnezia.vpn.notification"
 
 class AmneziaApplication : QtApplication(), CameraXConfig.Provider {
 
@@ -15,9 +18,8 @@ class AmneziaApplication : QtApplication(), CameraXConfig.Provider {
         super.onCreate()
         Prefs.init(this)
         Log.init(this)
-        VpnStateStore.init(this)
         Log.d(TAG, "Create Amnezia application")
-        ServiceNotification.createNotificationChannel(this)
+        createNotificationChannel()
     }
 
     override fun getCameraXConfig(): CameraXConfig = CameraXConfig.Builder
@@ -25,4 +27,14 @@ class AmneziaApplication : QtApplication(), CameraXConfig.Provider {
         .setMinimumLoggingLevel(android.util.Log.ERROR)
         .setAvailableCamerasLimiter(CameraSelector.DEFAULT_BACK_CAMERA)
         .build()
+
+    private fun createNotificationChannel() {
+        NotificationManagerCompat.from(this).createNotificationChannel(
+            Builder(NOTIFICATION_CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_LOW)
+                .setName("AmneziaVPN")
+                .setDescription("AmneziaVPN service notification")
+                .setShowBadge(false)
+                .build()
+        )
+    }
 }

client/android/src/org/amnezia/vpn/AmneziaContext.kt

@@ -1,56 +0,0 @@
-package org.amnezia.vpn
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import androidx.core.content.ContextCompat
-import androidx.core.content.ContextCompat.RegisterReceiverFlags
-import org.amnezia.vpn.protocol.ProtocolState
-import org.amnezia.vpn.protocol.ProtocolState.CONNECTED
-import org.amnezia.vpn.protocol.ProtocolState.CONNECTING
-import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTED
-import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTING
-import org.amnezia.vpn.protocol.ProtocolState.RECONNECTING
-import org.amnezia.vpn.protocol.ProtocolState.UNKNOWN
-
-fun Context.getString(state: ProtocolState): String =
-    getString(
-        when (state) {
-            DISCONNECTED, UNKNOWN -> R.string.disconnected
-            CONNECTED -> R.string.connected
-            CONNECTING -> R.string.connecting
-            DISCONNECTING -> R.string.disconnecting
-            RECONNECTING -> R.string.reconnecting
-        }
-    )
-
-fun Context.registerBroadcastReceiver(
-    action: String,
-    @RegisterReceiverFlags flags: Int = ContextCompat.RECEIVER_EXPORTED,
-    onReceive: (Intent?) -> Unit
-): BroadcastReceiver = registerBroadcastReceiver(arrayOf(action), flags, onReceive)
-
-fun Context.registerBroadcastReceiver(
-    actions: Array<String>,
-    @RegisterReceiverFlags flags: Int = ContextCompat.RECEIVER_EXPORTED,
-    onReceive: (Intent?) -> Unit
-): BroadcastReceiver =
-    object : BroadcastReceiver() {
-        override fun onReceive(context: Context?, intent: Intent?) {
-            onReceive(intent)
-        }
-    }.also {
-        ContextCompat.registerReceiver(
-            this,
-            it,
-            IntentFilter().apply {
-                actions.forEach(::addAction)
-            },
-            flags
-        )
-    }
-
-fun Context.unregisterBroadcastReceiver(receiver: BroadcastReceiver?) {
-    receiver?.let { this.unregisterReceiver(it) }
-}

client/android/src/org/amnezia/vpn/AmneziaTileService.kt

@@ -1,283 +0,0 @@
-package org.amnezia.vpn
-
-import android.annotation.SuppressLint
-import android.app.PendingIntent
-import android.content.ComponentName
-import android.content.Intent
-import android.content.ServiceConnection
-import android.net.VpnService
-import android.os.Build
-import android.os.IBinder
-import android.os.Messenger
-import android.service.quicksettings.Tile
-import android.service.quicksettings.TileService
-import androidx.core.content.ContextCompat
-import kotlin.LazyThreadSafetyMode.NONE
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.launch
-import org.amnezia.vpn.protocol.ProtocolState
-import org.amnezia.vpn.protocol.ProtocolState.CONNECTED
-import org.amnezia.vpn.protocol.ProtocolState.CONNECTING
-import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTED
-import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTING
-import org.amnezia.vpn.protocol.ProtocolState.RECONNECTING
-import org.amnezia.vpn.protocol.ProtocolState.UNKNOWN
-import org.amnezia.vpn.util.Log
-
-private const val TAG = "AmneziaTileService"
-private const val DEFAULT_TILE_LABEL = "AmneziaVPN"
-
-class AmneziaTileService : TileService() {
-
-    private lateinit var scope: CoroutineScope
-    private var vpnStateListeningJob: Job? = null
-    private lateinit var vpnServiceMessenger: IpcMessenger
-
-    @Volatile
-    private var isServiceConnected = false
-
-    @Volatile
-    private var vpnProto: VpnProto? = null
-    private var isInBoundState = false
-    @Volatile
-    private var isVpnConfigExists = false
-
-    private val serviceConnection: ServiceConnection by lazy(NONE) {
-        object : ServiceConnection {
-            override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
-                Log.d(TAG, "Service ${name?.flattenToString()} was connected")
-                vpnServiceMessenger.set(Messenger(service))
-                isServiceConnected = true
-            }
-
-            override fun onServiceDisconnected(name: ComponentName?) {
-                Log.w(TAG, "Service ${name?.flattenToString()} was unexpectedly disconnected")
-                isServiceConnected = false
-                vpnServiceMessenger.reset()
-                updateVpnState(DISCONNECTED)
-            }
-
-            override fun onBindingDied(name: ComponentName?) {
-                Log.w(TAG, "Binding to the ${name?.flattenToString()} unexpectedly died")
-                doUnbindService()
-                doBindService()
-            }
-        }
-    }
-
-    override fun onCreate() {
-        super.onCreate()
-        Log.d(TAG, "Create Amnezia Tile Service")
-        scope = CoroutineScope(SupervisorJob())
-        vpnServiceMessenger = IpcMessenger(
-            "VpnService",
-            onDeadObjectException = ::doUnbindService
-        )
-    }
-
-    override fun onDestroy() {
-        Log.d(TAG, "Destroy Amnezia Tile Service")
-        doUnbindService()
-        scope.cancel()
-        super.onDestroy()
-    }
-
-    // Workaround for some bugs
-    override fun onBind(intent: Intent?): IBinder? =
-        try {
-            super.onBind(intent)
-        } catch (e: Throwable) {
-            Log.e(TAG, "Failed to bind AmneziaTileService: $e")
-            null
-        }
-
-    override fun onStartListening() {
-        super.onStartListening()
-        scope.launch {
-            Log.d(TAG, "Start listening")
-            vpnProto = VpnStateStore.getVpnState().vpnProto
-            vpnProto.also { proto ->
-                if (proto != null && AmneziaVpnService.isRunning(applicationContext, proto.processName)) {
-                    Log.d(TAG, "Vpn service is running")
-                    doBindService()
-                } else {
-                    Log.d(TAG, "Vpn service is not running")
-                    isServiceConnected = false
-                    updateVpnState(DISCONNECTED)
-                }
-            }
-            vpnStateListeningJob = launchVpnStateListening()
-        }
-    }
-
-    override fun onStopListening() {
-        Log.d(TAG, "Stop listening")
-        vpnStateListeningJob?.cancel()
-        vpnStateListeningJob = null
-        doUnbindService()
-        super.onStopListening()
-    }
-
-    override fun onClick() {
-        Log.d(TAG, "onClick")
-        if (isLocked) {
-            unlockAndRun { onClickInternal() }
-        } else {
-            onClickInternal()
-        }
-    }
-
-    private fun onClickInternal() {
-        if (isVpnConfigExists && vpnProto != null) {
-            Log.d(TAG, "Change VPN state")
-            if (qsTile.state == Tile.STATE_INACTIVE) {
-                Log.d(TAG, "Start VPN")
-                updateVpnState(CONNECTING)
-                startVpn()
-            } else if (qsTile.state == Tile.STATE_ACTIVE) {
-                Log.d(TAG, "Stop vpn")
-                updateVpnState(DISCONNECTING)
-                stopVpn()
-            }
-        } else {
-            Log.d(TAG, "Start Activity")
-            Intent(this, AmneziaActivity::class.java).apply {
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            }.also {
-                startActivityAndCollapseCompat(it)
-            }
-        }
-    }
-
-    private fun doBindService() {
-        Log.d(TAG, "Bind service")
-        vpnProto?.let { proto ->
-            Intent(this, proto.serviceClass).also {
-                bindService(it, serviceConnection, BIND_ABOVE_CLIENT)
-            }
-            isInBoundState = true
-        }
-    }
-
-    private fun doUnbindService() {
-        if (isInBoundState) {
-            Log.d(TAG, "Unbind service")
-            isServiceConnected = false
-            vpnServiceMessenger.reset()
-            isInBoundState = false
-            unbindService(serviceConnection)
-        }
-    }
-
-    private fun startVpn() {
-        if (isServiceConnected) {
-            connectToVpn()
-        } else {
-            if (checkPermission()) {
-                startVpnService()
-                doBindService()
-            } else {
-                updateVpnState(DISCONNECTED)
-            }
-        }
-    }
-
-    private fun checkPermission() =
-        if (VpnService.prepare(applicationContext) != null) {
-            Intent(this, VpnRequestActivity::class.java).apply {
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                putExtra(EXTRA_PROTOCOL, vpnProto)
-            }.also {
-                startActivityAndCollapseCompat(it)
-            }
-            false
-        } else {
-            true
-        }
-
-    private fun startVpnService() {
-        vpnProto?.let { proto ->
-            try {
-                ContextCompat.startForegroundService(
-                    applicationContext,
-                    Intent(this, proto.serviceClass)
-                )
-            } catch (e: SecurityException) {
-                Log.e(TAG, "Failed to start ${proto.serviceClass.simpleName}: $e")
-            }
-        } ?: Log.e(TAG, "Failed to start vpn service: vpnProto is null")
-    }
-
-    private fun connectToVpn() = vpnServiceMessenger.send(Action.CONNECT)
-
-    private fun stopVpn() = vpnServiceMessenger.send(Action.DISCONNECT)
-
-    @SuppressLint("StartActivityAndCollapseDeprecated")
-    private fun startActivityAndCollapseCompat(intent: Intent) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            startActivityAndCollapse(
-                PendingIntent.getActivity(
-                    applicationContext,
-                    0,
-                    intent,
-                    PendingIntent.FLAG_IMMUTABLE
-                )
-            )
-        } else {
-            @Suppress("DEPRECATION")
-            startActivityAndCollapse(intent)
-        }
-    }
-
-    private fun updateVpnState(state: ProtocolState) =
-        scope.launch { VpnStateStore.store { it.copy(protocolState = state) } }
-
-    private fun launchVpnStateListening() =
-        scope.launch { VpnStateStore.dataFlow().collectLatest(::updateTile) }
-
-    private fun updateTile(vpnState: VpnState) {
-        Log.d(TAG, "Update tile: $vpnState")
-        isVpnConfigExists = vpnState.serverName != null
-        vpnProto = vpnState.vpnProto
-        val tile = qsTile ?: return
-        tile.apply {
-            label = (vpnState.serverName ?: DEFAULT_TILE_LABEL) + (vpnProto?.let { " ${it.label}" } ?: "")
-            when (val protocolState = vpnState.protocolState) {
-                CONNECTED -> {
-                    state = Tile.STATE_ACTIVE
-                    subtitleCompat = null
-                }
-
-                DISCONNECTED, UNKNOWN -> {
-                    state = Tile.STATE_INACTIVE
-                    subtitleCompat = null
-                }
-
-                CONNECTING, DISCONNECTING, RECONNECTING -> {
-                    state = Tile.STATE_UNAVAILABLE
-                    subtitleCompat = getString(protocolState)
-                }
-            }
-            updateTile()
-        }
-        // double update to fix weird visual glitches
-        tile.updateTile()
-    }
-
-    private var Tile.subtitleCompat: CharSequence?
-        set(value) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                this.subtitle = value
-            }
-        }
-        get() {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                return this.subtitle
-            }
-            return null
-        }
-}

client/android/src/org/amnezia/vpn/AmneziaVpnService.kt

@@ -1,14 +1,10 @@
 package org.amnezia.vpn
 
-import android.annotation.SuppressLint
-import android.app.ActivityManager
-import android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE
-import android.app.NotificationManager
-import android.content.BroadcastReceiver
-import android.content.Context
+import android.app.Notification
+import android.app.PendingIntent
 import android.content.Intent
 import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST
-import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SYSTEM_EXEMPTED
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE
 import android.net.VpnService
 import android.os.Build
 import android.os.Handler
@@ -16,13 +12,10 @@ import android.os.IBinder
 import android.os.Looper
 import android.os.Message
 import android.os.Messenger
-import android.os.PowerManager
 import android.os.Process
 import androidx.annotation.MainThread
+import androidx.core.app.NotificationCompat
 import androidx.core.app.ServiceCompat
-import androidx.core.content.ContextCompat
-import androidx.core.content.getSystemService
-import java.util.concurrent.ConcurrentHashMap
 import kotlin.LazyThreadSafetyMode.NONE
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineScope
@@ -33,58 +26,56 @@ import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
 import org.amnezia.vpn.protocol.BadConfigException
 import org.amnezia.vpn.protocol.LoadLibraryException
+import org.amnezia.vpn.protocol.Protocol
 import org.amnezia.vpn.protocol.ProtocolState.CONNECTED
 import org.amnezia.vpn.protocol.ProtocolState.CONNECTING
 import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTED
 import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTING
 import org.amnezia.vpn.protocol.ProtocolState.RECONNECTING
 import org.amnezia.vpn.protocol.ProtocolState.UNKNOWN
+import org.amnezia.vpn.protocol.Statistics
+import org.amnezia.vpn.protocol.Status
 import org.amnezia.vpn.protocol.VpnException
 import org.amnezia.vpn.protocol.VpnStartException
+import org.amnezia.vpn.protocol.awg.Awg
+import org.amnezia.vpn.protocol.cloak.Cloak
+import org.amnezia.vpn.protocol.openvpn.OpenVpn
+import org.amnezia.vpn.protocol.putStatistics
 import org.amnezia.vpn.protocol.putStatus
+import org.amnezia.vpn.protocol.wireguard.Wireguard
 import org.amnezia.vpn.util.Log
 import org.amnezia.vpn.util.Prefs
 import org.amnezia.vpn.util.net.NetworkState
-import org.amnezia.vpn.util.net.TrafficStats
 import org.json.JSONException
 import org.json.JSONObject
 
 private const val TAG = "AmneziaVpnService"
 
-const val ACTION_DISCONNECT = "org.amnezia.vpn.action.disconnect"
-const val ACTION_CONNECT = "org.amnezia.vpn.action.connect"
-
-const val MSG_VPN_CONFIG = "VPN_CONFIG"
-const val MSG_ERROR = "ERROR"
-const val MSG_SAVE_LOGS = "SAVE_LOGS"
-const val MSG_CLIENT_NAME = "CLIENT_NAME"
+const val VPN_CONFIG = "VPN_CONFIG"
+const val ERROR_MSG = "ERROR_MSG"
+const val SAVE_LOGS = "SAVE_LOGS"
 
 const val AFTER_PERMISSION_CHECK = "AFTER_PERMISSION_CHECK"
 private const val PREFS_CONFIG_KEY = "LAST_CONF"
-private const val PREFS_SERVER_NAME = "LAST_SERVER_NAME"
-private const val PREFS_SERVER_INDEX = "LAST_SERVER_INDEX"
-// private const val STATISTICS_SENDING_TIMEOUT = 1000L
-private const val TRAFFIC_STATS_UPDATE_TIMEOUT = 1000L
+private const val NOTIFICATION_ID = 1337
+private const val STATISTICS_SENDING_TIMEOUT = 1000L
 private const val DISCONNECT_TIMEOUT = 5000L
 private const val STOP_SERVICE_TIMEOUT = 5000L
 
-@SuppressLint("Registered")
-open class AmneziaVpnService : VpnService() {
+class AmneziaVpnService : VpnService() {
 
     private lateinit var mainScope: CoroutineScope
     private lateinit var connectionScope: CoroutineScope
     private var isServiceBound = false
-    private var vpnProto: VpnProto? = null
+    private var protocol: Protocol? = null
+    private val protocolCache = mutableMapOf<String, Protocol>()
     private var protocolState = MutableStateFlow(UNKNOWN)
-    private var serverName: String? = null
-    private var serverIndex: Int = -1
 
     private val isConnected
         get() = protocolState.value == CONNECTED
@@ -97,21 +88,13 @@ open class AmneziaVpnService : VpnService() {
 
     private var connectionJob: Job? = null
     private var disconnectionJob: Job? = null
-    private var trafficStatsUpdateJob: Job? = null
-    // private var statisticsSendingJob: Job? = null
+    private var statisticsSendingJob: Job? = null
+    private lateinit var clientMessenger: IpcMessenger
     private lateinit var networkState: NetworkState
-    private lateinit var trafficStats: TrafficStats
-    private var controlReceiver: BroadcastReceiver? = null
-    private var notificationStateReceiver: BroadcastReceiver? = null
-    private var screenOnReceiver: BroadcastReceiver? = null
-    private var screenOffReceiver: BroadcastReceiver? = null
-    private val clientMessengers = ConcurrentHashMap<Messenger, IpcMessenger>()
-
-    private val isActivityConnected
-        get() = clientMessengers.any { it.value.name == ACTIVITY_MESSENGER_NAME }
 
     private val connectionExceptionHandler = CoroutineExceptionHandler { _, e ->
         protocolState.value = DISCONNECTED
+        protocol = null
         when (e) {
             is IllegalArgumentException,
             is VpnStartException,
@@ -133,22 +116,13 @@ open class AmneziaVpnService : VpnService() {
                 Log.d(TAG, "Handle action: $action")
                 when (action) {
                     Action.REGISTER_CLIENT -> {
-                        val clientName = msg.data.getString(MSG_CLIENT_NAME)
-                        val messenger = IpcMessenger(msg.replyTo, clientName)
-                        clientMessengers[msg.replyTo] = messenger
-                        Log.d(TAG, "Messenger client '$clientName' was registered")
-                        // if (clientName == ACTIVITY_MESSENGER_NAME && isConnected) launchSendingStatistics()
-                    }
-
-                    Action.UNREGISTER_CLIENT -> {
-                        clientMessengers.remove(msg.replyTo)?.let {
-                            Log.d(TAG, "Messenger client '${it.name}' was unregistered")
-                            // if (it.name == ACTIVITY_MESSENGER_NAME) stopSendingStatistics()
-                        }
+                        clientMessenger.set(msg.replyTo)
                     }
 
                     Action.CONNECT -> {
-                        connect(msg.data.getString(MSG_VPN_CONFIG))
+                        val vpnConfig = msg.data.getString(VPN_CONFIG)
+                        Prefs.save(PREFS_CONFIG_KEY, vpnConfig)
+                        connect(vpnConfig)
                     }
 
                     Action.DISCONNECT -> {
@@ -156,21 +130,17 @@ open class AmneziaVpnService : VpnService() {
                     }
 
                     Action.REQUEST_STATUS -> {
-                        clientMessengers[msg.replyTo]?.let { clientMessenger ->
-                            clientMessenger.send {
-                                ServiceEvent.STATUS.packToMessage {
-                                    putStatus(this@AmneziaVpnService.protocolState.value)
-                                }
+                        clientMessenger.send {
+                            ServiceEvent.STATUS.packToMessage {
+                                putStatus(Status.build {
+                                    setState(this@AmneziaVpnService.protocolState.value)
+                                })
                             }
                         }
                     }
 
-                    Action.NOTIFICATION_PERMISSION_GRANTED -> {
-                        enableNotification()
-                    }
-
                     Action.SET_SAVE_LOGS -> {
-                        Log.saveLogs = msg.data.getBoolean(MSG_SAVE_LOGS)
+                        Log.saveLogs = msg.data.getBoolean(SAVE_LOGS)
                     }
                 }
             }
@@ -186,12 +156,30 @@ open class AmneziaVpnService : VpnService() {
      */
     private val foregroundServiceTypeCompat
         get() = when {
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE -> FOREGROUND_SERVICE_TYPE_SYSTEM_EXEMPTED
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE -> FOREGROUND_SERVICE_TYPE_SPECIAL_USE
             Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q -> FOREGROUND_SERVICE_TYPE_MANIFEST
             else -> 0
         }
 
-    private val serviceNotification: ServiceNotification by lazy(NONE) { ServiceNotification(this) }
+    private val notification: Notification by lazy(NONE) {
+        NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID)
+            .setSmallIcon(R.drawable.ic_amnezia_round)
+            .setShowWhen(false)
+            .setContentIntent(
+                PendingIntent.getActivity(
+                    this,
+                    0,
+                    Intent(this, AmneziaActivity::class.java),
+                    PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+                )
+            )
+            .setOngoing(true)
+            .setPriority(NotificationCompat.PRIORITY_LOW)
+            .setCategory(NotificationCompat.CATEGORY_SERVICE)
+            .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+            .setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE)
+            .build()
+    }
 
     /**
      * Service overloaded methods
@@ -201,31 +189,29 @@ open class AmneziaVpnService : VpnService() {
         Log.d(TAG, "Create Amnezia VPN service")
         mainScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
         connectionScope = CoroutineScope(SupervisorJob() + Dispatchers.IO + connectionExceptionHandler)
-        loadServerData()
+        clientMessenger = IpcMessenger(messengerName = "Client")
         launchProtocolStateHandler()
         networkState = NetworkState(this, ::reconnect)
-        trafficStats = TrafficStats()
-        registerBroadcastReceivers()
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        val isAlwaysOn = intent != null && intent.action == SERVICE_INTERFACE
+        val isAlwaysOnCompat =
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) isAlwaysOn
+            else intent?.component?.packageName != packageName
 
-        if (isAlwaysOn) {
+        if (isAlwaysOnCompat) {
             Log.d(TAG, "Start service via Always-on")
-            connect()
+            connect(Prefs.load(PREFS_CONFIG_KEY))
         } else if (intent?.getBooleanExtra(AFTER_PERMISSION_CHECK, false) == true) {
             Log.d(TAG, "Start service after permission check")
-            connect()
+            connect(Prefs.load(PREFS_CONFIG_KEY))
         } else {
             Log.d(TAG, "Start service")
-            connect(intent?.getStringExtra(MSG_VPN_CONFIG))
+            val vpnConfig = intent?.getStringExtra(VPN_CONFIG)
+            Prefs.save(PREFS_CONFIG_KEY, vpnConfig)
+            connect(vpnConfig)
         }
-        ServiceCompat.startForeground(
-            this, NOTIFICATION_ID,
-            serviceNotification.buildNotification(serverName, vpnProto?.label, protocolState.value),
-            foregroundServiceTypeCompat
-        )
+        ServiceCompat.startForeground(this, NOTIFICATION_ID, notification, foregroundServiceTypeCompat)
         return START_REDELIVER_INTENT
     }
 
@@ -233,16 +219,17 @@ open class AmneziaVpnService : VpnService() {
         Log.d(TAG, "onBind by $intent")
         if (intent?.action == SERVICE_INTERFACE) return super.onBind(intent)
         isServiceBound = true
+        if (isConnected) launchSendingStatistics()
         return vpnServiceMessenger.binder
     }
 
     override fun onUnbind(intent: Intent?): Boolean {
         Log.d(TAG, "onUnbind by $intent")
         if (intent?.action != SERVICE_INTERFACE) {
-            if (clientMessengers.isEmpty()) {
-                isServiceBound = false
-                if (isUnknown || isDisconnected) stopService()
-            }
+            isServiceBound = false
+            stopSendingStatistics()
+            clientMessenger.reset()
+            if (isUnknown || isDisconnected) stopService()
         }
         return true
     }
@@ -251,6 +238,7 @@ open class AmneziaVpnService : VpnService() {
         Log.d(TAG, "onRebind by $intent")
         if (intent?.action != SERVICE_INTERFACE) {
             isServiceBound = true
+            if (isConnected) launchSendingStatistics()
         }
         super.onRebind(intent)
     }
@@ -265,7 +253,6 @@ open class AmneziaVpnService : VpnService() {
 
     override fun onDestroy() {
         Log.d(TAG, "Destroy service")
-        unregisterBroadcastReceivers()
         runBlocking {
             disconnect()
             disconnectionJob?.join()
@@ -286,113 +273,35 @@ open class AmneziaVpnService : VpnService() {
         stopSelf()
     }
 
-    private fun registerBroadcastReceivers() {
-        Log.d(TAG, "Register broadcast receivers")
-        controlReceiver = registerBroadcastReceiver(
-            arrayOf(ACTION_CONNECT, ACTION_DISCONNECT), ContextCompat.RECEIVER_NOT_EXPORTED
-        ) {
-            it?.action?.let { action ->
-                Log.d(TAG, "Broadcast request received: $action")
-                when (action) {
-                    ACTION_CONNECT -> connect()
-                    ACTION_DISCONNECT -> disconnect()
-                    else -> Log.w(TAG, "Unknown action received: $action")
-                }
-            }
-        }
-
-        notificationStateReceiver = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            registerBroadcastReceiver(
-                arrayOf(
-                    NotificationManager.ACTION_NOTIFICATION_CHANNEL_BLOCK_STATE_CHANGED,
-                    NotificationManager.ACTION_APP_BLOCK_STATE_CHANGED
-                )
-            ) {
-                val state = it?.getBooleanExtra(NotificationManager.EXTRA_BLOCKED_STATE, false)
-                Log.d(TAG, "Notification state changed: ${it?.action}, blocked = $state")
-                if (state == false) {
-                    enableNotification()
-                } else {
-                    disableNotification()
-                }
-            }
-        } else null
-
-        registerScreenStateBroadcastReceivers()
-    }
-
-    private fun registerScreenStateBroadcastReceivers() {
-        if (serviceNotification.isNotificationEnabled()) {
-            Log.d(TAG, "Register screen state broadcast receivers")
-            screenOnReceiver = registerBroadcastReceiver(Intent.ACTION_SCREEN_ON) {
-                if (isConnected && serviceNotification.isNotificationEnabled()) startTrafficStatsUpdateJob()
-            }
-
-            screenOffReceiver = registerBroadcastReceiver(Intent.ACTION_SCREEN_OFF) {
-                stopTrafficStatsUpdateJob()
-            }
-        }
-    }
-
-    private fun unregisterScreenStateBroadcastReceivers() {
-        Log.d(TAG, "Unregister screen state broadcast receivers")
-        unregisterBroadcastReceiver(screenOnReceiver)
-        unregisterBroadcastReceiver(screenOffReceiver)
-        screenOnReceiver = null
-        screenOffReceiver = null
-    }
-
-    private fun unregisterBroadcastReceivers() {
-        Log.d(TAG, "Unregister broadcast receivers")
-        unregisterBroadcastReceiver(controlReceiver)
-        unregisterBroadcastReceiver(notificationStateReceiver)
-        unregisterScreenStateBroadcastReceivers()
-        controlReceiver = null
-        notificationStateReceiver = null
-    }
-
     /**
      * Methods responsible for processing VPN connection
      */
     private fun launchProtocolStateHandler() {
         mainScope.launch {
-            // drop first default UNKNOWN state
-            protocolState.drop(1).collect { protocolState ->
+            protocolState.collect { protocolState ->
                 Log.d(TAG, "Protocol state changed: $protocolState")
-
-                serviceNotification.updateNotification(serverName, vpnProto?.label, protocolState)
-
-                clientMessengers.send {
-                    ServiceEvent.STATUS_CHANGED.packToMessage {
-                        putStatus(protocolState)
-                    }
-                }
-
-                VpnStateStore.store { VpnState(protocolState, serverName, serverIndex, vpnProto) }
-
                 when (protocolState) {
                     CONNECTED -> {
+                        clientMessenger.send(ServiceEvent.CONNECTED)
                         networkState.bindNetworkListener()
-                        // if (isActivityConnected) launchSendingStatistics()
-                        launchTrafficStatsUpdate()
+                        if (isServiceBound) launchSendingStatistics()
                     }
 
                     DISCONNECTED -> {
+                        clientMessenger.send(ServiceEvent.DISCONNECTED)
                         networkState.unbindNetworkListener()
-                        stopTrafficStatsUpdateJob()
-                        // stopSendingStatistics()
+                        stopSendingStatistics()
                         if (!isServiceBound) stopService()
                     }
 
                     DISCONNECTING -> {
                         networkState.unbindNetworkListener()
-                        stopTrafficStatsUpdateJob()
-                        // stopSendingStatistics()
+                        stopSendingStatistics()
                     }
 
                     RECONNECTING -> {
-                        stopTrafficStatsUpdateJob()
-                        // stopSendingStatistics()
+                        clientMessenger.send(ServiceEvent.RECONNECTING)
+                        stopSendingStatistics()
                     }
 
                     CONNECTING, UNKNOWN -> {}
@@ -401,9 +310,9 @@ open class AmneziaVpnService : VpnService() {
         }
     }
 
-/*  @MainThread
+    @MainThread
     private fun launchSendingStatistics() {
-        if (isServiceBound && isConnected) {
+        /* if (isServiceBound && isConnected) {
             statisticsSendingJob = mainScope.launch {
                 while (true) {
                     clientMessenger.send {
@@ -414,98 +323,29 @@ open class AmneziaVpnService : VpnService() {
                     delay(STATISTICS_SENDING_TIMEOUT)
                 }
             }
-        }
+        } */
     }
 
     @MainThread
     private fun stopSendingStatistics() {
         statisticsSendingJob?.cancel()
-    } */
-
-    @MainThread
-    private fun enableNotification() {
-        registerScreenStateBroadcastReceivers()
-        serviceNotification.updateNotification(serverName, vpnProto?.label, protocolState.value)
-        launchTrafficStatsUpdate()
     }
 
     @MainThread
-    private fun disableNotification() {
-        unregisterScreenStateBroadcastReceivers()
-        stopTrafficStatsUpdateJob()
-    }
-
-    @MainThread
-    private fun launchTrafficStatsUpdate() {
-        stopTrafficStatsUpdateJob()
-        if (isConnected &&
-            serviceNotification.isNotificationEnabled() &&
-            getSystemService<PowerManager>()?.isInteractive != false
-        ) {
-            Log.d(TAG, "Launch traffic stats update")
-            trafficStats.reset()
-            startTrafficStatsUpdateJob()
-        }
-    }
-
-    @MainThread
-    private fun startTrafficStatsUpdateJob() {
-        if (trafficStatsUpdateJob == null && trafficStats.isSupported()) {
-            Log.d(TAG, "Start traffic stats update")
-            trafficStatsUpdateJob = mainScope.launch {
-                while (true) {
-                    trafficStats.getSpeed().let { speed ->
-                        if (isConnected) {
-                            serviceNotification.updateSpeed(speed)
-                        }
-                    }
-                    delay(TRAFFIC_STATS_UPDATE_TIMEOUT)
-                }
-            }
-        }
-    }
-
-    @MainThread
-    private fun stopTrafficStatsUpdateJob() {
-        Log.d(TAG, "Stop traffic stats update")
-        trafficStatsUpdateJob?.cancel()
-        trafficStatsUpdateJob = null
-    }
-
-    @MainThread
-    private fun connect(vpnConfig: String? = null) {
-        if (vpnConfig == null) {
-            connectToVpn(Prefs.load(PREFS_CONFIG_KEY))
-        } else {
-            Prefs.save(PREFS_CONFIG_KEY, vpnConfig)
-            connectToVpn(vpnConfig)
-        }
-    }
-
-    @MainThread
-    private fun connectToVpn(vpnConfig: String) {
+    private fun connect(vpnConfig: String?) {
         if (isConnected || protocolState.value == CONNECTING) return
 
         Log.d(TAG, "Start VPN connection")
 
+        protocolState.value = CONNECTING
+
         val config = parseConfigToJson(vpnConfig)
-        saveServerData(config)
         if (config == null) {
             onError("Invalid VPN config")
             protocolState.value = DISCONNECTED
             return
         }
 
-        try {
-            vpnProto = VpnProto.get(config.getString("protocol"))
-        } catch (e: Exception) {
-            onError("Invalid VPN config: ${e.message}")
-            protocolState.value = DISCONNECTED
-            return
-        }
-
-        protocolState.value = CONNECTING
-
         if (!checkPermission()) {
             protocolState.value = DISCONNECTED
             return
@@ -515,10 +355,8 @@ open class AmneziaVpnService : VpnService() {
             disconnectionJob?.join()
             disconnectionJob = null
 
-            vpnProto?.protocol?.let { protocol ->
-                protocol.initialize(applicationContext, protocolState, ::onError)
-                protocol.startVpn(config, Builder(), ::protect)
-            }
+            protocol = getProtocol(config.getString("protocol"))
+            protocol?.startVpn(config, Builder(), ::protect)
         }
     }
 
@@ -534,8 +372,8 @@ open class AmneziaVpnService : VpnService() {
             connectionJob?.join()
             connectionJob = null
 
-            vpnProto?.protocol?.stopVpn()
-
+            protocol?.stopVpn()
+            protocol = null
             try {
                 withTimeout(DISCONNECT_TIMEOUT) {
                     // waiting for disconnect state
@@ -557,55 +395,50 @@ open class AmneziaVpnService : VpnService() {
         protocolState.value = RECONNECTING
 
         connectionJob = connectionScope.launch {
-            vpnProto?.protocol?.reconnectVpn(Builder())
+            protocol?.reconnectVpn(Builder())
         }
     }
 
+    @MainThread
+    private fun getProtocol(protocolName: String): Protocol =
+        protocolCache[protocolName]
+            ?: when (protocolName) {
+                "wireguard" -> Wireguard()
+                "awg" -> Awg()
+                "openvpn" -> OpenVpn()
+                "cloak" -> Cloak()
+                else -> throw IllegalArgumentException("Protocol '$protocolName' not found")
+            }.apply { initialize(applicationContext, protocolState, ::onError) }
+                .also { protocolCache[protocolName] = it }
+
     /**
      * Utils methods
      */
     private fun onError(msg: String) {
         Log.e(TAG, msg)
         mainScope.launch {
-            clientMessengers.send {
+            clientMessenger.send {
                 ServiceEvent.ERROR.packToMessage {
-                    putString(MSG_ERROR, msg)
+                    putString(ERROR_MSG, msg)
                 }
             }
         }
     }
 
-    private fun parseConfigToJson(vpnConfig: String): JSONObject? =
-        if (vpnConfig.isBlank()) {
-            null
-        } else {
-            try {
-                JSONObject(vpnConfig)
-            } catch (e: JSONException) {
-                onError("Invalid VPN config json format: ${e.message}")
-                null
+    private fun parseConfigToJson(vpnConfig: String?): JSONObject? =
+        try {
+            vpnConfig?.let {
+                JSONObject(it)
             }
+        } catch (e: JSONException) {
+            onError("Invalid VPN config json format: ${e.message}")
+            null
         }
 
-    private fun saveServerData(config: JSONObject?) {
-        serverName = config?.opt("description") as String?
-        serverIndex = config?.opt("serverIndex") as Int? ?: -1
-        Log.d(TAG, "Save server data: ($serverIndex, $serverName)")
-        Prefs.save(PREFS_SERVER_NAME, serverName)
-        Prefs.save(PREFS_SERVER_INDEX, serverIndex)
-    }
-
-    private fun loadServerData() {
-        serverName = Prefs.load<String>(PREFS_SERVER_NAME).ifBlank { null }
-        if (serverName != null) serverIndex = Prefs.load(PREFS_SERVER_INDEX)
-        Log.d(TAG, "Load server data: ($serverIndex, $serverName)")
-    }
-
     private fun checkPermission(): Boolean =
         if (prepare(applicationContext) != null) {
             Intent(this, VpnRequestActivity::class.java).apply {
                 addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                putExtra(EXTRA_PROTOCOL, vpnProto)
             }.also {
                 startActivity(it)
             }
@@ -613,11 +446,4 @@ open class AmneziaVpnService : VpnService() {
         } else {
             true
         }
-
-    companion object {
-        fun isRunning(context: Context, processName: String): Boolean =
-            context.getSystemService<ActivityManager>()!!.runningAppProcesses.any {
-                it.processName == processName && it.importance <= IMPORTANCE_FOREGROUND_SERVICE
-            }
-    }
 }

client/android/src/org/amnezia/vpn/AppListProvider.kt

@@ -1,73 +0,0 @@
-import android.Manifest.permission.INTERNET
-import android.content.pm.ApplicationInfo
-import android.content.pm.PackageInfo
-import android.content.pm.PackageManager
-import android.content.pm.PackageManager.NameNotFoundException
-import android.graphics.Bitmap
-import android.graphics.Bitmap.Config.ARGB_8888
-import androidx.core.graphics.drawable.toBitmapOrNull
-import org.amnezia.vpn.util.Log
-import org.json.JSONArray
-import org.json.JSONObject
-
-private const val TAG = "AppListProvider"
-
-object AppListProvider {
-    fun getAppList(pm: PackageManager, selfPackageName: String): String {
-        val jsonArray = JSONArray()
-        pm.getPackagesHoldingPermissions(arrayOf(INTERNET), 0)
-            .filter { it.packageName != selfPackageName }
-            .map { App(it, pm) }
-            .sortedWith(App::compareTo)
-            .map(App::toJson)
-            .forEach(jsonArray::put)
-        return jsonArray.toString()
-    }
-
-    fun getAppIcon(pm: PackageManager, packageName: String, width: Int, height: Int): Bitmap {
-        val icon = try {
-            pm.getApplicationIcon(packageName)
-        } catch (e: NameNotFoundException) {
-            Log.e(TAG, "Package $packageName was not found: $e")
-            pm.defaultActivityIcon
-        }
-        val w: Int = if (width > 0) width else icon.intrinsicWidth
-        val h: Int = if (height > 0) height else icon.intrinsicHeight
-        return icon.toBitmapOrNull(w, h, ARGB_8888)
-            ?: Bitmap.createBitmap(w, h, ARGB_8888)
-    }
-}
-
-private class App(pi: PackageInfo, pm: PackageManager, ai: ApplicationInfo = pi.applicationInfo) : Comparable<App> {
-    val name: String?
-    val packageName: String = pi.packageName
-    val icon: Boolean = ai.icon != 0
-    val isLaunchable: Boolean = pm.getLaunchIntentForPackage(packageName) != null
-
-    init {
-        val name = ai.loadLabel(pm).toString()
-        this.name = if (name != packageName) name else null
-    }
-
-    override fun compareTo(other: App): Int {
-        val r = other.isLaunchable.compareTo(isLaunchable)
-        if (r != 0) return r
-        if (name != other.name) {
-            return when {
-                name == null -> 1
-                other.name == null -> -1
-                else -> String.CASE_INSENSITIVE_ORDER.compare(name, other.name)
-            }
-        }
-        return String.CASE_INSENSITIVE_ORDER.compare(packageName, other.packageName)
-    }
-
-    fun toJson(): JSONObject {
-        val jsonObject = JSONObject()
-        jsonObject.put("package", packageName)
-        jsonObject.put("name", name)
-        jsonObject.put("icon", icon)
-        jsonObject.put("launchable", isLaunchable)
-        return jsonObject
-    }
-}

client/android/src/org/amnezia/vpn/AwgService.kt

@@ -1,3 +0,0 @@
-package org.amnezia.vpn
-
-class AwgService : AmneziaVpnService()

client/android/src/org/amnezia/vpn/CameraActivity.kt

@@ -140,7 +140,7 @@ class CameraActivity : ComponentActivity() {
                             }
                         }
                     }.addOnFailureListener {
-                        Log.e(TAG, "Processing QR code image failed: ${it.message}")
+                        Log.e(TAG, "Processing QR-code image failed: ${it.message}")
                     }.addOnCompleteListener {
                         imageProxy.close()
                     }

client/android/src/org/amnezia/vpn/IpcMessage.kt

@@ -20,7 +20,9 @@ sealed interface IpcMessage {
 }
 
 enum class ServiceEvent : IpcMessage {
-    STATUS_CHANGED,
+    CONNECTED,
+    DISCONNECTED,
+    RECONNECTING,
     STATUS,
     STATISTICS_UPDATE,
     ERROR
@@ -28,11 +30,9 @@ enum class ServiceEvent : IpcMessage {
 
 enum class Action : IpcMessage {
     REGISTER_CLIENT,
-    UNREGISTER_CLIENT,
     CONNECT,
     DISCONNECT,
     REQUEST_STATUS,
-    NOTIFICATION_PERMISSION_GRANTED,
     SET_SAVE_LOGS
 }
 

client/android/src/org/amnezia/vpn/IpcMessenger.kt

@@ -9,21 +9,11 @@ import org.amnezia.vpn.util.Log
 private const val TAG = "IpcMessenger"
 
 class IpcMessenger(
-    messengerName: String? = null,
     private val onDeadObjectException: () -> Unit = {},
-    private val onRemoteException: () -> Unit = {}
+    private val onRemoteException: () -> Unit = {},
+    private val messengerName: String = "Unknown"
 ) {
     private var messenger: Messenger? = null
-    val name = messengerName ?: "Unknown"
-
-    constructor(
-        messenger: Messenger,
-        messengerName: String? = null,
-        onDeadObjectException: () -> Unit = {},
-        onRemoteException: () -> Unit = {}
-    ) : this(messengerName, onDeadObjectException, onRemoteException) {
-        this.messenger = messenger
-    }
 
     fun set(messenger: Messenger) {
         this.messenger = messenger
@@ -35,29 +25,19 @@ class IpcMessenger(
 
     fun send(msg: () -> Message) = messenger?.sendMsg(msg())
 
-    fun send(msg: Message, replyTo: Messenger) = messenger?.sendMsg(msg.apply { this.replyTo = replyTo })
-
     fun <T> send(msg: T)
         where T : Enum<T>, T : IpcMessage = messenger?.sendMsg(msg.packToMessage())
 
-    fun <T> send(msg: T, replyTo: Messenger)
-        where T : Enum<T>, T : IpcMessage = messenger?.sendMsg(msg.packToMessage().apply { this.replyTo = replyTo })
-
     private fun Messenger.sendMsg(msg: Message) {
         try {
             send(msg)
         } catch (e: DeadObjectException) {
-            Log.w(TAG, "$name messenger is dead")
+            Log.w(TAG, "$messengerName messenger is dead")
             messenger = null
             onDeadObjectException()
         } catch (e: RemoteException) {
-            Log.w(TAG, "Sending a message to the $name messenger failed: ${e.message}")
+            Log.w(TAG, "Sending a message to the $messengerName messenger failed: ${e.message}")
             onRemoteException()
         }
     }
 }
-
-fun Map<Messenger, IpcMessenger>.send(msg: () -> Message) = this.values.forEach { it.send(msg) }
-
-fun <T> Map<Messenger, IpcMessenger>.send(msg: T)
-    where T : Enum<T>, T : IpcMessage = this.values.forEach { it.send(msg) }

client/android/src/org/amnezia/vpn/OpenVpnService.kt

@@ -1,3 +0,0 @@
-package org.amnezia.vpn
-
-class OpenVpnService : AmneziaVpnService()

client/android/src/org/amnezia/vpn/PackageManagerHelper.java

@@ -0,0 +1,189 @@
+/* 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/. */
+
+package org.amnezia.vpn;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.Manifest.permission;
+import android.net.Uri;
+import android.os.Build;
+import android.util.Log;
+import android.webkit.WebView;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Pattern;
+
+// Gets used by /platforms/android/androidAppListProvider.cpp
+public class PackageManagerHelper {
+  final static String TAG = "PackageManagerHelper";
+  final static int MIN_CHROME_VERSION = 65;
+
+  final static List<String> CHROME_BROWSERS = Arrays.asList(
+      new String[] {"com.google.android.webview", "com.android.webview", "com.google.chrome"});
+
+  private static String getAllAppNames(Context ctx) {
+    JSONObject output = new JSONObject();
+    PackageManager pm = ctx.getPackageManager();
+    List<String> browsers = getBrowserIDs(pm);
+    List<PackageInfo> packs = pm.getInstalledPackages(PackageManager.GET_PERMISSIONS);
+    for (int i = 0; i < packs.size(); i++) {
+      PackageInfo p = packs.get(i);
+      // Do not add ourselves and System Apps to the list, unless it might be a browser
+      if ((!isSystemPackage(p,pm) || browsers.contains(p.packageName))
+          && !isSelf(p)) {
+        String appid = p.packageName;
+        String appName = p.applicationInfo.loadLabel(pm).toString();
+        try {
+          output.put(appid, appName);
+        } catch (JSONException e) {
+          e.printStackTrace();
+        }
+      }
+    }
+    return output.toString();
+  }
+
+  private static Drawable getAppIcon(Context ctx, String id) {
+    try {
+      return ctx.getPackageManager().getApplicationIcon(id);
+    } catch (PackageManager.NameNotFoundException e) {
+      e.printStackTrace();
+    }
+    return new ColorDrawable(Color.TRANSPARENT);
+  }
+
+  private static boolean isSystemPackage(PackageInfo pkgInfo, PackageManager pm) {
+    if( (pkgInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0){
+      // no system app
+      return false;
+    }
+    // For Systems Packages there are Cases where we want to add it anyway:
+    // Has the use Internet permission (otherwise makes no sense)
+    // Had at least 1 update (this means it's probably on any AppStore)
+    // Has a a launch activity (has a ui and is not just a system service)
+
+    if(!usesInternet(pkgInfo)){
+      return true;
+    }
+    if(!hadUpdate(pkgInfo)){
+      return true;
+    }
+    if(pm.getLaunchIntentForPackage(pkgInfo.packageName) == null){
+      // If there is no way to launch this from a homescreen, def a sys package
+      return true;
+    }
+    return false;
+  }
+  private static boolean isSelf(PackageInfo pkgInfo) {
+    return pkgInfo.packageName.equals("org.amnezia.vpn")
+        || pkgInfo.packageName.equals("org.amnezia.vpn.debug");
+  }
+  private static boolean usesInternet(PackageInfo pkgInfo){
+    if(pkgInfo.requestedPermissions == null){
+      return false;
+    }
+    for(int i=0; i < pkgInfo.requestedPermissions.length; i++) {
+      String permission = pkgInfo.requestedPermissions[i];
+      if(Manifest.permission.INTERNET.equals(permission)){
+        return true;
+      }
+    }
+    return false;
+  }
+  private static boolean hadUpdate(PackageInfo pkgInfo){
+    return pkgInfo.lastUpdateTime > pkgInfo.firstInstallTime;
+  }
+
+  // Returns List of all Packages that can classify themselves as browsers
+  private static List<String> getBrowserIDs(PackageManager pm) {
+    Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.amnezia.org/"));
+    intent.addCategory(Intent.CATEGORY_BROWSABLE);
+    // We've tried using PackageManager.MATCH_DEFAULT_ONLY flag and found that browsers that
+    // are not set as the default browser won't be matched even if they had CATEGORY_DEFAULT set
+    // in the intent filter
+
+    List<ResolveInfo> resolveInfos = pm.queryIntentActivities(intent, PackageManager.MATCH_ALL);
+    List<String> browsers = new ArrayList<String>();
+    for (int i = 0; i < resolveInfos.size(); i++) {
+      ResolveInfo info = resolveInfos.get(i);
+      String browserID = info.activityInfo.packageName;
+      browsers.add(browserID);
+    }
+    return browsers;
+  }
+
+  // Gets called in AndroidAuthenticationListener;
+  public static boolean isWebViewSupported(Context ctx) {
+    Log.v(TAG, "Checking if installed Webview is compatible with FxA");
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+      // The default Webview is able do to FXA
+      return true;
+    }
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      PackageInfo pi = WebView.getCurrentWebViewPackage();
+      if (CHROME_BROWSERS.contains(pi.packageName)) {
+        return isSupportedChromeBrowser(pi);
+      }
+      return isNotAncientBrowser(pi);
+    }
+
+    // Before O the webview is hardcoded, but we dont know which package it is.
+    // Check if com.google.android.webview is installed
+    PackageManager pm = ctx.getPackageManager();
+    try {
+      PackageInfo pi = pm.getPackageInfo("com.google.android.webview", 0);
+      return isSupportedChromeBrowser(pi);
+    } catch (PackageManager.NameNotFoundException e) {
+    }
+    // Otherwise check com.android.webview
+    try {
+      PackageInfo pi = pm.getPackageInfo("com.android.webview", 0);
+      return isSupportedChromeBrowser(pi);
+    } catch (PackageManager.NameNotFoundException e) {
+    }
+    Log.e(TAG, "Android System WebView is not found");
+    // Giving up :(
+    return false;
+  }
+
+  private static boolean isSupportedChromeBrowser(PackageInfo pi) {
+    Log.d(TAG, "Checking Chrome Based Browser: " + pi.packageName);
+    Log.d(TAG, "version name: " + pi.versionName);
+    Log.d(TAG, "version code: " + pi.versionCode);
+    try {
+      String versionCode = pi.versionName.split(Pattern.quote(" "))[0];
+      String majorVersion = versionCode.split(Pattern.quote("."))[0];
+      int version = Integer.parseInt(majorVersion);
+      return version >= MIN_CHROME_VERSION;
+    } catch (Exception e) {
+      Log.e(TAG, "Failed to check Chrome Version Code " + pi.versionName);
+      return false;
+    }
+  }
+
+  private static boolean isNotAncientBrowser(PackageInfo pi) {
+    // Not a google chrome - So the version name is worthless
+    // Lets just make sure the WebView
+    // used is not ancient ==> Was updated in at least the last 365 days
+    Log.d(TAG, "Checking Chrome Based Browser: " + pi.packageName);
+    Log.d(TAG, "version name: " + pi.versionName);
+    Log.d(TAG, "version code: " + pi.versionCode);
+    double oneYearInMillis = 31536000000L;
+    return pi.lastUpdateTime > (System.currentTimeMillis() - oneYearInMillis);
+  }
+}

client/android/src/org/amnezia/vpn/ServiceNotification.kt

@@ -1,175 +0,0 @@
-package org.amnezia.vpn
-
-import android.Manifest.permission
-import android.annotation.SuppressLint
-import android.app.Notification
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.os.Build
-import androidx.core.app.NotificationChannelCompat.Builder
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationCompat.Action
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.content.ContextCompat
-import org.amnezia.vpn.protocol.ProtocolState
-import org.amnezia.vpn.protocol.ProtocolState.CONNECTED
-import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTED
-import org.amnezia.vpn.util.Log
-import org.amnezia.vpn.util.net.TrafficStats.TrafficData
-
-private const val TAG = "ServiceNotification"
-
-private const val OLD_NOTIFICATION_CHANNEL_ID: String = "org.amnezia.vpn.notification"
-private const val NOTIFICATION_CHANNEL_ID: String = "org.amnezia.vpn.notifications"
-const val NOTIFICATION_ID = 1337
-
-private const val GET_ACTIVITY_REQUEST_CODE = 0
-private const val CONNECT_REQUEST_CODE = 1
-private const val DISCONNECT_REQUEST_CODE = 2
-
-class ServiceNotification(private val context: Context) {
-
-    private val upDownSymbols = when (Build.BRAND) {
-        "Infinix" -> '˅' to '˄'
-        else -> '↓' to '↑'
-    }
-
-    private val notificationManager = NotificationManagerCompat.from(context)
-
-    private val notificationBuilder = NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_ID)
-        .setShowWhen(false)
-        .setOngoing(true)
-        .setPriority(NotificationCompat.PRIORITY_DEFAULT)
-        .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-        .setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE)
-        .setCategory(NotificationCompat.CATEGORY_SERVICE)
-        .setContentIntent(
-            PendingIntent.getActivity(
-                context,
-                GET_ACTIVITY_REQUEST_CODE,
-                Intent(context, AmneziaActivity::class.java),
-                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-            )
-        )
-
-    private val zeroSpeed: String = with(TrafficData.ZERO) {
-        formatSpeedString(rxString, txString)
-    }
-
-    fun buildNotification(serverName: String?, protocol: String?, state: ProtocolState): Notification {
-        val speedString = if (state == CONNECTED) zeroSpeed else null
-
-        Log.d(TAG, "Build notification: $serverName, $state")
-
-        return notificationBuilder
-            .setSmallIcon(R.drawable.ic_amnezia_round)
-            .setContentTitle((serverName ?: "AmneziaVPN") + (protocol?.let { " $it" } ?: ""))
-            .setContentText(context.getString(state))
-            .setSubText(speedString)
-            .setWhen(System.currentTimeMillis())
-            .clearActions()
-            .apply {
-                getAction(state)?.let {
-                    addAction(it)
-                }
-            }
-            .build()
-    }
-
-    private fun buildNotification(speed: TrafficData): Notification =
-        notificationBuilder
-            .setWhen(System.currentTimeMillis())
-            .setSubText(getSpeedString(speed))
-            .build()
-
-    fun isNotificationEnabled(): Boolean {
-        if (!context.isNotificationPermissionGranted()) return false
-        if (!notificationManager.areNotificationsEnabled()) return false
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            return notificationManager.getNotificationChannel(NOTIFICATION_CHANNEL_ID)
-                ?.let { it.importance != NotificationManager.IMPORTANCE_NONE } ?: true
-        }
-        return true
-    }
-
-    @SuppressLint("MissingPermission")
-    fun updateNotification(serverName: String?, protocol: String?, state: ProtocolState) {
-        if (context.isNotificationPermissionGranted()) {
-            Log.d(TAG, "Update notification: $serverName, $state")
-            notificationManager.notify(NOTIFICATION_ID, buildNotification(serverName, protocol, state))
-        }
-    }
-
-    @SuppressLint("MissingPermission")
-    fun updateSpeed(speed: TrafficData) {
-        if (context.isNotificationPermissionGranted()) {
-            notificationManager.notify(NOTIFICATION_ID, buildNotification(speed))
-        }
-    }
-
-    private fun getSpeedString(traffic: TrafficData) =
-        if (traffic == TrafficData.ZERO) zeroSpeed
-        else formatSpeedString(traffic.rxString, traffic.txString)
-
-    private fun formatSpeedString(rx: String, tx: String) = with(upDownSymbols) { "$first $rx  $second $tx" }
-
-    private fun getAction(state: ProtocolState): Action? {
-        return when (state) {
-            CONNECTED -> {
-                Action(
-                    0, context.getString(R.string.disconnect),
-                    PendingIntent.getBroadcast(
-                        context,
-                        DISCONNECT_REQUEST_CODE,
-                        Intent(ACTION_DISCONNECT).apply {
-                            setPackage(context.packageName)
-                        },
-                        PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-                    )
-                )
-            }
-
-            DISCONNECTED -> {
-                Action(
-                    0, context.getString(R.string.connect),
-                    PendingIntent.getBroadcast(
-                        context,
-                        CONNECT_REQUEST_CODE,
-                        Intent(ACTION_CONNECT).apply {
-                            setPackage(context.packageName)
-                        },
-                        PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-                    )
-                )
-            }
-
-            else -> null
-        }
-    }
-
-    companion object {
-        fun createNotificationChannel(context: Context) {
-            with(NotificationManagerCompat.from(context)) {
-                deleteNotificationChannel(OLD_NOTIFICATION_CHANNEL_ID)
-                createNotificationChannel(
-                    Builder(NOTIFICATION_CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_DEFAULT)
-                        .setShowBadge(false)
-                        .setSound(null, null)
-                        .setVibrationEnabled(false)
-                        .setLightsEnabled(false)
-                        .setName("AmneziaVPN")
-                        .setDescription(context.resources.getString(R.string.notificationChannelDescription))
-                        .build()
-                )
-            }
-        }
-    }
-}
-
-fun Context.isNotificationPermissionGranted(): Boolean =
-    Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU ||
-        ContextCompat.checkSelfPermission(this, permission.POST_NOTIFICATIONS) ==
-        PackageManager.PERMISSION_GRANTED

client/android/src/org/amnezia/vpn/VpnProto.kt

@@ -1,75 +0,0 @@
-package org.amnezia.vpn
-
-import org.amnezia.vpn.protocol.Protocol
-import org.amnezia.vpn.protocol.awg.Awg
-import org.amnezia.vpn.protocol.cloak.Cloak
-import org.amnezia.vpn.protocol.openvpn.OpenVpn
-import org.amnezia.vpn.protocol.wireguard.Wireguard
-import org.amnezia.vpn.protocol.xray.Xray
-
-enum class VpnProto(
-    val label: String,
-    val processName: String,
-    val serviceClass: Class<out AmneziaVpnService>
-) {
-    WIREGUARD(
-        "WireGuard",
-        "org.amnezia.vpn:amneziaAwgService",
-        AwgService::class.java
-    ) {
-        override fun createProtocol(): Protocol = Wireguard()
-    },
-
-    AWG(
-        "AmneziaWG",
-        "org.amnezia.vpn:amneziaAwgService",
-        AwgService::class.java
-    ) {
-        override fun createProtocol(): Protocol = Awg()
-    },
-
-    OPENVPN(
-        "OpenVPN",
-        "org.amnezia.vpn:amneziaOpenVpnService",
-        OpenVpnService::class.java
-    ) {
-        override fun createProtocol(): Protocol = OpenVpn()
-    },
-
-    CLOAK(
-        "Cloak",
-        "org.amnezia.vpn:amneziaOpenVpnService",
-        OpenVpnService::class.java
-    ) {
-        override fun createProtocol(): Protocol = Cloak()
-    },
-
-    XRAY(
-        "XRay",
-        "org.amnezia.vpn:amneziaXrayService",
-        XrayService::class.java
-    ) {
-        override fun createProtocol(): Protocol = Xray.instance
-    },
-
-    SSXRAY(
-        "SSXRay",
-        "org.amnezia.vpn:amneziaXrayService",
-        XrayService::class.java
-    ) {
-        override fun createProtocol(): Protocol = Xray.instance
-    };
-
-    private var _protocol: Protocol? = null
-    val protocol: Protocol
-        get() {
-            if (_protocol == null) _protocol = createProtocol()
-            return _protocol ?: throw AssertionError("Set to null by another thread")
-        }
-
-    protected abstract fun createProtocol(): Protocol
-
-    companion object {
-        fun get(protocolName: String): VpnProto = VpnProto.valueOf(protocolName.uppercase())
-    }
-}

client/android/src/org/amnezia/vpn/VpnRequestActivity.kt

@@ -1,15 +1,12 @@
 package org.amnezia.vpn
 
-import android.app.AlertDialog
 import android.app.KeyguardManager
 import android.content.BroadcastReceiver
+import android.content.Context
 import android.content.Intent
-import android.content.res.Configuration.UI_MODE_NIGHT_MASK
-import android.content.res.Configuration.UI_MODE_NIGHT_YES
+import android.content.IntentFilter
 import android.net.VpnService
-import android.os.Build
 import android.os.Bundle
-import android.provider.Settings
 import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.result.ActivityResult
@@ -19,11 +16,9 @@ import androidx.core.content.getSystemService
 import org.amnezia.vpn.util.Log
 
 private const val TAG = "VpnRequestActivity"
-const val EXTRA_PROTOCOL = "PROTOCOL"
 
 class VpnRequestActivity : ComponentActivity() {
 
-    private var vpnProto: VpnProto? = null
     private var userPresentReceiver: BroadcastReceiver? = null
     private val requestLauncher =
         registerForActivityResult(StartActivityForResult(), ::checkRequestResult)
@@ -31,18 +26,14 @@ class VpnRequestActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         Log.d(TAG, "Start request activity")
-        vpnProto = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            intent.extras?.getSerializable(EXTRA_PROTOCOL, VpnProto::class.java)
-        } else {
-            @Suppress("DEPRECATION")
-            intent.extras?.getSerializable(EXTRA_PROTOCOL) as VpnProto
-        }
         val requestIntent = VpnService.prepare(applicationContext)
         if (requestIntent != null) {
             if (getSystemService<KeyguardManager>()!!.isKeyguardLocked) {
-                userPresentReceiver = registerBroadcastReceiver(Intent.ACTION_USER_PRESENT) {
-                    requestLauncher.launch(requestIntent)
+                userPresentReceiver = object : BroadcastReceiver() {
+                    override fun onReceive(context: Context?, intent: Intent?) =
+                        requestLauncher.launch(requestIntent)
                 }
+                registerReceiver(userPresentReceiver, IntentFilter(Intent.ACTION_USER_PRESENT))
             } else {
                 requestLauncher.launch(requestIntent)
             }
@@ -54,57 +45,26 @@ class VpnRequestActivity : ComponentActivity() {
     }
 
     override fun onDestroy() {
-        unregisterBroadcastReceiver(userPresentReceiver)
-        userPresentReceiver = null
+        userPresentReceiver?.let {
+            unregisterReceiver(it)
+        }
         super.onDestroy()
     }
 
     private fun checkRequestResult(result: ActivityResult) {
-        when (val resultCode = result.resultCode) {
-            RESULT_OK -> {
-                onPermissionGranted()
-                finish()
-            }
-
-            else -> {
-                Log.w(TAG, "Vpn permission denied, resultCode: $resultCode")
-                showOnVpnPermissionRejectDialog()
-            }
+        when (result.resultCode) {
+            RESULT_OK -> onPermissionGranted()
+            else -> Toast.makeText(this, "Vpn permission denied", Toast.LENGTH_LONG).show()
         }
+        finish()
     }
 
     private fun onPermissionGranted() {
-        Toast.makeText(this, resources.getString(R.string.vpnGranted), Toast.LENGTH_LONG).show()
-        vpnProto?.let { proto ->
-            Intent(applicationContext, proto.serviceClass).apply {
-                putExtra(AFTER_PERMISSION_CHECK, true)
-            }.also {
-                ContextCompat.startForegroundService(this, it)
-            }
-        } ?: run {
-            Intent(this, AmneziaActivity::class.java).apply {
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            }.also {
-                startActivity(it)
-            }
+        Toast.makeText(this, "Vpn permission granted", Toast.LENGTH_LONG).show()
+        Intent(applicationContext, AmneziaVpnService::class.java).apply {
+            putExtra(AFTER_PERMISSION_CHECK, true)
+        }.also {
+            ContextCompat.startForegroundService(this, it)
         }
     }
-
-    private fun showOnVpnPermissionRejectDialog() {
-        AlertDialog.Builder(this, getDialogTheme())
-            .setTitle(R.string.vpnSetupFailed)
-            .setMessage(R.string.vpnSetupFailedMessage)
-            .setNegativeButton(R.string.ok) { _, _ -> }
-            .setPositiveButton(R.string.openVpnSettings) { _, _ ->
-                startActivity(Intent(Settings.ACTION_VPN_SETTINGS))
-            }
-            .setOnDismissListener { finish() }
-            .show()
-    }
-
-    private fun getDialogTheme(): Int =
-        if (resources.configuration.uiMode and UI_MODE_NIGHT_MASK == UI_MODE_NIGHT_YES)
-            android.R.style.Theme_DeviceDefault_Dialog_Alert
-        else
-            android.R.style.Theme_DeviceDefault_Light_Dialog_Alert
 }

client/android/src/org/amnezia/vpn/VpnState.kt

@@ -1,88 +0,0 @@
-package org.amnezia.vpn
-
-import android.app.Application
-import androidx.datastore.core.CorruptionException
-import androidx.datastore.core.MultiProcessDataStoreFactory
-import androidx.datastore.core.Serializer
-import androidx.datastore.core.handlers.ReplaceFileCorruptionHandler
-import androidx.datastore.dataStoreFile
-import java.io.InputStream
-import java.io.OutputStream
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.SerializationException
-import kotlinx.serialization.decodeFromByteArray
-import kotlinx.serialization.encodeToByteArray
-import kotlinx.serialization.protobuf.ProtoBuf
-import org.amnezia.vpn.protocol.ProtocolState
-import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTED
-import org.amnezia.vpn.util.Log
-
-private const val TAG = "VpnState"
-private const val STORE_FILE_NAME = "vpnState"
-
-@Serializable
-data class VpnState(
-    val protocolState: ProtocolState,
-    val serverName: String? = null,
-    val serverIndex: Int = -1,
-    val vpnProto: VpnProto? = null
-) {
-    companion object {
-        val defaultState: VpnState = VpnState(DISCONNECTED)
-    }
-}
-
-object VpnStateStore {
-    private lateinit var app: Application
-
-    private val dataStore = MultiProcessDataStoreFactory.create(
-        serializer = VpnStateSerializer(),
-        produceFile = { app.dataStoreFile(STORE_FILE_NAME) },
-        corruptionHandler = ReplaceFileCorruptionHandler { e ->
-            Log.e(TAG, "VpnState DataStore corrupted: $e")
-            VpnState.defaultState
-        }
-    )
-
-    fun init(app: Application) {
-        Log.v(TAG, "Init VpnStateStore")
-        this.app = app
-    }
-
-    fun dataFlow(): Flow<VpnState> = dataStore.data.catch { e ->
-        Log.e(TAG, "Failed to read VpnState from store: ${e.message}")
-        emit(VpnState.defaultState)
-    }
-
-    suspend fun getVpnState(): VpnState = dataFlow().firstOrNull() ?: VpnState.defaultState
-
-    suspend fun store(f: (vpnState: VpnState) -> VpnState) {
-        try {
-            dataStore.updateData(f)
-        } catch (e: Exception) {
-            Log.e(TAG, "Failed to store VpnState: $e")
-            Log.w(TAG, "Remove DataStore file")
-            app.dataStoreFile(STORE_FILE_NAME).delete()
-        }
-    }
-}
-
-@OptIn(ExperimentalSerializationApi::class)
-private class VpnStateSerializer : Serializer<VpnState> {
-    override val defaultValue: VpnState = VpnState.defaultState
-
-    override suspend fun readFrom(input: InputStream): VpnState = try {
-        ProtoBuf.decodeFromByteArray<VpnState>(input.readBytes())
-    } catch (e: SerializationException) {
-        Log.e(TAG, "Failed to deserialize data: $e")
-        throw CorruptionException("Failed to deserialize data", e)
-    }
-
-    @Suppress("BlockingMethodInNonBlockingContext")
-    override suspend fun writeTo(t: VpnState, output: OutputStream) =
-        output.write(ProtoBuf.encodeToByteArray(t))
-}

client/android/src/org/amnezia/vpn/XrayService.kt

@@ -1,3 +0,0 @@
-package org.amnezia.vpn
-
-class XrayService : AmneziaVpnService()

client/android/src/org/amnezia/vpn/qt/QtAndroidController.kt

@@ -1,24 +1,18 @@
 package org.amnezia.vpn.qt
 
-import org.amnezia.vpn.protocol.ProtocolState
-import org.amnezia.vpn.protocol.Status
-
 /**
  * JNI functions of the AndroidController class from android_controller.cpp,
  * called by events in the Android part of the client
  */
 object QtAndroidController {
-
-    fun onStatus(status: Status) = onStatus(status.state)
-    fun onStatus(protocolState: ProtocolState) = onStatus(protocolState.ordinal)
-
     external fun onStatus(stateCode: Int)
     external fun onServiceDisconnected()
     external fun onServiceError()
 
     external fun onVpnPermissionRejected()
-    external fun onNotificationStateChanged()
-    external fun onVpnStateChanged(stateCode: Int)
+    external fun onVpnConnected()
+    external fun onVpnDisconnected()
+    external fun onVpnReconnecting()
     external fun onStatisticsUpdate(rxBytes: Long, txBytes: Long)
 
     external fun onFileOpened(uri: String)

client/android/utils/build.gradle.kts

@@ -17,7 +17,5 @@ android {
 }
 
 dependencies {
-    implementation(libs.androidx.core)
-    implementation(libs.kotlinx.coroutines)
     implementation(libs.androidx.security.crypto)
 }

client/android/utils/src/main/kotlin/Log.kt

@@ -109,11 +109,9 @@ object Log {
         "${deviceInfo()}\n${readLogs()}\nLOGCAT:\n${getLogcat()}"
 
     fun clearLogs() {
-        if (logDir.exists()) {
-            withLock {
-                logFile.delete()
-                rotateLogFile.delete()
-            }
+        withLock {
+            logFile.delete()
+            rotateLogFile.delete()
         }
     }
 

client/android/utils/src/main/kotlin/net/InetEndpoint.kt

@@ -1,21 +1,16 @@
 package org.amnezia.vpn.util.net
 
-import java.net.Inet4Address
 import java.net.InetAddress
 
 data class InetEndpoint(val address: InetAddress, val port: Int) {
 
-    override fun toString(): String = if (address is Inet4Address) {
-        "${address.ip}:$port"
-    } else {
-        "[${address.ip}]:$port"
-    }
+    override fun toString(): String = "${address.hostAddress}:$port"
 
     companion object {
         fun parse(data: String): InetEndpoint {
-            val i = data.lastIndexOf(':')
-            val address = parseInetAddress(data.substring(0, i))
-            val port = data.substring(i + 1).toInt()
+            val split = data.split(":")
+            val address = parseInetAddress(split.first())
+            val port = split.last().toInt()
             return InetEndpoint(address, port)
         }
     }

client/android/utils/src/main/kotlin/net/InetNetwork.kt

@@ -9,11 +9,7 @@ data class InetNetwork(val address: InetAddress, val mask: Int) {
 
     constructor(address: InetAddress) : this(address, address.maxPrefixLength)
 
-    val isIpv4: Boolean = address is Inet4Address
-    val isIpv6: Boolean
-        get() = !isIpv4
-
-    override fun toString(): String = "${address.ip}/$mask"
+    override fun toString(): String = "${address.hostAddress}/$mask"
 
     companion object {
         fun parse(data: String): InetNetwork {

client/android/utils/src/main/kotlin/net/IpAddress.kt

@@ -3,17 +3,12 @@ package org.amnezia.vpn.util.net
 import java.net.InetAddress
 
 @OptIn(ExperimentalUnsignedTypes::class)
-internal class IpAddress private constructor(private val address: UByteArray) : Comparable<IpAddress> {
+class IpAddress private constructor(private val address: UByteArray) : Comparable<IpAddress> {
 
     val size: Int = address.size
     val lastIndex: Int = address.lastIndex
     val maxMask: Int = size * 8
 
-    @OptIn(ExperimentalStdlibApi::class)
-    val hexFormat: HexFormat by lazy {
-        HexFormat { number.removeLeadingZeros = true }
-    }
-
     constructor(inetAddress: InetAddress) : this(inetAddress.address.asUByteArray())
 
     constructor(ipAddress: String) : this(parseInetAddress(ipAddress))
@@ -48,8 +43,6 @@ internal class IpAddress private constructor(private val address: UByteArray) :
         return copy
     }
 
-    fun isMinIp(): Boolean = address.all { it == 0x00u.toUByte() }
-
     fun isMaxIp(): Boolean = address.all { it == 0xffu.toUByte() }
 
     override fun compareTo(other: IpAddress): Int {
@@ -81,14 +74,12 @@ internal class IpAddress private constructor(private val address: UByteArray) :
     private fun toIpv6String(): String {
         val sb = StringBuilder()
         var i = 0
-        var block: Int
         while (i < size) {
-            block = address[i++].toInt() shl 8
-            block += address[i++].toInt()
-            sb.append(block.toHexString(hexFormat))
+            sb.append(address[i++].toHexString())
+            sb.append(address[i++].toHexString())
             sb.append(':')
         }
         sb.deleteAt(sb.lastIndex)
-        return convertIpv6ToCanonicalForm(sb.toString())
+        return sb.toString()
     }
 }

client/android/utils/src/main/kotlin/net/IpRange.kt

@@ -2,24 +2,14 @@ package org.amnezia.vpn.util.net
 
 import java.net.InetAddress
 
-class IpRange internal constructor(
-    internal val start: IpAddress,
-    internal val end: IpAddress
-) : Comparable<IpRange> {
+class IpRange(private val start: IpAddress, private val end: IpAddress) : Comparable<IpRange> {
 
     init {
-        if (start.size != end.size) {
-            throw IllegalArgumentException(
-                "Unable to create a range between IPv4 and IPv6 addresses (start IP: [$start], end IP: [$end])"
-            )
-        }
-        if (start > end) throw IllegalArgumentException("Start IP: [$start] is greater then end IP: [$end]")
+        if (start > end) throw IllegalArgumentException("Start IP: $start is greater then end IP: $end")
     }
 
     private constructor(addresses: Pair<IpAddress, IpAddress>) : this(addresses.first, addresses.second)
 
-    internal constructor(ipAddress: IpAddress) : this(ipAddress, ipAddress)
-
     constructor(inetAddress: InetAddress, mask: Int) : this(from(inetAddress, mask))
 
     constructor(address: String, mask: Int) : this(parseInetAddress(address), mask)
@@ -32,13 +22,6 @@ class IpRange internal constructor(
     private fun isIntersect(other: IpRange): Boolean =
         (start <= other.end) && (end >= other.start)
 
-    operator fun plus(other: IpRange): IpRange? {
-        if (start > other.end && !start.isMinIp() && start.dec() == other.end) return IpRange(other.start, end)
-        if (end < other.start && !end.isMaxIp() && end.inc() == other.start) return IpRange(start, other.end)
-        if (!isIntersect(other)) return null
-        return IpRange(minOf(start, other.start), maxOf(end, other.end))
-    }
-
     operator fun minus(other: IpRange): List<IpRange>? {
         if (this in other) return emptyList()
         if (!isIntersect(other)) return null
@@ -111,7 +94,9 @@ class IpRange internal constructor(
         return result
     }
 
-    override fun toString(): String = if (start == end) "<$start>" else "<$start - $end>"
+    override fun toString(): String {
+        return "$start - $end"
+    }
 
     companion object {
         private fun from(inetAddress: InetAddress, mask: Int): Pair<IpAddress, IpAddress> {

client/android/utils/src/main/kotlin/net/IpRangeSet.kt

@@ -1,35 +1,15 @@
 package org.amnezia.vpn.util.net
 
-class IpRangeSet {
+class IpRangeSet(ipRange: IpRange = IpRange("0.0.0.0", 0)) {
 
-    private val ranges = sortedSetOf<IpRange>()
-
-    fun add(ipRange: IpRange) {
-        val iterator = ranges.iterator()
-        var rangeToAdd = ipRange
-        run {
-            while (iterator.hasNext()) {
-                val curRange = iterator.next()
-                if (rangeToAdd.end < curRange.start &&
-                    !rangeToAdd.end.isMaxIp() &&
-                    rangeToAdd.end.inc() != curRange.start) break
-                (curRange + rangeToAdd)?.let { resultRange ->
-                    if (resultRange == curRange) return@run
-                    iterator.remove()
-                    rangeToAdd = resultRange
-                }
-            }
-            ranges += rangeToAdd
-        }
-    }
+    private val ranges = sortedSetOf(ipRange)
 
     fun remove(ipRange: IpRange) {
         val iterator = ranges.iterator()
         val splitRanges = mutableListOf<IpRange>()
         while (iterator.hasNext()) {
-            val curRange = iterator.next()
-            if (ipRange.end < curRange.start) break
-            (curRange - ipRange)?.let { resultRanges ->
+            val range = iterator.next()
+            (range - ipRange)?.let { resultRanges ->
                 iterator.remove()
                 splitRanges += resultRanges
             }
@@ -37,7 +17,10 @@ class IpRangeSet {
         ranges += splitRanges
     }
 
-    fun subnets(): List<InetNetwork> = ranges.map(IpRange::subnets).flatten()
+    fun subnets(): List<InetNetwork> =
+        ranges.map(IpRange::subnets).flatten()
 
-    override fun toString(): String = ranges.toString()
+    override fun toString(): String {
+        return ranges.toString()
+    }
 }

client/android/utils/src/main/kotlin/net/NetworkState.kt

@@ -10,9 +10,7 @@ import android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED
 import android.net.NetworkRequest
 import android.os.Build
 import android.os.Handler
-import androidx.core.content.getSystemService
 import kotlin.LazyThreadSafetyMode.NONE
-import kotlinx.coroutines.delay
 import org.amnezia.vpn.util.Log
 
 private const val TAG = "NetworkState"
@@ -30,7 +28,7 @@ class NetworkState(
     }
 
     private val connectivityManager: ConnectivityManager by lazy(NONE) {
-        context.getSystemService<ConnectivityManager>()!!
+        context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
     }
 
     private val networkRequest: NetworkRequest by lazy(NONE) {
@@ -82,24 +80,13 @@ class NetworkState(
         }
     }
 
-    suspend fun bindNetworkListener() {
+    fun bindNetworkListener() {
         if (isListenerBound) return
         Log.d(TAG, "Bind network listener")
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             connectivityManager.registerBestMatchingNetworkCallback(networkRequest, networkCallback, handler)
         } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            try {
-                connectivityManager.requestNetwork(networkRequest, networkCallback, handler)
-            } catch (e: SecurityException) {
-                Log.e(TAG, "Failed to bind network listener: $e")
-                // Android 11 bug: https://issuetracker.google.com/issues/175055271
-                if (e.message?.startsWith("Package android does not belong to") == true) {
-                    delay(1000)
-                    connectivityManager.requestNetwork(networkRequest, networkCallback, handler)
-                } else {
-                    throw e
-                }
-            }
+            connectivityManager.requestNetwork(networkRequest, networkCallback, handler)
         } else {
             connectivityManager.requestNetwork(networkRequest, networkCallback)
         }

client/android/utils/src/main/kotlin/net/NetworkUtils.kt

@@ -5,14 +5,12 @@ import android.net.ConnectivityManager
 import android.net.InetAddresses
 import android.net.NetworkCapabilities
 import android.os.Build
-import androidx.core.content.getSystemService
-import java.lang.reflect.InvocationTargetException
 import java.net.Inet4Address
 import java.net.Inet6Address
 import java.net.InetAddress
 
 fun getLocalNetworks(context: Context, ipv6: Boolean): List<InetNetwork> {
-    val connectivityManager = context.getSystemService<ConnectivityManager>()!!
+    val connectivityManager = context.getSystemService(ConnectivityManager::class.java)
     connectivityManager.activeNetwork?.let { network ->
         val netCapabilities = connectivityManager.getNetworkCapabilities(network)
         val linkProperties = connectivityManager.getLinkProperties(network)
@@ -41,28 +39,8 @@ private val parseNumericAddressCompat: (String) -> InetAddress =
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
         InetAddresses::parseNumericAddress
     } else {
-        try {
-            val m = InetAddress::class.java.getMethod("parseNumericAddress", String::class.java)
-            fun(address: String): InetAddress {
-                try {
-                    return m.invoke(null, address) as InetAddress
-                } catch (e: InvocationTargetException) {
-                    throw e.cause ?: e
-                }
-            }
-        } catch (_: NoSuchMethodException) {
-            fun(address: String): InetAddress {
-                return InetAddress.getByName(address)
-            }
+        val m = InetAddress::class.java.getMethod("parseNumericAddress", String::class.java)
+        fun(address: String): InetAddress {
+            return m.invoke(null, address) as InetAddress
         }
     }
-
-internal fun convertIpv6ToCanonicalForm(ipv6: String): String = ipv6
-    .replace("((?:(?:^|:)0+\\b){2,}):?(?!\\S*\\b\\1:0+\\b)(\\S*)".toRegex(), "::$2")
-
-internal val InetAddress.ip: String
-    get() = if (this is Inet4Address) {
-        hostAddress!!
-    } else {
-        convertIpv6ToCanonicalForm(hostAddress!!)
-    }

client/android/utils/src/main/kotlin/net/TrafficStats.kt

@@ -1,93 +0,0 @@
-package org.amnezia.vpn.util.net
-
-import android.net.TrafficStats
-import android.os.Build
-import android.os.Process
-import android.os.SystemClock
-import kotlin.math.roundToLong
-
-private const val BYTE = 1L
-private const val KiB = BYTE shl 10
-private const val MiB = KiB shl 10
-private const val GiB = MiB shl 10
-private const val TiB = GiB shl 10
-
-class TrafficStats {
-
-    private var lastTrafficData = TrafficData.ZERO
-    private var lastTimestamp = 0L
-
-    private val getTrafficDataCompat: () -> TrafficData =
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            val iface = "tun0"
-            fun(): TrafficData {
-                return TrafficData(TrafficStats.getRxBytes(iface), TrafficStats.getTxBytes(iface))
-            }
-        } else {
-            val uid = Process.myUid()
-            fun(): TrafficData {
-                return TrafficData(TrafficStats.getUidRxBytes(uid), TrafficStats.getUidTxBytes(uid))
-            }
-        }
-
-    fun reset() {
-        lastTrafficData = getTrafficDataCompat()
-        lastTimestamp = SystemClock.elapsedRealtime()
-    }
-
-    fun isSupported(): Boolean =
-        lastTrafficData.rx != TrafficStats.UNSUPPORTED.toLong() && lastTrafficData.tx != TrafficStats.UNSUPPORTED.toLong()
-
-    fun getSpeed(): TrafficData {
-        val timestamp = SystemClock.elapsedRealtime()
-        val elapsedSeconds = (timestamp - lastTimestamp) / 1000.0
-        val trafficData = getTrafficDataCompat()
-        val speed = trafficData.diff(lastTrafficData, elapsedSeconds)
-        lastTrafficData = trafficData
-        lastTimestamp = timestamp
-        return speed
-    }
-
-    class TrafficData(val rx: Long, val tx: Long) {
-
-        private var _rxString: String? = null
-        val rxString: String
-            get() {
-                if (_rxString == null) _rxString = rx.speedToString()
-                return _rxString ?: throw AssertionError("Set to null by another thread")
-            }
-
-        private var _txString: String? = null
-        val txString: String
-            get() {
-                if (_txString == null) _txString = tx.speedToString()
-                return _txString ?: throw AssertionError("Set to null by another thread")
-            }
-
-        fun diff(other: TrafficData, elapsedSeconds: Double): TrafficData {
-            val rx = ((this.rx - other.rx) / elapsedSeconds).round()
-            val tx = ((this.tx - other.tx) / elapsedSeconds).round()
-            return if (rx == 0L && tx == 0L) ZERO else TrafficData(rx, tx)
-        }
-
-        private fun Double.round() = if (isNaN()) 0L else roundToLong()
-
-        private fun Long.speedToString() =
-            when {
-                this < KiB -> formatSize(this, BYTE, "B/s")
-                this < MiB -> formatSize(this, KiB, "KiB/s")
-                this < GiB -> formatSize(this, MiB, "MiB/s")
-                this < TiB -> formatSize(this, GiB, "GiB/s")
-                else -> formatSize(this, TiB, "TiB/s")
-            }
-
-        private fun formatSize(bytes: Long, divider: Long, unit: String): String {
-            val s = (bytes.toDouble() / divider * 100).roundToLong() / 100.0
-            return "${s.toString().removeSuffix(".0")} $unit"
-        }
-
-        companion object {
-            val ZERO: TrafficData = TrafficData(0L, 0L)
-        }
-    }
-}

client/android/wireguard/src/main/kotlin/GoBackend.kt

@@ -0,0 +1,10 @@
+package org.amnezia.vpn.protocol.wireguard
+
+object GoBackend {
+    external fun wgGetConfig(handle: Int): String?
+    external fun wgGetSocketV4(handle: Int): Int
+    external fun wgGetSocketV6(handle: Int): Int
+    external fun wgTurnOff(handle: Int)
+    external fun wgTurnOn(ifName: String, tunFd: Int, settings: String): Int
+    external fun wgVersion(): String
+}

client/android/wireguard/src/main/kotlin/Wireguard.kt

@@ -1,9 +1,11 @@
 package org.amnezia.vpn.protocol.wireguard
 
+import android.content.Context
 import android.net.VpnService.Builder
 import java.util.TreeMap
-import org.amnezia.awg.GoBackend
+import kotlinx.coroutines.flow.MutableStateFlow
 import org.amnezia.vpn.protocol.Protocol
+import org.amnezia.vpn.protocol.ProtocolState
 import org.amnezia.vpn.protocol.ProtocolState.CONNECTED
 import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTED
 import org.amnezia.vpn.protocol.Statistics
@@ -59,7 +61,7 @@ open class Wireguard : Protocol() {
     override val statistics: Statistics
         get() {
             if (tunnelHandle == -1) return Statistics.EMPTY_STATISTICS
-            val config = GoBackend.awgGetConfig(tunnelHandle) ?: return Statistics.EMPTY_STATISTICS
+            val config = GoBackend.wgGetConfig(tunnelHandle) ?: return Statistics.EMPTY_STATISTICS
             return Statistics.build {
                 var optsCount = 0
                 config.splitToSequence("\n").forEach { line ->
@@ -75,8 +77,9 @@ open class Wireguard : Protocol() {
             }
         }
 
-    override fun internalInit() {
-        if (!isInitialized) loadSharedLibrary(context, "wg-go")
+    override fun initialize(context: Context, state: MutableStateFlow<ProtocolState>, onError: (String) -> Unit) {
+        super.initialize(context, state, onError)
+        loadSharedLibrary(context, "wg-go")
     }
 
     override fun startVpn(config: JSONObject, vpnBuilder: Builder, protect: (Int) -> Boolean) {
@@ -89,13 +92,12 @@ open class Wireguard : Protocol() {
         val configDataJson = config.getJSONObject("wireguard_config_data")
         val configData = parseConfigData(configDataJson.getString("config"))
         return WireguardConfig.build {
-            configWireguard(configData, configDataJson)
+            configWireguard(configData)
             configSplitTunneling(config)
-            configAppSplitTunneling(config)
         }
     }
 
-    protected fun WireguardConfig.Builder.configWireguard(configData: Map<String, String>, configDataJson: JSONObject) {
+    protected fun WireguardConfig.Builder.configWireguard(configData: Map<String, String>) {
         configData["Address"]?.split(",")?.map { address ->
             InetNetwork.parse(address.trim())
         }?.forEach(::addAddress)
@@ -116,14 +118,7 @@ open class Wireguard : Protocol() {
         if (routes.any { it !in defRoutes }) disableSplitTunneling()
         addRoutes(routes)
 
-        configDataJson.optString("mtu").let { mtu ->
-            if (mtu.isNotEmpty()) {
-                setMtu(mtu.toInt())
-            } else {
-                configData["MTU"]?.let { setMtu(it.toInt()) }
-            }
-        }
-
+        configData["MTU"]?.let { setMtu(it.toInt()) }
         configData["Endpoint"]?.let { setEndpoint(InetEndpoint.parse(it)) }
         configData["PersistentKeepalive"]?.let { setPersistentKeepalive(it.toInt()) }
         configData["PrivateKey"]?.let { setPrivateKeyHex(it.base64ToHex()) }
@@ -154,8 +149,8 @@ open class Wireguard : Protocol() {
             if (tunFd == null) {
                 throw VpnStartException("Create VPN interface: permission not granted or revoked")
             }
-            Log.i(TAG, "awg-go backend ${GoBackend.awgVersion()}")
-            tunnelHandle = GoBackend.awgTurnOn(ifName, tunFd.detachFd(), config.toWgUserspaceString())
+            Log.v(TAG, "Wg-go backend ${GoBackend.wgVersion()}")
+            tunnelHandle = GoBackend.wgTurnOn(ifName, tunFd.detachFd(), config.toWgUserspaceString())
         }
 
         if (tunnelHandle < 0) {
@@ -163,8 +158,8 @@ open class Wireguard : Protocol() {
             throw VpnStartException("Wireguard tunnel creation error")
         }
 
-        if (!protect(GoBackend.awgGetSocketV4(tunnelHandle)) || !protect(GoBackend.awgGetSocketV6(tunnelHandle))) {
-            GoBackend.awgTurnOff(tunnelHandle)
+        if (!protect(GoBackend.wgGetSocketV4(tunnelHandle)) || !protect(GoBackend.wgGetSocketV6(tunnelHandle))) {
+            GoBackend.wgTurnOff(tunnelHandle)
             tunnelHandle = -1
             throw VpnStartException("Protect VPN interface: permission not granted or revoked")
         }
@@ -177,7 +172,7 @@ open class Wireguard : Protocol() {
         }
         val handleToClose = tunnelHandle
         tunnelHandle = -1
-        GoBackend.awgTurnOff(handleToClose)
+        GoBackend.wgTurnOff(handleToClose)
         state.value = DISCONNECTED
     }
 

client/android/wireguard/src/main/kotlin/WireguardConfig.kt

@@ -37,8 +37,8 @@ open class WireguardConfig protected constructor(
 
     open fun appendPeerLine(sb: StringBuilder) = with(sb) {
         appendLine("public_key=$publicKeyHex")
-        routes.filter { it.include }.forEach { route ->
-            appendLine("allowed_ip=${route.inetNetwork}")
+        routes.forEach { route ->
+            appendLine("allowed_ip=$route")
         }
         appendLine("endpoint=$endpoint")
         if (persistentKeepalive != 0)

client/android/wireguard/src/main/kotlin/org/amnezia/awg/GoBackend.kt

@@ -1,10 +0,0 @@
-package org.amnezia.awg
-
-object GoBackend {
-    external fun awgGetConfig(handle: Int): String?
-    external fun awgGetSocketV4(handle: Int): Int
-    external fun awgGetSocketV6(handle: Int): Int
-    external fun awgTurnOff(handle: Int)
-    external fun awgTurnOn(ifName: String, tunFd: Int, settings: String): Int
-    external fun awgVersion(): String
-}

client/android/xray/build.gradle.kts

@@ -1,19 +0,0 @@
-plugins {
-    id(libs.plugins.android.library.get().pluginId)
-    id(libs.plugins.kotlin.android.get().pluginId)
-}
-
-kotlin {
-    jvmToolchain(17)
-}
-
-android {
-    namespace = "org.amnezia.vpn.protocol.xray"
-}
-
-dependencies {
-    compileOnly(project(":utils"))
-    compileOnly(project(":protocolApi"))
-    implementation(project(":xray:libXray"))
-    implementation(libs.kotlinx.coroutines)
-}

client/android/xray/libXray/build.gradle.kts

@@ -1,6 +0,0 @@
-@file:Suppress("UnstableApiUsage")
-
-configurations {
-    maybeCreate("default")
-}
-artifacts.add("default", file("libxray.aar"))

client/android/xray/src/main/kotlin/Xray.kt

@@ -1,239 +0,0 @@
-package org.amnezia.vpn.protocol.xray
-
-import android.content.Context
-import android.net.VpnService.Builder
-import java.io.File
-import java.io.IOException
-import go.Seq
-import org.amnezia.vpn.protocol.BadConfigException
-import org.amnezia.vpn.protocol.Protocol
-import org.amnezia.vpn.protocol.ProtocolState.CONNECTED
-import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTED
-import org.amnezia.vpn.protocol.Statistics
-import org.amnezia.vpn.protocol.VpnStartException
-import org.amnezia.vpn.protocol.xray.libXray.DialerController
-import org.amnezia.vpn.protocol.xray.libXray.LibXray
-import org.amnezia.vpn.protocol.xray.libXray.Logger
-import org.amnezia.vpn.protocol.xray.libXray.Tun2SocksConfig
-import org.amnezia.vpn.util.Log
-import org.amnezia.vpn.util.net.InetNetwork
-import org.amnezia.vpn.util.net.parseInetAddress
-import org.json.JSONObject
-
-/**
- *    Config example:
- * {
- *     "appSplitTunnelType": 0,
- *     "config_version": 0,
- *     "description": "Server 1",
- *     "dns1": "1.1.1.1",
- *     "dns2": "1.0.0.1",
- *     "hostName": "100.100.100.0",
- *     "protocol": "xray",
- *     "splitTunnelApps": [],
- *     "splitTunnelSites": [],
- *     "splitTunnelType": 0,
- *     "xray_config_data": {
- *         "inbounds": [
- *             {
- *                 "listen": "127.0.0.1",
- *                 "port": 8080,
- *                 "protocol": "socks",
- *                 "settings": {
- *                     "udp": true
- *                 }
- *             }
- *         ],
- *         "log": {
- *             "loglevel": "error"
- *         },
- *         "outbounds": [
- *             {
- *                 "protocol": "vless",
- *                 "settings": {
- *                     "vnext": [
- *                         {
- *                             "address": "100.100.100.0",
- *                             "port": 443,
- *                             "users": [
- *                                 {
- *                                     "encryption": "none",
- *                                     "flow": "xtls-rprx-vision",
- *                                     "id": "id"
- *                                 }
- *                             ]
- *                         }
- *                     ]
- *                 },
- *                 "streamSettings": {
- *                     "network": "tcp",
- *                     "realitySettings": {
- *                         "fingerprint": "chrome",
- *                         "publicKey": "publicKey",
- *                         "serverName": "google.com",
- *                         "shortId": "id",
- *                         "spiderX": ""
- *                     },
- *                     "security": "reality"
- *                 }
- *             }
- *         ]
- *     }
- * }
- *
- */
-
-private const val TAG = "Xray"
-private const val LIBXRAY_TAG = "libXray"
-
-class Xray : Protocol() {
-
-    private var isRunning: Boolean = false
-    override val statistics: Statistics = Statistics.EMPTY_STATISTICS
-
-    override fun internalInit() {
-        Seq.setContext(context)
-        if (!isInitialized) {
-            LibXray.initLogger(object : Logger {
-                override fun warning(s: String) = Log.w(LIBXRAY_TAG, s)
-
-                override fun error(s: String) = Log.e(LIBXRAY_TAG, s)
-
-                override fun write(msg: ByteArray): Long {
-                    Log.w(LIBXRAY_TAG, String(msg))
-                    return msg.size.toLong()
-                }
-            }).isNotNullOrBlank { err ->
-                Log.w(TAG, "Failed to initialize logger: $err")
-            }
-        }
-    }
-
-    override fun startVpn(config: JSONObject, vpnBuilder: Builder, protect: (Int) -> Boolean) {
-        if (isRunning) {
-            Log.w(TAG, "XRay already running")
-            return
-        }
-
-        val xrayJsonConfig = config.optJSONObject("xray_config_data")
-            ?: config.optJSONObject("ssxray_config_data")
-            ?: throw BadConfigException("config_data not found")
-        val xrayConfig = parseConfig(config, xrayJsonConfig)
-
-        (xrayJsonConfig.optJSONObject("log") ?: JSONObject().also { xrayJsonConfig.put("log", it) })
-            .put("loglevel", "warning")
-            .put("access", "none") // disable access log
-
-        start(xrayConfig, xrayJsonConfig.toString(), vpnBuilder, protect)
-        state.value = CONNECTED
-        isRunning = true
-    }
-
-    private fun parseConfig(config: JSONObject, xrayJsonConfig: JSONObject): XrayConfig {
-        return XrayConfig.build {
-            addAddress(XrayConfig.DEFAULT_IPV4_ADDRESS)
-
-            config.optString("dns1").let {
-                if (it.isNotBlank()) addDnsServer(parseInetAddress(it))
-            }
-
-            config.optString("dns2").let {
-                if (it.isNotBlank()) addDnsServer(parseInetAddress(it))
-            }
-
-            addRoute(InetNetwork("0.0.0.0", 0))
-            addRoute(InetNetwork("2000::0", 3))
-            config.getString("hostName").let {
-                excludeRoute(InetNetwork(it, 32))
-            }
-
-            config.optString("mtu").let {
-                if (it.isNotBlank()) setMtu(it.toInt())
-            }
-
-            val socksConfig = xrayJsonConfig.getJSONArray("inbounds")[0] as JSONObject
-            socksConfig.getInt("port").let { setSocksPort(it) }
-
-            configSplitTunneling(config)
-            configAppSplitTunneling(config)
-        }
-    }
-
-    private fun start(config: XrayConfig, configJson: String, vpnBuilder: Builder, protect: (Int) -> Boolean) {
-        buildVpnInterface(config, vpnBuilder)
-
-        DialerController { protect(it.toInt()) }.also {
-            LibXray.registerDialerController(it).isNotNullOrBlank { err ->
-                throw VpnStartException("Failed to register dialer controller: $err")
-            }
-            LibXray.registerListenerController(it).isNotNullOrBlank { err ->
-                throw VpnStartException("Failed to register listener controller: $err")
-            }
-        }
-
-        vpnBuilder.establish().use { tunFd ->
-            if (tunFd == null) {
-                throw VpnStartException("Create VPN interface: permission not granted or revoked")
-            }
-            Log.d(TAG, "Run tun2Socks")
-            runTun2Socks(config, tunFd.detachFd())
-
-            Log.d(TAG, "Run XRay")
-            Log.i(TAG, "xray ${LibXray.xrayVersion()}")
-            val assetsPath = context.getDir("assets", Context.MODE_PRIVATE).absolutePath
-            LibXray.initXray(assetsPath)
-            val geoDir = File(assetsPath, "geo").absolutePath
-            val configPath = File(context.cacheDir, "config.json")
-            Log.d(TAG, "xray.location.asset: $geoDir")
-            Log.d(TAG, "config: $configPath")
-            try {
-                configPath.writeText(configJson)
-            } catch (e: IOException) {
-                LibXray.stopTun2Socks()
-                throw VpnStartException("Failed to write xray config: ${e.message}")
-            }
-            LibXray.runXray(geoDir, configPath.absolutePath, config.maxMemory).isNotNullOrBlank { err ->
-                LibXray.stopTun2Socks()
-                throw VpnStartException("Failed to start xray: $err")
-            }
-        }
-    }
-
-    override fun stopVpn() {
-        LibXray.stopXray().isNotNullOrBlank { err ->
-            Log.e(TAG, "Failed to stop XRay: $err")
-        }
-        LibXray.stopTun2Socks().isNotNullOrBlank { err ->
-            Log.e(TAG, "Failed to stop tun2Socks: $err")
-        }
-
-        isRunning = false
-        state.value = DISCONNECTED
-    }
-
-    override fun reconnectVpn(vpnBuilder: Builder) {
-        state.value = CONNECTED
-    }
-
-    private fun runTun2Socks(config: XrayConfig, fd: Int) {
-        val tun2SocksConfig = Tun2SocksConfig().apply {
-            mtu = config.mtu.toLong()
-            proxy = "socks5://127.0.0.1:${config.socksPort}"
-            device = "fd://$fd"
-            logLevel = "warning"
-        }
-        LibXray.startTun2Socks(tun2SocksConfig, fd.toLong()).isNotNullOrBlank { err ->
-            throw VpnStartException("Failed to start tun2socks: $err")
-        }
-    }
-
-    companion object {
-        val instance: Xray by lazy { Xray() }
-    }
-}
-
-private fun String?.isNotNullOrBlank(block: (String) -> Unit) {
-    if (!this.isNullOrBlank()) {
-        block(this)
-    }
-}

client/android/xray/src/main/kotlin/XrayConfig.kt

@@ -1,42 +0,0 @@
-package org.amnezia.vpn.protocol.xray
-
-import org.amnezia.vpn.protocol.ProtocolConfig
-import org.amnezia.vpn.util.net.InetNetwork
-
-private const val XRAY_DEFAULT_MTU = 1500
-private const val XRAY_DEFAULT_MAX_MEMORY: Long = 50 shl 20 // 50 MB
-
-class XrayConfig protected constructor(
-    protocolConfigBuilder: ProtocolConfig.Builder,
-    val socksPort: Int,
-    val maxMemory: Long,
-) : ProtocolConfig(protocolConfigBuilder) {
-
-    protected constructor(builder: Builder) : this(
-        builder,
-        builder.socksPort,
-        builder.maxMemory
-    )
-
-    class Builder : ProtocolConfig.Builder(false) {
-        internal var socksPort: Int = 0
-            private set
-
-        internal var maxMemory: Long = XRAY_DEFAULT_MAX_MEMORY
-            private set
-
-        override var mtu: Int = XRAY_DEFAULT_MTU
-
-        fun setSocksPort(port: Int) = apply { socksPort = port }
-
-        fun setMaxMemory(maxMemory: Long) = apply { this.maxMemory = maxMemory }
-
-        override fun build(): XrayConfig = configBuild().run { XrayConfig(this@Builder) }
-    }
-
-    companion object {
-        internal val DEFAULT_IPV4_ADDRESS: InetNetwork = InetNetwork("10.0.42.2", 30)
-
-        inline fun build(block: Builder.() -> Unit): XrayConfig = Builder().apply(block).build()
-    }
-}

client/cmake/android.cmake

@@ -20,38 +20,38 @@ set(QT_ANDROID_MULTI_ABI_FORWARD_VARS "QT_NO_GLOBAL_APK_TARGET_PART_OF_ALL;CMAKE
 
 # We need to include qtprivate api's
 # As QAndroidBinder is not yet implemented with a public api
-set(LIBS ${LIBS} Qt6::CorePrivate -ljnigraphics)
+set(LIBS ${LIBS} Qt6::CorePrivate)
 
 link_directories(${CMAKE_CURRENT_SOURCE_DIR}/platforms/android)
 
 set(HEADERS ${HEADERS}
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/android_controller.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/android_notificationhandler.h
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/android_utils.h
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/authResultReceiver.h
     ${CMAKE_CURRENT_SOURCE_DIR}/protocols/android_vpnprotocol.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/core/installedAppsImageProvider.h
 )
 
 set(SOURCES ${SOURCES}
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/android_controller.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/android_notificationhandler.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/android_utils.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/authResultReceiver.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/protocols/android_vpnprotocol.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/core/installedAppsImageProvider.cpp
 )
 
 foreach(abi IN ITEMS ${QT_ANDROID_ABIS})
     set_property(TARGET ${PROJECT} PROPERTY QT_ANDROID_EXTRA_LIBS
+        ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/amneziawg/android/${abi}/libwg.so
         ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/amneziawg/android/${abi}/libwg-go.so
+        ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/amneziawg/android/${abi}/libwg-quick.so
+        ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/shadowsocks/android/${abi}/libredsocks.so
+        ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/shadowsocks/android/${abi}/libsslocal.so
+        ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/shadowsocks/android/${abi}/libtun2socks.so
         ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/android/${abi}/libck-ovpn-plugin.so
         ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/android/${abi}/libovpn3.so
         ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/android/${abi}/libovpnutil.so
         ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/android/${abi}/librsapss.so
-        ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openssl/android/${abi}/libcrypto_3.so
-        ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openssl/android/${abi}/libssl_3.so
         ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/libssh/android/${abi}/libssh.so
     )
 endforeach()
-
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/xray/android/libxray.aar
-        DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/android/xray/libXray)

client/cmake/ios.cmake

@@ -46,6 +46,7 @@ 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/MobileUtils.mm
 )
 
 
@@ -106,20 +107,16 @@ target_sources(${PROJECT} PRIVATE
     ${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}/ios/app/AmneziaVPNLaunchScreen.storyboard
     ${CMAKE_CURRENT_SOURCE_DIR}/ios/app/Media.xcassets
-    ${CMAKE_CURRENT_SOURCE_DIR}/ios/app/PrivacyInfo.xcprivacy
 )
 
 set_property(TARGET ${PROJECT} APPEND PROPERTY RESOURCE
     ${CMAKE_CURRENT_SOURCE_DIR}/ios/app/AmneziaVPNLaunchScreen.storyboard
     ${CMAKE_CURRENT_SOURCE_DIR}/ios/app/Media.xcassets
-    ${CMAKE_CURRENT_SOURCE_DIR}/ios/app/PrivacyInfo.xcprivacy
 )
 
 add_subdirectory(ios/networkextension)

client/configurators/awg_configurator.cpp

@@ -3,15 +3,17 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 
-AwgConfigurator::AwgConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent)
-    : WireguardConfigurator(settings, serverController, true, parent)
+#include "core/controllers/serverController.h"
+
+AwgConfigurator::AwgConfigurator(std::shared_ptr<Settings> settings, QObject *parent)
+    : WireguardConfigurator(settings, true, parent)
 {
 }
 
-QString AwgConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig,
-                                      ErrorCode &errorCode)
+QString AwgConfigurator::genAwgConfig(const ServerCredentials &credentials, DockerContainer container,
+                                      const QJsonObject &containerConfig, QString &clientId, ErrorCode *errorCode)
 {
-    QString config = WireguardConfigurator::createConfig(credentials, container, containerConfig, errorCode);
+    QString config = WireguardConfigurator::genWireguardConfig(credentials, container, containerConfig, clientId, errorCode);
 
     QJsonObject jsonConfig = QJsonDocument::fromJson(config.toUtf8()).object();
     QString awgConfig = jsonConfig.value(config_key::config).toString();
@@ -39,8 +41,6 @@ QString AwgConfigurator::createConfig(const ServerCredentials &credentials, Dock
     jsonConfig[config_key::responsePacketMagicHeader] = configMap.value(config_key::responsePacketMagicHeader);
     jsonConfig[config_key::underloadPacketMagicHeader] = configMap.value(config_key::underloadPacketMagicHeader);
     jsonConfig[config_key::transportPacketMagicHeader] = configMap.value(config_key::transportPacketMagicHeader);
-    jsonConfig[config_key::mtu] =
-            containerConfig.value(ProtocolProps::protoToString(Proto::Awg)).toObject().value(config_key::mtu).toString(protocols::awg::defaultMtu);
 
     return QJsonDocument(jsonConfig).toJson();
 }

client/configurators/awg_configurator.h

@@ -9,10 +9,10 @@ class AwgConfigurator : public WireguardConfigurator
 {
     Q_OBJECT
 public:
-    AwgConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent = nullptr);
+    AwgConfigurator(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
 
-    QString createConfig(const ServerCredentials &credentials, DockerContainer container,
-                         const QJsonObject &containerConfig, ErrorCode &errorCode);
+    QString genAwgConfig(const ServerCredentials &credentials, DockerContainer container,
+                         const QJsonObject &containerConfig, QString &clientId, ErrorCode *errorCode = nullptr);
 };
 
 #endif // AWGCONFIGURATOR_H

client/configurators/cloak_configurator.cpp

@@ -1,33 +1,34 @@
 #include "cloak_configurator.h"
 
 #include <QFile>
-#include <QJsonDocument>
 #include <QJsonObject>
+#include <QJsonDocument>
 
-#include "containers/containers_defs.h"
 #include "core/controllers/serverController.h"
+#include "containers/containers_defs.h"
 
-CloakConfigurator::CloakConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent)
-    : ConfiguratorBase(settings, serverController, parent)
+CloakConfigurator::CloakConfigurator(std::shared_ptr<Settings> settings, QObject *parent):
+    ConfiguratorBase(settings, parent)
 {
+
 }
 
-QString CloakConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig,
-                                        ErrorCode &errorCode)
+QString CloakConfigurator::genCloakConfig(const ServerCredentials &credentials,
+    DockerContainer container, const QJsonObject &containerConfig, ErrorCode *errorCode)
 {
-    QString cloakPublicKey =
-            m_serverController->getTextFileFromContainer(container, credentials, amnezia::protocols::cloak::ckPublicKeyPath, errorCode);
+    ErrorCode e = ErrorCode::NoError;
+    ServerController serverController(m_settings);
+
+    QString cloakPublicKey = serverController.getTextFileFromContainer(container, credentials,
+        amnezia::protocols::cloak::ckPublicKeyPath, &e);
     cloakPublicKey.replace("\n", "");
 
-    if (errorCode != ErrorCode::NoError) {
-        return "";
-    }
-
-    QString cloakBypassUid =
-            m_serverController->getTextFileFromContainer(container, credentials, amnezia::protocols::cloak::ckBypassUidKeyPath, errorCode);
+    QString cloakBypassUid = serverController.getTextFileFromContainer(container, credentials,
+        amnezia::protocols::cloak::ckBypassUidKeyPath, &e);
     cloakBypassUid.replace("\n", "");
 
-    if (errorCode != ErrorCode::NoError) {
+    if (e) {
+        if (errorCode) *errorCode = e;
         return "";
     }
 
@@ -44,8 +45,9 @@ QString CloakConfigurator::createConfig(const ServerCredentials &credentials, Do
     config.insert("RemoteHost", credentials.hostName);
     config.insert("RemotePort", "$CLOAK_SERVER_PORT");
 
-    QString textCfg = m_serverController->replaceVars(QJsonDocument(config).toJson(),
-                                                      m_serverController->genVarsForScript(credentials, container, containerConfig));
+    QString textCfg = serverController.replaceVars(QJsonDocument(config).toJson(),
+                                                   serverController.genVarsForScript(credentials, container, containerConfig));
 
+    // qDebug().noquote() << textCfg;
     return textCfg;
 }

client/configurators/cloak_configurator.h

@@ -7,14 +7,14 @@
 
 using namespace amnezia;
 
-class CloakConfigurator : public ConfiguratorBase
+class CloakConfigurator : ConfiguratorBase
 {
     Q_OBJECT
 public:
-    CloakConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent = nullptr);
+    CloakConfigurator(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
 
-    QString createConfig(const ServerCredentials &credentials, DockerContainer container,
-                         const QJsonObject &containerConfig, ErrorCode &errorCode);
+    QString genCloakConfig(const ServerCredentials &credentials, DockerContainer container,
+        const QJsonObject &containerConfig, ErrorCode *errorCode = nullptr);
 };
 
 #endif // CLOAK_CONFIGURATOR_H

client/configurators/configurator_base.cpp

@@ -1,26 +1,8 @@
 #include "configurator_base.h"
 
-ConfiguratorBase::ConfiguratorBase(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent)
-    : QObject { parent }, m_settings(settings), m_serverController(serverController)
+ConfiguratorBase::ConfiguratorBase(std::shared_ptr<Settings> settings, QObject *parent)
+    : QObject{parent},
+      m_settings(settings)
 {
-}
 
-QString ConfiguratorBase::processConfigWithLocalSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
-                                                         QString &protocolConfigString)
-{
-    processConfigWithDnsSettings(dns, protocolConfigString);
-    return protocolConfigString;
-}
-
-QString ConfiguratorBase::processConfigWithExportSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
-                                                          QString &protocolConfigString)
-{
-    processConfigWithDnsSettings(dns, protocolConfigString);
-    return protocolConfigString;
-}
-
-void ConfiguratorBase::processConfigWithDnsSettings(const QPair<QString, QString> &dns, QString &protocolConfigString)
-{
-    protocolConfigString.replace("$PRIMARY_DNS", dns.first);
-    protocolConfigString.replace("$SECONDARY_DNS", dns.second);
 }

client/configurators/configurator_base.h

@@ -3,31 +3,19 @@
 
 #include <QObject>
 
+class Settings;
+
 #include "containers/containers_defs.h"
 #include "core/defs.h"
-#include "core/controllers/serverController.h"
-#include "settings.h"
 
 class ConfiguratorBase : public QObject
 {
     Q_OBJECT
 public:
-    explicit ConfiguratorBase(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent = nullptr);
-
-    virtual QString createConfig(const ServerCredentials &credentials, DockerContainer container,
-                                 const QJsonObject &containerConfig, ErrorCode &errorCode) = 0;
-
-    virtual QString processConfigWithLocalSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
-                                                   QString &protocolConfigString);
-    virtual QString processConfigWithExportSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
-                                                    QString &protocolConfigString);
+    explicit ConfiguratorBase(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
 
 protected:
-    void processConfigWithDnsSettings(const QPair<QString, QString> &dns, QString &protocolConfigString);
-
     std::shared_ptr<Settings> m_settings;
-    QSharedPointer<ServerController> m_serverController;
-
 };
 
 #endif // CONFIGURATORBASE_H

client/configurators/ikev2_configurator.cpp

@@ -9,18 +9,18 @@
 #include <QUuid>
 
 #include "containers/containers_defs.h"
-#include "core/controllers/serverController.h"
 #include "core/scripts_registry.h"
 #include "core/server_defs.h"
+#include "core/controllers/serverController.h"
 #include "utilities.h"
 
-Ikev2Configurator::Ikev2Configurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent)
-    : ConfiguratorBase(settings, serverController, parent)
+Ikev2Configurator::Ikev2Configurator(std::shared_ptr<Settings> settings, QObject *parent)
+    : ConfiguratorBase(settings, parent)
 {
 }
 
-Ikev2Configurator::ConnectionData Ikev2Configurator::prepareIkev2Config(const ServerCredentials &credentials, DockerContainer container,
-                                                                        ErrorCode &errorCode)
+Ikev2Configurator::ConnectionData Ikev2Configurator::prepareIkev2Config(const ServerCredentials &credentials,
+                                                                        DockerContainer container, ErrorCode *errorCode)
 {
     Ikev2Configurator::ConnectionData connData;
     connData.host = credentials.hostName;
@@ -39,14 +39,18 @@ Ikev2Configurator::ConnectionData Ikev2Configurator::prepareIkev2Config(const Se
                                        "--extKeyUsage serverAuth,clientAuth -8 \"%1\"")
                                        .arg(connData.clientId);
 
-    errorCode = m_serverController->runContainerScript(credentials, container, scriptCreateCert);
+    ServerController serverController(m_settings);
+    ErrorCode e = serverController.runContainerScript(credentials, container, scriptCreateCert);
 
-    QString scriptExportCert =
-            QString("pk12util -W \"%1\" -d sql:/etc/ipsec.d -n \"%2\" -o \"%3\"").arg(connData.password).arg(connData.clientId).arg(certFileName);
-    errorCode = m_serverController->runContainerScript(credentials, container, scriptExportCert);
+    QString scriptExportCert = QString("pk12util -W \"%1\" -d sql:/etc/ipsec.d -n \"%2\" -o \"%3\"")
+                                       .arg(connData.password)
+                                       .arg(connData.clientId)
+                                       .arg(certFileName);
+    e = serverController.runContainerScript(credentials, container, scriptExportCert);
 
-    connData.clientCert = m_serverController->getTextFileFromContainer(container, credentials, certFileName, errorCode);
-    connData.caCert = m_serverController->getTextFileFromContainer(container, credentials, "/etc/ipsec.d/ca_cert_base64.p12", errorCode);
+    connData.clientCert = serverController.getTextFileFromContainer(container, credentials, certFileName, &e);
+    connData.caCert =
+            serverController.getTextFileFromContainer(container, credentials, "/etc/ipsec.d/ca_cert_base64.p12", &e);
 
     qDebug() << "Ikev2Configurator::ConnectionData client cert size:" << connData.clientCert.size();
     qDebug() << "Ikev2Configurator::ConnectionData ca cert size:" << connData.caCert.size();
@@ -54,13 +58,13 @@ Ikev2Configurator::ConnectionData Ikev2Configurator::prepareIkev2Config(const Se
     return connData;
 }
 
-QString Ikev2Configurator::createConfig(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig,
-                                        ErrorCode &errorCode)
+QString Ikev2Configurator::genIkev2Config(const ServerCredentials &credentials, DockerContainer container,
+                                          const QJsonObject &containerConfig, ErrorCode *errorCode)
 {
     Q_UNUSED(containerConfig)
 
     ConnectionData connData = prepareIkev2Config(credentials, container, errorCode);
-    if (errorCode != ErrorCode::NoError) {
+    if (errorCode && *errorCode) {
         return "";
     }
 

client/configurators/ikev2_configurator.h

@@ -7,11 +7,11 @@
 #include "configurator_base.h"
 #include "core/defs.h"
 
-class Ikev2Configurator : public ConfiguratorBase
+class Ikev2Configurator : ConfiguratorBase
 {
     Q_OBJECT
 public:
-    Ikev2Configurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent = nullptr);
+    Ikev2Configurator(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
 
     struct ConnectionData {
         QByteArray clientCert; // p12 client cert
@@ -21,15 +21,15 @@ public:
         QString host; // host ip
     };
 
-    QString createConfig(const ServerCredentials &credentials, DockerContainer container,
-                         const QJsonObject &containerConfig, ErrorCode &errorCode);
+    QString genIkev2Config(const ServerCredentials &credentials, DockerContainer container,
+        const QJsonObject &containerConfig, ErrorCode *errorCode = nullptr);
 
     QString genIkev2Config(const ConnectionData &connData);
     QString genMobileConfig(const ConnectionData &connData);
     QString genStrongSwanConfig(const ConnectionData &connData);
 
     ConnectionData prepareIkev2Config(const ServerCredentials &credentials,
-        DockerContainer container, ErrorCode &errorCode);
+        DockerContainer container, ErrorCode *errorCode = nullptr);
 };
 
 #endif // IKEV2_CONFIGURATOR_H

client/configurators/openvpn_configurator.cpp

@@ -14,9 +14,9 @@
 #endif
 
 #include "containers/containers_defs.h"
-#include "core/controllers/serverController.h"
 #include "core/scripts_registry.h"
 #include "core/server_defs.h"
+#include "core/controllers/serverController.h"
 #include "settings.h"
 #include "utilities.h"
 
@@ -24,61 +24,74 @@
 #include <openssl/rsa.h>
 #include <openssl/x509.h>
 
-OpenVpnConfigurator::OpenVpnConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController,
-                                         QObject *parent)
-    : ConfiguratorBase(settings, serverController, parent)
+OpenVpnConfigurator::OpenVpnConfigurator(std::shared_ptr<Settings> settings, QObject *parent)
+    : ConfiguratorBase(settings, parent)
 {
 }
 
 OpenVpnConfigurator::ConnectionData OpenVpnConfigurator::prepareOpenVpnConfig(const ServerCredentials &credentials,
-                                                                              DockerContainer container, ErrorCode &errorCode)
+                                                                              DockerContainer container,
+                                                                              ErrorCode *errorCode)
 {
     OpenVpnConfigurator::ConnectionData connData = OpenVpnConfigurator::createCertRequest();
     connData.host = credentials.hostName;
 
     if (connData.privKey.isEmpty() || connData.request.isEmpty()) {
-        errorCode = ErrorCode::OpenSslFailed;
+        if (errorCode)
+            *errorCode = ErrorCode::OpenSslFailed;
         return connData;
     }
 
     QString reqFileName = QString("%1/%2.req").arg(amnezia::protocols::openvpn::clientsDirPath).arg(connData.clientId);
 
-    errorCode = m_serverController->uploadTextFileToContainer(container, credentials, connData.request, reqFileName);
-    if (errorCode != ErrorCode::NoError) {
+    ServerController serverController(m_settings);
+    ErrorCode e = serverController.uploadTextFileToContainer(container, credentials, connData.request, reqFileName);
+    if (e) {
+        if (errorCode)
+            *errorCode = e;
         return connData;
     }
 
-    errorCode = signCert(container, credentials, connData.clientId);
-    if (errorCode != ErrorCode::NoError) {
+    e = signCert(container, credentials, connData.clientId);
+    if (e) {
+        if (errorCode)
+            *errorCode = e;
         return connData;
     }
 
-    connData.caCert =
-            m_serverController->getTextFileFromContainer(container, credentials, amnezia::protocols::openvpn::caCertPath, errorCode);
-    connData.clientCert = m_serverController->getTextFileFromContainer(
-            container, credentials, QString("%1/%2.crt").arg(amnezia::protocols::openvpn::clientCertPath).arg(connData.clientId), errorCode);
+    connData.caCert = serverController.getTextFileFromContainer(container, credentials,
+                                                                amnezia::protocols::openvpn::caCertPath, &e);
+    connData.clientCert = serverController.getTextFileFromContainer(
+            container, credentials,
+            QString("%1/%2.crt").arg(amnezia::protocols::openvpn::clientCertPath).arg(connData.clientId), &e);
 
-    if (errorCode != ErrorCode::NoError) {
+    if (e) {
+        if (errorCode)
+            *errorCode = e;
         return connData;
     }
 
-    connData.taKey = m_serverController->getTextFileFromContainer(container, credentials, amnezia::protocols::openvpn::taKeyPath, errorCode);
+    connData.taKey = serverController.getTextFileFromContainer(container, credentials,
+                                                               amnezia::protocols::openvpn::taKeyPath, &e);
 
     if (connData.caCert.isEmpty() || connData.clientCert.isEmpty() || connData.taKey.isEmpty()) {
-        errorCode = ErrorCode::SshScpFailureError;
+        if (errorCode)
+            *errorCode = ErrorCode::SshSftpFailureError;
     }
 
     return connData;
 }
 
-QString OpenVpnConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container,
-                                          const QJsonObject &containerConfig, ErrorCode &errorCode)
+QString OpenVpnConfigurator::genOpenVpnConfig(const ServerCredentials &credentials, DockerContainer container,
+                                              const QJsonObject &containerConfig, QString &clientId, ErrorCode *errorCode)
 {
-    QString config = m_serverController->replaceVars(amnezia::scriptData(ProtocolScriptType::openvpn_template, container),
-                                                     m_serverController->genVarsForScript(credentials, container, containerConfig));
+    ServerController serverController(m_settings);
+    QString config =
+            serverController.replaceVars(amnezia::scriptData(ProtocolScriptType::openvpn_template, container),
+                                         serverController.genVarsForScript(credentials, container, containerConfig));
 
     ConnectionData connData = prepareOpenVpnConfig(credentials, container, errorCode);
-    if (errorCode != ErrorCode::NoError) {
+    if (errorCode && *errorCode) {
         return "";
     }
 
@@ -100,35 +113,34 @@ QString OpenVpnConfigurator::createConfig(const ServerCredentials &credentials,
     QJsonObject jConfig;
     jConfig[config_key::config] = config;
 
-    jConfig[config_key::clientId] = connData.clientId;
+    clientId = connData.clientId;
 
     return QJsonDocument(jConfig).toJson();
 }
 
-QString OpenVpnConfigurator::processConfigWithLocalSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
-                                                            QString &protocolConfigString)
+QString OpenVpnConfigurator::processConfigWithLocalSettings(QString jsonConfig, const int serverIndex)
 {
-    processConfigWithDnsSettings(dns, protocolConfigString);
-
-    QJsonObject json = QJsonDocument::fromJson(protocolConfigString.toUtf8()).object();
+    QJsonObject json = QJsonDocument::fromJson(jsonConfig.toUtf8()).object();
     QString config = json[config_key::config].toString();
 
-    if (!isApiConfig) {
+    if (!m_settings->server(serverIndex).value(config_key::configVersion).toInt()) {
         QRegularExpression regex("redirect-gateway.*");
         config.replace(regex, "");
-        
-        if (!m_settings->isSitesSplitTunnelingEnabled()) {
+
+        if (m_settings->routeMode() == Settings::VpnAllSites) {
             config.append("\nredirect-gateway def1 ipv6 bypass-dhcp\n");
             // Prevent ipv6 leak
             config.append("ifconfig-ipv6 fd15:53b6:dead::2/64  fd15:53b6:dead::1\n");
             config.append("block-ipv6\n");
-        } else if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) {
+        }
+        if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) {
 
             // no redirect-gateway
-        } else if (m_settings->routeMode() == Settings::VpnAllExceptSites) {
-#ifndef Q_OS_ANDROID
+        }
+        if (m_settings->routeMode() == Settings::VpnAllExceptSites) {
+    #ifndef Q_OS_ANDROID
             config.append("\nredirect-gateway ipv6 !ipv4 bypass-dhcp\n");
-#endif
+    #endif
             // Prevent ipv6 leak
             config.append("ifconfig-ipv6 fd15:53b6:dead::2/64  fd15:53b6:dead::1\n");
             config.append("block-ipv6\n");
@@ -152,12 +164,9 @@ QString OpenVpnConfigurator::processConfigWithLocalSettings(const QPair<QString,
     return QJsonDocument(json).toJson();
 }
 
-QString OpenVpnConfigurator::processConfigWithExportSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
-                                                             QString &protocolConfigString)
+QString OpenVpnConfigurator::processConfigWithExportSettings(QString jsonConfig)
 {
-    processConfigWithDnsSettings(dns, protocolConfigString);
-
-    QJsonObject json = QJsonDocument::fromJson(protocolConfigString.toUtf8()).object();
+    QJsonObject json = QJsonDocument::fromJson(jsonConfig.toUtf8()).object();
     QString config = json[config_key::config].toString();
 
     QRegularExpression regex("redirect-gateway.*");
@@ -189,10 +198,12 @@ ErrorCode OpenVpnConfigurator::signCert(DockerContainer container, const ServerC
                                   .arg(ContainerProps::containerToString(container))
                                   .arg(clientId);
 
+    ServerController serverController(m_settings);
     QStringList scriptList { script_import, script_sign };
-    QString script = m_serverController->replaceVars(scriptList.join("\n"), m_serverController->genVarsForScript(credentials, container));
+    QString script = serverController.replaceVars(scriptList.join("\n"),
+                                                  serverController.genVarsForScript(credentials, container));
 
-    return m_serverController->runScript(credentials, script);
+    return serverController.runScript(credentials, script);
 }
 
 OpenVpnConfigurator::ConnectionData OpenVpnConfigurator::createCertRequest()
@@ -226,8 +237,8 @@ OpenVpnConfigurator::ConnectionData OpenVpnConfigurator::createCertRequest()
 
     X509_NAME_add_entry_by_txt(x509_name, "C", MBSTRING_ASC, (unsigned char *)"ORG", -1, -1, 0);
     X509_NAME_add_entry_by_txt(x509_name, "O", MBSTRING_ASC, (unsigned char *)"", -1, -1, 0);
-    X509_NAME_add_entry_by_txt(x509_name, "CN", MBSTRING_ASC, reinterpret_cast<unsigned char const *>(clientIdUtf8.data()),
-                               clientIdUtf8.size(), -1, 0);
+    X509_NAME_add_entry_by_txt(x509_name, "CN", MBSTRING_ASC,
+                               reinterpret_cast<unsigned char const *>(clientIdUtf8.data()), clientIdUtf8.size(), -1, 0);
 
     // 4. set public key of x509 req
     ret = X509_REQ_set_pubkey(x509_req, pKey);

client/configurators/openvpn_configurator.h

@@ -7,37 +7,37 @@
 #include "configurator_base.h"
 #include "core/defs.h"
 
-class OpenVpnConfigurator : public ConfiguratorBase
+class OpenVpnConfigurator : ConfiguratorBase
 {
     Q_OBJECT
 public:
-    OpenVpnConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent = nullptr);
+    OpenVpnConfigurator(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
 
-    struct ConnectionData
-    {
+    struct ConnectionData {
         QString clientId;
-        QString request;    // certificate request
-        QString privKey;    // client private key
+        QString request; // certificate request
+        QString privKey; // client private key
         QString clientCert; // client signed certificate
-        QString caCert;     // server certificate
-        QString taKey;      // tls-auth key
-        QString host;       // host ip
+        QString caCert; // server certificate
+        QString taKey; // tls-auth key
+        QString host; // host ip
     };
 
-    QString createConfig(const ServerCredentials &credentials, DockerContainer container,
-                         const QJsonObject &containerConfig, ErrorCode &errorCode);
+    QString genOpenVpnConfig(const ServerCredentials &credentials, DockerContainer container,
+        const QJsonObject &containerConfig, QString &clientId, ErrorCode *errorCode = nullptr);
 
-    QString processConfigWithLocalSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
-                                           QString &protocolConfigString);
-    QString processConfigWithExportSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
-                                            QString &protocolConfigString);
+    QString processConfigWithLocalSettings(QString jsonConfig, const int serverIndex);
+    QString processConfigWithExportSettings(QString jsonConfig);
+
+    ErrorCode signCert(DockerContainer container,
+        const ServerCredentials &credentials, QString clientId);
 
     static ConnectionData createCertRequest();
 
 private:
-    ConnectionData prepareOpenVpnConfig(const ServerCredentials &credentials, DockerContainer container,
-                                        ErrorCode &errorCode);
-    ErrorCode signCert(DockerContainer container, const ServerCredentials &credentials, QString clientId);
+    ConnectionData prepareOpenVpnConfig(const ServerCredentials &credentials,
+        DockerContainer container, ErrorCode *errorCode = nullptr);
+
 };
 
 #endif // OPENVPN_CONFIGURATOR_H

client/configurators/shadowsocks_configurator.cpp

@@ -1,26 +1,30 @@
 #include "shadowsocks_configurator.h"
 
 #include <QFile>
-#include <QJsonDocument>
 #include <QJsonObject>
+#include <QJsonDocument>
 
 #include "containers/containers_defs.h"
 #include "core/controllers/serverController.h"
 
-ShadowSocksConfigurator::ShadowSocksConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController,
-                                                 QObject *parent)
-    : ConfiguratorBase(settings, serverController, parent)
+ShadowSocksConfigurator::ShadowSocksConfigurator(std::shared_ptr<Settings> settings, QObject *parent):
+    ConfiguratorBase(settings, parent)
 {
+
 }
 
-QString ShadowSocksConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container,
-                                              const QJsonObject &containerConfig, ErrorCode &errorCode)
+QString ShadowSocksConfigurator::genShadowSocksConfig(const ServerCredentials &credentials,
+    DockerContainer container, const QJsonObject &containerConfig, ErrorCode *errorCode)
 {
-    QString ssKey =
-            m_serverController->getTextFileFromContainer(container, credentials, amnezia::protocols::shadowsocks::ssKeyPath, errorCode);
+    ErrorCode e = ErrorCode::NoError;
+    ServerController serverController(m_settings);
+
+    QString ssKey = serverController.getTextFileFromContainer(container, credentials,
+                                                              amnezia::protocols::shadowsocks::ssKeyPath, &e);
     ssKey.replace("\n", "");
 
-    if (errorCode != ErrorCode::NoError) {
+    if (e) {
+        if (errorCode) *errorCode = e;
         return "";
     }
 
@@ -32,9 +36,10 @@ QString ShadowSocksConfigurator::createConfig(const ServerCredentials &credentia
     config.insert("timeout", 60);
     config.insert("method", "$SHADOWSOCKS_CIPHER");
 
-    QString textCfg = m_serverController->replaceVars(QJsonDocument(config).toJson(),
-                                                      m_serverController->genVarsForScript(credentials, container, containerConfig));
 
-    // qDebug().noquote() << textCfg;
+    QString textCfg = serverController.replaceVars(QJsonDocument(config).toJson(),
+                                                   serverController.genVarsForScript(credentials, container, containerConfig));
+
+    //qDebug().noquote() << textCfg;
     return textCfg;
 }