added tab navigation to the share connection drawer

2026-07-03 14:07:39 +02:00 · 2024-02-19 19:17:24 +05:00
48 changed files with 378 additions and 615 deletions
@@ -131,6 +131,3 @@ client/3rd/ShadowSocks/ss_ios.xcconfig

 # UML generated pics
 out/
-
-# CMake files
-CMakeFiles/
@@ -15,15 +15,6 @@ set(PACKAGES
    Core5Compat Concurrent LinguistTools
 )

-execute_process(
-  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-  COMMAND git rev-parse --short HEAD
-  OUTPUT_VARIABLE GIT_COMMIT_HASH
-  OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-add_definitions(-DGIT_COMMIT_HASH="${GIT_COMMIT_HASH}")
-
 if(IOS)
    set(PACKAGES ${PACKAGES} Multimedia)
 endif()
@@ -286,16 +286,10 @@ void AmneziaApplication::initModels()
    m_containersModel.reset(new ContainersModel(this));
    m_engine->rootContext()->setContextProperty("ContainersModel", m_containersModel.get());

-    m_defaultServerContainersModel.reset(new ContainersModel(this));
-    m_engine->rootContext()->setContextProperty("DefaultServerContainersModel", m_defaultServerContainersModel.get());
-
    m_serversModel.reset(new ServersModel(m_settings, this));
    m_engine->rootContext()->setContextProperty("ServersModel", m_serversModel.get());
    connect(m_serversModel.get(), &ServersModel::containersUpdated, m_containersModel.get(),
            &ContainersModel::updateModel);
-    connect(m_serversModel.get(), &ServersModel::defaultServerContainersUpdated, m_defaultServerContainersModel.get(),
-            &ContainersModel::updateModel);
-    m_serversModel->resetModel();

    m_languageModel.reset(new LanguageModel(m_settings, this));
    m_engine->rootContext()->setContextProperty("LanguageModel", m_languageModel.get());
@@ -339,7 +333,7 @@ void AmneziaApplication::initModels()
    connect(m_configurator.get(), &VpnConfigurator::newVpnConfigCreated, this,
            [this](const QString &clientId, const QString &clientName, const DockerContainer container,
                   ServerCredentials credentials) {
-                m_serversModel->reloadDefaultServerContainerConfig();
+                m_serversModel->reloadContainerConfig();
                m_clientManagementModel->appendClient(clientId, clientName, container, credentials);
                emit m_configurator->clientModelUpdated();
            });
@@ -92,7 +92,6 @@ private:
    QCommandLineParser m_parser;

    QSharedPointer<ContainersModel> m_containersModel;
-    QSharedPointer<ContainersModel> m_defaultServerContainersModel;
    QSharedPointer<ServersModel> m_serversModel;
    QSharedPointer<LanguageModel> m_languageModel;
    QSharedPointer<ProtocolsModel> m_protocolsModel;
@@ -1,6 +0,0 @@
-<svg width="19" height="18" viewBox="0 0 19 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="0.5" width="18" height="18" rx="5" fill="white"/>
-<path d="M8.49219 13.5L8.49219 9.44141L14.0191 4.99484" stroke="#0E0E11" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4.47363 5.49805L6.98828 8.0127" stroke="#0E0E11" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M14.4727 9.5L14.4727 4.5033L9.50195 4.5033" stroke="#0E0E11" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
@@ -124,10 +124,7 @@ void LocalSocketController::activate(const QJsonObject &rawConfig) {
  //  json.insert("hopindex", QJsonValue((double)hop.m_hopindex));
  json.insert("privateKey", wgConfig.value(amnezia::config_key::client_priv_key));
  json.insert("deviceIpv4Address", wgConfig.value(amnezia::config_key::client_ip));
-  // todo review wg ipv6
-#ifndef Q_OS_WINDOWS
  json.insert("deviceIpv6Address", "dead::1");
-#endif
  json.insert("serverPublicKey", wgConfig.value(amnezia::config_key::server_pub_key));
  json.insert("serverPskKey", wgConfig.value(amnezia::config_key::psk_key));
  json.insert("serverIpv4AddrIn", wgConfig.value(amnezia::config_key::hostName));
@@ -224,8 +224,6 @@
        <file>ui/qml/Pages2/PageShareFullAccess.qml</file>
        <file>images/controls/close.svg</file>
        <file>images/controls/search.svg</file>
-        <file>ui/qml/Components/HomeSplitTunnelingDrawer.qml</file>
-        <file>images/controls/split-tunneling.svg</file>
        <file>ui/qml/Controls2/DrawerType2.qml</file>
    </qresource>
 </RCC>
@@ -997,11 +997,6 @@ And if you don&apos;t like the app, all the more support it - the donation will
        <source>https://amnezia.org</source>
        <translation></translation>
    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="176"/>
-        <source>Software version: %1</source>
-        <translation>%1 :إصدار البرنامج</translation>
-    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="192"/>
        <source>Check for updates</source>
@@ -1144,7 +1139,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="122"/>
        <source>Restore from backup</source>
-        <translation>استرجاع من ملف يحتوي علي نسخة احتياطية</translation>
+        <translation>استرجاع من ملف احتياطي</translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="125"/>
@@ -1344,7 +1339,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="128"/>
        <source>Save logs to file</source>
-        <translation>احفظ السجلات في ملف</translation>
+        <translation>احفظ السجلات لملف</translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="146"/>
@@ -1947,8 +1942,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
    <message>
        <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="40"/>
        <source>A line that starts with vpn://...</source>
-        <translatorcomment>يجب ان تٌكتب بهذه الطريقة حتي بوجود الخطأ كي تظهر بشكل صحيح داخل التطبيق</translatorcomment>
-        <translation>سطر يبدأ ب ...//:vpn</translation>
+        <translation>سطر يبدأ ب vpn://...</translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="51"/>
@@ -3004,6 +2998,11 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
 </context>
 <context>
    <name>SettingsController</name>
+    <message>
+        <location filename="../ui/controllers/settingsController.cpp" line="31"/>
+        <source>Software version</source>
+        <translation>إصدار البرنامج</translation>
+    </message>
    <message>
        <location filename="../ui/controllers/settingsController.cpp" line="139"/>
        <source>Backup file is corrupted</source>
@@ -144,7 +144,7 @@
    </message>
    <message>
        <source>Reconnect via VPN Procotol: </source>
-        <translation type="vanished">پروتکل VPN را متصل مجدد کنید" </translation>
+        <translation type="vanished">Переподключение через VPN протокол: </translation>
    </message>
 </context>
 <context>
@@ -371,7 +371,7 @@ Already installed containers were found on the server. All installed containers
    </message>
    <message>
        <source>All users who you shared a connection with will no longer be able to connect to it.</source>
-        <translation type="vanished">همه کاربرانی که با آن‌ها این پروتکل VPN را به اشتراک گذاشته‌اید دیگر نمی‌توانند به آن متصل شوند.</translation>
+        <translation type="vanished">Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться.</translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="280"/>
@@ -604,7 +604,7 @@ Already installed containers were found on the server. All installed containers
    </message>
    <message>
        <source>All users who you shared a connection with will no longer be able to connect to it.</source>
-        <translation type="vanished">همه کاربرانی که با آن این پروتکل VPN را به اشتراک گذاشته‌اید دیگر نمی‌توانند به آن متصل شوند.</translation>
+        <translation type="vanished">Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться.</translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="369"/>
@@ -656,7 +656,7 @@ Already installed containers were found on the server. All installed containers
    </message>
    <message>
        <source>All users who you shared a connection with will no longer be able to connect to it.</source>
-        <translation type="obsolete">همه کاربرانی که با آن این پروتکل VPN را به اشتراک گذاشته‌اید دیگر نمی‌توانند به آن متصل شوند.</translation>
+        <translation type="obsolete">Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться.</translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="180"/>
@@ -697,7 +697,7 @@ Already installed containers were found on the server. All installed containers
    <name>PageServerContainers</name>
    <message>
        <source>Continue</source>
-        <translation type="obsolete">ادامه دهید</translation>
+        <translation type="obsolete">Продолжить</translation>
    </message>
 </context>
 <context>
@@ -847,13 +847,13 @@ Already installed containers were found on the server. All installed containers
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="94"/>
-        <source>Use &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor Browser&lt;/a&gt; to open this URL. </source>
-        <translation>استفاده &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor Browser&lt;/a&gt; برای باز کردن این نشانی.</translation>
+        <source>Use &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor Browser&lt;/a&gt; to open this URL.</source>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="103"/>
        <source>After creating your onion site, it takes a few minutes for the Tor network to make it available for use.</source>
-        <translation>پس از ایجاد سایت پیاز خود، چند دقیقه طول می‌کشد تا شبکه تور آن را برای استفاده فراهم کند.</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Use &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor Browser&lt;/a&gt; to open this url.</source>
@@ -870,7 +870,7 @@ Already installed containers were found on the server. All installed containers
    </message>
    <message>
        <source>When configuring WordPress set the this address as domain.</source>
-        <translation type="vanished">هنگام تنظیم وردپرس، این آدرس پیاز را به عنوان دامنه مشخص کنید.</translation>
+        <translation type="vanished">При настройке WordPress укажите этот onion адрес в качестве домена.</translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="126"/>
@@ -940,7 +940,7 @@ Already installed containers were found on the server. All installed containers
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="56"/>
        <source>Support Amnezia</source>
-        <translation>پشتیبانی از Amnezia</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="71"/>
@@ -1022,11 +1022,6 @@ Already installed containers were found on the server. All installed containers
        <source>https://amnezia.org</source>
        <translation>https://amnezia.org</translation>
    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="176"/>
-        <source>Software version: %1</source>
-        <translation>%1 :نسخه نرم‎افزار</translation>
-    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="192"/>
        <source>Check for updates</source>
@@ -1220,7 +1215,7 @@ Already installed containers were found on the server. All installed containers
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="86"/>
        <source>When AmneziaDNS is not used or installed</source>
-        <translation>وقتی AmneziaDNS استفاده نشده یا نصب نشده است.</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="120"/>
@@ -1256,7 +1251,7 @@ Already installed containers were found on the server. All installed containers
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="35"/>
        <source>Default server does not support custom dns</source>
-        <translation>سرور پیش‌فرض از دی‌ان‌اس سفارشی پشتیبانی نمی‌کند.</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="53"/>
@@ -1438,27 +1433,27 @@ Already installed containers were found on the server. All installed containers
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="139"/>
        <source>Reboot server</source>
-        <translation>سرور را دوباره راه‌اندازی کنید.</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="143"/>
        <source>Do you want to reboot the server?</source>
-        <translation>آیا می‌خواهید سرور را دوباره راه‌اندازی کنید؟</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="144"/>
        <source>The reboot process may take approximately 30 seconds. Are you sure you wish to proceed?</source>
-        <translation>فرآیند راه‌اندازی ممکن است حدود ۳۰ ثانیه طول بکشد. آیا مطمئن هستید که می‌خواهید ادامه دهید؟</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="175"/>
        <source>Do you want to remove the server from application?</source>
-        <translation>آیا می‌خواهید سرور را از برنامه حذف کنید؟</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="206"/>
        <source>Do you want to clear server from Amnezia software?</source>
-        <translation>آیا می‌خواهید سرور را از نرم‌افزار Amnezia پاک کنید؟</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="171"/>
@@ -1541,7 +1536,7 @@ Already installed containers were found on the server. All installed containers
    </message>
    <message>
        <source>All users who you shared a connection with will no longer be able to connect to it.</source>
-        <translation type="vanished">تمام کاربرانی که با آن VPN را به اشتراک گذاشته‌اید، دیگر نمی‌توانند به آن متصل شوند.</translation>
+        <translation type="vanished">Все пользователи, которым вы поделились VPN, больше не смогут к нему подключаться.</translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="118"/>
@@ -1567,7 +1562,7 @@ Already installed containers were found on the server. All installed containers
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="29"/>
        <source>Default server does not support split tunneling function</source>
-        <translation>سرور پیش‌فرض از عملکرد تونل‌سازی تقسیم شده پشتیبانی نمی‌کند.</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Addresses from the list should be accessed via VPN</source>
@@ -1614,17 +1609,17 @@ Already installed containers were found on the server. All installed containers
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="59"/>
        <source>Only the sites listed here will be accessed through the VPN</source>
-        <translation>تنها سایت‌های موجود در اینجا از طریق VPN دسترسی داده خواهند شد.</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="254"/>
        <source>website or IP</source>
-        <translation>وب‌سایت یا آدرس IP</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="298"/>
        <source>Import / Export Sites</source>
-        <translation>وارد کردن / صادر کردن وب‌سایت‌ها</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="304"/>
@@ -1721,7 +1716,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
    <name>PageSetupWizardCredentials</name>
    <message>
        <source>Server connection</source>
-        <translation type="vanished">اتصال به سرور</translation>
+        <translation type="vanished">Подключение к серверу</translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="51"/>
@@ -1828,12 +1823,12 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <translation>سرور در حال حاضر به نرم‎افزار اضافه شده است</translation>
    </message>
    <message>
-        <source>Amnezia has detected that your server is currently </source>
-        <translation type="vanished">Amnezia has detected that your server is currently </translation>
+        <source>Amnesia has detected that your server is currently </source>
+        <translation type="vanished">Amnesia обнаружила, что ваш сервер в настоящее время </translation>
    </message>
    <message>
-        <source>busy installing other software. Amnezia installation </source>
-        <translation type="vanished">busy installing other software. Amnezia installation</translation>
+        <source>busy installing other software. Amnesia installation </source>
+        <translation type="vanished">занят установкой других протоколов или сервисов. Установка Amnesia </translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="67"/>
@@ -2024,7 +2019,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
    </message>
    <message>
        <source>VPN Access</source>
-        <translation type="vanished">دسترسی VPN</translation>
+        <translation type="vanished">VPN-Доступ</translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="220"/>
@@ -2033,11 +2028,11 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
    </message>
    <message>
        <source>VPN access without the ability to manage the server</source>
-        <translation type="vanished">دسترسی به VPN بدون امکان مدیریت سرور</translation>
+        <translation type="vanished">Доступ к VPN, без возможности управления сервером</translation>
    </message>
    <message>
        <source>Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the server, as well as change settings.</source>
-        <translation type="vanished">دسترسی به مدیریت سرور. کاربری که با او دسترسی کامل به اتصال را به اشتراک می‌گذارید، می‌تواند پروتکل‌ها و سرویس‌های شما را در سرور اضافه و حذف کند، همچنین تنظیمات را تغییر دهد.</translation>
+        <translation type="vanished">Доступ к управлению сервером. Пользователь, с которым вы делитесь полным доступом к соединению, сможет добавлять и удалять ваши протоколы и службы на сервере, а также изменять настройки.</translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="280"/>
@@ -2137,7 +2132,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
    <message>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="584"/>
        <source>Creation date: </source>
-        <translation>تاریخ ایجاد:</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="598"/>
@@ -2162,7 +2157,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
    <message>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="671"/>
        <source>Revoke the config for a user - %1?</source>
-        <translation> لغو پیکربندی برای یک کاربر %1؟</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Revoke the config for a user - </source>
@@ -2737,17 +2732,17 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
    <message>
        <location filename="../containers/containers_defs.cpp" line="101"/>
        <source>ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but it may be recognized by analysis systems in some highly censored regions.</source>
-        <translation>شدوساکس - ترافیک VPN را پنهان می کند، به طوری که مشابه ترافیک وب عادی می شود، اما ممکن است توسط سیستم های تجزیه و تحلیل در برخی از مناطق با سانسور شدید شناسایی شود.</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../containers/containers_defs.cpp" line="104"/>
        <source>OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against active-probing detection. Ideal for bypassing blocking in regions with the highest levels of censorship.</source>
-        <translation>OpenVPN روی Cloak - OpenVPN با VPN که به عنوان ترافیک وب پنهان می‌شود و مقاومت در برابر تشخیص فعال از طریق پیشرفته. ایده‌آل برای دور زدن مسدود کردن در مناطق با بالاترین سطوح سانسور</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../containers/containers_defs.cpp" line="122"/>
        <source>Create a file vault on your server to securely store and transfer files.</source>
-        <translation>ساختن یک گنجانده فایل بر روی سرور شما برای ذخیره و انتقال ایمن فایل‌ها</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../containers/containers_defs.cpp" line="155"/>
@@ -2769,23 +2764,7 @@ If there is a extreme level of Internet censorship in your region, we advise you
 * Not recognised by DPI analysis systems
 * Works over TCP network protocol, 443 port.
 </source>
-        <translation>این ترکیبی از پروتکل OpenVPN و پلاگین Cloak به طور خاص برای محافظت در برابر مسدود کردن طراحی شده است.
-
-OpenVPN ارتباط امن VPN را با رمزگذاری تمام ترافیک اینترنتی بین مشتری و سرور فراهم می‌کند.
-
-Cloak OpenVPN را از شناسایی و مسدود کردن محافظت می‌کند.
-
-Cloak می‌تواند اطلاعات فراداده بسته را تغییر دهد تا ترافیک VPN را به طور کامل به عنوان ترافیک وب عادی پنهان کند و همچنین VPN را از شناسایی توسط Active Probing محافظت کند. این باعث می‌شود این سیستم بسیار مقاوم در برابر شناسایی شود.
-
-فوراً پس از دریافت اولین بسته داده، Cloak اتصال ورودی را تأیید می‌کند. اگر تأیید اعتبار ناموفق باشد، پلاگین سرور را به عنوان یک وب‌سایت جعلی پنهان می‌کند و VPN شما برای سیستم‌های تجزیه و تحلیل غیر قابل دسترسی می‌شود.
-
-اگر در منطقه شما سطح بسیار بالایی از سانسور اینترنت وجود دارد، به شما توصیه می‌شود که از اولین اتصال فقط از OpenVPN over Cloak استفاده کنید.
-
-    در دسترس در AmneziaVPN بر روی تمام پلتفرم‌ها
-    مصرف بالای برق در دستگاه‌های تلفن همراه
-    تنظیمات انعطاف پذیر
-    توسط سیستم‌های تجزیه و تحلیل DPI شناخته نمی‌شود
-    بر روی پروتکل شبکه TCP، پورت 443 کار می‌کند.</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../containers/containers_defs.cpp" line="174"/>
@@ -3112,6 +3091,11 @@ This means that AmneziaWG keeps the fast performance of the original while addin
 </context>
 <context>
    <name>SettingsController</name>
+    <message>
+        <location filename="../ui/controllers/settingsController.cpp" line="27"/>
+        <source>Software version</source>
+        <translation>نسخه نرم‎افزار</translation>
+    </message>
    <message>
        <location filename="../ui/controllers/settingsController.cpp" line="148"/>
        <source>All settings have been reset to default values</source>
@@ -3249,7 +3233,7 @@ This means that AmneziaWG keeps the fast performance of the original while addin
    <message>
        <location filename="../ui/qml/Controls2/TextFieldWithHeaderType.qml" line="105"/>
        <source>The field can&apos;t be empty</source>
-        <translation>این فیلد نمی‌تواند خالی باشد.</translation>
+        <translation>Поле не может быть пустым</translation>
    </message>
 </context>
 <context>
@@ -3337,23 +3321,23 @@ This means that AmneziaWG keeps the fast performance of the original while addin
    </message>
    <message>
        <source>High</source>
-        <translation type="vanished">بالایی</translation>
+        <translation type="vanished">Высокий</translation>
    </message>
    <message>
        <source>Medium</source>
-        <translation type="vanished">متوسط</translation>
+        <translation type="vanished">Средний</translation>
    </message>
    <message>
        <source>Many foreign websites and VPN providers are blocked</source>
-        <translation type="vanished">بسیاری از وب‌سایت‌ها و ارائه‌دهندگان VPN خارجی مسدود شده‌اند.</translation>
+        <translation type="vanished">Многие иностранные сайты и VPN-провайдеры заблокированы</translation>
    </message>
    <message>
        <source>Some foreign sites are blocked, but VPN providers are not blocked</source>
-        <translation type="vanished">بعضی از وب‌سایت‌های خارجی مسدود شده‌اند، اما ارائه‌دهندگان VPN مسدود نمی‌شوند.</translation>
+        <translation type="vanished">Некоторые иностранные сайты заблокированы, но VPN-провайдеры не блокируются</translation>
    </message>
    <message>
        <source>I just want to increase the level of privacy</source>
-        <translation type="vanished">من فقط می‌خواهم سطح حریم خصوصی خود را افزایش دهم.</translation>
+        <translation type="vanished">Хочу просто повысить уровень приватности</translation>
    </message>
 </context>
 <context>
@@ -938,7 +938,7 @@ Already installed containers were found on the server. All installed containers
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="56"/>
        <source>Support Amnezia</source>
-        <translation type="unfinished">Поддержите Amnezia</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="71"/>
@@ -1020,11 +1020,6 @@ Already installed containers were found on the server. All installed containers
        <source>https://amnezia.org</source>
        <translation>https://amnezia.org</translation>
    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="176"/>
-        <source>Software version: %1</source>
-        <translation>Версия ПО: %1</translation>
-    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="192"/>
        <source>Check for updates</source>
@@ -1207,7 +1202,7 @@ Already installed containers were found on the server. All installed containers
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="70"/>
-        <source>If AmneziaDNS is installed on the server</source>
+        <source>When AmneziaDNS is installed on the server</source>
        <translation>Если он уставновлен на сервере</translation>
    </message>
    <message>
@@ -2813,7 +2808,7 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
        <translation>OpenVPN - популярный VPN-протокол, с гибкой настройкой. Имеет собственный протокол безопасности с SSL/TLS для обмена ключами.</translation>
    </message>
    <message>
-        <source>ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but it may be recognized by analysis systems in some highly censored regions.</source>
+        <source>ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but it may be recognised by analysis systems in some highly censored regions.</source>
        <translation type="vanished">ShadowSocks - маскирует VPN-трафик под обычный веб-трафик, но распознается системами анализа в некоторых регионах с высоким уровнем цензуры.</translation>
    </message>
    <message>
@@ -3063,6 +3058,11 @@ This means that AmneziaWG keeps the fast performance of the original while addin
 </context>
 <context>
    <name>SettingsController</name>
+    <message>
+        <location filename="../ui/controllers/settingsController.cpp" line="27"/>
+        <source>Software version</source>
+        <translation>Версия ПО</translation>
+    </message>
    <message>
        <location filename="../ui/controllers/settingsController.cpp" line="148"/>
        <source>All settings have been reset to default values</source>
@@ -200,7 +200,7 @@ Already installed containers were found on the server. All installed containers
    <message>
        <location filename="../ui/controllers/installController.cpp" line="305"/>
        <source>Server &apos;%1&apos; was rebooted</source>
-        <translation type="unfinished">服务器 &apos;%1&apos; 已重新启动</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/controllers/installController.cpp" line="314"/>
@@ -891,10 +891,10 @@ Already installed containers were found on the server. All installed containers
    <message>
        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="103"/>
        <source>After creating your onion site, it takes a few minutes for the Tor network to make it available for use.</source>
-        <translation>创建您的洋葱网站后，需要几分钟时间，才能使其在Tor网络上可用</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Use &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor Browser&lt;/a&gt; to open this URL.</source>
+        <source>Use &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor Browser&lt;/a&gt; to open this url.</source>
        <translation type="vanished">用 &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor 浏览器&lt;/a&gt; 打开上面网址</translation>
    </message>
    <message>
@@ -984,7 +984,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="56"/>
        <source>Support Amnezia</source>
-        <translation>支持Amnezia</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="71"/>
@@ -1067,11 +1067,6 @@ And if you don&apos;t like the app, all the more support it - the donation will
        <source>https://amnezia.org</source>
        <translation></translation>
    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="176"/>
-        <source>Software version: %1</source>
-        <translation>软件版本: %1</translation>
-    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="192"/>
        <source>Check for updates</source>
@@ -1266,7 +1261,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="86"/>
        <source>When AmneziaDNS is not used or installed</source>
-        <translation>当未使用或未安装AmneziaDNS时</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="120"/>
@@ -1484,12 +1479,12 @@ And if you don&apos;t like the app, all the more support it - the donation will
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="143"/>
        <source>Do you want to reboot the server?</source>
-        <translation type="unfinished">您想重新启动服务器吗？</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="206"/>
        <source>Do you want to clear server from Amnezia software?</source>
-        <translation>您要清除服务器上的Amnezia软件吗？</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="92"/>
@@ -1525,12 +1520,12 @@ And if you don&apos;t like the app, all the more support it - the donation will
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="139"/>
        <source>Reboot server</source>
-        <translation>重新启动服务器</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="144"/>
        <source>The reboot process may take approximately 30 seconds. Are you sure you wish to proceed?</source>
-        <translation> 重新启动过程可能需要大约30秒。您确定要继续吗？</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="171"/>
@@ -1540,7 +1535,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="175"/>
        <source>Do you want to remove the server from application?</source>
-        <translation type="unfinished">您想要从应用程序中移除服务器吗？</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Remove server?</source>
@@ -1711,17 +1706,17 @@ And if you don&apos;t like the app, all the more support it - the donation will
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="59"/>
        <source>Only the sites listed here will be accessed through the VPN</source>
-        <translation>只有这里列出的网站将通过VPN访问</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="254"/>
        <source>website or IP</source>
-        <translation>网站或IP</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="298"/>
        <source>Import / Export Sites</source>
-        <translation>导入/导出网站</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="304"/>
@@ -2143,12 +2138,12 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
    <message>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="120"/>
        <source>ShadowSocks native format</source>
-        <translation>ShadowSocks原生格式</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="125"/>
        <source>Cloak native format</source>
-        <translation>Cloak原生格式</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="150"/>
@@ -2158,18 +2153,18 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
    <message>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="178"/>
        <source>Share full access to the server and VPN</source>
-        <translation>共享服务器和VPN的完全访问权限</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="179"/>
        <source>Use for your own devices, or share with those you trust to manage the server.</source>
-        <translation type="unfinished">用于您自己的设备，或与您信任的人共享以管理服务器</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="231"/>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="486"/>
        <source>Users</source>
-        <translation>用户</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="251"/>
@@ -2204,17 +2199,17 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
    <message>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="668"/>
        <source>Revoke</source>
-        <translation>撤销</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="671"/>
        <source>Revoke the config for a user - %1?</source>
-        <translation>撤销用户的配置- %1?</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <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>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="673"/>
@@ -2300,12 +2295,12 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
    <message>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="34"/>
        <source>Config revoked</source>
-        <translation>配置已撤销</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="262"/>
        <source>User name</source>
-        <translation>用户名</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="429"/>
@@ -2325,7 +2320,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
    <message>
        <location filename="../ui/qml/Pages2/PageShareFullAccess.qml" line="49"/>
        <source>Full access to the server and VPN</source>
-        <translation>对服务器和VPN的完全访问权限</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageShareFullAccess.qml" line="57"/>
@@ -2336,7 +2331,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
    <message>
        <location filename="../ui/qml/Pages2/PageShareFullAccess.qml" line="58"/>
        <source>If you share full access with other people, they can remove and add protocols and services to the server, which will cause the VPN to work incorrectly for all users. </source>
-        <translation>如果您与其他人共享完全访问权限，他们可以从服务器中删除和添加协议和服务，这将导致VPN对所有用户的工作出现问题。</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageShareFullAccess.qml" line="73"/>
@@ -2827,7 +2822,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
    <message>
        <location filename="../core/errorstrings.cpp" line="62"/>
        <source>The config does not contain any containers and credentials for connecting to the server</source>
-        <translation>配置不包含任何用于连接服务器的容器和凭据</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>The config does not contain any containers and credentiaks for connecting to the server</source>
@@ -2836,7 +2831,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
    <message>
        <location filename="../core/errorstrings.cpp" line="69"/>
        <source>Internal error</source>
-        <translation></translation>
+        <translation>内部错误</translation>
    </message>
    <message>
        <location filename="../containers/containers_defs.cpp" line="88"/>
@@ -2867,17 +2862,17 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
    <message>
        <location filename="../containers/containers_defs.cpp" line="101"/>
        <source>ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but it may be recognized by analysis systems in some highly censored regions.</source>
-        <translation>ShadowSocks - 掩盖VPN流量，使其类似于正常的网络流量，但在一些高度审查的地区可能会被分析系统识别</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../containers/containers_defs.cpp" line="104"/>
-        <source>OpenVPN over Cloak - OpenVPN with masquerading as web traffic and protection against active-probing detection. Ideal for bypassing blocking in regions with the highest levels of censorship.</source>
-        <translation type="unfinished">OpenVPN over Cloak - OpenVPN与VPN结合，伪装成Web流量，并保护免受主动探测的侦测。非常适合在具有最高审查水平的地区绕过封锁</translation>
+        <source>OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against active-probing detection. Ideal for bypassing blocking in regions with the highest levels of censorship.</source>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../containers/containers_defs.cpp" line="122"/>
        <source>Create a file vault on your server to securely store and transfer files.</source>
-        <translation>在您的服务器上创建一个文件保险库，用于安全存储和传输文件。</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../containers/containers_defs.cpp" line="155"/>
@@ -2912,23 +2907,15 @@ WireGuard is very susceptible to blocking due to its distinct packet signatures.
 * Minimum number of settings
 * Easily recognised by DPI analysis systems, susceptible to blocking
 * Works over UDP network protocol.</source>
-        <translation>一个相对较新的流行VPN协议，具有简化的架构。
-WireGuard提供稳定的VPN连接，并在所有设备上具有高性能。它使用硬编码的加密设置。与OpenVPN相比，WireGuard具有较低的延迟和更好的数据传输吞吐量。
-WireGuard非常容易被阻挡，因为其独特的数据包签名。与一些其他VPN协议不同，这些协议使用混淆技术，WireGuard数据包的一致签名模式更容易被高级深度数据包检测（DPI）系统和其他网络监控工具识别和阻挡。
-
-    在AmneziaVPN上适用于所有平台
-    低功耗
-    最少的设置
-    易于被DPI分析系统识别，容易被阻挡
-    通过UDP网络协议运行。</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but is recognised by analysis systems in some highly censored regions.</source>
        <translation type="vanished">ShadowSocks - 混淆 VPN 流量，使其与正常的 Web 流量相似，但在一些审查力度高的地区可以被分析系统识别。</translation>
    </message>
    <message>
-        <source>OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against active-probing detection. Ideal for bypassing blocking in regions with the highest levels of censorship.</source>
-        <translation type="vanished">OpenVPN over Cloak - OpenVPN与VPN结合，伪装成Web流量，并保护免受主动探测的侦测。非常适合在具有最高审查水平的地区绕过封锁</translation>
+        <source>OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against active-probbing detection. Ideal for bypassing blocking in regions with the highest levels of censorship.</source>
+        <translation type="vanished">OpenVPN over Cloak - OpenVPN 与 VPN 具有伪装成网络流量和防止主动探测检测的保护。非常适合绕过审查力度特别强的地区的封锁。</translation>
    </message>
    <message>
        <location filename="../containers/containers_defs.cpp" line="108"/>
@@ -3211,6 +3198,11 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
 </context>
 <context>
    <name>SettingsController</name>
+    <message>
+        <location filename="../ui/controllers/settingsController.cpp" line="27"/>
+        <source>Software version</source>
+        <translation>软件版本</translation>
+    </message>
    <message>
        <location filename="../ui/controllers/settingsController.cpp" line="132"/>
        <source>Backup file is corrupted</source>
@@ -3254,7 +3246,7 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
    <message>
        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="128"/>
        <source>Copy config string</source>
-        <translation>复制配置字符串</translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="150"/>
@@ -136,7 +136,8 @@ void ApiController::updateServerConfigFromApi()

                auto defaultContainer = apiConfig.value(config_key::defaultContainer).toString();
                serverConfig.insert(config_key::defaultContainer, defaultContainer);
-                m_serversModel->editServer(serverConfig, m_serversModel->getDefaultServerIndex());
+                m_serversModel->editServer(serverConfig);
+                emit m_serversModel->defaultContainerChanged(ContainerProps::containerFromString(defaultContainer));
            } else {
                qDebug() << reply->error();
                qDebug() << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
@@ -163,5 +164,5 @@ void ApiController::clearApiConfig()

    serverConfig.insert(config_key::defaultContainer, ContainerProps::containerToString(DockerContainer::None));

-    m_serversModel->editServer(serverConfig, m_serversModel->getDefaultServerIndex());
+    m_serversModel->editServer(serverConfig);
 }
@@ -33,7 +33,7 @@ void ConnectionController::openConnection()
    int serverIndex = m_serversModel->getDefaultServerIndex();
    ServerCredentials credentials = m_serversModel->getServerCredentials(serverIndex);

-    DockerContainer container = qvariant_cast<DockerContainer>(m_serversModel->data(serverIndex, ServersModel::Roles::DefaultContainerRole));
+    DockerContainer container = m_serversModel->getDefaultContainer(serverIndex);
    const QJsonObject &containerConfig = m_containersModel->getContainerConfig(container);

    if (container == DockerContainer::None) {
@@ -45,7 +45,7 @@ void ExportController::generateFullAccessConfig()
 {
    clearPreviousConfig();

-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    QJsonObject config = m_settings->server(serverIndex);

    QJsonArray containers = config.value(config_key::containers).toArray();
@@ -99,7 +99,7 @@ void ExportController::generateConnectionConfig(const QString &clientName)
 {
    clearPreviousConfig();

-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    ServerCredentials credentials = m_serversModel->getServerCredentials(serverIndex);

    DockerContainer container = static_cast<DockerContainer>(m_containersModel->getCurrentlyProcessedContainerIndex());
@@ -155,7 +155,7 @@ void ExportController::generateOpenVpnConfig(const QString &clientName)
 {
    clearPreviousConfig();

-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    ServerCredentials credentials = m_serversModel->getServerCredentials(serverIndex);

    DockerContainer container = static_cast<DockerContainer>(m_containersModel->getCurrentlyProcessedContainerIndex());
@@ -193,7 +193,7 @@ void ExportController::generateWireGuardConfig(const QString &clientName)
 {
    clearPreviousConfig();

-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    ServerCredentials credentials = m_serversModel->getServerCredentials(serverIndex);

    DockerContainer container = static_cast<DockerContainer>(m_containersModel->getCurrentlyProcessedContainerIndex());
@@ -232,7 +232,7 @@ void ExportController::generateShadowSocksConfig()
 {
    clearPreviousConfig();

-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    ServerCredentials credentials = m_serversModel->getServerCredentials(serverIndex);

    DockerContainer container = static_cast<DockerContainer>(m_containersModel->getCurrentlyProcessedContainerIndex());
@@ -268,7 +268,7 @@ void ExportController::generateCloakConfig()
 {
    clearPreviousConfig();

-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    ServerCredentials credentials = m_serversModel->getServerCredentials(serverIndex);

    DockerContainer container = static_cast<DockerContainer>(m_containersModel->getCurrentlyProcessedContainerIndex());
@@ -328,7 +328,7 @@ void ExportController::updateClientManagementModel(const DockerContainer contain
 void ExportController::revokeConfig(const int row, const DockerContainer container, ServerCredentials credentials)
 {
    ErrorCode errorCode = m_clientManagementModel->revokeClient(row, container, credentials,
-                                                                m_serversModel->getProcessedServerIndex());
+                                                                m_serversModel->getCurrentlyProcessedServerIndex());
    if (errorCode != ErrorCode::NoError) {
        emit exportErrorOccurred(errorString(errorCode));
    }
@@ -176,7 +176,7 @@ void InstallController::installServer(DockerContainer container, QJsonObject &co

 void InstallController::installContainer(DockerContainer container, QJsonObject &config)
 {
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    ServerCredentials serverCredentials =
            qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));

@@ -238,7 +238,7 @@ bool InstallController::isServerAlreadyExists()

 void InstallController::scanServerForInstalledContainers()
 {
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    ServerCredentials serverCredentials =
            qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));

@@ -267,7 +267,7 @@ void InstallController::scanServerForInstalledContainers()

 void InstallController::updateContainer(QJsonObject config)
 {
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    ServerCredentials serverCredentials =
            qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));

@@ -283,8 +283,8 @@ void InstallController::updateContainer(QJsonObject config)
        m_serversModel->updateContainerConfig(container, config);
        m_protocolModel->updateModel(config);

-        auto defaultContainer = qvariant_cast<DockerContainer>(m_serversModel->data(serverIndex, ServersModel::Roles::DefaultContainerRole));
-        if ((serverIndex == m_serversModel->getDefaultServerIndex()) && (container == defaultContainer)) {
+        if ((serverIndex == m_serversModel->getDefaultServerIndex())
+            && (container == m_serversModel->getDefaultContainer(serverIndex))) {
            emit currentContainerUpdated();
        } else {
            emit updateContainerFinished(tr("Settings updated successfully"));
@@ -296,27 +296,27 @@ void InstallController::updateContainer(QJsonObject config)
    emit installationErrorOccurred(errorString(errorCode));
 }

-void InstallController::rebootProcessedServer()
+void InstallController::rebootCurrentlyProcessedServer()
 {
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    QString serverName = m_serversModel->data(serverIndex, ServersModel::Roles::NameRole).toString();

    m_serversModel->rebootServer();
-    emit rebootProcessedServerFinished(tr("Server '%1' was rebooted").arg(serverName));
+    emit rebootCurrentlyProcessedServerFinished(tr("Server '%1' was rebooted").arg(serverName));
 }

-void InstallController::removeProcessedServer()
+void InstallController::removeCurrentlyProcessedServer()
 {
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    QString serverName = m_serversModel->data(serverIndex, ServersModel::Roles::NameRole).toString();

    m_serversModel->removeServer();
-    emit removeProcessedServerFinished(tr("Server '%1' was removed").arg(serverName));
+    emit removeCurrentlyProcessedServerFinished(tr("Server '%1' was removed").arg(serverName));
 }

 void InstallController::removeAllContainers()
 {
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    QString serverName = m_serversModel->data(serverIndex, ServersModel::Roles::NameRole).toString();

    ErrorCode errorCode = m_serversModel->removeAllContainers();
@@ -329,7 +329,7 @@ void InstallController::removeAllContainers()

 void InstallController::removeCurrentlyProcessedContainer()
 {
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    QString serverName = m_serversModel->data(serverIndex, ServersModel::Roles::NameRole).toString();

    int container = m_containersModel->getCurrentlyProcessedContainerIndex();
@@ -377,7 +377,7 @@ void InstallController::mountSftpDrive(const QString &port, const QString &passw
    QString mountPath;
    QString cmd;

-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    ServerCredentials serverCredentials =
            qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
    QString hostname = serverCredentials.hostName;
@@ -30,8 +30,8 @@ public slots:

    void updateContainer(QJsonObject config);

-    void removeProcessedServer();
-    void rebootProcessedServer();
+    void removeCurrentlyProcessedServer();
+    void rebootCurrentlyProcessedServer();
    void removeAllContainers();
    void removeCurrentlyProcessedContainer();

@@ -54,8 +54,8 @@ signals:

    void scanServerFinished(bool isInstalledContainerFound);

-    void rebootProcessedServerFinished(const QString &finishedMessage);
-    void removeProcessedServerFinished(const QString &finishedMessage);
+    void rebootCurrentlyProcessedServerFinished(const QString &finishedMessage);
+    void removeCurrentlyProcessedServerFinished(const QString &finishedMessage);
    void removeAllContainersFinished(const QString &finishedMessage);
    void removeCurrentlyProcessedContainerFinished(const QString &finishedMessage);

@@ -28,7 +28,7 @@ SettingsController::SettingsController(const QSharedPointer<ServersModel> &serve
      m_sitesModel(sitesModel),
      m_settings(settings)
 {
-    m_appVersion = QString("%1 (%2, %3)").arg(QString(APP_VERSION), __DATE__, GIT_COMMIT_HASH);
+    m_appVersion = QString("%1: %2 (%3)").arg(tr("Software version"), QString(APP_VERSION), __DATE__);

 #ifdef Q_OS_ANDROID
    if (!m_settings->isScreenshotsEnabled()) {
@@ -5,13 +5,19 @@
 ServersModel::ServersModel(std::shared_ptr<Settings> settings, QObject *parent)
    : m_settings(settings), QAbstractListModel(parent)
 {
-    connect(this, &ServersModel::defaultServerIndexChanged, this, &ServersModel::defaultServerNameChanged);
+    m_servers = m_settings->serversArray();
+    m_defaultServerIndex = m_settings->defaultServerIndex();
+    m_currentlyProcessedServerIndex = m_defaultServerIndex;

+    connect(this, &ServersModel::defaultServerIndexChanged, this, &ServersModel::defaultServerNameChanged);
+    connect(this, &ServersModel::defaultContainerChanged, this, &ServersModel::defaultServerDescriptionChanged);
    connect(this, &ServersModel::defaultServerIndexChanged, this, [this](const int serverIndex) {
        auto defaultContainer = ContainerProps::containerFromString(m_servers.at(serverIndex).toObject().value(config_key::defaultContainer).toString());
-        emit ServersModel::defaultServerDefaultContainerChanged(defaultContainer);
-        emit ServersModel::defaultServerNameChanged();
-        updateDefaultServerContainersModel();
+        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);
    });
 }

@@ -68,14 +74,16 @@ QVariant ServersModel::data(const QModelIndex &index, int role) const
        return name;
    }
    case ServerDescriptionRole: {
-        auto description = getServerDescription(server, index.row());
-        return configVersion ? description : description + server.value(config_key::hostName).toString();
+        if (configVersion) {
+            return server.value(config_key::description).toString();
+        }
+        return server.value(config_key::hostName).toString();
    }
    case HostNameRole: return server.value(config_key::hostName).toString();
    case CredentialsRole: return QVariant::fromValue(serverCredentials(index.row()));
    case CredentialsLoginRole: return serverCredentials(index.row()).userName;
    case IsDefaultRole: return index.row() == m_defaultServerIndex;
-    case IsCurrentlyProcessedRole: return index.row() == m_processedServerIndex;
+    case IsCurrentlyProcessedRole: return index.row() == m_currentlyProcessedServerIndex;
    case HasWriteAccessRole: {
        auto credentials = serverCredentials(index.row());
        return (!credentials.userName.isEmpty() && !credentials.secretData.isEmpty());
@@ -87,13 +95,6 @@ QVariant ServersModel::data(const QModelIndex &index, int role) const
    case DefaultContainerRole: {
        return ContainerProps::containerFromString(server.value(config_key::defaultContainer).toString());
    }
-    case IsServerFromApiRole: {
-        return server.value(config_key::configVersion).toInt();
-    }
-    case HasAmneziaDns: {
-        QString primaryDns = server.value(config_key::dns1).toString();
-        return primaryDns == protocols::dns::amneziaDnsIp;
-    }
    }

    return QVariant();
@@ -110,9 +111,8 @@ void ServersModel::resetModel()
    beginResetModel();
    m_servers = m_settings->serversArray();
    m_defaultServerIndex = m_settings->defaultServerIndex();
-    m_processedServerIndex = m_defaultServerIndex;
+    m_currentlyProcessedServerIndex = m_defaultServerIndex;
    endResetModel();
-    emit defaultServerIndexChanged(m_defaultServerIndex);
 }

 void ServersModel::setDefaultServerIndex(const int index)
@@ -132,7 +132,12 @@ const QString ServersModel::getDefaultServerName()
    return qvariant_cast<QString>(data(m_defaultServerIndex, NameRole));
 }

-QString ServersModel::getServerDescription(const QJsonObject &server, const int index) const
+const QString ServersModel::getDefaultServerHostName()
+{
+    return qvariant_cast<QString>(data(m_defaultServerIndex, HostNameRole));
+}
+
+QString ServersModel::getDefaultServerDescription(const QJsonObject &server)
 {
    const auto configVersion = server.value(config_key::configVersion).toInt();

@@ -140,12 +145,13 @@ QString ServersModel::getServerDescription(const QJsonObject &server, const int

    if (configVersion) {
        return server.value(config_key::description).toString();
-    } else if (data(index, HasWriteAccessRole).toBool()) {
-        if (m_isAmneziaDnsEnabled && isAmneziaDnsContainerInstalled(index)) {
+    } else if (isDefaultServerHasWriteAccess()) {
+        if (m_isAmneziaDnsEnabled
+            && isAmneziaDnsContainerInstalled(m_defaultServerIndex)) {
            description += "Amnezia DNS | ";
        }
    } else {
-        if (data(index, HasAmneziaDns).toBool()) {
+        if (isDefaultServerConfigContainsAmneziaDns()) {
            description += "Amnezia DNS | ";
        }
    }
@@ -156,7 +162,7 @@ const QString ServersModel::getDefaultServerDescriptionCollapsed()
 {
    const QJsonObject server = m_servers.at(m_defaultServerIndex).toObject();
    const auto configVersion = server.value(config_key::configVersion).toInt();
-    auto description = getServerDescription(server, m_defaultServerIndex);
+    auto description = getDefaultServerDescription(server);
    if (configVersion) {
        return description;
    }
@@ -170,7 +176,7 @@ const QString ServersModel::getDefaultServerDescriptionExpanded()
 {
    const QJsonObject server = m_servers.at(m_defaultServerIndex).toObject();
    const auto configVersion = server.value(config_key::configVersion).toInt();
-    auto description = getServerDescription(server, m_defaultServerIndex);
+    auto description = getDefaultServerDescription(server);
    if (configVersion) {
        return description;
    }
@@ -193,21 +199,26 @@ bool ServersModel::hasServerWithWriteAccess()
    return false;
 }

-void ServersModel::setProcessedServerIndex(const int index)
+void ServersModel::setCurrentlyProcessedServerIndex(const int index)
 {
-    m_processedServerIndex = index;
+    m_currentlyProcessedServerIndex = index;
    updateContainersModel();
-    emit processedServerIndexChanged(m_processedServerIndex);
+    emit currentlyProcessedServerIndexChanged(m_currentlyProcessedServerIndex);
 }

-int ServersModel::getProcessedServerIndex()
+int ServersModel::getCurrentlyProcessedServerIndex()
 {
-    return m_processedServerIndex;
+    return m_currentlyProcessedServerIndex;
 }

-const ServerCredentials ServersModel::getProcessedServerCredentials()
+QString ServersModel::getCurrentlyProcessedServerHostName()
 {
-    return serverCredentials(m_processedServerIndex);
+    return qvariant_cast<QString>(data(m_currentlyProcessedServerIndex, HostNameRole));
+}
+
+const ServerCredentials ServersModel::getCurrentlyProcessedServerCredentials()
+{
+    return serverCredentials(m_currentlyProcessedServerIndex);
 }

 const ServerCredentials ServersModel::getServerCredentials(const int index)
@@ -217,17 +228,12 @@ const ServerCredentials ServersModel::getServerCredentials(const int index)

 bool ServersModel::isDefaultServerCurrentlyProcessed()
 {
-    return m_defaultServerIndex == m_processedServerIndex;
+    return m_defaultServerIndex == m_currentlyProcessedServerIndex;
 }

-bool ServersModel::isDefaultServerFromApi()
+bool ServersModel::isCurrentlyProcessedServerHasWriteAccess()
 {
-    return qvariant_cast<bool>(data(m_defaultServerIndex, IsServerFromApiRole));
-}
-
-bool ServersModel::isProcessedServerHasWriteAccess()
-{
-    return qvariant_cast<bool>(data(m_processedServerIndex, HasWriteAccessRole));
+    return qvariant_cast<bool>(data(m_currentlyProcessedServerIndex, HasWriteAccessRole));
 }

 bool ServersModel::isDefaultServerHasWriteAccess()
@@ -243,42 +249,40 @@ void ServersModel::addServer(const QJsonObject &server)
    endResetModel();
 }

-void ServersModel::editServer(const QJsonObject &server, const int serverIndex)
+void ServersModel::editServer(const QJsonObject &server)
 {
-    m_settings->editServer(serverIndex, server);
-    m_servers.replace(serverIndex, m_settings->serversArray().at(serverIndex));
-    emit dataChanged(index(serverIndex, 0), index(serverIndex, 0));
-
-    if (serverIndex == m_defaultServerIndex) {
-        updateDefaultServerContainersModel();
-    }
+    m_settings->editServer(m_currentlyProcessedServerIndex, server);
+    m_servers.replace(m_currentlyProcessedServerIndex, m_settings->serversArray().at(m_currentlyProcessedServerIndex));
+    emit dataChanged(index(m_currentlyProcessedServerIndex, 0), index(m_currentlyProcessedServerIndex, 0));
    updateContainersModel();
-
-    if (serverIndex == m_defaultServerIndex) {
-        auto defaultContainer = qvariant_cast<DockerContainer>(getDefaultServerData("defaultContainer"));
-        emit defaultServerDefaultContainerChanged(defaultContainer);
-    }
 }

 void ServersModel::removeServer()
 {
    beginResetModel();
-    m_settings->removeServer(m_processedServerIndex);
+    m_settings->removeServer(m_currentlyProcessedServerIndex);
    m_servers = m_settings->serversArray();

-    if (m_settings->defaultServerIndex() == m_processedServerIndex) {
+    if (m_settings->defaultServerIndex() == m_currentlyProcessedServerIndex) {
        setDefaultServerIndex(0);
-    } else if (m_settings->defaultServerIndex() > m_processedServerIndex) {
+    } else if (m_settings->defaultServerIndex() > m_currentlyProcessedServerIndex) {
        setDefaultServerIndex(m_settings->defaultServerIndex() - 1);
    }

    if (m_settings->serversCount() == 0) {
        setDefaultServerIndex(-1);
    }
-    setProcessedServerIndex(m_defaultServerIndex);
+    setCurrentlyProcessedServerIndex(m_defaultServerIndex);
    endResetModel();
 }

+bool ServersModel::isDefaultServerConfigContainsAmneziaDns()
+{
+    const QJsonObject server = m_servers.at(m_defaultServerIndex).toObject();
+    QString primaryDns = server.value(config_key::dns1).toString();
+    return primaryDns == protocols::dns::amneziaDnsIp;
+}
+
 QHash<int, QByteArray> ServersModel::roleNames() const
 {
    QHash<int, QByteArray> roles;
@@ -286,8 +290,6 @@ QHash<int, QByteArray> ServersModel::roleNames() const
    roles[NameRole] = "serverName";
    roles[NameRole] = "name";
    roles[ServerDescriptionRole] = "serverDescription";
-    roles[CollapsedServerDescriptionRole] = "collapsedServerDescription";
-    roles[ExpandedServerDescriptionRole] = "expandedServerDescription";

    roles[HostNameRole] = "hostName";

@@ -302,8 +304,6 @@ QHash<int, QByteArray> ServersModel::roleNames() const
    roles[ContainsAmneziaDnsRole] = "containsAmneziaDns";

    roles[DefaultContainerRole] = "defaultContainer";
-
-    roles[IsServerFromApiRole] = "isServerFromApi";
    return roles;
 }

@@ -322,29 +322,28 @@ ServerCredentials ServersModel::serverCredentials(int index) const

 void ServersModel::updateContainersModel()
 {
-    auto containers = m_servers.at(m_processedServerIndex).toObject().value(config_key::containers).toArray();
+    auto containers = m_servers.at(m_currentlyProcessedServerIndex).toObject().value(config_key::containers).toArray();
    emit containersUpdated(containers);
 }

-void ServersModel::updateDefaultServerContainersModel()
-{
-    auto containers = m_servers.at(m_defaultServerIndex).toObject().value(config_key::containers).toArray();
-    emit defaultServerContainersUpdated(containers);
-}
-
 QJsonObject ServersModel::getDefaultServerConfig()
 {
    return m_servers.at(m_defaultServerIndex).toObject();
 }

-void ServersModel::reloadDefaultServerContainerConfig()
+QJsonObject ServersModel::getCurrentlyProcessedServerConfig()
 {
-    QJsonObject server = m_servers.at(m_defaultServerIndex).toObject();
+    return m_servers.at(m_currentlyProcessedServerIndex).toObject();
+}
+
+void ServersModel::reloadContainerConfig()
+{
+    QJsonObject server = m_servers.at(m_currentlyProcessedServerIndex).toObject();
    auto container = ContainerProps::containerFromString(server.value(config_key::defaultContainer).toString());

    auto containers = server.value(config_key::containers).toArray();

-    auto config = m_settings->containerConfig(m_defaultServerIndex, container);
+    auto config = m_settings->containerConfig(m_currentlyProcessedServerIndex, container);
    for (auto i = 0; i < containers.size(); i++) {
        auto c = ContainerProps::containerFromString(containers.at(i).toObject().value(config_key::container).toString());
        if (c == container) {
@@ -354,13 +353,13 @@ void ServersModel::reloadDefaultServerContainerConfig()
    }

    server.insert(config_key::containers, containers);
-    editServer(server, m_defaultServerIndex);
+    editServer(server);
 }

 void ServersModel::updateContainerConfig(const int containerIndex, const QJsonObject config)
 {
    auto container = static_cast<DockerContainer>(containerIndex);
-    QJsonObject server = m_servers.at(m_processedServerIndex).toObject();
+    QJsonObject server = m_servers.at(m_currentlyProcessedServerIndex).toObject();

    auto containers = server.value(config_key::containers).toArray();
    for (auto i = 0; i < containers.size(); i++) {
@@ -378,25 +377,30 @@ void ServersModel::updateContainerConfig(const int containerIndex, const QJsonOb
        server.insert(config_key::defaultContainer, ContainerProps::containerToString(container));
    }

-    editServer(server, m_processedServerIndex);
+    editServer(server);
 }

 void ServersModel::addContainerConfig(const int containerIndex, const QJsonObject config)
 {
    auto container = static_cast<DockerContainer>(containerIndex);
-    QJsonObject server = m_servers.at(m_processedServerIndex).toObject();
+    QJsonObject server = m_servers.at(m_currentlyProcessedServerIndex).toObject();

    auto containers = server.value(config_key::containers).toArray();
    containers.push_back(config);

    server.insert(config_key::containers, containers);

+    bool isDefaultContainerChanged = false;
    auto defaultContainer = server.value(config_key::defaultContainer).toString();
    if ((ContainerProps::containerFromString(defaultContainer) == DockerContainer::None || ContainerProps::containerService(container) != ServiceType::Other)) {
        server.insert(config_key::defaultContainer, ContainerProps::containerToString(container));
+        isDefaultContainerChanged = true;
    }

-    editServer(server, m_processedServerIndex);
+    editServer(server);
+    if (isDefaultContainerChanged) {
+        emit defaultContainerChanged(container);
+    }
 }

 void ServersModel::setDefaultContainer(const int serverIndex, const int containerIndex)
@@ -404,12 +408,18 @@ void ServersModel::setDefaultContainer(const int serverIndex, const int containe
    auto container = static_cast<DockerContainer>(containerIndex);
    QJsonObject s = m_servers.at(serverIndex).toObject();
    s.insert(config_key::defaultContainer, ContainerProps::containerToString(container));
-    editServer(s, serverIndex); //check
+    editServer(s); //check
+    emit defaultContainerChanged(container);
 }

-const QString ServersModel::getDefaultServerDefaultContainerName()
+DockerContainer ServersModel::getDefaultContainer(const int serverIndex)
 {
-    auto defaultContainer = qvariant_cast<DockerContainer>(getDefaultServerData("defaultContainer"));
+    return qvariant_cast<DockerContainer>(data(serverIndex, DefaultContainerRole));
+}
+
+const QString ServersModel::getDefaultContainerName()
+{
+    auto defaultContainer = getDefaultContainer(m_defaultServerIndex);
    return ContainerProps::containerHumanNames().value(defaultContainer);
 }

@@ -417,14 +427,15 @@ ErrorCode ServersModel::removeAllContainers()
 {
    ServerController serverController(m_settings);
    ErrorCode errorCode =
-            serverController.removeAllContainers(m_settings->serverCredentials(m_processedServerIndex));
+            serverController.removeAllContainers(m_settings->serverCredentials(m_currentlyProcessedServerIndex));

    if (errorCode == ErrorCode::NoError) {
-        QJsonObject s = m_servers.at(m_processedServerIndex).toObject();
+        QJsonObject s = m_servers.at(m_currentlyProcessedServerIndex).toObject();
        s.insert(config_key::containers, {});
        s.insert(config_key::defaultContainer, ContainerProps::containerToString(DockerContainer::None));

-        editServer(s, m_processedServerIndex);
+        editServer(s);
+        emit defaultContainerChanged(DockerContainer::None);
    }
    return errorCode;
 }
@@ -432,7 +443,7 @@ ErrorCode ServersModel::removeAllContainers()
 ErrorCode ServersModel::rebootServer()
 {
    ServerController serverController(m_settings);
-    auto credentials = m_settings->serverCredentials(m_processedServerIndex);
+    auto credentials = m_settings->serverCredentials(m_currentlyProcessedServerIndex);

    ErrorCode errorCode = serverController.rebootServer(credentials);
    return errorCode;
@@ -441,13 +452,13 @@ ErrorCode ServersModel::rebootServer()
 ErrorCode ServersModel::removeContainer(const int containerIndex)
 {
    ServerController serverController(m_settings);
-    auto credentials = m_settings->serverCredentials(m_processedServerIndex);
+    auto credentials = m_settings->serverCredentials(m_currentlyProcessedServerIndex);
    auto dockerContainer = static_cast<DockerContainer>(containerIndex);

    ErrorCode errorCode = serverController.removeContainer(credentials, dockerContainer);

    if (errorCode == ErrorCode::NoError) {
-        QJsonObject server = m_servers.at(m_processedServerIndex).toObject();
+        QJsonObject server = m_servers.at(m_currentlyProcessedServerIndex).toObject();

        auto containers = server.value(config_key::containers).toArray();
        for (auto it = containers.begin(); it != containers.end(); it++) {
@@ -469,37 +480,32 @@ ErrorCode ServersModel::removeContainer(const int containerIndex)
            server.insert(config_key::defaultContainer, ContainerProps::containerToString(defaultContainer));
        }

-        editServer(server, m_processedServerIndex);
+        editServer(server);
+        emit defaultContainerChanged(defaultContainer);
    }
    return errorCode;
 }

 void ServersModel::clearCachedProfiles()
 {
-    const auto &containers = m_settings->containers(m_processedServerIndex);
+    const auto &containers = m_settings->containers(m_currentlyProcessedServerIndex);
    for (DockerContainer container : containers.keys()) {
-        m_settings->clearLastConnectionConfig(m_processedServerIndex, container);
+        m_settings->clearLastConnectionConfig(m_currentlyProcessedServerIndex, container);
    }

-    m_servers.replace(m_processedServerIndex, m_settings->server(m_processedServerIndex));
-    if (m_processedServerIndex == m_defaultServerIndex) {
-        updateDefaultServerContainersModel();
-    }
+    m_servers.replace(m_currentlyProcessedServerIndex, m_settings->server(m_currentlyProcessedServerIndex));
    updateContainersModel();
 }

 void ServersModel::clearCachedProfile(const DockerContainer container)
 {
-    m_settings->clearLastConnectionConfig(m_processedServerIndex, container);
+    m_settings->clearLastConnectionConfig(m_currentlyProcessedServerIndex, container);

-    m_servers.replace(m_processedServerIndex, m_settings->server(m_processedServerIndex));
-    if (m_processedServerIndex == m_defaultServerIndex) {
-        updateDefaultServerContainersModel();
-    }
+    m_servers.replace(m_currentlyProcessedServerIndex, m_settings->server(m_currentlyProcessedServerIndex));
    updateContainersModel();
 }

-bool ServersModel::isAmneziaDnsContainerInstalled(const int serverIndex) const
+bool ServersModel::isAmneziaDnsContainerInstalled(const int serverIndex)
 {
    QJsonObject server = m_servers.at(serverIndex).toObject();
    auto containers = server.value(config_key::containers).toArray();
@@ -538,6 +544,16 @@ void ServersModel::toggleAmneziaDns(bool enabled)
    emit defaultServerDescriptionChanged();
 }

+bool ServersModel::isDefaultServerFromApi()
+{
+    return m_settings->server(m_defaultServerIndex).value(config_key::configVersion).toInt();
+}
+
+bool ServersModel::isCurrentlyProcessedServerFromApi()
+{
+    return m_settings->server(m_currentlyProcessedServerIndex).value(config_key::configVersion).toInt();
+}
+
 bool ServersModel::isServerFromApiAlreadyExists(const quint16 crc)
 {
    for (const auto &server : qAsConst(m_servers)) {
@@ -548,52 +564,3 @@ bool ServersModel::isServerFromApiAlreadyExists(const quint16 crc)
    return false;
 }

-QVariant ServersModel::getDefaultServerData(const QString roleString)
-{
-    auto roles = roleNames();
-    for (auto it = roles.begin(); it != roles.end(); it++) {
-        if (QString(it.value()) == roleString) {
-            return data(m_defaultServerIndex, it.key());
-        }
-    }
-
-    return {};
-}
-
-void ServersModel::setDefaultServerData(const QString roleString, const QVariant &value)
-{
-
-}
-
-QVariant ServersModel::getProcessedServerData(const QString roleString)
-{
-    auto roles = roleNames();
-    for (auto it = roles.begin(); it != roles.end(); it++) {
-        if (QString(it.value()) == roleString) {
-            return data(m_processedServerIndex, it.key());
-        }
-    }
-
-    return {};
-}
-
-void ServersModel::setProcessedServerData(const QString roleString, const QVariant &value)
-{
-
-}
-
-bool ServersModel::isDefaultServerDefaultContainerHasSplitTunneling()
-{
-    auto server = m_servers.at(m_defaultServerIndex).toObject();
-    auto defaultContainer = ContainerProps::containerFromString(server.value(config_key::defaultContainer).toString());
-    auto containerConfig = server.value(config_key::containers).toArray().at(defaultContainer).toObject();
-    auto protocolConfig = containerConfig.value(ContainerProps::containerTypeToString(defaultContainer)).toObject();
-
-    if (defaultContainer == DockerContainer::Awg || defaultContainer == DockerContainer::WireGuard) {
-        return !(protocolConfig.value(config_key::last_config).toString().contains("AllowedIPs = 0.0.0.0/0, ::/0"));
-    } else if (defaultContainer == DockerContainer::Cloak || defaultContainer == DockerContainer::OpenVpn || defaultContainer == DockerContainer::ShadowSocks) {
-        return !(protocolConfig.value(config_key::last_config).toString().contains("redirect-gateway"));
-    }
-
-    return false;
-}
@@ -12,8 +12,7 @@ public:
    enum Roles {
        NameRole = Qt::UserRole + 1,
        ServerDescriptionRole,
-        CollapsedServerDescriptionRole,
-        ExpandedServerDescriptionRole,
+
        HostNameRole,

        CredentialsRole,
@@ -26,11 +25,7 @@ public:

        ContainsAmneziaDnsRole,

-        DefaultContainerRole,
-
-        IsServerFromApiRole,
-
-        HasAmneziaDns
+        DefaultContainerRole
    };

    ServersModel(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
@@ -45,43 +40,47 @@ public:

    Q_PROPERTY(int defaultIndex READ getDefaultServerIndex WRITE setDefaultServerIndex NOTIFY defaultServerIndexChanged)
    Q_PROPERTY(QString defaultServerName READ getDefaultServerName NOTIFY defaultServerNameChanged)
-    Q_PROPERTY(QString defaultServerDefaultContainerName READ getDefaultServerDefaultContainerName NOTIFY defaultServerDefaultContainerChanged)
-    Q_PROPERTY(QString defaultServerDescriptionCollapsed READ getDefaultServerDescriptionCollapsed NOTIFY defaultServerDefaultContainerChanged)
-    Q_PROPERTY(QString defaultServerDescriptionExpanded READ getDefaultServerDescriptionExpanded NOTIFY defaultServerDefaultContainerChanged)
-    Q_PROPERTY(bool isDefaultServerDefaultContainerHasSplitTunneling READ isDefaultServerDefaultContainerHasSplitTunneling NOTIFY defaultServerDefaultContainerChanged)
-    Q_PROPERTY(bool isDefaultServerFromApi READ isDefaultServerFromApi NOTIFY defaultServerIndexChanged)
+    Q_PROPERTY(QString defaultServerHostName READ getDefaultServerHostName NOTIFY defaultServerIndexChanged)
+    Q_PROPERTY(QString defaultContainerName READ getDefaultContainerName NOTIFY defaultContainerChanged)
+    Q_PROPERTY(QString defaultServerDescriptionCollapsed READ getDefaultServerDescriptionCollapsed NOTIFY defaultServerDescriptionChanged)
+    Q_PROPERTY(QString defaultServerDescriptionExpanded READ getDefaultServerDescriptionExpanded NOTIFY defaultServerDescriptionChanged)

-    Q_PROPERTY(int processedIndex READ getProcessedServerIndex WRITE setProcessedServerIndex NOTIFY processedServerIndexChanged)
+    Q_PROPERTY(int currentlyProcessedIndex READ getCurrentlyProcessedServerIndex WRITE setCurrentlyProcessedServerIndex
+                       NOTIFY currentlyProcessedServerIndexChanged)

 public slots:
    void setDefaultServerIndex(const int index);
    const int getDefaultServerIndex();
    const QString getDefaultServerName();
+    const QString getDefaultServerHostName();
    const QString getDefaultServerDescriptionCollapsed();
    const QString getDefaultServerDescriptionExpanded();
-    const QString getDefaultServerDefaultContainerName();
    bool isDefaultServerCurrentlyProcessed();
-    bool isDefaultServerFromApi();

-    bool isProcessedServerHasWriteAccess();
+    bool isCurrentlyProcessedServerHasWriteAccess();
    bool isDefaultServerHasWriteAccess();
    bool hasServerWithWriteAccess();

    const int getServersCount();

-    void setProcessedServerIndex(const int index);
-    int getProcessedServerIndex();
+    void setCurrentlyProcessedServerIndex(const int index);
+    int getCurrentlyProcessedServerIndex();

-    const ServerCredentials getProcessedServerCredentials();
+    QString getCurrentlyProcessedServerHostName();
+    const ServerCredentials getCurrentlyProcessedServerCredentials();
    const ServerCredentials getServerCredentials(const int index);

    void addServer(const QJsonObject &server);
-    void editServer(const QJsonObject &server, const int serverIndex);
+    void editServer(const QJsonObject &server);
    void removeServer();

-    QJsonObject getDefaultServerConfig();
+    bool isDefaultServerConfigContainsAmneziaDns();
+    bool isAmneziaDnsContainerInstalled(const int serverIndex);

-    void reloadDefaultServerContainerConfig();
+    QJsonObject getDefaultServerConfig();
+    QJsonObject getCurrentlyProcessedServerConfig();
+
+    void reloadContainerConfig();
    void updateContainerConfig(const int containerIndex, const QJsonObject config);
    void addContainerConfig(const int containerIndex, const QJsonObject config);

@@ -93,49 +92,42 @@ public slots:
    ErrorCode rebootServer();

    void setDefaultContainer(const int serverIndex, const int containerIndex);
+    DockerContainer getDefaultContainer(const int serverIndex);
+    const QString getDefaultContainerName();

    QStringList getAllInstalledServicesName(const int serverIndex);

    void toggleAmneziaDns(bool enabled);

+    bool isDefaultServerFromApi();
+    bool isCurrentlyProcessedServerFromApi();
+
    bool isServerFromApiAlreadyExists(const quint16 crc);

-    QVariant getDefaultServerData(const QString roleString);
-    void setDefaultServerData(const QString roleString, const QVariant &value);
-
-    QVariant getProcessedServerData(const QString roleString);
-    void setProcessedServerData(const QString roleString, const QVariant &value);
-
-    bool isDefaultServerDefaultContainerHasSplitTunneling();
-
 protected:
    QHash<int, QByteArray> roleNames() const override;

 signals:
-    void processedServerIndexChanged(const int index);
+    void currentlyProcessedServerIndexChanged(const int index);
    void defaultServerIndexChanged(const int index);
    void defaultServerNameChanged();
    void defaultServerDescriptionChanged();

    void containersUpdated(const QJsonArray &containers);
-    void defaultServerContainersUpdated(const QJsonArray &containers);
-    void defaultServerDefaultContainerChanged(const int containerIndex);
+    void defaultContainerChanged(const int containerIndex);

 private:
    ServerCredentials serverCredentials(int index) const;
    void updateContainersModel();
-    void updateDefaultServerContainersModel();

-    QString getServerDescription(const QJsonObject &server, const int index) const;
-
-    bool isAmneziaDnsContainerInstalled(const int serverIndex) const;
+    QString getDefaultServerDescription(const QJsonObject &server);

    QJsonArray m_servers;

    std::shared_ptr<Settings> m_settings;

    int m_defaultServerIndex;
-    int m_processedServerIndex;
+    int m_currentlyProcessedServerIndex;

    bool m_isAmneziaDnsEnabled = m_settings->useAmneziaDns();
 };
@@ -113,7 +113,6 @@ void SitesModel::toggleSplitTunneling(bool enabled)
        m_settings->setRouteMode(Settings::RouteMode::VpnAllSites);
    }
    m_isSplitTunnelingEnabled = enabled;
-    emit splitTunnelingToggled();
 }

 QVector<QPair<QString, QString> > SitesModel::getCurrentSites()
@@ -22,7 +22,6 @@ public:
    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;

    Q_PROPERTY(int routeMode READ getRouteMode WRITE setRouteMode NOTIFY routeModeChanged)
-    Q_PROPERTY(bool isTunnelingEnabled READ isSplitTunnelingEnabled NOTIFY splitTunnelingToggled)

 public slots:
    bool addSite(const QString &hostname, const QString &ip);
@@ -39,7 +38,6 @@ public slots:

 signals:
    void routeModeChanged();
-    void splitTunnelingToggled();

 protected:
    QHash<int, QByteArray> roleNames() const override;
@@ -138,7 +138,7 @@ Button {
    }

    onClicked: {
-        ServersModel.setProcessedServerIndex(ServersModel.defaultIndex)
+        ServersModel.setCurrentlyProcessedServerIndex(ServersModel.defaultIndex)
        ApiController.updateServerConfigFromApi()
    }
 }
@@ -15,7 +15,6 @@ ListView {
    id: menuContent

    property var rootWidth
-    property var selectedText

    width: rootWidth
    height: menuContent.contentItem.height
@@ -52,7 +51,7 @@ ListView {
                showImage: !isInstalled

                checkable: isInstalled && !ConnectionController.isConnected && isSupported
-                checked: proxyDefaultServerContainersModel.mapToSource(index) === ServersModel.getDefaultServerData("defaultContainer")
+                checked: proxyContainersModel.mapToSource(index) === ServersModel.getDefaultContainer(ServersModel.defaultIndex)

                onClicked: {
                    if (ConnectionController.isConnected && isInstalled) {
@@ -62,14 +61,14 @@ ListView {

                    if (checked) {
                        containersDropDown.close()
-                        ServersModel.setDefaultContainer(ServersModel.defaultIndex, proxyDefaultServerContainersModel.mapToSource(index))
+                        ServersModel.setDefaultContainer(ServersModel.defaultIndex, proxyContainersModel.mapToSource(index))
                    } else {
                        if (!isSupported && isInstalled) {
                            PageController.showErrorMessage(qsTr("The selected protocol is not supported on the current platform"))
                            return
                        }

-                        ContainersModel.setCurrentlyProcessedContainerIndex(proxyDefaultServerContainersModel.mapToSource(index))
+                        ContainersModel.setCurrentlyProcessedContainerIndex(proxyContainersModel.mapToSource(index))
                        InstallController.setShouldCreateServer(false)
                        PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
                        containersDropDown.close()
@@ -1,92 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-import PageEnum 1.0
-
-import "../Controls2"
-import "../Controls2/TextTypes"
-import "../Config"
-
-DrawerType2 {
-    id: root
-
-    anchors.fill: parent
-    expandedHeight: parent.height * 0.7
-
-    expandedContent: ColumnLayout {
-        id: content
-
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-        spacing: 0
-
-        Header2Type {
-            Layout.fillWidth: true
-            Layout.topMargin: 24
-            Layout.rightMargin: 16
-            Layout.leftMargin: 16
-            Layout.bottomMargin: 16
-
-            headerText: qsTr("Split tunneling")
-            descriptionText:  qsTr("Allows you to connect to some sites or applications through a VPN connection and bypass others")
-        }
-
-        LabelWithButtonType {
-            Layout.fillWidth: true
-            Layout.topMargin: 16
-
-            visible: ServersModel.isDefaultServerDefaultContainerHasSplitTunneling && ServersModel.getDefaultServerData("isServerFromApi")
-
-            text: qsTr("Split tunneling on the server")
-            descriptionText: qsTr("Enabled \nCan't be disabled for current server")
-            rightImageSource: "qrc:/images/controls/chevron-right.svg"
-
-            clickedFunction: function() {
-//                PageController.goToPage(PageEnum.PageSettingsSplitTunneling)
-//                root.close()
-            }
-        }
-
-        DividerType {
-            visible: ServersModel.isDefaultServerDefaultContainerHasSplitTunneling && ServersModel.getDefaultServerData("isServerFromApi")
-        }
-
-        LabelWithButtonType {
-            Layout.fillWidth: true
-            Layout.topMargin: 16
-
-            enabled: ! ServersModel.isDefaultServerDefaultContainerHasSplitTunneling || !ServersModel.getDefaultServerData("isServerFromApi")
-
-            text: qsTr("Site-based split tunneling")
-            descriptionText: enabled && SitesModel.isTunnelingEnabled ? qsTr("Enabled") : qsTr("Disabled")
-            rightImageSource: "qrc:/images/controls/chevron-right.svg"
-
-            clickedFunction: function() {
-                PageController.goToPage(PageEnum.PageSettingsSplitTunneling)
-                root.close()
-            }
-        }
-
-        DividerType {
-        }
-
-        LabelWithButtonType {
-            Layout.fillWidth: true
-            visible: false
-
-            text: qsTr("App-based split tunneling")
-            rightImageSource: "qrc:/images/controls/chevron-right.svg"
-
-            clickedFunction: function() {
-//                PageController.goToPage(PageEnum.PageSetupWizardConfigSource)
-                root.close()
-            }
-        }
-
-        DividerType {
-            visible: false
-        }
-    }
-}
@@ -38,6 +38,14 @@ DrawerType2 {
    expandedContent: Item {
        implicitHeight: root.expandedHeight

+        Connections {
+            target: root
+
+            function onOpened() {
+                header.forceActiveFocus()
+            }
+        }
+
        Header2Type {
            id: header
            anchors.top: parent.top
@@ -48,6 +56,8 @@ DrawerType2 {
            anchors.rightMargin: 16

            headerText: root.headerText
+
+            KeyNavigation.tab: shareButton
        }

        FlickableType {
@@ -68,12 +78,15 @@ DrawerType2 {
                visible: root.contentVisible

                BasicButtonType {
+                    id: shareButton
                    Layout.fillWidth: true
                    Layout.topMargin: 16

                    text: qsTr("Share")
                    imageSource: "qrc:/images/controls/share-2.svg"

+                    KeyNavigation.tab: copyConfigTextButton
+
                    clickedFunc: function() {
                        var fileName = ""
                        if (GC.isMobile()) {
@@ -108,12 +121,7 @@ DrawerType2 {
                    text: qsTr("Copy")
                    imageSource: "qrc:/images/controls/copy.svg"

-                    clickedFunc: function() {
-                        configText.selectAll()
-                        configText.copy()
-                        configText.select(0, 0)
-                        PageController.showNotificationMessage(qsTr("Copied"))
-                    }
+                    KeyNavigation.tab: copyNativeConfigStringButton.visible ? copyNativeConfigStringButton : showSettingsButton
                }

                BasicButtonType {
@@ -133,15 +141,12 @@ DrawerType2 {
                    text: qsTr("Copy config string")
                    imageSource: "qrc:/images/controls/copy.svg"

-                    clickedFunc: function() {
-                        nativeConfigString.selectAll()
-                        nativeConfigString.copy()
-                        nativeConfigString.select(0, 0)
-                        PageController.showNotificationMessage(qsTr("Copied"))
-                    }
+                    KeyNavigation.tab: showSettingsButton
                }

                BasicButtonType {
+                    id: showSettingsButton
+
                    Layout.fillWidth: true
                    Layout.topMargin: 24

@@ -157,6 +162,8 @@ DrawerType2 {
                    clickedFunc: function() {
                        configContentDrawer.open()
                    }
+
+                    KeyNavigation.tab: header
                }

                DrawerType2 {
@@ -21,8 +21,6 @@ Button {
    property int borderFocusedWidth: 1

    property string imageSource
-    property string rightImageSource
-    property string leftImageColor: textColor

    property bool squareLeftSide: false

@@ -33,22 +31,23 @@ Button {
    hoverEnabled: true

    background: Rectangle {
-        id: background_border
+        id: focusBorder

        color: "transparent"
        border.color: root.activeFocus ? root.borderFocusedColor : "transparent"
        border.width: root.activeFocus ? root.borderFocusedWidth : "transparent"

        anchors.fill: parent
+
        radius: 16

        Rectangle {
            id: background

-            anchors.fill: background_border
-            anchors.margins: root.activeFocus ? 2: 0
+            anchors.fill: focusBorder
+            anchors.margins: root.activeFocus ? 2 : 0

-            radius: 16
+            radius: root.activeFocus ? 14 : 16
            color: {
                if (root.enabled) {
                    if (root.pressed) {
@@ -59,8 +58,8 @@ Button {
                    return disabledColor
                }
            }
-            border.color: root.activeFocus ? "transparent" : borderColor
-            border.width: root.activeFocus ? 0 : borderWidth
+            border.color: borderColor
+            border.width: borderWidth

            Behavior on color {
                PropertyAnimation { duration: 200 }
@@ -95,13 +94,13 @@ Button {
    }

    MouseArea {
-        anchors.fill: background_border
+        anchors.fill: focusBorder
        enabled: false
        cursorShape: Qt.PointingHandCursor
    }

    contentItem: Item {
-        anchors.fill: background_border
+        anchors.fill: focusBorder

        implicitWidth: content.implicitWidth
        implicitHeight: content.implicitHeight
@@ -120,7 +119,7 @@ Button {
                layer {
                    enabled: true
                    effect: ColorOverlay {
-                        color: leftImageColor
+                        color: textColor
                    }
                }
            }
@@ -133,21 +132,6 @@ Button {
                horizontalAlignment: Text.AlignLeft
                verticalAlignment: Text.AlignVCenter
            }
-
-            Image {
-                Layout.preferredHeight: 20
-                Layout.preferredWidth: 20
-
-                source: root.rightImageSource
-                visible: root.rightImageSource === "" ? false : true
-
-                layer {
-                    enabled: true
-                    effect: ColorOverlay {
-                        color: textColor
-                    }
-                }
-            }
        }
    }

@@ -84,7 +84,6 @@ Item {
        id: emptyArea
        anchors.fill: parent
        enabled: root.isExpanded
-        visible: enabled
        onClicked: {
            root.close()
        }
@@ -34,45 +34,8 @@ PageType {
        anchors.bottomMargin: drawer.collapsedHeight

        ConnectButton {
-            id: connectButton
            anchors.centerIn: parent
        }
-
-        BasicButtonType {
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.bottom: parent.bottom
-            anchors.bottomMargin: 34
-            leftPadding: 16
-            rightPadding: 16
-
-            implicitHeight: 36
-
-            defaultColor: "transparent"
-            hoveredColor: Qt.rgba(1, 1, 1, 0.08)
-            pressedColor: Qt.rgba(1, 1, 1, 0.12)
-            disabledColor: "#878B91"
-            textColor: "#878B91"
-            leftImageColor: "transparent"
-            borderWidth: 0
-
-            property bool isSplitTunnelingEnabled: SitesModel.isTunnelingEnabled ||
-                                                   (ServersModel.isDefaultServerDefaultContainerHasSplitTunneling && ServersModel.getDefaultServerData("isServerFromApi"))
-
-            text: isSplitTunnelingEnabled ? qsTr("Split tunneling enabled") : qsTr("Split tunneling disabled")
-
-            imageSource: isSplitTunnelingEnabled ? "qrc:/images/controls/split-tunneling.svg" : ""
-            rightImageSource: "qrc:/images/controls/chevron-down.svg"
-
-            onClicked: {
-                homeSplitTunnelingDrawer.open()
-            }
-
-            HomeSplitTunnelingDrawer {
-                id: homeSplitTunnelingDrawer
-
-                parent: root
-            }
-        }
    }


@@ -193,7 +156,7 @@ PageType {

                LabelTextType {
                    id: expandedServersMenuDescription
-                    Layout.bottomMargin: ServersModel.isDefaultServerFromApi ? 69 : 24
+                    Layout.bottomMargin: 24
                    Layout.fillWidth: true
                    horizontalAlignment: Qt.AlignHCenter
                    verticalAlignment: Qt.AlignVCenter
@@ -204,9 +167,6 @@ PageType {
                    Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
                    spacing: 8

-                    visible: !ServersModel.isDefaultServerFromApi
-                    onVisibleChanged: expandedServersMenuDescription.Layout
-
                    DropDownType {
                        id: containersDropDown

@@ -219,12 +179,13 @@ PageType {
                        rootButtonTextTopMargin: 8
                        rootButtonTextBottomMargin: 8

-                        text: ServersModel.defaultServerDefaultContainerName
+                        text: ServersModel.defaultContainerName
                        textColor: "#0E0E11"
                        headerText: qsTr("VPN protocol")
                        headerBackButtonImage: "qrc:/images/controls/arrow-left.svg"

                        rootButtonClickedFunction: function() {
+                            ServersModel.currentlyProcessedIndex = serversMenuContent.currentIndex
                            containersDropDown.open()
                        }

@@ -236,23 +197,22 @@ PageType {
                            Connections {
                                target: ServersModel

-                                function onDefaultServerIndexChanged() {
+                                function onCurrentlyProcessedServerIndexChanged() {
                                    updateContainersModelFilters()
                                }
                            }

                            function updateContainersModelFilters() {
-                                if (ServersModel.isDefaultServerHasWriteAccess()) {
-                                    proxyDefaultServerContainersModel.filters = ContainersModelFilters.getWriteAccessProtocolsListFilters()
+                                if (ServersModel.isCurrentlyProcessedServerHasWriteAccess()) {
+                                    proxyContainersModel.filters = ContainersModelFilters.getWriteAccessProtocolsListFilters()
                                } else {
-                                    proxyDefaultServerContainersModel.filters = ContainersModelFilters.getReadAccessProtocolsListFilters()
+                                    proxyContainersModel.filters = ContainersModelFilters.getReadAccessProtocolsListFilters()
                                }
                            }

                            model: SortFilterProxyModel {
-                                id: proxyDefaultServerContainersModel
-                                sourceModel: DefaultServerContainersModel
-                                
+                                id: proxyContainersModel
+                                sourceModel: ContainersModel
                                sorters: [
                                    RoleSorter { roleName: "isInstalled"; sortOrder: Qt.DescendingOrder }
                                ]
@@ -348,7 +308,21 @@ PageType {
                                        Layout.fillWidth: true

                                        text: name
-                                        descriptionText: serverDescription
+                                        descriptionText: {
+                                            var fullDescription = ""
+                                            if (hasWriteAccess) {
+                                                if (SettingsController.isAmneziaDnsEnabled()
+                                                        && ServersModel.isAmneziaDnsContainerInstalled(index)) {
+                                                    fullDescription += "Amnezia DNS | "
+                                                }
+                                            } else {
+                                                if (containsAmneziaDns) {
+                                                    fullDescription += "Amnezia DNS | "
+                                                }
+                                            }
+
+                                            return fullDescription += serverDescription
+                                        }

                                        checked: index === serversMenuContent.currentIndex
                                        checkable: !ConnectionController.isConnected
@@ -363,6 +337,7 @@ PageType {

                                            serversMenuContent.currentIndex = index

+                                            ServersModel.currentlyProcessedIndex = index
                                            ServersModel.defaultIndex = index
                                        }

@@ -383,7 +358,7 @@ PageType {
                                        z: 1

                                        onClicked: function() {
-                                            ServersModel.processedIndex = index
+                                            ServersModel.currentlyProcessedIndex = index
                                            PageController.goToPage(PageEnum.PageSettingsServerInfo)
                                            drawer.close()
                                        }
@@ -44,7 +44,7 @@ PageType {
            anchors.left: parent.left
            anchors.right: parent.right

-            enabled: ServersModel.isProcessedServerHasWriteAccess()
+            enabled: ServersModel.isCurrentlyProcessedServerHasWriteAccess()

            ListView {

@@ -43,7 +43,7 @@ PageType {
            anchors.left: parent.left
            anchors.right: parent.right

-            enabled: ServersModel.isProcessedServerHasWriteAccess()
+            enabled: ServersModel.isCurrentlyProcessedServerHasWriteAccess()

            ListView {
                id: listview
@@ -44,7 +44,7 @@ PageType {
            anchors.left: parent.left
            anchors.right: parent.right

-            enabled: ServersModel.isProcessedServerHasWriteAccess()
+            enabled: ServersModel.isCurrentlyProcessedServerHasWriteAccess()

            ListView {
                id: listview
@@ -175,7 +175,7 @@ PageType {

                width: parent.width

-                visible: ServersModel.isProcessedServerHasWriteAccess()
+                visible: ServersModel.isCurrentlyProcessedServerHasWriteAccess()

                text: qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName()
                textColor: "#EB5757"
@@ -43,7 +43,7 @@ PageType {
            anchors.left: parent.left
            anchors.right: parent.right

-            enabled: ServersModel.isProcessedServerHasWriteAccess()
+            enabled: ServersModel.isCurrentlyProcessedServerHasWriteAccess()

            ListView {
                id: listview
@@ -49,7 +49,7 @@ PageType {
            anchors.left: parent.left
            anchors.right: parent.right

-            enabled: ServersModel.isProcessedServerHasWriteAccess()
+            enabled: ServersModel.isCurrentlyProcessedServerHasWriteAccess()

            ListView {
                id: listview
@@ -88,7 +88,7 @@ PageType {
                            Layout.topMargin: 32

                            text: qsTr("Host")
-                            descriptionText: ServersModel.getProcessedServerData("HostName")
+                            descriptionText: ServersModel.getCurrentlyProcessedServerHostName()

                            descriptionOnTop: true

@@ -175,7 +175,7 @@ PageType {

                horizontalAlignment: Text.AlignHCenter

-                text: qsTr("Software version: %1").arg(SettingsController.getAppVersion())
+                text: SettingsController.getAppVersion()
                color: "#878B91"
            }

@@ -30,12 +30,10 @@ PageType {
        anchors.bottom: parent.bottom
        contentHeight: content.height

-        property var isServerFromApi: ServersModel.getDefaultServerData("isServerFromApi")
-
-        enabled: !isServerFromApi
+        enabled: !ServersModel.isDefaultServerFromApi()

        Component.onCompleted: {
-            if (isServerFromApi) {
+            if (ServersModel.isDefaultServerFromApi()) {
                PageController.showNotificationMessage(qsTr("Default server does not support custom dns"))
            }
        }
@@ -28,7 +28,7 @@ PageType {
            PageController.showErrorMessage(message)
        }

-        function onRemoveProcessedServerFinished(finishedMessage) {
+        function onRemoveCurrentlyProcessedServerFinished(finishedMessage) {
            if (!ServersModel.getServersCount()) {
                PageController.replaceStartPage()
            } else {
@@ -38,7 +38,7 @@ PageType {
            PageController.showNotificationMessage(finishedMessage)
        }

-        function onRebootProcessedServerFinished(finishedMessage) {
+        function onRebootCurrentlyProcessedServerFinished(finishedMessage) {
            PageController.showNotificationMessage(finishedMessage)
        }

@@ -64,8 +64,8 @@ PageType {
    Connections {
        target: ServersModel

-        function onProcessedServerIndexChanged() {
-            content.isServerWithWriteAccess = ServersModel.isProcessedServerHasWriteAccess()
+        function onCurrentlyProcessedServerIndexChanged() {
+            content.isServerWithWriteAccess = ServersModel.isCurrentlyProcessedServerHasWriteAccess()
        }
    }

@@ -82,7 +82,7 @@ PageType {
            anchors.left: parent.left
            anchors.right: parent.right

-            property bool isServerWithWriteAccess: ServersModel.isProcessedServerHasWriteAccess()
+            property bool isServerWithWriteAccess: ServersModel.isCurrentlyProcessedServerHasWriteAccess()

            LabelWithButtonType {
                visible: content.isServerWithWriteAccess
@@ -149,7 +149,7 @@ PageType {
                        if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
                            ConnectionController.closeConnection()
                        }
-                        InstallController.rebootProcessedServer()
+                        InstallController.rebootCurrentlyProcessedServer()
                        PageController.showBusyIndicator(false)
                    }
                    var noButtonFunction = function() {
@@ -180,7 +180,7 @@ PageType {
                        if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
                            ConnectionController.closeConnection()
                        }
-                        InstallController.removeProcessedServer()
+                        InstallController.removeCurrentlyProcessedServer()
                        PageController.showBusyIndicator(false)
                    }
                    var noButtonFunction = function() {
@@ -224,7 +224,7 @@ PageType {
            }

            LabelWithButtonType {
-                visible: ServersModel.getProcessedServerData("isServerFromApi")
+                visible: ServersModel.isCurrentlyProcessedServerFromApi()
                Layout.fillWidth: true

                text: qsTr("Reset API config")
@@ -249,7 +249,7 @@ PageType {
            }

            DividerType {
-                visible: ServersModel.getProcessedServerData("isServerFromApi")
+                visible: ServersModel.isCurrentlyProcessedServerFromApi()
            }
        }
    }
@@ -63,7 +63,7 @@ PageType {

                    headerText: name
                    descriptionText: {
-                        if (ServersModel.isProcessedServerHasWriteAccess()) {
+                        if (ServersModel.isCurrentlyProcessedServerHasWriteAccess()) {
                            return credentialsLogin + " · " + hostName
                        } else {
                            return hostName
@@ -107,7 +107,7 @@ PageType {

                width: parent.width

-                visible: ServersModel.isProcessedServerHasWriteAccess()
+                visible: ServersModel.isCurrentlyProcessedServerHasWriteAccess()

                text: qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName()
                textColor: "#EB5757"
@@ -38,13 +38,13 @@ PageType {
                Connections {
                    target: ServersModel

-                    function onProcessedServerIndexChanged() {
+                    function onCurrentlyProcessedServerIndexChanged() {
                        settingsContainersListView.updateContainersModelFilters()
                    }
                }

                function updateContainersModelFilters() {
-                    if (ServersModel.isProcessedServerHasWriteAccess()) {
+                    if (ServersModel.isCurrentlyProcessedServerHasWriteAccess()) {
                        proxyContainersModel.filters = ContainersModelFilters.getWriteAccessProtocolsListFilters()
                    } else {
                        proxyContainersModel.filters = ContainersModelFilters.getReadAccessProtocolsListFilters()
@@ -38,13 +38,13 @@ PageType {
                Connections {
                    target: ServersModel

-                    function onProcessedServerIndexChanged() {
+                    function onCurrentlyProcessedServerIndexChanged() {
                        settingsContainersListView.updateContainersModelFilters()
                    }
                }

                function updateContainersModelFilters() {
-                    if (ServersModel.isProcessedServerHasWriteAccess()) {
+                    if (ServersModel.isCurrentlyProcessedServerHasWriteAccess()) {
                        proxyContainersModel.filters = ContainersModelFilters.getWriteAccessServicesListFilters()
                    } else {
                        proxyContainersModel.filters = ContainersModelFilters.getReadAccessServicesListFilters()
@@ -87,7 +87,7 @@ PageType {
                            rightImageSource: "qrc:/images/controls/chevron-right.svg"

                            clickedFunction: function() {
-                                ServersModel.processedIndex = index
+                                ServersModel.currentlyProcessedIndex = index
                                PageController.goToPage(PageEnum.PageSettingsServerInfo)
                            }
                        }
@@ -20,23 +20,15 @@ import "../Components"
 PageType {
    id: root

-    property var isServerFromApi: ServersModel.getDefaultServerData("isServerFromApi")
-    
    defaultActiveFocusItem: website_ip_field.textField

    property bool pageEnabled: {
-        return !ConnectionController.isConnected && !isServerFromApi
+        return !ConnectionController.isConnected && !ServersModel.isDefaultServerFromApi()
    }

    Component.onCompleted: {
-        if (ConnectionController.isConnected) {
-            PageController.showNotificationMessage(qsTr("Cannot change split tunneling settings during active connection"))
-            root.pageEnabled = false
-        } else if (ServersModel.isDefaultServerDefaultContainerHasSplitTunneling && isServerFromApi) {
+        if (ServersModel.isDefaultServerFromApi()) {
            PageController.showNotificationMessage(qsTr("Default server does not support split tunneling function"))
-            root.pageEnabled = false
-        } else {
-            root.pageEnabled = true
        }
    }

@@ -114,7 +106,7 @@ PageType {
                Layout.fillWidth: true
                Layout.rightMargin: 16

-                checked: SitesModel.isTunnelingEnabled
+                checked: SitesModel.isSplitTunnelingEnabled()
                onToggled: {                    
                    SitesModel.toggleSplitTunneling(checked)
                    selector.text = root.routeModesModel[getRouteModesModelIndex()].name
@@ -26,7 +26,7 @@ PageType {

        function onInstallContainerFinished(finishedMessage, isServiceInstall) {
            if (!ConnectionController.isConnected && !isServiceInstall) {
-                ServersModel.setDefaultContainer(ServersModel.processedIndex, ContainersModel.getCurrentlyProcessedContainerIndex())
+                ServersModel.setDefaultContainer(ServersModel.currentlyProcessedIndex, ContainersModel.getCurrentlyProcessedContainerIndex())
            }

            PageController.closePage() // close installing page
@@ -42,7 +42,7 @@ PageType {
        function onInstallServerFinished(finishedMessage) {
            if (!ConnectionController.isConnected) {
                ServersModel.setDefaultServerIndex(ServersModel.getServersCount() - 1);
-                ServersModel.processedIndex = ServersModel.defaultIndex
+                ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex
            }

            PageController.goToStartPage()
@@ -55,7 +55,7 @@ PageType {

        function onServerAlreadyExists(serverIndex) {
            PageController.goToStartPage()
-            ServersModel.processedIndex = serverIndex
+            ServersModel.currentlyProcessedIndex = serverIndex
            PageController.goToPage(PageEnum.PageSettingsServerInfo, false)

            PageController.showErrorMessage(qsTr("The server has already been added to the application"))
@@ -30,7 +30,7 @@ PageType {
        function onImportFinished() {
            if (!ConnectionController.isConnected) {
                ServersModel.setDefaultServerIndex(ServersModel.getServersCount() - 1);
-                ServersModel.processedIndex = ServersModel.defaultIndex
+                ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex
            }

            PageController.goToStartPage()
@@ -31,7 +31,7 @@ PageType {
        PageController.showBusyIndicator(true)
        ExportController.revokeConfig(index,
                                      ContainersModel.getCurrentlyProcessedContainerIndex(),
-                                      ServersModel.getProcessedServerCredentials())
+                                      ServersModel.getCurrentlyProcessedServerCredentials())
        PageController.showBusyIndicator(false)
        PageController.showNotificationMessage(qsTr("Config revoked"))
    }
@@ -230,7 +230,7 @@ PageType {
                            accessTypeSelector.currentIndex = 1
                            PageController.showBusyIndicator(true)
                            ExportController.updateClientManagementModel(ContainersModel.getCurrentlyProcessedContainerIndex(),
-                                                                         ServersModel.getProcessedServerCredentials())
+                                                                         ServersModel.getCurrentlyProcessedServerCredentials())
                            PageController.showBusyIndicator(false)
                        }
                    }
@@ -315,7 +315,7 @@ PageType {

                    function handler() {
                        serverSelector.text = selectedText
-                        ServersModel.processedIndex = proxyServersModel.mapToSource(currentIndex)
+                        ServersModel.currentlyProcessedIndex = proxyServersModel.mapToSource(currentIndex)
                    }
                }
            }
@@ -365,7 +365,7 @@ PageType {
                        target: serverSelector

                        function onSeverSelectorIndexChanged() {
-                            var defaultContainer = proxyContainersModel.mapFromSource(ServersModel.getProcessedServerData("defaultContainer"))
+                            var defaultContainer = proxyContainersModel.mapFromSource(ServersModel.getDefaultContainer(ServersModel.currentlyProcessedIndex))
                            protocolSelectorListView.currentIndex = defaultContainer
                            protocolSelectorListView.triggerCurrentItem()
                        }
@@ -388,7 +388,7 @@ PageType {
                        if (accessTypeSelector.currentIndex === 1) {
                            PageController.showBusyIndicator(true)
                            ExportController.updateClientManagementModel(ContainersModel.getCurrentlyProcessedContainerIndex(),
-                                                                         ServersModel.getProcessedServerCredentials())
+                                                                         ServersModel.getCurrentlyProcessedServerCredentials())
                            PageController.showBusyIndicator(false)
                        }
                    }
@@ -654,7 +654,7 @@ PageType {
                                                        ExportController.renameClient(index,
                                                                                      clientNameEditor.textFieldText,
                                                                                      ContainersModel.getCurrentlyProcessedContainerIndex(),
-                                                                                      ServersModel.getProcessedServerCredentials())
+                                                                                      ServersModel.getCurrentlyProcessedServerCredentials())
                                                        PageController.showBusyIndicator(false)
                                                        clientNameEditDrawer.close()
                                                    }
@@ -111,7 +111,7 @@ PageType {

                    function handler() {
                        serverSelector.text = selectedText
-                        ServersModel.processedIndex = proxyServersModel.mapToSource(currentIndex)
+                        ServersModel.currentlyProcessedIndex = proxyServersModel.mapToSource(currentIndex)
                    }
                }
            }
@@ -44,7 +44,6 @@ PageType {

        function onClosePage() {
            tabBar.isServerInfoShow = tabBarStackView.currentItem.objectName !== PageController.getPagePath(PageEnum.PageSettingsServerInfo)
-                                        && tabBarStackView.currentItem.objectName !== PageController.getPagePath(PageEnum.PageSettingsSplitTunneling)

            if (tabBarStackView.depth <= 1) {
                return
@@ -61,7 +60,7 @@ PageType {
                tabBarStackView.push(pagePath, { "objectName" : pagePath }, StackView.Immediate)
            }
            
-            tabBar.isServerInfoShow = page === PageEnum.PageSettingsServerInfo || PageEnum.PageSettingsSplitTunneling || tabBar.isServerInfoShow
+            tabBar.isServerInfoShow = page === PageEnum.PageSettingsServerInfo || tabBar.isServerInfoShow
        }

        function onGoToStartPage() {
@@ -109,7 +108,7 @@ PageType {
        function onNoInstalledContainers() {
            PageController.setTriggeredBtConnectButton(true)

-            ServersModel.processedIndex = ServersModel.getDefaultServerIndex()
+            ServersModel.currentlyProcessedIndex = ServersModel.getDefaultServerIndex()
            InstallController.setShouldCreateServer(false)
            PageController.goToPage(PageEnum.PageSetupWizardEasy)
        }
@@ -137,7 +136,7 @@ PageType {

        Component.onCompleted: {
            var pagePath = PageController.getPagePath(PageEnum.PageHome)
-            ServersModel.processedIndex = ServersModel.defaultIndex
+            ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex
            tabBarStackView.push(pagePath, { "objectName" : pagePath })
        }
    }
@@ -181,7 +180,7 @@ PageType {
            image: "qrc:/images/controls/home.svg"
            onClicked: {
                tabBarStackView.goToTabBarPage(PageEnum.PageHome)
-                ServersModel.processedIndex = ServersModel.defaultIndex
+                ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex
                tabBar.previousIndex = 0
            }
        }