debug-output

Merge pull request #491 from amnezia-vpn/bugfix/current-processed-server-selection
fixed current processed server selection after import/install new server
2026-06-18 00:03:21 +03:00 · 2024-01-15 23:31:21 +07:00 · 2024-01-15 05:43:34 -08:00 · 2024-01-15 10:06:20 +00:00 · 2024-01-15 09:28:48 +00:00 · 2024-01-15 09:20:13 +00:00
38 changed files with 560 additions and 578 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)

 set(PROJECT AmneziaVPN)

-project(${PROJECT} VERSION 4.1.0.1
+project(${PROJECT} VERSION 4.2.0.1
        DESCRIPTION "AmneziaVPN"
        HOMEPAGE_URL "https://amnezia.org/"
 )
--- a/client/3rd-prebuilt
+++ b/client/3rd-prebuilt
--- a/client/3rd/qtkeychain
+++ b/client/3rd/qtkeychain
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -361,7 +361,7 @@ void AmneziaApplication::initControllers()
                                                  m_settings, m_configurator));
    m_engine->rootContext()->setContextProperty("ExportController", m_exportController.get());

-    m_settingsController.reset(new SettingsController(m_serversModel, m_containersModel, m_languageModel, m_settings));
+    m_settingsController.reset(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(); });
--- a/client/android/AndroidManifest.xml
+++ b/client/android/AndroidManifest.xml
@@ -22,7 +22,6 @@
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

    <!-- Enable when VPN-per-app mode will be implemented -->
    <!-- <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/> -->
--- a/client/android/src/org/amnezia/vpn/AmneziaActivity.kt
+++ b/client/android/src/org/amnezia/vpn/AmneziaActivity.kt
@@ -2,6 +2,7 @@ package org.amnezia.vpn

 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.net.Uri
@@ -12,11 +13,13 @@ import android.os.IBinder
 import android.os.Looper
 import android.os.Message
 import android.os.Messenger
+import android.webkit.MimeTypeMap
 import android.widget.Toast
 import androidx.annotation.MainThread
 import androidx.core.content.ContextCompat
 import java.io.IOException
 import kotlin.LazyThreadSafetyMode.NONE
+import kotlin.text.RegexOption.IGNORE_CASE
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -35,6 +38,7 @@ private const val TAG = "AmneziaActivity"

 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 BIND_SERVICE_TIMEOUT = 1000L

 class AmneziaActivity : QtActivity() {
@@ -201,6 +205,15 @@ class AmneziaActivity : QtActivity() {
                }
            }

+            OPEN_FILE_ACTION_CODE -> {
+                when (resultCode) {
+                    RESULT_OK -> data?.data?.toString() ?: ""
+                    else -> ""
+                }.let { uri ->
+                    QtAndroidController.onFileOpened(uri)
+                }
+            }
+
            CHECK_VPN_PERMISSION_ACTION_CODE -> {
                when (resultCode) {
                    RESULT_OK -> {
@@ -370,6 +383,36 @@ class AmneziaActivity : QtActivity() {
        }
    }

+    @Suppress("unused")
+    fun openFile(filter: String?) {
+        Log.v(TAG, "Open file with filter: $filter")
+
+        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.d(TAG, "File mimyType filter: $mimeTypes")
+            when (mimeTypes.size) {
+                1 -> type = mimeTypes.first()
+
+                in 2..Int.MAX_VALUE -> {
+                    type = "*/*"
+                    putExtra(EXTRA_MIME_TYPES, mimeTypes.toTypedArray())
+                }
+
+                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")
--- a/client/android/src/org/amnezia/vpn/qt/QtAndroidController.kt
+++ b/client/android/src/org/amnezia/vpn/qt/QtAndroidController.kt
@@ -15,6 +15,8 @@ object QtAndroidController {
    external fun onVpnReconnecting()
    external fun onStatisticsUpdate(rxBytes: Long, txBytes: Long)

+    external fun onFileOpened(uri: String)
+
    external fun onConfigImported(data: String)

    external fun decodeQrCode(data: String): Boolean
--- a/client/cmake/3rdparty.cmake
+++ b/client/cmake/3rdparty.cmake
@@ -90,7 +90,7 @@ include_directories(
    ${LIBSSH_ROOT_DIR}/include
    ${CLIENT_ROOT_DIR}/3rd/libssh/include
    ${CLIENT_ROOT_DIR}/3rd/QSimpleCrypto/include
-    ${CLIENT_ROOT_DIR}/3rd/qtkeychain
+    ${CLIENT_ROOT_DIR}/3rd/qtkeychain/qtkeychain
    ${CMAKE_CURRENT_BINARY_DIR}/3rd/qtkeychain
    ${CMAKE_CURRENT_BINARY_DIR}/3rd/libssh/include
 )
--- a/client/cmake/android.cmake
+++ b/client/cmake/android.cmake
@@ -27,7 +27,7 @@ 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/androidutils.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
 )
@@ -35,7 +35,7 @@ set(HEADERS ${HEADERS}
 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/androidutils.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
 )
--- a/client/core/controllers/serverController.cpp
+++ b/client/core/controllers/serverController.cpp
@@ -211,8 +211,14 @@ ErrorCode ServerController::uploadFileToHost(const ServerCredentials &credential
    localFile.write(data);
    localFile.close();

+#ifdef Q_OS_WINDOWS
+    error = m_sshClient.sftpFileCopy(overwriteMode, localFile.fileName().toLocal8Bit().toStdString(), remotePath.toStdString(),
+                                     "non_desc");
+#else
    error = m_sshClient.sftpFileCopy(overwriteMode, localFile.fileName().toStdString(), remotePath.toStdString(),
                                     "non_desc");
+#endif
+
    if (error != ErrorCode::NoError) {
        return error;
    }
--- a/client/platforms/android/android_controller.cpp
+++ b/client/platforms/android/android_controller.cpp
@@ -1,8 +1,10 @@
-#include <QCoreApplication>
 #include <QJniEnvironment>
 #include <QJsonDocument>
+#include <QQmlFile>
+#include <QEventLoop>

 #include "android_controller.h"
+#include "android_utils.h"
 #include "ui/controllers/importController.h"

 namespace
@@ -106,6 +108,7 @@ bool AndroidController::initialize()
        {"onVpnDisconnected", "()V", reinterpret_cast<void *>(onVpnDisconnected)},
        {"onVpnReconnecting", "()V", reinterpret_cast<void *>(onVpnReconnecting)},
        {"onStatisticsUpdate", "(JJ)V", reinterpret_cast<void *>(onStatisticsUpdate)},
+        {"onFileOpened", "(Ljava/lang/String;)V", reinterpret_cast<void *>(onFileOpened)},
        {"onConfigImported", "(Ljava/lang/String;)V", reinterpret_cast<void *>(onConfigImported)},
        {"decodeQrCode", "(Ljava/lang/String;)Z", reinterpret_cast<bool *>(decodeQrCode)}
    };
@@ -127,7 +130,7 @@ auto AndroidController::callActivityMethod(const char *methodName, const char *s
                                           const std::function<Ret()> &defValue, Args &&...args)
 {
    qDebug() << "Call activity method:" << methodName;
-    QJniObject activity = QNativeInterface::QAndroidApplication::context();
+    QJniObject activity = AndroidUtils::getActivity();
    if (activity.isValid()) {
        return activity.callMethod<Ret>(methodName, signature, std::forward<Args>(args)...);
    } else {
@@ -165,6 +168,24 @@ void AndroidController::saveFile(const QString &fileName, const QString &data)
                       QJniObject::fromString(data).object<jstring>());
 }

+QString AndroidController::openFile(const QString &filter)
+{
+    QEventLoop wait;
+    QString fileName;
+    connect(this, &AndroidController::fileOpened, this,
+            [&fileName, &wait](const QString &uri) {
+                qDebug() << "Android event: file opened; uri:" << uri;
+                fileName = QQmlFile::urlToLocalFileOrQrc(uri);
+                qDebug() << "Android opened filename:" << fileName;
+                wait.quit();
+            },
+            static_cast<Qt::ConnectionType>(Qt::QueuedConnection | Qt::SingleShotConnection));
+    callActivityMethod("openFile", "(Ljava/lang/String;)V",
+                       QJniObject::fromString(filter).object<jstring>());
+    wait.exec();
+    return fileName;
+}
+
 void AndroidController::setNotificationText(const QString &title, const QString &message, int timerSec)
 {
    callActivityMethod("setNotificationText", "(Ljava/lang/String;Ljava/lang/String;I)V",
@@ -285,20 +306,19 @@ void AndroidController::onStatisticsUpdate(JNIEnv *env, jobject thiz, jlong rxBy
 }

 // static
-void AndroidController::onConfigImported(JNIEnv *env, jobject thiz, jstring data)
+void AndroidController::onFileOpened(JNIEnv *env, jobject thiz, jstring uri)
 {
-    Q_UNUSED(env);
    Q_UNUSED(thiz);

-    const char *buffer = env->GetStringUTFChars(data, nullptr);
-    if (!buffer) {
-        return;
-    }
+    emit AndroidController::instance()->fileOpened(AndroidUtils::convertJString(env, uri));
+}

-    QString config(buffer);
-    env->ReleaseStringUTFChars(data, buffer);
+// static
+void AndroidController::onConfigImported(JNIEnv *env, jobject thiz, jstring data)
+{
+    Q_UNUSED(thiz);

-    emit AndroidController::instance()->configImported(config);
+    emit AndroidController::instance()->configImported(AndroidUtils::convertJString(env, data));
 }

 // static
@@ -306,12 +326,5 @@ bool AndroidController::decodeQrCode(JNIEnv *env, jobject thiz, jstring data)
 {
    Q_UNUSED(thiz);

-    const char *buffer = env->GetStringUTFChars(data, nullptr);
-    if (!buffer) {
-        return false;
-    }
-
-    QString code(buffer);
-    env->ReleaseStringUTFChars(data, buffer);
-    return ImportController::decodeQrCode(code);
+    return ImportController::decodeQrCode(AndroidUtils::convertJString(env, data));
 }
--- a/client/platforms/android/android_controller.h
+++ b/client/platforms/android/android_controller.h
@@ -18,7 +18,8 @@ public:
    bool initialize();

    // keep synchronized with org.amnezia.vpn.protocol.ProtocolState
-    enum class ConnectionState {
+    enum class ConnectionState
+    {
        CONNECTED,
        CONNECTING,
        DISCONNECTED,
@@ -30,7 +31,8 @@ public:
    ErrorCode start(const QJsonObject &vpnConfig);
    void stop();
    void setNotificationText(const QString &title, const QString &message, int timerSec);
-    void saveFile(const QString& fileName, const QString &data);
+    void saveFile(const QString &fileName, const QString &data);
+    QString openFile(const QString &filter);
    void startQrReaderActivity();

 signals:
@@ -43,6 +45,7 @@ signals:
    void vpnDisconnected();
    void vpnReconnecting();
    void statisticsUpdated(quint64 rxBytes, quint64 txBytes);
+    void fileOpened(QString uri);
    void configImported(QString config);
    void importConfigFromOutside(QString config);
    void initConnectionState(Vpn::ConnectionState state);
@@ -65,6 +68,7 @@ private:
    static void onVpnReconnecting(JNIEnv *env, jobject thiz);
    static void onStatisticsUpdate(JNIEnv *env, jobject thiz, jlong rxBytes, jlong txBytes);
    static void onConfigImported(JNIEnv *env, jobject thiz, jstring data);
+    static void onFileOpened(JNIEnv *env, jobject thiz, jstring uri);
    static bool decodeQrCode(JNIEnv *env, jobject thiz, jstring data);

    template <typename Ret, typename ...Args>
--- a/client/platforms/android/android_utils.cpp
+++ b/client/platforms/android/android_utils.cpp
@@ -0,0 +1,30 @@
+#include <QCoreApplication>
+#include "android_utils.h"
+
+namespace AndroidUtils
+{
+
+QJniObject getActivity()
+{
+    return QNativeInterface::QAndroidApplication::context();
+}
+
+QString convertJString(JNIEnv *env, jstring data)
+{
+    int len = env->GetStringLength(data);
+    QString res(len, Qt::Uninitialized);
+    env->GetStringRegion(data, 0, len, reinterpret_cast<jchar *>(res.data()));
+    return res;
+}
+
+void runOnAndroidThreadSync(const std::function<void()> &runnable)
+{
+    QNativeInterface::QAndroidApplication::runOnAndroidMainThread(runnable).waitForFinished();
+}
+
+void runOnAndroidThreadAsync(const std::function<void()> &runnable)
+{
+    QNativeInterface::QAndroidApplication::runOnAndroidMainThread(runnable);
+}
+
+}
--- a/client/platforms/android/android_utils.h
+++ b/client/platforms/android/android_utils.h
@@ -0,0 +1,16 @@
+#ifndef ANDROID_UTILS_H
+#define ANDROID_UTILS_H
+
+#include <QJniObject>
+
+namespace AndroidUtils
+{
+QJniObject getActivity();
+
+QString convertJString(JNIEnv *env, jstring data);
+
+void runOnAndroidThreadSync(const std::function<void()> &runnable);
+void runOnAndroidThreadAsync(const std::function<void()> &runnable);
+};
+
+#endif // ANDROID_UTILS_H
--- a/client/platforms/android/androidutils.cpp
+++ b/client/platforms/android/androidutils.cpp
@@ -1,183 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "androidutils.h"
-
-#include <QGuiApplication>
-#include <QJniEnvironment>
-#include <QJniObject>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QNetworkCookieJar>
-#include <QTimer>
-#include <QUrlQuery>
-
-#include "jni.h"
-
-namespace
-{
-    AndroidUtils *s_instance = nullptr;
-} // namespace
-
-// static
-QString AndroidUtils::GetDeviceName()
-{
-    QJniEnvironment env;
-    jclass BUILD = env->FindClass("android/os/Build");
-    jfieldID model = env->GetStaticFieldID(BUILD, "MODEL", "Ljava/lang/String;");
-    jstring value = (jstring)env->GetStaticObjectField(BUILD, model);
-
-    if (!value) {
-        return QString("Android Device");
-    }
-
-    const char *buffer = env->GetStringUTFChars(value, nullptr);
-    if (!buffer) {
-        return QString("Android Device");
-    }
-
-    QString res(buffer);
-    env->ReleaseStringUTFChars(value, buffer);
-
-    return res;
-};
-
-// static
-AndroidUtils *AndroidUtils::instance()
-{
-    if (!s_instance) {
-        Q_ASSERT(qApp);
-        s_instance = new AndroidUtils(qApp);
-    }
-
-    return s_instance;
-}
-
-AndroidUtils::AndroidUtils(QObject *parent) : QObject(parent)
-{
-    Q_ASSERT(!s_instance);
-    s_instance = this;
-}
-
-AndroidUtils::~AndroidUtils()
-{
-    Q_ASSERT(s_instance == this);
-    s_instance = nullptr;
-}
-
-// static
-void AndroidUtils::dispatchToMainThread(std::function<void()> callback)
-{
-    QTimer *timer = new QTimer();
-    timer->moveToThread(qApp->thread());
-    timer->setSingleShot(true);
-    QObject::connect(timer, &QTimer::timeout, [=]() {
-        callback();
-        timer->deleteLater();
-    });
-    QMetaObject::invokeMethod(timer, "start", Qt::QueuedConnection);
-}
-
-// static
-QByteArray AndroidUtils::getQByteArrayFromJString(JNIEnv *env, jstring data)
-{
-    const char *buffer = env->GetStringUTFChars(data, nullptr);
-    if (!buffer) {
-        qDebug() << "getQByteArrayFromJString - failed to parse data.";
-        return QByteArray();
-    }
-
-    QByteArray out(buffer);
-    env->ReleaseStringUTFChars(data, buffer);
-    return out;
-}
-
-// static
-QString AndroidUtils::getQStringFromJString(JNIEnv *env, jstring data)
-{
-    const char *buffer = env->GetStringUTFChars(data, nullptr);
-    if (!buffer) {
-        qDebug() << "getQStringFromJString - failed to parse data.";
-        return QString();
-    }
-
-    QString out(buffer);
-    env->ReleaseStringUTFChars(data, buffer);
-    return out;
-}
-
-// static
-QJsonObject AndroidUtils::getQJsonObjectFromJString(JNIEnv *env, jstring data)
-{
-    QByteArray raw(getQByteArrayFromJString(env, data));
-    QJsonParseError jsonError;
-    QJsonDocument json = QJsonDocument::fromJson(raw, &jsonError);
-    if (QJsonParseError::NoError != jsonError.error) {
-        qDebug() << "getQJsonObjectFromJstring - error parsing json. Code: " << jsonError.error
-                 << "Offset: " << jsonError.offset << "Message: " << jsonError.errorString() << "Data: " << raw;
-        return QJsonObject();
-    }
-
-    if (!json.isObject()) {
-        qDebug() << "getQJsonObjectFromJString - object expected.";
-        return QJsonObject();
-    }
-
-    return json.object();
-}
-
-QJniObject AndroidUtils::getActivity()
-{
-    return QNativeInterface::QAndroidApplication::context();
-}
-
-int AndroidUtils::GetSDKVersion()
-{
-    QJniEnvironment env;
-    jclass versionClass = env->FindClass("android/os/Build$VERSION");
-    jfieldID sdkIntFieldID = env->GetStaticFieldID(versionClass, "SDK_INT", "I");
-    int sdk = env->GetStaticIntField(versionClass, sdkIntFieldID);
-
-    return sdk;
-}
-
-QString AndroidUtils::GetManufacturer()
-{
-    QJniEnvironment env;
-    jclass buildClass = env->FindClass("android/os/Build");
-    jfieldID manuFacturerField = env->GetStaticFieldID(buildClass, "MANUFACTURER", "Ljava/lang/String;");
-    jstring value = (jstring)env->GetStaticObjectField(buildClass, manuFacturerField);
-
-    const char *buffer = env->GetStringUTFChars(value, nullptr);
-
-    if (!buffer) {
-        qDebug() << "Failed to fetch MANUFACTURER";
-        return QByteArray();
-    }
-
-    QString res(buffer);
-    qDebug() << "MANUFACTURER: " << res;
-    env->ReleaseStringUTFChars(value, buffer);
-    return res;
-}
-
-void AndroidUtils::runOnAndroidThreadSync(const std::function<void()> runnable)
-{
-    QNativeInterface::QAndroidApplication::runOnAndroidMainThread(runnable).waitForFinished();
-}
-
-void AndroidUtils::runOnAndroidThreadAsync(const std::function<void()> runnable)
-{
-    QNativeInterface::QAndroidApplication::runOnAndroidMainThread(runnable);
-}
-
-// Static
-// Creates a copy of the passed QByteArray in the JVM and passes back a ref
-jbyteArray AndroidUtils::tojByteArray(const QByteArray &data)
-{
-    QJniEnvironment env;
-    jbyteArray out = env->NewByteArray(data.size());
-    env->SetByteArrayRegion(out, 0, data.size(), reinterpret_cast<const jbyte *>(data.constData()));
-    return out;
-}
--- a/client/platforms/android/androidutils.h
+++ b/client/platforms/android/androidutils.h
@@ -1,49 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef ANDROIDUTILS_H
-#define ANDROIDUTILS_H
-
-#include <jni.h>
-
-#include <QJniEnvironment>
-#include <QJniObject>
-#include <QObject>
-#include <QString>
-#include <QUrl>
-
-class AndroidUtils final : public QObject
-{
-    Q_OBJECT
-    Q_DISABLE_COPY_MOVE(AndroidUtils)
-
-public:
-    static QString GetDeviceName();
-
-    static int GetSDKVersion();
-    static QString GetManufacturer();
-
-    static AndroidUtils* instance();
-
-    static void dispatchToMainThread(std::function<void()> callback);
-
-    static QByteArray getQByteArrayFromJString(JNIEnv* env, jstring data);
-
-    static jbyteArray tojByteArray(const QByteArray& data);
-
-    static QString getQStringFromJString(JNIEnv* env, jstring data);
-
-    static QJsonObject getQJsonObjectFromJString(JNIEnv* env, jstring data);
-
-    static QJniObject getActivity();
-
-    static void runOnAndroidThreadSync(const std::function<void()> runnable);
-    static void runOnAndroidThreadAsync(const std::function<void()> runnable);
-
-private:
-    AndroidUtils(QObject* parent);
-    ~AndroidUtils();
-};
-
-#endif // ANDROIDUTILS_H
--- a/client/secure_qsettings.h
+++ b/client/secure_qsettings.h
@@ -14,12 +14,14 @@ constexpr const char *keyChainName = "AmneziaVPN-Keychain";

 class SecureQSettings : public QObject
 {
+    Q_OBJECT
+
 public:
    explicit SecureQSettings(const QString &organization, const QString &application = QString(),
                             QObject *parent = nullptr);

-    QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const;
-    void setValue(const QString &key, const QVariant &value);
+    Q_INVOKABLE QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const;
+    Q_INVOKABLE void setValue(const QString &key, const QVariant &value);
    void remove(const QString &key);
    void sync();

--- a/client/server_scripts/check_server_is_busy.sh
+++ b/client/server_scripts/check_server_is_busy.sh
@@ -1,5 +1,6 @@
 if which apt-get > /dev/null 2>&1; then LOCK_FILE="/var/lib/dpkg/lock-frontend";\
 elif which dnf > /dev/null 2>&1; then LOCK_FILE="/var/run/dnf.pid";\
 elif which yum > /dev/null 2>&1; then LOCK_FILE="/var/run/yum.pid";\
+elif which pacman > /dev/null 2>&1; then LOCK_FILE="/var/lib/pacman/db.lck";\
 else echo "Packet manager not found"; echo "Internal error"; exit 1; fi;\
-if command -v fuser > /dev/null 2>&1; then sudo fuser $LOCK_FILE 2>/dev/null; else  echo "fuser not installed"; fi
+if command -v fuser > /dev/null 2>&1; then sudo fuser $LOCK_FILE 2>/dev/null; else echo "fuser not installed"; fi
--- a/client/server_scripts/install_docker.sh
+++ b/client/server_scripts/install_docker.sh
@@ -1,6 +1,7 @@
 if which apt-get > /dev/null 2>&1; then pm=$(which apt-get); silent_inst="-yq install"; check_pkgs="-yq update"; docker_pkg="docker.io"; dist="debian";\
 elif which dnf > /dev/null 2>&1; then pm=$(which dnf); silent_inst="-yq install"; check_pkgs="-yq check-update"; docker_pkg="docker"; dist="fedora";\
 elif which yum > /dev/null 2>&1; then pm=$(which yum); silent_inst="-y -q install"; check_pkgs="-y -q check-update"; docker_pkg="docker"; dist="centos";\
+elif which pacman > /dev/null 2>&1; then pm=$(which pacman); silent_inst="-S --noconfirm --noprogressbar --quiet"; check_pkgs="> /dev/null 2>&1"; docker_pkg="docker"; dist="archlinux";\
 else echo "Packet manager not found"; exit 1; fi;\
 echo "Dist: $dist, Packet manager: $pm, Install command: $silent_inst, Check pkgs command: $check_pkgs, Docker pkg: $docker_pkg";\
 if [ "$dist" = "debian" ]; then export DEBIAN_FRONTEND=noninteractive; fi;\
--- a/client/settings.cpp
+++ b/client/settings.cpp
@@ -1,4 +1,8 @@
 #include "settings.h"
+
+#include "QThread"
+#include "QCoreApplication"
+
 #include "utilities.h"
 #include "version.h"

@@ -12,10 +16,10 @@ Settings::Settings(QObject *parent) : QObject(parent), m_settings(ORGANIZATION_N
 {
    // Import old settings
    if (serversCount() == 0) {
-        QString user = m_settings.value("Server/userName").toString();
-        QString password = m_settings.value("Server/password").toString();
-        QString serverName = m_settings.value("Server/serverName").toString();
-        int port = m_settings.value("Server/serverPort").toInt();
+        QString user = value("Server/userName").toString();
+        QString password = value("Server/password").toString();
+        QString serverName = value("Server/serverName").toString();
+        int port = value("Server/serverPort").toInt();

        if (!user.isEmpty() && !password.isEmpty() && !serverName.isEmpty()) {
            QJsonObject server;
@@ -211,7 +215,7 @@ QString Settings::nextAvailableServerName() const

 void Settings::setSaveLogs(bool enabled)
 {
-    m_settings.setValue("Conf/saveLogs", enabled);
+    setValue("Conf/saveLogs", enabled);
    if (!isSaveLogs()) {
        Logger::deInit();
    } else {
@@ -233,7 +237,7 @@ QString Settings::routeModeString(RouteMode mode) const

 Settings::RouteMode Settings::routeMode() const
 {
-    return static_cast<RouteMode>(m_settings.value("Conf/routeMode", 0).toInt());
+    return static_cast<RouteMode>(value("Conf/routeMode", 0).toInt());
 }

 bool Settings::addVpnSite(RouteMode mode, const QString &site, const QString &ip)
@@ -321,12 +325,12 @@ void Settings::removeAllVpnSites(RouteMode mode)

 QString Settings::primaryDns() const
 {
-    return m_settings.value("Conf/primaryDns", cloudFlareNs1).toString();
+    return value("Conf/primaryDns", cloudFlareNs1).toString();
 }

 QString Settings::secondaryDns() const
 {
-    return m_settings.value("Conf/secondaryDns", cloudFlareNs2).toString();
+    return value("Conf/secondaryDns", cloudFlareNs2).toString();
 }

 void Settings::clearSettings()
@@ -351,3 +355,30 @@ ServerCredentials Settings::serverCredentials(int index) const

    return credentials;
 }
+
+QVariant Settings::value(const QString &key, const QVariant &defaultValue) const
+{
+    QVariant returnValue;
+    if (QThread::currentThread() == QCoreApplication::instance()->thread()) {
+        returnValue = m_settings.value(key, defaultValue);
+    } else {
+        QMetaObject::invokeMethod(&m_settings, "value",
+                                  Qt::BlockingQueuedConnection,
+                                  Q_RETURN_ARG(QVariant, returnValue),
+                                  Q_ARG(const QString&, key),
+                                  Q_ARG(const QVariant&, defaultValue));
+    }
+    return returnValue;
+}
+
+void Settings::setValue(const QString &key, const QVariant &value)
+{
+    if (QThread::currentThread() == QCoreApplication::instance()->thread()) {
+        m_settings.setValue(key, value);
+    } else {
+        QMetaObject::invokeMethod(&m_settings, "setValue",
+                                  Qt::BlockingQueuedConnection,
+                                  Q_ARG(const QString&, key),
+                                  Q_ARG(const QVariant&, value));
+    }
+}
--- a/client/settings.h
+++ b/client/settings.h
@@ -29,11 +29,11 @@ public:

    QJsonArray serversArray() const
    {
-        return QJsonDocument::fromJson(m_settings.value("Servers/serversList").toByteArray()).array();
+        return QJsonDocument::fromJson(value("Servers/serversList").toByteArray()).array();
    }
    void setServersArray(const QJsonArray &servers)
    {
-        m_settings.setValue("Servers/serversList", QJsonDocument(servers).toJson());
+        setValue("Servers/serversList", QJsonDocument(servers).toJson());
    }

    // Servers section
@@ -45,11 +45,11 @@ public:

    int defaultServerIndex() const
    {
-        return m_settings.value("Servers/defaultServerIndex", 0).toInt();
+        return value("Servers/defaultServerIndex", 0).toInt();
    }
    void setDefaultServer(int index)
    {
-        m_settings.setValue("Servers/defaultServerIndex", index);
+        setValue("Servers/defaultServerIndex", index);
    }
    QJsonObject defaultServer() const
    {
@@ -78,25 +78,25 @@ public:
    // App settings section
    bool isAutoConnect() const
    {
-        return m_settings.value("Conf/autoConnect", false).toBool();
+        return value("Conf/autoConnect", false).toBool();
    }
    void setAutoConnect(bool enabled)
    {
-        m_settings.setValue("Conf/autoConnect", enabled);
+        setValue("Conf/autoConnect", enabled);
    }

    bool isStartMinimized() const
    {
-        return m_settings.value("Conf/startMinimized", false).toBool();
+        return value("Conf/startMinimized", false).toBool();
    }
    void setStartMinimized(bool enabled)
    {
-        m_settings.setValue("Conf/startMinimized", enabled);
+        setValue("Conf/startMinimized", enabled);
    }

    bool isSaveLogs() const
    {
-        return m_settings.value("Conf/saveLogs", false).toBool();
+        return value("Conf/saveLogs", false).toBool();
    }
    void setSaveLogs(bool enabled);

@@ -110,15 +110,15 @@ public:
    QString routeModeString(RouteMode mode) const;

    RouteMode routeMode() const;
-    void setRouteMode(RouteMode mode) { m_settings.setValue("Conf/routeMode", mode); }
+    void setRouteMode(RouteMode mode) { setValue("Conf/routeMode", mode); }

    QVariantMap vpnSites(RouteMode mode) const
    {
-        return m_settings.value("Conf/" + routeModeString(mode)).toMap();
+        return value("Conf/" + routeModeString(mode)).toMap();
    }
    void setVpnSites(RouteMode mode, const QVariantMap &sites)
    {
-        m_settings.setValue("Conf/" + routeModeString(mode), sites);
+        setValue("Conf/" + routeModeString(mode), sites);
        m_settings.sync();
    }
    bool addVpnSite(RouteMode mode, const QString &site, const QString &ip = "");
@@ -132,11 +132,11 @@ public:

    bool useAmneziaDns() const
    {
-        return m_settings.value("Conf/useAmneziaDns", true).toBool();
+        return value("Conf/useAmneziaDns", true).toBool();
    }
    void setUseAmneziaDns(bool enabled)
    {
-        m_settings.setValue("Conf/useAmneziaDns", enabled);
+        setValue("Conf/useAmneziaDns", enabled);
    }

    QString primaryDns() const;
@@ -145,13 +145,13 @@ public:
    // QString primaryDns() const { return m_primaryDns; }
    void setPrimaryDns(const QString &primaryDns)
    {
-        m_settings.setValue("Conf/primaryDns", primaryDns);
+        setValue("Conf/primaryDns", primaryDns);
    }

    // QString secondaryDns() const { return m_secondaryDns; }
    void setSecondaryDns(const QString &secondaryDns)
    {
-        m_settings.setValue("Conf/secondaryDns", secondaryDns);
+        setValue("Conf/secondaryDns", secondaryDns);
    }

    static const char cloudFlareNs1[];
@@ -171,20 +171,20 @@ public:

    QLocale getAppLanguage()
    {
-        return m_settings.value("Conf/appLanguage", QLocale()).toLocale();
+        return value("Conf/appLanguage", QLocale()).toLocale();
    };
    void setAppLanguage(QLocale locale)
    {
-        m_settings.setValue("Conf/appLanguage", locale);
+        setValue("Conf/appLanguage", locale);
    };

    bool isScreenshotsEnabled() const
    {
-        return m_settings.value("Conf/screenshotsEnabled", false).toBool();
+        return value("Conf/screenshotsEnabled", false).toBool();
    }
    void setScreenshotsEnabled(bool enabled)
    {
-        m_settings.setValue("Conf/screenshotsEnabled", enabled);
+        setValue("Conf/screenshotsEnabled", enabled);
    }

    void clearSettings();
@@ -193,7 +193,10 @@ signals:
    void saveLogsChanged();

 private:
-    SecureQSettings m_settings;
+    QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const;
+    void setValue(const QString &key, const QVariant &value);
+
+    mutable SecureQSettings m_settings;
 };

 #endif // SETTINGS_H
--- a/client/translations/amneziavpn_fa_IR.ts
+++ b/client/translations/amneziavpn_fa_IR.ts
@@ -946,6 +946,11 @@ Already installed containers were found on the server. All installed containers
        <source>Show other methods on Github</source>
        <translation>نمایش متد‎های دیگر در گیت هاب</translation>
    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="104"/>
+        <source>https://github.com/amnezia-vpn/amnezia-client#donate</source>
+        <translation type="unfinished"></translation>
+    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="113"/>
        <source>Contacts</source>
@@ -1854,6 +1859,11 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <source>I have nothing</source>
        <translation>من هیچی ندارم</translation>
    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="138"/>
+        <source>https://amnezia.org/instructions/0_starter-guide</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>PageSetupWizardTextKey</name>
@@ -2178,38 +2188,38 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::DeletePasswordJobPrivate</name>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="104"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="104"/>
        <source>Password entry not found</source>
        <translation>Password entry not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="108"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="108"/>
        <source>Could not decrypt data</source>
        <translation>Could not decrypt data</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="552"/>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="560"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="585"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="593"/>
        <source>Unknown error</source>
        <translation>Unknown error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="578"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="614"/>
        <source>Could not open wallet: %1; %2</source>
        <translation>Could not open wallet: %1; %2</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="177"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_haiku.cpp" line="177"/>
        <source>Password not found</source>
        <translation>Password not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="173"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="173"/>
        <source>Could not open keystore</source>
        <translation>Could not open keystore</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="179"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="179"/>
        <source>Could not remove private key from keystore</source>
        <translation>Could not remove private key from keystore</translation>
    </message>
@@ -2217,12 +2227,12 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::JobPrivate</name>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="265"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="295"/>
        <source>Unknown error</source>
        <translation>Unknown error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="509"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="542"/>
        <source>Access to keychain denied</source>
        <translation>Access to keychain denied</translation>
    </message>
@@ -2230,27 +2240,27 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::PlainTextStore</name>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="65"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="65"/>
        <source>Could not store data in settings: access error</source>
        <translation>Could not store data in settings: access error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="67"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="67"/>
        <source>Could not store data in settings: format error</source>
        <translation>Could not store data in settings: format error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="85"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="85"/>
        <source>Could not delete data from settings: access error</source>
        <translation>Could not delete data from settings: access error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="87"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="87"/>
        <source>Could not delete data from settings: format error</source>
        <translation>Could not delete data from settings: format error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="104"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="104"/>
        <source>Entry not found</source>
        <translation>Entry not found</translation>
    </message>
@@ -2258,80 +2268,80 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::ReadPasswordJobPrivate</name>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="32"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="32"/>
        <source>Password entry not found</source>
        <translation>Password entry not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="36"/>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="139"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="36"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="139"/>
        <source>Could not decrypt data</source>
        <translation>Could not decrypt data</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="178"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="205"/>
        <source>D-Bus is not running</source>
        <translation>D-Bus is not running</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="187"/>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="197"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="214"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="224"/>
        <source>Unknown error</source>
        <translation>Unknown error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="286"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="316"/>
        <source>No keychain service available</source>
        <translation>No keychain service available</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="288"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="318"/>
        <source>Could not open wallet: %1; %2</source>
        <translation>Could not open wallet: %1; %2</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="333"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="363"/>
        <source>Access to keychain denied</source>
        <translation>Access to keychain denied</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="354"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="384"/>
        <source>Could not determine data type: %1; %2</source>
        <translation>Could not determine data type: %1; %2</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="363"/>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="52"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="393"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="52"/>
        <source>Entry not found</source>
        <translation>Entry not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="372"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="402"/>
        <source>Unsupported entry type &apos;Map&apos;</source>
        <translation>Unsupported entry type &apos;Map&apos;</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="375"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="405"/>
        <source>Unknown kwallet entry type &apos;%1&apos;</source>
        <translation>Unknown kwallet entry type &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="96"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_haiku.cpp" line="96"/>
        <source>Password not found</source>
        <translation>Password not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="60"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="60"/>
        <source>Could not open keystore</source>
        <translation>Could not open keystore</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="68"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="68"/>
        <source>Could not retrieve private key from keystore</source>
        <translation>Could not retrieve private key from keystore</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="75"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="75"/>
        <source>Could not create decryption cipher</source>
        <translation>Could not create decryption cipher</translation>
    </message>
@@ -2339,73 +2349,73 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::WritePasswordJobPrivate</name>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="78"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="78"/>
        <source>Credential size exceeds maximum size of %1</source>
        <translation>Credential size exceeds maximum size of %1</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="87"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="87"/>
        <source>Credential key exceeds maximum size of %1</source>
        <translation>Credential key exceeds maximum size of %1</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="92"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="92"/>
        <source>Writing credentials failed: Win32 error code %1</source>
        <translation>Writing credentials failed: Win32 error code %1</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="162"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="162"/>
        <source>Encryption failed</source>
        <translation>Encryption failed</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="415"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="445"/>
        <source>D-Bus is not running</source>
        <translation>D-Bus is not running</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="425"/>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="452"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="455"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="482"/>
        <source>Unknown error</source>
        <translation>Unknown error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="468"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="501"/>
        <source>Could not open wallet: %1; %2</source>
        <translation>Could not open wallet: %1; %2</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="144"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_haiku.cpp" line="144"/>
        <source>Password not found</source>
        <translation>Password not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="95"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="95"/>
        <source>Could not open keystore</source>
        <translation>Could not open keystore</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="124"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="124"/>
        <source>Could not create private key generator</source>
        <translation>Could not create private key generator</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="131"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="131"/>
        <source>Could not generate new private key</source>
        <translation>Could not generate new private key</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="139"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="139"/>
        <source>Could not retrieve private key from keystore</source>
        <translation>Could not retrieve private key from keystore</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="147"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="147"/>
        <source>Could not create encryption cipher</source>
        <translation>Could not create encryption cipher</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="155"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="155"/>
        <source>Could not encrypt data</source>
        <translation>Could not encrypt data</translation>
    </message>
@@ -2855,74 +2865,72 @@ This means that AmneziaWG keeps the fast performance of the original while addin
        <translation>سرویس Sftp</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/libsecret.cpp" line="119"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/libsecret.cpp" line="119"/>
        <source>Entry not found</source>
        <translation>Entry not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="225"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="255"/>
        <source>Access to keychain denied</source>
        <translation>Access to keychain denied</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="227"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="257"/>
        <source>No keyring daemon</source>
        <translation>No keyring daemon</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="229"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="259"/>
        <source>Already unlocked</source>
        <translation>Already unlocked</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="231"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="261"/>
        <source>No such keyring</source>
        <translation>No such keyring</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="233"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="263"/>
        <source>Bad arguments</source>
        <translation>Bad arguments</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="235"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="265"/>
        <source>I/O error</source>
        <translation>I/O error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="237"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="267"/>
        <source>Cancelled</source>
        <translation>Cancelled</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="239"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="269"/>
        <source>Keyring already exists</source>
        <translation>Keyring already exists</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="241"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="271"/>
        <source>No match</source>
        <translation>No match</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="246"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="276"/>
        <source>Unknown error</source>
        <translation>Unknown error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="72"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_haiku.cpp" line="72"/>
        <source>error 0x%1: %2</source>
        <translation>error 0x%1: %2</translation>
    </message>
    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
        <source>WireGuard Configuration Highlighter</source>
-        <translation>هایلایتر پیکربندی WireGuard</translation>
+        <translation type="vanished">هایلایتر پیکربندی WireGuard</translation>
    </message>
    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
        <source>&amp;Randomize colors</source>
-        <translation>رنگ‎های تصادفی</translation>
+        <translation type="vanished">رنگ‎های تصادفی</translation>
    </message>
 </context>
 <context>
@@ -2936,13 +2944,13 @@ This means that AmneziaWG keeps the fast performance of the original while addin
 <context>
    <name>Settings</name>
    <message>
-        <location filename="../settings.cpp" line="26"/>
+        <location filename="../settings.cpp" line="30"/>
        <source>Server #1</source>
        <translation>Server #1</translation>
    </message>
    <message>
-        <location filename="../settings.cpp" line="202"/>
-        <location filename="../settings.cpp" line="209"/>
+        <location filename="../settings.cpp" line="206"/>
+        <location filename="../settings.cpp" line="213"/>
        <source>Server</source>
        <translation>Server</translation>
    </message>
@@ -2950,22 +2958,22 @@ This means that AmneziaWG keeps the fast performance of the original while addin
 <context>
    <name>SettingsController</name>
    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="25"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="26"/>
        <source>Software version</source>
        <translation>نسخه نرم‎افزار</translation>
    </message>
    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="137"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="139"/>
        <source>All settings have been reset to default values</source>
        <translation>تمام تنظیمات به مقادیر پیش فرض ریست شد</translation>
    </message>
    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="143"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="145"/>
        <source>Cached profiles cleared</source>
        <translation>پروفایل ذخیره شده پاک شد</translation>
    </message>
    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="122"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="123"/>
        <source>Backup file is corrupted</source>
        <translation>فایل بک‎آپ خراب شده است</translation>
    </message>
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -15,15 +15,13 @@
 <context>
    <name>AndroidController</name>
    <message>
-        <location filename="../platforms/android/android_controller.cpp" line="236"/>
        <source>AmneziaVPN</source>
-        <translation>AmneziaVPN</translation>
+        <translation type="vanished">AmneziaVPN</translation>
    </message>
    <message>
-        <location filename="../platforms/android/android_controller.cpp" line="239"/>
        <source>VPN Connected</source>
        <extracomment>Refers to the app - which is currently running the background and waiting</extracomment>
-        <translation>VPN Подключен</translation>
+        <translation type="vanished">VPN Подключен</translation>
    </message>
 </context>
 <context>
@@ -151,7 +149,7 @@
 <context>
    <name>ImportController</name>
    <message>
-        <location filename="../ui/controllers/importController.cpp" line="435"/>
+        <location filename="../ui/controllers/importController.cpp" line="411"/>
        <source>Scanned %1 of %2.</source>
        <translation>Отсканировано %1 из%2.</translation>
    </message>
@@ -946,6 +944,11 @@ Already installed containers were found on the server. All installed containers
        <source>Show other methods on Github</source>
        <translation>Показать другие способы на Github</translation>
    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="104"/>
+        <source>https://github.com/amnezia-vpn/amnezia-client#donate</source>
+        <translation type="unfinished"></translation>
+    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="113"/>
        <source>Contacts</source>
@@ -1428,22 +1431,22 @@ Already installed containers were found on the server. All installed containers
        <translation>Имя сервера</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="110"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="111"/>
        <source>Save</source>
        <translation>Сохранить</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="137"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="142"/>
        <source>Protocols</source>
        <translation>Протоколы</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="143"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="148"/>
        <source>Services</source>
        <translation>Сервисы</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="147"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="152"/>
        <source>Data</source>
        <translation>Данные</translation>
    </message>
@@ -1854,6 +1857,11 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <source>I have nothing</source>
        <translation>У меня ничего нет</translation>
    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="138"/>
+        <source>https://amnezia.org/instructions/0_starter-guide</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>PageSetupWizardTextKey</name>
@@ -1941,8 +1949,8 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <translation type="vanished">Доступ к управлению сервером. Пользователь, с которым вы делитесь полным доступом к соединению, сможет добавлять и удалять ваши протоколы и службы на сервере, а также изменять настройки.</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="279"/>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="280"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="281"/>
        <source>Server</source>
        <translation>Сервер</translation>
    </message>
@@ -2017,7 +2025,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="231"/>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="483"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="486"/>
        <source>Users</source>
        <translation type="unfinished">Пользователи</translation>
    </message>
@@ -2027,47 +2035,52 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <translation type="unfinished">Имя пользователя</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="499"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="502"/>
        <source>Search</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="595"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="584"/>
+        <source>Creation date: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="598"/>
        <source>Rename</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="624"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="627"/>
        <source>Client name</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="632"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="636"/>
        <source>Save</source>
        <translation type="unfinished">Сохранить</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="660"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="668"/>
        <source>Revoke</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="663"/>
-        <source>Revoke the config for a user - </source>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="671"/>
+        <source>Revoke the config for a user - %1?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="664"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="672"/>
        <source>The user will no longer be able to connect to your server.</source>
        <translation type="unfinished">Пользователь больше не сможет подключаться к вашему серверу</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="665"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="673"/>
        <source>Continue</source>
        <translation type="unfinished">Продолжить</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="666"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="674"/>
        <source>Cancel</source>
        <translation type="unfinished">Отменить</translation>
    </message>
@@ -2081,20 +2094,20 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <translation>Поделиться доступом к VPN, без возможности управления сервером</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="331"/>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="332"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="333"/>
        <source>Protocol</source>
        <translation>Протокол</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="428"/>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="429"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="430"/>
        <source>Connection format</source>
        <translation>Формат подключения</translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="186"/>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="468"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="469"/>
        <source>Share</source>
        <translation>Поделиться</translation>
    </message>
@@ -2124,12 +2137,12 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <translation type="unfinished">Сервер</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShareFullAccess.qml" line="102"/>
+        <location filename="../ui/qml/Pages2/PageShareFullAccess.qml" line="100"/>
        <source>Accessing </source>
        <translation type="unfinished">Доступ </translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShareFullAccess.qml" line="103"/>
+        <location filename="../ui/qml/Pages2/PageShareFullAccess.qml" line="101"/>
        <source>File with accessing settings to </source>
        <translation type="unfinished"></translation>
    </message>
@@ -2160,38 +2173,38 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::DeletePasswordJobPrivate</name>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="104"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="104"/>
        <source>Password entry not found</source>
        <translation>Password entry not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="108"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="108"/>
        <source>Could not decrypt data</source>
        <translation>Could not decrypt data</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="552"/>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="560"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="585"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="593"/>
        <source>Unknown error</source>
        <translation>Unknown error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="578"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="614"/>
        <source>Could not open wallet: %1; %2</source>
        <translation>Could not open wallet: %1; %2</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="177"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_haiku.cpp" line="177"/>
        <source>Password not found</source>
        <translation>Password not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="173"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="173"/>
        <source>Could not open keystore</source>
        <translation>Could not open keystore</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="179"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="179"/>
        <source>Could not remove private key from keystore</source>
        <translation>Could not remove private key from keystore</translation>
    </message>
@@ -2199,12 +2212,12 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::JobPrivate</name>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="265"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="295"/>
        <source>Unknown error</source>
        <translation>Unknown error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="509"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="542"/>
        <source>Access to keychain denied</source>
        <translation>Access to keychain denied</translation>
    </message>
@@ -2212,27 +2225,27 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::PlainTextStore</name>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="65"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="65"/>
        <source>Could not store data in settings: access error</source>
        <translation>Could not store data in settings: access error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="67"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="67"/>
        <source>Could not store data in settings: format error</source>
        <translation>Could not store data in settings: format error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="85"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="85"/>
        <source>Could not delete data from settings: access error</source>
        <translation>Could not delete data from settings: access error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="87"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="87"/>
        <source>Could not delete data from settings: format error</source>
        <translation>Could not delete data from settings: format error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="104"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="104"/>
        <source>Entry not found</source>
        <translation>Entry not found</translation>
    </message>
@@ -2240,80 +2253,80 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::ReadPasswordJobPrivate</name>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="32"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="32"/>
        <source>Password entry not found</source>
        <translation>Password entry not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="36"/>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="139"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="36"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="139"/>
        <source>Could not decrypt data</source>
        <translation>Could not decrypt data</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="178"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="205"/>
        <source>D-Bus is not running</source>
        <translation>D-Bus is not running</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="187"/>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="197"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="214"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="224"/>
        <source>Unknown error</source>
        <translation>Unknown error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="286"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="316"/>
        <source>No keychain service available</source>
        <translation>No keychain service available</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="288"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="318"/>
        <source>Could not open wallet: %1; %2</source>
        <translation>Could not open wallet: %1; %2</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="333"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="363"/>
        <source>Access to keychain denied</source>
        <translation>Access to keychain denied</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="354"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="384"/>
        <source>Could not determine data type: %1; %2</source>
        <translation>Could not determine data type: %1; %2</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="363"/>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="52"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="393"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="52"/>
        <source>Entry not found</source>
        <translation>Entry not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="372"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="402"/>
        <source>Unsupported entry type &apos;Map&apos;</source>
        <translation>Unsupported entry type &apos;Map&apos;</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="375"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="405"/>
        <source>Unknown kwallet entry type &apos;%1&apos;</source>
        <translation>Unknown kwallet entry type &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="96"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_haiku.cpp" line="96"/>
        <source>Password not found</source>
        <translation>Password not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="60"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="60"/>
        <source>Could not open keystore</source>
        <translation>Could not open keystore</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="68"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="68"/>
        <source>Could not retrieve private key from keystore</source>
        <translation>Could not retrieve private key from keystore</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="75"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="75"/>
        <source>Could not create decryption cipher</source>
        <translation>Could not create decryption cipher</translation>
    </message>
@@ -2321,73 +2334,73 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::WritePasswordJobPrivate</name>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="78"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="78"/>
        <source>Credential size exceeds maximum size of %1</source>
        <translation>Credential size exceeds maximum size of %1</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="87"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="87"/>
        <source>Credential key exceeds maximum size of %1</source>
        <translation>Credential key exceeds maximum size of %1</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="92"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="92"/>
        <source>Writing credentials failed: Win32 error code %1</source>
        <translation>Writing credentials failed: Win32 error code %1</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="162"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="162"/>
        <source>Encryption failed</source>
        <translation>Encryption failed</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="415"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="445"/>
        <source>D-Bus is not running</source>
        <translation>D-Bus is not running</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="425"/>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="452"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="455"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="482"/>
        <source>Unknown error</source>
        <translation>Unknown error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="468"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="501"/>
        <source>Could not open wallet: %1; %2</source>
        <translation>Could not open wallet: %1; %2</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="144"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_haiku.cpp" line="144"/>
        <source>Password not found</source>
        <translation>Password not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="95"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="95"/>
        <source>Could not open keystore</source>
        <translation>Could not open keystore</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="124"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="124"/>
        <source>Could not create private key generator</source>
        <translation>Could not create private key generator</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="131"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="131"/>
        <source>Could not generate new private key</source>
        <translation>Could not generate new private key</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="139"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="139"/>
        <source>Could not retrieve private key from keystore</source>
        <translation>Could not retrieve private key from keystore</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="147"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="147"/>
        <source>Could not create encryption cipher</source>
        <translation>Could not create encryption cipher</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="155"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="155"/>
        <source>Could not encrypt data</source>
        <translation>Could not encrypt data</translation>
    </message>
@@ -2594,7 +2607,12 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <translation>VPN pool error: no available addresses</translation>
    </message>
    <message>
-        <location filename="../core/errorstrings.cpp" line="64"/>
+        <location filename="../core/errorstrings.cpp" line="63"/>
+        <source>VPN connection error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="67"/>
        <source>Internal error</source>
        <translation>Internal error</translation>
    </message>
@@ -2822,62 +2840,62 @@ This means that AmneziaWG keeps the fast performance of the original while addin
        <translation>Сервис SFTP</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/libsecret.cpp" line="119"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/libsecret.cpp" line="119"/>
        <source>Entry not found</source>
        <translation>Entry not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="225"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="255"/>
        <source>Access to keychain denied</source>
        <translation>Access to keychain denied</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="227"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="257"/>
        <source>No keyring daemon</source>
        <translation>No keyring daemon</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="229"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="259"/>
        <source>Already unlocked</source>
        <translation>Already unlocked</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="231"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="261"/>
        <source>No such keyring</source>
        <translation>No such keyring</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="233"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="263"/>
        <source>Bad arguments</source>
        <translation>Bad arguments</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="235"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="265"/>
        <source>I/O error</source>
        <translation>I/O error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="237"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="267"/>
        <source>Cancelled</source>
        <translation>Cancelled</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="239"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="269"/>
        <source>Keyring already exists</source>
        <translation>Keyring already exists</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="241"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="271"/>
        <source>No match</source>
        <translation>No match</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="246"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="276"/>
        <source>Unknown error</source>
        <translation>Unknown error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="72"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_haiku.cpp" line="72"/>
        <source>error 0x%1: %2</source>
        <translation>error 0x%1: %2</translation>
    </message>
@@ -2893,13 +2911,13 @@ This means that AmneziaWG keeps the fast performance of the original while addin
 <context>
    <name>Settings</name>
    <message>
-        <location filename="../settings.cpp" line="26"/>
+        <location filename="../settings.cpp" line="30"/>
        <source>Server #1</source>
        <translation>Server #1</translation>
    </message>
    <message>
-        <location filename="../settings.cpp" line="202"/>
-        <location filename="../settings.cpp" line="209"/>
+        <location filename="../settings.cpp" line="206"/>
+        <location filename="../settings.cpp" line="213"/>
        <source>Server</source>
        <translation>Server</translation>
    </message>
@@ -2907,22 +2925,22 @@ This means that AmneziaWG keeps the fast performance of the original while addin
 <context>
    <name>SettingsController</name>
    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="25"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="26"/>
        <source>Software version</source>
        <translation>Версия ПО</translation>
    </message>
    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="137"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="139"/>
        <source>All settings have been reset to default values</source>
        <translation>Все настройки были сброшены к значению &quot;По умолчанию&quot;</translation>
    </message>
    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="143"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="145"/>
        <source>Cached profiles cleared</source>
        <translation>Кэш профиля очищен</translation>
    </message>
    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="122"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="123"/>
        <source>Backup file is corrupted</source>
        <translation>Backup файл поврежден</translation>
    </message>
@@ -3054,7 +3072,7 @@ This means that AmneziaWG keeps the fast performance of the original while addin
 <context>
    <name>VpnConnection</name>
    <message>
-        <location filename="../vpnconnection.cpp" line="429"/>
+        <location filename="../vpnconnection.cpp" line="432"/>
        <source>Mbps</source>
        <translation>Mbps</translation>
    </message>
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -11,15 +11,9 @@
 <context>
    <name>AndroidController</name>
    <message>
-        <location filename="../platforms/android/android_controller.cpp" line="236"/>
-        <source>AmneziaVPN</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../platforms/android/android_controller.cpp" line="239"/>
        <source>VPN Connected</source>
        <extracomment>Refers to the app - which is currently running the background and waiting</extracomment>
-        <translation>VPN已连接</translation>
+        <translation type="vanished">VPN已连接</translation>
    </message>
 </context>
 <context>
@@ -158,7 +152,7 @@
 <context>
    <name>ImportController</name>
    <message>
-        <location filename="../ui/controllers/importController.cpp" line="435"/>
+        <location filename="../ui/controllers/importController.cpp" line="411"/>
        <source>Scanned %1 of %2.</source>
        <translation>扫描 %1 of %2.</translation>
    </message>
@@ -997,6 +991,11 @@ And if you don&apos;t like the app, all the more support it - the donation will
        <source>Show other methods on Github</source>
        <translation>其他捐款途径</translation>
    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="104"/>
+        <source>https://github.com/amnezia-vpn/amnezia-client#donate</source>
+        <translation type="unfinished"></translation>
+    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="113"/>
        <source>Contacts</source>
@@ -1511,22 +1510,22 @@ And if you don&apos;t like the app, all the more support it - the donation will
        <translation>服务器名</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="110"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="111"/>
        <source>Save</source>
        <translation>保存</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="137"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="142"/>
        <source>Protocols</source>
        <translation>协议</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="143"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="148"/>
        <source>Services</source>
        <translation>服务</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="147"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="152"/>
        <source>Data</source>
        <translation>数据</translation>
    </message>
@@ -1957,6 +1956,11 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <source>I have nothing</source>
        <translation>我没有</translation>
    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="138"/>
+        <source>https://amnezia.org/instructions/0_starter-guide</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>PageSetupWizardTextKey</name>
@@ -2078,7 +2082,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="231"/>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="483"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="486"/>
        <source>Users</source>
        <translation type="unfinished"></translation>
    </message>
@@ -2088,47 +2092,52 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <translation>共享 VPN 访问，无需管理服务器</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="499"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="502"/>
        <source>Search</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="595"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="584"/>
+        <source>Creation date: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="598"/>
        <source>Rename</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="624"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="627"/>
        <source>Client name</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="632"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="636"/>
        <source>Save</source>
        <translation type="unfinished">保存</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="660"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="668"/>
        <source>Revoke</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="663"/>
-        <source>Revoke the config for a user - </source>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="671"/>
+        <source>Revoke the config for a user - %1?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="664"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="672"/>
        <source>The user will no longer be able to connect to your server.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="665"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="673"/>
        <source>Continue</source>
        <translation type="unfinished">继续</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="666"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="674"/>
        <source>Cancel</source>
        <translation type="unfinished">取消</translation>
    </message>
@@ -2170,8 +2179,8 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <translation type="obsolete">服务器</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="279"/>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="280"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="281"/>
        <source>Server</source>
        <translation>服务器</translation>
    </message>
@@ -2193,8 +2202,8 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <translation type="obsolete">协议</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="331"/>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="332"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="333"/>
        <source>Protocol</source>
        <translation>协议</translation>
    </message>
@@ -2214,14 +2223,14 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="428"/>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="429"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="430"/>
        <source>Connection format</source>
        <translation>连接格式</translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="186"/>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="468"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="469"/>
        <source>Share</source>
        <translation>共享</translation>
    </message>
@@ -2251,12 +2260,12 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <translation type="unfinished">服务器</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShareFullAccess.qml" line="102"/>
+        <location filename="../ui/qml/Pages2/PageShareFullAccess.qml" line="100"/>
        <source>Accessing </source>
        <translation type="unfinished">访问</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShareFullAccess.qml" line="103"/>
+        <location filename="../ui/qml/Pages2/PageShareFullAccess.qml" line="101"/>
        <source>File with accessing settings to </source>
        <translation type="unfinished">访问配置文件的内容为:</translation>
    </message>
@@ -2287,38 +2296,38 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::DeletePasswordJobPrivate</name>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="104"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="104"/>
        <source>Password entry not found</source>
        <translation>未发现秘密</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="108"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="108"/>
        <source>Could not decrypt data</source>
        <translation>数据无法加密</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="552"/>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="560"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="585"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="593"/>
        <source>Unknown error</source>
        <translation>未知错误</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="578"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="614"/>
        <source>Could not open wallet: %1; %2</source>
        <translation>无法打开钱包: %1; %2</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="177"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_haiku.cpp" line="177"/>
        <source>Password not found</source>
        <translation>未发现密码</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="173"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="173"/>
        <source>Could not open keystore</source>
        <translation>无法打开密钥库</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="179"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="179"/>
        <source>Could not remove private key from keystore</source>
        <translation>无法从密钥库中删除私钥</translation>
    </message>
@@ -2326,12 +2335,12 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::JobPrivate</name>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="265"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="295"/>
        <source>Unknown error</source>
        <translation>未知错误</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="509"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="542"/>
        <source>Access to keychain denied</source>
        <translation>访问钥匙串被拒绝</translation>
    </message>
@@ -2339,27 +2348,27 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::PlainTextStore</name>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="65"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="65"/>
        <source>Could not store data in settings: access error</source>
        <translation>无法在配置中存储数据：访问错误</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="67"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="67"/>
        <source>Could not store data in settings: format error</source>
        <translation>无法在陪置中存储数据：格式错误</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="85"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="85"/>
        <source>Could not delete data from settings: access error</source>
        <translation>无法在配置中删除数据：访问错误</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="87"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="87"/>
        <source>Could not delete data from settings: format error</source>
        <translation>无法在配置中删除数据：格式错误</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="104"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="104"/>
        <source>Entry not found</source>
        <translation>未找到条目</translation>
    </message>
@@ -2367,80 +2376,80 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::ReadPasswordJobPrivate</name>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="32"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="32"/>
        <source>Password entry not found</source>
        <translation>未发现密码</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="36"/>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="139"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="36"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="139"/>
        <source>Could not decrypt data</source>
        <translation>数据无法加密</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="178"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="205"/>
        <source>D-Bus is not running</source>
        <translation>D-Bus未运行</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="187"/>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="197"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="214"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="224"/>
        <source>Unknown error</source>
        <translation>未知错误</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="286"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="316"/>
        <source>No keychain service available</source>
        <translation>没有有效的钥匙串服务</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="288"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="318"/>
        <source>Could not open wallet: %1; %2</source>
        <translation>无法打开钱包: %1; %2</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="333"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="363"/>
        <source>Access to keychain denied</source>
        <translation>访问钥匙串被拒绝</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="354"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="384"/>
        <source>Could not determine data type: %1; %2</source>
        <translation>无法确定数据类型: %1； %2</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="363"/>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="52"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="393"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="52"/>
        <source>Entry not found</source>
        <translation>未找到记录</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="372"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="402"/>
        <source>Unsupported entry type &apos;Map&apos;</source>
        <translation>不支持的记录类型 &apos;Map&apos;</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="375"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="405"/>
        <source>Unknown kwallet entry type &apos;%1&apos;</source>
        <translation>未知钱包类型 &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="96"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_haiku.cpp" line="96"/>
        <source>Password not found</source>
        <translation>未发现密码</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="60"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="60"/>
        <source>Could not open keystore</source>
        <translation>无法打开密钥库</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="68"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="68"/>
        <source>Could not retrieve private key from keystore</source>
        <translation>无法从密钥存储库中检索私钥</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="75"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="75"/>
        <source>Could not create decryption cipher</source>
        <translation>无法创建解密算法</translation>
    </message>
@@ -2448,73 +2457,73 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::WritePasswordJobPrivate</name>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="78"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="78"/>
        <source>Credential size exceeds maximum size of %1</source>
        <translation>证书大小超过上限，最大为: %1</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="87"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="87"/>
        <source>Credential key exceeds maximum size of %1</source>
        <translation>凭证密钥大小超过上限，最大为: %1</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="92"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="92"/>
        <source>Writing credentials failed: Win32 error code %1</source>
        <translation>写入凭证失败，Win32错误码: %1</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="162"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="162"/>
        <source>Encryption failed</source>
        <translation>加密失败</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="415"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="445"/>
        <source>D-Bus is not running</source>
        <translation>D-Bus未运行</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="425"/>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="452"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="455"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="482"/>
        <source>Unknown error</source>
        <translation>未知错误</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="468"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="501"/>
        <source>Could not open wallet: %1; %2</source>
        <translation>无法打开钱包: %1; %2</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="144"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_haiku.cpp" line="144"/>
        <source>Password not found</source>
        <translation>未发现密码</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="95"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="95"/>
        <source>Could not open keystore</source>
        <translation>无法打开密钥库</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="124"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="124"/>
        <source>Could not create private key generator</source>
        <translation>无法创建私钥生成器</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="131"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="131"/>
        <source>Could not generate new private key</source>
        <translation>无法生成新的私钥</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="139"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="139"/>
        <source>Could not retrieve private key from keystore</source>
        <translation>无法从密钥库检索私钥</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="147"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="147"/>
        <source>Could not create encryption cipher</source>
        <translation>无法创建加密密码</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="155"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="155"/>
        <source>Could not encrypt data</source>
        <translation>无法加密数据</translation>
    </message>
@@ -2666,6 +2675,11 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <source>Sftp error: No media was in remote drive</source>
        <translation>Sftp 错误: 远程驱动器中没有媒介</translation>
    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="63"/>
+        <source>VPN connection error</source>
+        <translation type="unfinished"></translation>
+    </message>
    <message>
        <source>Failed to save config to disk</source>
        <translation type="vanished">配置保存到磁盘失败</translation>
@@ -2730,7 +2744,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <translation type="vanished">该配置不包含任何用于连接到服务器的容器和凭据。</translation>
    </message>
    <message>
-        <location filename="../core/errorstrings.cpp" line="64"/>
+        <location filename="../core/errorstrings.cpp" line="67"/>
        <source>Internal error</source>
        <translation>内部错误</translation>
    </message>
@@ -2970,62 +2984,62 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
        <translation>Sftp 文件共享服务 - 安全的 FTP 服务</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/libsecret.cpp" line="119"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/libsecret.cpp" line="119"/>
        <source>Entry not found</source>
        <translation>未找到记录</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="225"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="255"/>
        <source>Access to keychain denied</source>
        <translation>访问钥匙串被拒绝</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="227"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="257"/>
        <source>No keyring daemon</source>
        <translation>没有密钥环守护进程</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="229"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="259"/>
        <source>Already unlocked</source>
        <translation>已经解锁</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="231"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="261"/>
        <source>No such keyring</source>
        <translation>没有这样的密钥环</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="233"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="263"/>
        <source>Bad arguments</source>
        <translation>错误参数</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="235"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="265"/>
        <source>I/O error</source>
        <translation>I/O错误</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="237"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="267"/>
        <source>Cancelled</source>
        <translation>已取消</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="239"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="269"/>
        <source>Keyring already exists</source>
        <translation>密匙环已经存在</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="241"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="271"/>
        <source>No match</source>
        <translation>不匹配</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="246"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="276"/>
        <source>Unknown error</source>
        <translation>未知错误</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="72"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_haiku.cpp" line="72"/>
        <source>error 0x%1: %2</source>
        <translation>错误 0x%1: %2</translation>
    </message>
@@ -3041,13 +3055,13 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
 <context>
    <name>Settings</name>
    <message>
-        <location filename="../settings.cpp" line="26"/>
+        <location filename="../settings.cpp" line="30"/>
        <source>Server #1</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../settings.cpp" line="202"/>
-        <location filename="../settings.cpp" line="209"/>
+        <location filename="../settings.cpp" line="206"/>
+        <location filename="../settings.cpp" line="213"/>
        <source>Server</source>
        <translation>服务器</translation>
    </message>
@@ -3055,22 +3069,22 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
 <context>
    <name>SettingsController</name>
    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="25"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="26"/>
        <source>Software version</source>
        <translation>软件版本</translation>
    </message>
    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="122"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="123"/>
        <source>Backup file is corrupted</source>
        <translation>备份文件已损坏</translation>
    </message>
    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="137"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="139"/>
        <source>All settings have been reset to default values</source>
        <translation>所配置恢复为默认值</translation>
    </message>
    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="143"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="145"/>
        <source>Cached profiles cleared</source>
        <translation>缓存的配置文件已清除</translation>
    </message>
@@ -3206,7 +3220,7 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
 <context>
    <name>VpnConnection</name>
    <message>
-        <location filename="../vpnconnection.cpp" line="429"/>
+        <location filename="../vpnconnection.cpp" line="432"/>
        <source>Mbps</source>
        <translation></translation>
    </message>
--- a/client/ui/controllers/exportController.cpp
+++ b/client/ui/controllers/exportController.cpp
@@ -15,7 +15,7 @@
 #include "core/errorstrings.h"
 #include "systemController.h"
 #ifdef Q_OS_ANDROID
-    #include "platforms/android/androidutils.h"
+    #include "platforms/android/android_utils.h"
 #endif
 #include "qrcodegen.hpp"

--- a/client/ui/controllers/pageController.cpp
+++ b/client/ui/controllers/pageController.cpp
@@ -7,7 +7,7 @@
 #endif

 #ifdef Q_OS_ANDROID
-    #include "../../platforms/android/androidutils.h"
+    #include "platforms/android/android_utils.h"
    #include <QJniObject>
 #endif
 #if defined Q_OS_MAC
--- a/client/ui/controllers/settingsController.cpp
+++ b/client/ui/controllers/settingsController.cpp
@@ -7,19 +7,20 @@
 #include "ui/qautostart.h"
 #include "version.h"
 #ifdef Q_OS_ANDROID
-    #include "../../platforms/android/android_controller.h"
-    #include "../../platforms/android/androidutils.h"
+    #include "platforms/android/android_utils.h"
    #include <QJniObject>
 #endif

 SettingsController::SettingsController(const QSharedPointer<ServersModel> &serversModel,
                                       const QSharedPointer<ContainersModel> &containersModel,
                                       const QSharedPointer<LanguageModel> &languageModel,
+                                       const QSharedPointer<SitesModel> &sitesModel,
                                       const std::shared_ptr<Settings> &settings, QObject *parent)
    : QObject(parent),
      m_serversModel(serversModel),
      m_containersModel(containersModel),
      m_languageModel(languageModel),
+      m_sitesModel(sitesModel),
      m_settings(settings)
 {
    m_appVersion = QString("%1: %2 (%3)").arg(tr("Software version"), QString(APP_VERSION), __DATE__);
@@ -134,6 +135,7 @@ void SettingsController::clearSettings()
    m_serversModel->resetModel();
    m_languageModel->changeLanguage(
            static_cast<LanguageSettings::AvailableLanguageEnum>(m_languageModel->getCurrentLanguageIndex()));
+    m_sitesModel->setRouteMode(Settings::RouteMode::VpnAllSites);
    emit changeSettingsFinished(tr("All settings have been reset to default values"));
 }

--- a/client/ui/controllers/settingsController.h
+++ b/client/ui/controllers/settingsController.h
@@ -6,6 +6,7 @@
 #include "ui/models/containers_model.h"
 #include "ui/models/languageModel.h"
 #include "ui/models/servers_model.h"
+#include "ui/models/sites_model.h"

 class SettingsController : public QObject
 {
@@ -14,6 +15,7 @@ public:
    explicit SettingsController(const QSharedPointer<ServersModel> &serversModel,
                                const QSharedPointer<ContainersModel> &containersModel,
                                const QSharedPointer<LanguageModel> &languageModel,
+                                const QSharedPointer<SitesModel> &sitesModel,
                                const std::shared_ptr<Settings> &settings, QObject *parent = nullptr);

    Q_PROPERTY(QString primaryDns READ getPrimaryDns WRITE setPrimaryDns NOTIFY primaryDnsChanged)
@@ -76,6 +78,7 @@ private:
    QSharedPointer<ServersModel> m_serversModel;
    QSharedPointer<ContainersModel> m_containersModel;
    QSharedPointer<LanguageModel> m_languageModel;
+    QSharedPointer<SitesModel> m_sitesModel;
    std::shared_ptr<Settings> m_settings;

    QString m_appVersion;
--- a/client/ui/controllers/systemController.cpp
+++ b/client/ui/controllers/systemController.cpp
@@ -60,6 +60,11 @@ QString SystemController::getFileName(const QString &acceptLabel, const QString
                                      const QString &selectedFile, const bool isSaveMode, const QString &defaultSuffix)
 {
    QString fileName;
+#ifdef Q_OS_ANDROID
+    Q_ASSERT(!isSaveMode);
+    return AndroidController::instance()->openFile(nameFilter);
+#endif
+
 #ifdef Q_OS_IOS

    MobileUtils mobileUtils;
@@ -108,20 +113,6 @@ QString SystemController::getFileName(const QString &acceptLabel, const QString
    }

    fileName = mainFileDialog->property("selectedFile").toString();
-
-#ifdef Q_OS_ANDROID
-    // patch for files containing spaces etc
-    const QString sep { "raw%3A%2F" };
-    if (fileName.startsWith("content://") && fileName.contains(sep)) {
-        QString contentUrl = fileName.split(sep).at(0);
-        QString rawUrl = fileName.split(sep).at(1);
-        rawUrl.replace(" ", "%20");
-        fileName = contentUrl + sep + rawUrl;
-    }
-
-    return fileName;
-#endif
-
    return QUrl(fileName).toLocalFile();
 }

--- a/client/ui/models/clientManagementModel.cpp
+++ b/client/ui/models/clientManagementModel.cpp
@@ -231,7 +231,7 @@ ErrorCode ClientManagementModel::appendClient(const QString &clientId, const QSt
        }
    }

-    beginInsertRows(QModelIndex(), rowCount(), 1);
+    beginInsertRows(QModelIndex(), rowCount(), rowCount() + 1);
    QJsonObject client;
    client[configKey::clientId] = clientId;

--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -15,6 +15,10 @@ ServersModel::ServersModel(std::shared_ptr<Settings> settings, QObject *parent)
        auto defaultContainer = ContainerProps::containerFromString(m_servers.at(serverIndex).toObject().value(config_key::defaultContainer).toString());
        emit ServersModel::defaultContainerChanged(defaultContainer);
    });
+    connect(this, &ServersModel::currentlyProcessedServerIndexChanged, this, [this](const int serverIndex) {
+        auto defaultContainer = ContainerProps::containerFromString(m_servers.at(serverIndex).toObject().value(config_key::defaultContainer).toString());
+        emit ServersModel::defaultContainerChanged(defaultContainer);
+    });
 }

 int ServersModel::rowCount(const QModelIndex &parent) const
@@ -269,6 +273,7 @@ void ServersModel::removeServer()
    if (m_settings->serversCount() == 0) {
        setDefaultServerIndex(-1);
    }
+    setCurrentlyProcessedServerIndex(m_defaultServerIndex);
    endResetModel();
 }

--- a/client/ui/qml/Components/HomeContainersListView.qml
+++ b/client/ui/qml/Components/HomeContainersListView.qml
@@ -26,6 +26,22 @@ ListView {
        id: containersRadioButtonGroup
    }

+    Connections {
+        target: ServersModel
+
+        function onCurrentlyProcessedServerIndexChanged() {
+            menuContent.checkCurrentItem()
+        }
+    }
+
+    function checkCurrentItem() {
+        var item = menuContent.itemAtIndex(currentIndex)
+        if (item !== null) {
+            var radioButton = item.children[0].children[0]
+            radioButton.checked = true
+        }
+    }
+
    delegate: Item {
        implicitWidth: rootWidth
        implicitHeight: content.implicitHeight
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -31,6 +31,7 @@ PageType {
                containersDropDown.rootButtonClickedFunction()
            }
        }
+
        function onForceCloseDrawer() {
            buttonContent.state = "collapsed"
        }
--- a/client/ui/qml/Pages2/PageSettingsAbout.qml
+++ b/client/ui/qml/Pages2/PageSettingsAbout.qml
@@ -101,7 +101,7 @@ PageType {

                text: qsTr("Show other methods on Github")

-                onClicked: Qt.openUrlExternally("https://github.com/amnezia-vpn/amnezia-client#donate")
+                onClicked: Qt.openUrlExternally(qsTr("https://github.com/amnezia-vpn/amnezia-client#donate"))
            }

            ParagraphTextType {
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -42,6 +42,7 @@ PageType {
        function onInstallServerFinished(finishedMessage) {
            if (!ConnectionController.isConnected) {
                ServersModel.setDefaultServerIndex(ServersModel.getServersCount() - 1);
+                ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex
            }

            PageController.goToStartPage()
--- a/client/ui/qml/Pages2/PageSetupWizardStart.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -135,7 +135,7 @@ PageType {

                text: qsTr("I have nothing")

-                onClicked: Qt.openUrlExternally("https://amnezia.org/instructions/0_starter-guide")
+                onClicked: Qt.openUrlExternally(qsTr("https://amnezia.org/instructions/0_starter-guide"))
            }
        }

--- a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
@@ -26,6 +26,7 @@ PageType {
        function onImportFinished() {
            if (!ConnectionController.isConnected) {
                ServersModel.setDefaultServerIndex(ServersModel.getServersCount() - 1);
+                ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex
            }

            PageController.goToStartPage()
--- a/client/vpnconnection.cpp
+++ b/client/vpnconnection.cpp
@@ -65,6 +65,7 @@ void VpnConnection::onConnectionStateChanged(Vpn::ConnectionState state)
            IpcClient::Interface()->flushDns();

            if (m_settings->routeMode() != Settings::VpnAllSites) {
+                qDebug() << "1";
                IpcClient::Interface()->routeDeleteList(m_vpnProtocol->vpnGateway(), QStringList() << "0.0.0.0");
                // qDebug() << "VpnConnection::onConnectionStateChanged :: adding custom routes, count:" << forwardIps.size();
            }
@@ -74,9 +75,11 @@ void VpnConnection::onConnectionStateChanged(Vpn::ConnectionState state)
            IpcClient::Interface()->routeAddList(m_vpnProtocol->vpnGateway(), QStringList() << dns1 << dns2);

            if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) {
+                qDebug() << "2";
                QTimer::singleShot(1000, m_vpnProtocol.data(),
                                   [this]() { addSitesRoutes(m_vpnProtocol->vpnGateway(), m_settings->routeMode()); });
            } else if (m_settings->routeMode() == Settings::VpnAllExceptSites) {
+                qDebug() << "3";
                IpcClient::Interface()->routeAddList(m_vpnProtocol->vpnGateway(), QStringList() << "0.0.0.0/1");
                IpcClient::Interface()->routeAddList(m_vpnProtocol->vpnGateway(), QStringList() << "128.0.0.0/1");
Author	SHA1	Message	Date
vladimir.kuznetsov	e89738f57a	debug-output	2024-01-15 23:31:21 +07:00
pokamest	2802b42747	Merge pull request #491 from amnezia-vpn/bugfix/current-processed-server-selection fixed current processed server selection after import/install new server	2024-01-15 05:43:34 -08:00
pokamest	66c5d2f0a8	Updated submodule qtkeychain	2024-01-15 10:06:20 +00:00
pokamest	6dbf4ac62c	Release 4.2.0.1	2024-01-15 09:28:48 +00:00
pokamest	ae2872830b	Updated submodule qtkeychain	2024-01-15 09:20:13 +00:00
pokamest	6f4a3587e4	Merge pull request #495 from amnezia-vpn/feature/update-awg-core Update AWG core (v0.1.8)	2024-01-14 17:33:10 -05:00
Mykola Baibuz	145f51906e	Update AWG core (v0.1.8)	2024-01-14 21:58:53 +02:00
pokamest	12e72bc74b	Merge pull request #481 from amnezia-vpn/refactoring/android Refactor Android open file method	2024-01-13 06:46:25 -05:00
vladimir.kuznetsov	88cd5825d3	Merge branch 'dev' of github.com:amnezia-vpn/amnezia-client into HEAD	2024-01-11 20:26:06 +07:00
pokamest	ecdad2a315	Merge branch 'dev' into refactoring/android	2024-01-11 13:01:03 +00:00
pokamest	0398ddd6a2	Merge pull request #488 from amnezia-vpn/bugfix/split-tunnel-reset-on-app-reset bugfix/split-tunnel-reset-on-app-reset	2024-01-11 07:58:04 -05:00
pokamest	50ea4d3b0f	Merge pull request #453 from amnezia-vpn/bugfix/windows-crush-on-utf8-symbolos added conversion using the system locale	2024-01-11 07:51:22 -05:00
pokamest	77be8169f2	Merge pull request #493 from amnezia-vpn/bugfix/secureqsettings-deadlock-2 now value and setValue of secureQSettings are always called in the main thread	2024-01-11 07:48:42 -05:00
lunardunno	7a435f76b6	ArchLinux_support (#463 ) Arch linux support (#464)	2024-01-10 20:15:14 +00:00
pokamest	42949e0dea	Merge pull request #492 from amnezia-vpn/bugfix/append-client fixed insert rows count in appendClient function	2024-01-10 12:42:07 -05:00
pokamest	26db423232	Merge pull request #489 from amnezia-vpn/bugfix/remote-links-on-site added the ability to change the site link via a translation file	2024-01-10 12:40:19 -05:00
vladimir.kuznetsov	645cf52803	now value and setValue of secureQSettings are always called in the main thread	2024-01-10 23:05:22 +07:00
vladimir.kuznetsov	673b8ad5b2	fixed insert rows count in appendClient function	2024-01-10 11:55:32 +07:00
vladimir.kuznetsov	2a03834bb2	fixed current processed server selection after import/install new server	2024-01-09 00:25:18 +07:00
vladimir.kuznetsov	0690d86e52	added the ability to change the site link via a translation file	2024-01-06 20:42:43 +07:00
vladimir.kuznetsov	bb8a11d110	added reset routeMode when resetting application settings	2024-01-06 20:38:41 +07:00
vladimir.kuznetsov	69dd415ab5	Merge branch 'dev' of github.com:amnezia-vpn/amnezia-client into bugfix/windows-crush-on-utf8-symbolos	2023-12-28 14:47:19 +07:00
albexk	e605f549bd	Merge branch 'dev' into refactoring/android	2023-12-26 18:23:53 +03:00
albexk	a961932b2e	Refactor AndroidUtils	2023-12-26 17:41:49 +03:00
albexk	e8cc80f046	Refactor Android open file method Fix some bugs with mimetype filters when the Qt mimetype database does not match the Android database	2023-12-26 16:30:33 +03:00
vladimir.kuznetsov	67f29ac483	added conversion using the system locale	2023-12-26 13:36:21 +07:00
albexk	7437d47d92	Remove unnecessary permission RECEIVE_BOOT_COMPLETED	2023-12-25 15:16:22 +03:00