Added Accessible for main menu tabs and some PageSettings items

.gitmodules

@@ -1,3 +1,6 @@
+[submodule "client/3rd/wireguard-apple"]
+	path = client/3rd/wireguard-apple
+	url = https://github.com/WireGuard/wireguard-apple
 [submodule "client/3rd/OpenVPNAdapter"]
 	path = client/3rd/OpenVPNAdapter
 	url = https://github.com/amnezia-vpn/OpenVPNAdapter.git
@@ -22,6 +25,3 @@
 [submodule "client/3rd-prebuilt"]
 	path = client/3rd-prebuilt
 	url = https://github.com/amnezia-vpn/3rd-prebuilt
-[submodule "client/3rd/awg-apple"]
-	path = client/3rd/awg-apple
-	url = https://github.com/amnezia-vpn/awg-apple

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 
-project(${PROJECT} VERSION 4.0.8.5
+project(${PROJECT} VERSION 4.0.7.1
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )

client/CMakeLists.txt

@@ -50,30 +50,12 @@ endif()
 
 qt6_add_resources(QRC ${QRC} ${CMAKE_CURRENT_LIST_DIR}/resources.qrc)
 
-# -- i18n begin
-set(CMAKE_AUTORCC ON)
-
-set(AMNEZIAVPN_TS_FILES
+qt6_add_translations(${PROJECT} TS_FILES
     ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_ru.ts
-    ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_zh_CN.ts
 )
 
-file(GLOB_RECURSE AMNEZIAVPN_TS_SOURCES *.qrc *.cpp *.h *.ui)
-
-qt_create_translation(AMNEZIAVPN_QM_FILES ${AMNEZIAVPN_TS_SOURCES} ${AMNEZIAVPN_TS_FILES})
-
-set(QM_FILE_LIST "")
-foreach(FILE ${AMNEZIAVPN_QM_FILES})
-    get_filename_component(QM_FILE_NAME ${FILE} NAME)
-    list(APPEND QM_FILE_LIST "<file>${QM_FILE_NAME}</file>")
-endforeach()
-string(REPLACE ";" "" QM_FILE_LIST ${QM_FILE_LIST})
-
-configure_file(${CMAKE_CURRENT_LIST_DIR}/translations/translations.qrc.in ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc)
-qt6_add_resources(QRC ${I18NQRC} ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc)
-# -- i18n end
-
 if(IOS)
+    #execute_process(COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/scripts/run-build-cloak.sh)
     execute_process(COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/ios/scripts/openvpn.sh args
         WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
 endif()
@@ -281,7 +263,6 @@ if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
         ${CMAKE_CURRENT_LIST_DIR}/protocols/openvpnovercloakprotocol.h
         ${CMAKE_CURRENT_LIST_DIR}/protocols/shadowsocksvpnprotocol.h
         ${CMAKE_CURRENT_LIST_DIR}/protocols/wireguardprotocol.h
-        ${CMAKE_CURRENT_LIST_DIR}/protocols/awgprotocol.h
     )
 
     set(SOURCES ${SOURCES}
@@ -292,7 +273,6 @@ if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
         ${CMAKE_CURRENT_LIST_DIR}/protocols/openvpnovercloakprotocol.cpp
         ${CMAKE_CURRENT_LIST_DIR}/protocols/shadowsocksvpnprotocol.cpp
         ${CMAKE_CURRENT_LIST_DIR}/protocols/wireguardprotocol.cpp
-        ${CMAKE_CURRENT_LIST_DIR}/protocols/awgprotocol.cpp
     )
 endif()
 
@@ -342,5 +322,5 @@ if(NOT IOS AND NOT ANDROID)
 
 endif()
 
-target_sources(${PROJECT} PRIVATE ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC} ${I18NQRC})
+target_sources(${PROJECT} PRIVATE ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC})
 qt_finalize_target(${PROJECT})

client/amnezia_application.cpp

@@ -87,7 +87,6 @@ void AmneziaApplication::init()
     m_vpnConnectionThread.start();
 
     initModels();
-    loadTranslator();
     initControllers();
 
 #ifdef Q_OS_ANDROID
@@ -139,8 +138,6 @@ void AmneziaApplication::init()
             &ConnectionController::openConnection);
     connect(m_notificationHandler.get(), &NotificationHandler::disconnectRequested, m_connectionController.get(),
             &ConnectionController::closeConnection);
-    connect(this, &AmneziaApplication::translationsUpdated, m_notificationHandler.get(),
-            &NotificationHandler::onTranslationsUpdated);
 
     m_engine->load(url);
     m_systemController->setQmlRoot(m_engine->rootObjects().value(0));
@@ -224,25 +221,33 @@ void AmneziaApplication::loadTranslator()
 {
     auto locale = m_settings->getAppLanguage();
     m_translator.reset(new QTranslator());
-    updateTranslator(locale);
+    if (locale != QLocale::English) {
+        if (m_translator->load(locale, QString("amneziavpn"), QLatin1String("_"), QLatin1String(":/i18n"))) {
+            if (QCoreApplication::installTranslator(m_translator.get())) {
+                m_settings->setAppLanguage(locale);
+            }
+        }
+    }
 }
 
 void AmneziaApplication::updateTranslator(const QLocale &locale)
 {
-    if (!m_translator->isEmpty()) {
+    QResource::registerResource(":/translations.qrc");
+    if (!m_translator->isEmpty())
         QCoreApplication::removeTranslator(m_translator.get());
+
+    if (locale == QLocale::English) {
+        m_settings->setAppLanguage(locale);
+        m_engine->retranslate();
     }
 
-    QString strFileName = QString(":/translations/amneziavpn") + QLatin1String("_") + locale.name() + ".qm";
-    if (m_translator->load(strFileName)) {
+    if (m_translator->load(locale, QString("amneziavpn"), QLatin1String("_"), QLatin1String(":/i18n"))) {
         if (QCoreApplication::installTranslator(m_translator.get())) {
             m_settings->setAppLanguage(locale);
         }
-    } else {
-        m_settings->setAppLanguage(QLocale::English);
-    }
 
-    m_engine->retranslate();
+        m_engine->retranslate();
+    }
 
     emit translationsUpdated();
 }
@@ -279,15 +284,11 @@ void AmneziaApplication::initModels()
 {
     m_containersModel.reset(new ContainersModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("ContainersModel", m_containersModel.get());
-    connect(m_vpnConnection.get(), &VpnConnection::newVpnConfigurationCreated, m_containersModel.get(),
-            &ContainersModel::updateContainersConfig);
 
     m_serversModel.reset(new ServersModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("ServersModel", m_serversModel.get());
     connect(m_serversModel.get(), &ServersModel::currentlyProcessedServerIndexChanged, m_containersModel.get(),
             &ContainersModel::setCurrentlyProcessedServerIndex);
-    connect(m_serversModel.get(), &ServersModel::defaultServerIndexChanged, m_containersModel.get(),
-            &ContainersModel::setCurrentlyProcessedServerIndex);
 
     m_languageModel.reset(new LanguageModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("LanguageModel", m_languageModel.get());
@@ -297,13 +298,11 @@ void AmneziaApplication::initModels()
     m_sitesModel.reset(new SitesModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("SitesModel", m_sitesModel.get());
     connect(m_containersModel.get(), &ContainersModel::defaultContainerChanged, this, [this]() {
-        if ((m_containersModel->getDefaultContainer() == DockerContainer::WireGuard
-             || m_containersModel->getDefaultContainer() == DockerContainer::Awg)
-            && m_sitesModel->isSplitTunnelingEnabled()) {
-            m_sitesModel->toggleSplitTunneling(false);
+        if (m_containersModel->getDefaultContainer() == DockerContainer::WireGuard
+            && m_sitesModel->getRouteMode() != Settings::RouteMode::VpnAllSites) {
+            m_sitesModel->setRouteMode(Settings::RouteMode::VpnAllSites);
             emit m_pageController->showNotificationMessage(
-                    tr("Split tunneling for %1 is not implemented, the option was disabled")
-                            .arg(ContainerProps::containerHumanNames().value(m_containersModel->getDefaultContainer())));
+                    tr("Split tunneling for WireGuard is not implemented, the option was disabled"));
         }
     });
 
@@ -319,11 +318,8 @@ void AmneziaApplication::initModels()
     m_cloakConfigModel.reset(new CloakConfigModel(this));
     m_engine->rootContext()->setContextProperty("CloakConfigModel", m_cloakConfigModel.get());
 
-    m_wireGuardConfigModel.reset(new WireGuardConfigModel(this));
-    m_engine->rootContext()->setContextProperty("WireGuardConfigModel", m_wireGuardConfigModel.get());
-
-    m_awgConfigModel.reset(new AwgConfigModel(this));
-    m_engine->rootContext()->setContextProperty("AwgConfigModel", m_awgConfigModel.get());
+    m_wireguardConfigModel.reset(new WireGuardConfigModel(this));
+    m_engine->rootContext()->setContextProperty("WireGuardConfigModel", m_wireguardConfigModel.get());
 
 #ifdef Q_OS_WINDOWS
     m_ikev2ConfigModel.reset(new Ikev2ConfigModel(this));
@@ -339,9 +335,6 @@ void AmneziaApplication::initControllers()
     m_connectionController.reset(new ConnectionController(m_serversModel, m_containersModel, m_vpnConnection));
     m_engine->rootContext()->setContextProperty("ConnectionController", m_connectionController.get());
 
-    connect(this, &AmneziaApplication::translationsUpdated, m_connectionController.get(),
-            &ConnectionController::onTranslationsUpdated);
-
     m_pageController.reset(new PageController(m_serversModel, m_settings));
     m_engine->rootContext()->setContextProperty("PageController", m_pageController.get());
 

client/amnezia_application.h

@@ -31,7 +31,6 @@
 #ifdef Q_OS_WINDOWS
     #include "ui/models/protocols/ikev2ConfigModel.h"
 #endif
-#include "ui/models/protocols/awgConfigModel.h"
 #include "ui/models/protocols/openvpnConfigModel.h"
 #include "ui/models/protocols/shadowsocksConfigModel.h"
 #include "ui/models/protocols/wireguardConfigModel.h"
@@ -98,8 +97,7 @@ private:
     QScopedPointer<OpenVpnConfigModel> m_openVpnConfigModel;
     QScopedPointer<ShadowSocksConfigModel> m_shadowSocksConfigModel;
     QScopedPointer<CloakConfigModel> m_cloakConfigModel;
-    QScopedPointer<WireGuardConfigModel> m_wireGuardConfigModel;
-    QScopedPointer<AwgConfigModel> m_awgConfigModel;
+    QScopedPointer<WireGuardConfigModel> m_wireguardConfigModel;
 #ifdef Q_OS_WINDOWS
     QScopedPointer<Ikev2ConfigModel> m_ikev2ConfigModel;
 #endif

client/android/AndroidManifest.xml

@@ -45,7 +45,6 @@
             android:label="-- %%INSERT_APP_NAME%% --"
             android:screenOrientation="unspecified"
             android:launchMode="singleInstance"
-            android:windowSoftInputMode="adjustResize"
             android:exported="true">
     
 <!--            android:theme="@style/splashScreenTheme"-->

client/android/build.gradle

@@ -138,8 +138,8 @@ android {
         resConfig "en"
         minSdkVersion = 24
         targetSdkVersion = 34
-        versionCode 37 // Change to a higher number
-        versionName "4.0.8" // Change to a higher number
+        versionCode 32 // Change to a higher number
+        versionName "3.0.9" // Change to a higher number
 
         javaCompileOptions.annotationProcessorOptions.arguments = [
             "room.schemaLocation": "${qtAndroidDir}/schemas".toString()

client/android/src/com/wireguard/config/BadConfigException.java

@@ -70,15 +70,6 @@ public class BadConfigException extends Exception {
     EXCLUDED_APPLICATIONS("ExcludedApplications"),
     INCLUDED_APPLICATIONS("IncludedApplications"),
     LISTEN_PORT("ListenPort"),
-    JC("Jc"),
-    JMIN("Jmin"),
-    JMAX("Jmax"),
-    S1("S1"),
-    S2("S2"),
-    H1("H1"),
-    H2("H2"),
-    H3("H3"),
-    H4("H4"),
     MTU("MTU"),
     PERSISTENT_KEEPALIVE("PersistentKeepalive"),
     PRE_SHARED_KEY("PresharedKey"),

client/android/src/com/wireguard/config/Interface.java

@@ -44,15 +44,6 @@ public final class Interface {
   private final KeyPair keyPair;
   private final Optional<Integer> listenPort;
   private final Optional<Integer> mtu;
-  private final Optional<Integer> jc;
-  private final Optional<Integer> jmin;
-  private final Optional<Integer> jmax;
-  private final Optional<Integer> s1;
-  private final Optional<Integer> s2;
-  private final Optional<Long> h1;
-  private final Optional<Long> h2;
-  private final Optional<Long> h3;
-  private final Optional<Long> h4;
 
   private Interface(final Builder builder) {
     // Defensively copy to ensure immutability even if the Builder is reused.
@@ -65,15 +56,6 @@ public final class Interface {
     keyPair = Objects.requireNonNull(builder.keyPair, "Interfaces must have a private key");
     listenPort = builder.listenPort;
     mtu = builder.mtu;
-    jc = builder.jc;
-    jmax = builder.jmax;
-    jmin = builder.jmin;
-    s1 = builder.s1;
-    s2 = builder.s2;
-    h1 = builder.h1;
-    h2 = builder.h2;
-    h3 = builder.h3;
-    h4 = builder.h4;
   }
 
   /**
@@ -113,33 +95,6 @@ public final class Interface {
         case "privatekey":
           builder.parsePrivateKey(attribute.getValue());
           break;
-        case "jc":
-          builder.parseJc(attribute.getValue());
-          break;
-        case "jmin":
-          builder.parseJmin(attribute.getValue());
-          break;
-        case "jmax":
-          builder.parseJmax(attribute.getValue());
-          break;
-        case "s1":
-          builder.parseS1(attribute.getValue());
-          break;                   
-        case "s2":
-          builder.parseS2(attribute.getValue());
-          break;
-        case "h1":
-          builder.parseH1(attribute.getValue());
-          break;          
-        case "h2":
-          builder.parseH2(attribute.getValue());
-          break;
-        case "h3":
-          builder.parseH3(attribute.getValue());
-          break; 
-        case "h4":
-          builder.parseH4(attribute.getValue());
-          break;                          
         default:
           throw new BadConfigException(
               Section.INTERFACE, Location.TOP_LEVEL, Reason.UNKNOWN_ATTRIBUTE, attribute.getKey());
@@ -156,9 +111,7 @@ public final class Interface {
     return addresses.equals(other.addresses) && dnsServers.equals(other.dnsServers)
         && excludedApplications.equals(other.excludedApplications)
         && includedApplications.equals(other.includedApplications) && keyPair.equals(other.keyPair)
-        && listenPort.equals(other.listenPort) && mtu.equals(other.mtu) && jc.equals(other.jc) && jmin.equals(other.jmin)
-        && jmax.equals(other.jmax) && s1.equals(other.s1) && s2.equals(other.s2) && h1.equals(other.h1) && h2.equals(other.h2)
-        && h3.equals(other.h3) && h4.equals(other.h4);
+        && listenPort.equals(other.listenPort) && mtu.equals(other.mtu);
   }
 
   /**
@@ -227,42 +180,6 @@ public final class Interface {
   public Optional<Integer> getMtu() {
     return mtu;
   }
-  
-  public Optional<Integer> getJc() {
-    return jc;
-  }
-  
-  public Optional<Integer> getJmin() {
-    return jmin;
-  }
-
-  public Optional<Integer> getJmax() {
-    return jmax;
-  }
-
-  public Optional<Integer> getS1() {
-    return s1;
-  }
-
-  public Optional<Integer> getS2() {
-    return s2;
-  }
-
-  public Optional<Long> getH1() {
-    return h1;
-  }
-
-  public Optional<Long> getH2() {
-    return h2;
-  }
-
-  public Optional<Long> getH3() {
-    return h3;
-  }
-
-  public Optional<Long> getH4() {
-    return h4;
-  }
 
   @Override
   public int hashCode() {
@@ -274,15 +191,6 @@ public final class Interface {
     hash = 31 * hash + keyPair.hashCode();
     hash = 31 * hash + listenPort.hashCode();
     hash = 31 * hash + mtu.hashCode();
-    hash = 31 * hash + jc.hashCode();
-    hash = 31 * hash + jmin.hashCode();
-    hash = 31 * hash + jmax.hashCode();
-    hash = 31 * hash + s1.hashCode();
-    hash = 31 * hash + s2.hashCode();
-    hash = 31 * hash + h1.hashCode();
-    hash = 31 * hash + h2.hashCode();
-    hash = 31 * hash + h3.hashCode();
-    hash = 31 * hash + h4.hashCode();
     return hash;
   }
 
@@ -326,19 +234,6 @@ public final class Interface {
           .append('\n');
     listenPort.ifPresent(lp -> sb.append("ListenPort = ").append(lp).append('\n'));
     mtu.ifPresent(m -> sb.append("MTU = ").append(m).append('\n'));
-    
-    jc.ifPresent(t_jc -> sb.append("Jc = ").append(t_jc).append('\n'));
-    jmin.ifPresent(t_jmin -> sb.append("Jmin = ").append(t_jmin).append('\n'));
-    jmax.ifPresent(t_jmax -> sb.append("Jmax = ").append(t_jmax).append('\n'));
-
-    s1.ifPresent(t_s1 -> sb.append("S1 = ").append(t_s1).append('\n'));
-    s2.ifPresent(t_s2 -> sb.append("S2 = ").append(t_s2).append('\n'));
-
-    h1.ifPresent(t_h1 -> sb.append("H1 = ").append(t_h1).append('\n'));
-    h2.ifPresent(t_h2 -> sb.append("H2 = ").append(t_h2).append('\n'));
-    h3.ifPresent(t_h3 -> sb.append("H3 = ").append(t_h3).append('\n'));
-    h4.ifPresent(t_h4 -> sb.append("H4 = ").append(t_h4).append('\n'));
-    
     sb.append("PrivateKey = ").append(keyPair.getPrivateKey().toBase64()).append('\n');
     return sb.toString();
   }
@@ -353,18 +248,6 @@ public final class Interface {
     final StringBuilder sb = new StringBuilder();
     sb.append("private_key=").append(keyPair.getPrivateKey().toHex()).append('\n');
     listenPort.ifPresent(lp -> sb.append("listen_port=").append(lp).append('\n'));
-
-    jc.ifPresent(t_jc -> sb.append("jc=").append(t_jc).append('\n'));
-    jmin.ifPresent(t_jmin -> sb.append("jmin=").append(t_jmin).append('\n'));
-    jmax.ifPresent(t_jmax -> sb.append("jmax=").append(t_jmax).append('\n'));
-    
-    s1.ifPresent(t_s1 -> sb.append("s1=").append(t_s1).append('\n'));
-    s2.ifPresent(t_s2 -> sb.append("s2=").append(t_s2).append('\n'));
-    
-    h1.ifPresent(t_h1 -> sb.append("h1=").append(t_h1).append('\n'));
-    h2.ifPresent(t_h2 -> sb.append("h2=").append(t_h2).append('\n'));
-    h3.ifPresent(t_h3 -> sb.append("h3=").append(t_h3).append('\n'));
-    h4.ifPresent(t_h4 -> sb.append("h4=").append(t_h4).append('\n'));    
     return sb.toString();
   }
 
@@ -384,17 +267,6 @@ public final class Interface {
     private Optional<Integer> listenPort = Optional.empty();
     // Defaults to not present.
     private Optional<Integer> mtu = Optional.empty();
-    private Optional<Integer> jc = Optional.empty();
-    private Optional<Integer> jmin = Optional.empty();
-    private Optional<Integer> jmax = Optional.empty();
-    
-    private Optional<Integer> s1 = Optional.empty();
-    private Optional<Integer> s2 = Optional.empty();
-    
-    private Optional<Long> h1 = Optional.empty();
-    private Optional<Long> h2 = Optional.empty();
-    private Optional<Long> h3 = Optional.empty();
-    private Optional<Long> h4 = Optional.empty();
 
     public Builder addAddress(final InetNetwork address) {
       addresses.add(address);
@@ -490,78 +362,6 @@ public final class Interface {
       }
     }
 
-    public Builder parseJc(final String jc) throws BadConfigException {
-      try {
-        return setJc(Integer.parseInt(jc));
-      } catch (final NumberFormatException e) {
-        throw new BadConfigException(Section.INTERFACE, Location.JC, jc, e);
-      }
-    }
-    
-    public Builder parseJmax(final String jmax) throws BadConfigException {
-      try {
-        return setJmax(Integer.parseInt(jmax));
-      } catch (final NumberFormatException e) {
-        throw new BadConfigException(Section.INTERFACE, Location.JMAX, jmax, e);
-      }
-    }
-
-    public Builder parseJmin(final String jmin) throws BadConfigException {
-      try {
-        return setJmin(Integer.parseInt(jmin));
-      } catch (final NumberFormatException e) {
-        throw new BadConfigException(Section.INTERFACE, Location.JMIN, jmin, e);
-      }
-    }    
-
-    public Builder parseS1(final String s1) throws BadConfigException {
-      try {
-        return setS1(Integer.parseInt(s1));
-      } catch (final NumberFormatException e) {
-        throw new BadConfigException(Section.INTERFACE, Location.S1, s1, e);
-      }
-    } 
-
-    public Builder parseS2(final String s2) throws BadConfigException {
-      try {
-        return setS2(Integer.parseInt(s2));
-      } catch (final NumberFormatException e) {
-        throw new BadConfigException(Section.INTERFACE, Location.S2, s2, e);
-      }
-    } 
-
-    public Builder parseH1(final String h1) throws BadConfigException {
-      try {
-        return setH1(Long.parseLong(h1));
-      } catch (final NumberFormatException e) {
-        throw new BadConfigException(Section.INTERFACE, Location.H1, h1, e);
-      }
-    } 
-
-    public Builder parseH2(final String h2) throws BadConfigException {
-      try {
-        return setH2(Long.parseLong(h2));
-      } catch (final NumberFormatException e) {
-        throw new BadConfigException(Section.INTERFACE, Location.H2, h2, e);
-      }
-    } 
-
-    public Builder parseH3(final String h3) throws BadConfigException {
-      try {
-        return setH3(Long.parseLong(h3));
-      } catch (final NumberFormatException e) {
-        throw new BadConfigException(Section.INTERFACE, Location.H3, h3, e);
-      }
-    } 
-
-    public Builder parseH4(final String h4) throws BadConfigException {
-      try {
-        return setH4(Long.parseLong(h4));
-      } catch (final NumberFormatException e) {
-        throw new BadConfigException(Section.INTERFACE, Location.H4, h4, e);
-      }
-    } 
-
     public Builder parsePrivateKey(final String privateKey) throws BadConfigException {
       try {
         return setKeyPair(new KeyPair(Key.fromBase64(privateKey)));
@@ -586,81 +386,9 @@ public final class Interface {
     public Builder setMtu(final int mtu) throws BadConfigException {
       if (mtu < 0)
         throw new BadConfigException(
-            Section.INTERFACE, Location.MTU, Reason.INVALID_VALUE, String.valueOf(mtu));
+            Section.INTERFACE, Location.LISTEN_PORT, Reason.INVALID_VALUE, String.valueOf(mtu));
       this.mtu = mtu == 0 ? Optional.empty() : Optional.of(mtu);
       return this;
     }
-    
-    public Builder setJc(final int jc) throws BadConfigException {
-      if (jc < 0)
-        throw new BadConfigException(
-            Section.INTERFACE, Location.JC, Reason.INVALID_VALUE, String.valueOf(jc));
-      this.jc = Optional.of(jc);
-      return this;
-    }      
-    
-    public Builder setJmin(final int jmin) throws BadConfigException {
-      if (jmin < 0)
-        throw new BadConfigException(
-            Section.INTERFACE, Location.JMIN, Reason.INVALID_VALUE, String.valueOf(jmin));
-      this.jmin = Optional.of(jmin);
-      return this;
-    }
-
-    public Builder setJmax(final int jmax) throws BadConfigException {
-      if (jmax < 0)
-        throw new BadConfigException(
-            Section.INTERFACE, Location.JMAX, Reason.INVALID_VALUE, String.valueOf(jmax));
-      this.jmax = Optional.of(jmax);
-      return this;
-    }
-
-    public Builder setS1(final int s1) throws BadConfigException {
-      if (s1 < 0)
-        throw new BadConfigException(
-            Section.INTERFACE, Location.S1, Reason.INVALID_VALUE, String.valueOf(s1));
-      this.s1 = Optional.of(s1);
-      return this;
-    }
-
-    public Builder setS2(final int s2) throws BadConfigException {
-      if (s2 < 0)
-        throw new BadConfigException(
-            Section.INTERFACE, Location.S2, Reason.INVALID_VALUE, String.valueOf(s2));
-      this.s2 = Optional.of(s2);
-      return this;
-    }
-
-    public Builder setH1(final long h1) throws BadConfigException {
-      if (h1 < 0)
-        throw new BadConfigException(
-            Section.INTERFACE, Location.H1, Reason.INVALID_VALUE, String.valueOf(h1));
-      this.h1 = Optional.of(h1);
-      return this;
-    }
-
-    public Builder setH2(final long h2) throws BadConfigException {
-      if (h2 < 0)
-        throw new BadConfigException(
-            Section.INTERFACE, Location.H2, Reason.INVALID_VALUE, String.valueOf(h2));
-      this.h2 = Optional.of(h2);
-      return this;
-    }
-
-    public Builder setH3(final long h3) throws BadConfigException {
-      if (h3 < 0)
-        throw new BadConfigException(
-            Section.INTERFACE, Location.H3, Reason.INVALID_VALUE, String.valueOf(h3));
-      this.h3 = Optional.of(h3);
-      return this;
-    }
-
-    public Builder setH4(final long h4) throws BadConfigException {
-      if (h4 < 0)
-        throw new BadConfigException(
-            Section.INTERFACE, Location.H4, Reason.INVALID_VALUE, String.valueOf(h4));
-      this.h4 = Optional.of(h4);
-      return this;
-    }
   }
-}    
+}

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

@@ -380,10 +380,7 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
                 mNetworkState.bindNetworkListener()
             }
             "wireguard" -> {
-                startWireGuard("wireguard")
-            }
-            "awg" -> {
-                startWireGuard("awg")
+                startWireGuard()
             }
             "shadowsocks" -> {
                 startShadowsocks()
@@ -460,8 +457,7 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
     fun turnOff() {
         Log.v(tag, "Aman: turnOff....................")
         when (mProtocol) {
-            "wireguard",
-            "awg" -> {
+            "wireguard" -> {
                 GoBackend.wgTurnOff(currentTunnelHandle)
             }
             "cloak",
@@ -563,14 +559,14 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
         }
         return parseData
     }
-    
+
     /**
      * Create a Wireguard [Config]  from a [json] string -
      * The [json] will be created in AndroidVpnProtocol.cpp
      */
-    private fun buildWireguardConfig(obj: JSONObject, type: String): Config {
+    private fun buildWireguardConfig(obj: JSONObject): Config {
         val confBuilder = Config.Builder()
-        val wireguardConfigData = obj.getJSONObject(type)
+        val wireguardConfigData = obj.getJSONObject("wireguard_config_data")
         val config = parseConfigData(wireguardConfigData.getString("config"))
         val peerBuilder = Peer.Builder()
         val peerConfig = config["Peer"]!!
@@ -603,30 +599,6 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
         ifaceConfig["DNS"]!!.split(",").forEach {
             ifaceBuilder.addDnsServer(InetNetwork.parse(it.trim()).address)
         }
-        
-        ifaceBuilder.parsePrivateKey(ifaceConfig["PrivateKey"])
-        if (type == "awg_config_data") {
-            ifaceBuilder.parseJc(ifaceConfig["Jc"])
-            ifaceBuilder.parseJmin(ifaceConfig["Jmin"])
-            ifaceBuilder.parseJmax(ifaceConfig["Jmax"])
-            ifaceBuilder.parseS1(ifaceConfig["S1"])
-            ifaceBuilder.parseS2(ifaceConfig["S2"])
-            ifaceBuilder.parseH1(ifaceConfig["H1"])
-            ifaceBuilder.parseH2(ifaceConfig["H2"])
-            ifaceBuilder.parseH3(ifaceConfig["H3"])
-            ifaceBuilder.parseH4(ifaceConfig["H4"])
-        } else {
-            ifaceBuilder.parseJc("0")
-            ifaceBuilder.parseJmin("0")
-            ifaceBuilder.parseJmax("0")
-            ifaceBuilder.parseS1("0")
-            ifaceBuilder.parseS2("0")
-            ifaceBuilder.parseH1("0")
-            ifaceBuilder.parseH2("0")
-            ifaceBuilder.parseH3("0")
-            ifaceBuilder.parseH4("0")           
-        
-        }
         /*val jExcludedApplication = obj.getJSONArray("excludedApps")
     (0 until jExcludedApplication.length()).toList().forEach {
         val appName = jExcludedApplication.get(it).toString()
@@ -744,8 +716,8 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
         }).start()
     }
 
-    private fun startWireGuard(type: String) {
-        val wireguard_conf = buildWireguardConfig(mConfig!!, type + "_config_data")
+    private fun startWireGuard() {
+        val wireguard_conf = buildWireguardConfig(mConfig!!)
         Log.i(tag, "startWireGuard: wireguard_conf : $wireguard_conf")
         if (currentTunnelHandle != -1) {
             Log.e(tag, "Tunnel already up")
@@ -756,15 +728,9 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
         val builder = Builder()
         setupBuilder(wireguard_conf, builder)
         builder.setSession("Amnezia")
-        
-        
         builder.establish().use { tun ->
-        if (tun == null) return
-            if (type == "awg"){
-      	        currentTunnelHandle = GoBackend.wgTurnOn("awg0", tun.detachFd(), wgConfig)
-            } else {
-                currentTunnelHandle = GoBackend.wgTurnOn("amn0", tun.detachFd(), wgConfig)
-            }
+            if (tun == null) return
+            currentTunnelHandle = GoBackend.wgTurnOn("Amnezia", tun.detachFd(), wgConfig)
         }
         if (currentTunnelHandle < 0) {
             Log.e(tag, "Activation Error Code -> $currentTunnelHandle")

client/cmake/ios.cmake

@@ -97,7 +97,7 @@ target_compile_options(${PROJECT} PRIVATE
     -DVPN_NE_BUNDLEID=\"${BUILD_IOS_APP_IDENTIFIER}.network-extension\"
 )
 
-set(WG_APPLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rd/awg-apple/Sources)
+set(WG_APPLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rd/wireguard-apple/Sources)
 
 target_sources(${PROJECT} PRIVATE
 #    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/iosvpnprotocol.swift

client/configurators/awg_configurator.cpp

@@ -1,47 +0,0 @@
-#include "awg_configurator.h"
-
-#include <QJsonDocument>
-#include <QJsonObject>
-
-#include "core/servercontroller.h"
-
-AwgConfigurator::AwgConfigurator(std::shared_ptr<Settings> settings, QObject *parent)
-    : WireguardConfigurator(settings, true, parent)
-{
-}
-
-QString AwgConfigurator::genAwgConfig(const ServerCredentials &credentials,
-                                                                DockerContainer container,
-                                                                const QJsonObject &containerConfig, ErrorCode *errorCode)
-{
-    QString config = WireguardConfigurator::genWireguardConfig(credentials, container, containerConfig, errorCode);
-
-    QJsonObject jsonConfig = QJsonDocument::fromJson(config.toUtf8()).object();
-    QString awgConfig = jsonConfig.value(config_key::config).toString();
-
-    QMap<QString, QString> configMap;
-    auto configLines = awgConfig.split("\n");
-    for (auto &line : configLines) {
-        auto trimmedLine = line.trimmed();
-        if (trimmedLine.startsWith("[") && trimmedLine.endsWith("]")) {
-            continue;
-        } else {
-            QStringList parts = trimmedLine.split(" = ");
-            if (parts.count() == 2) {
-                configMap.insert(parts[0].trimmed(), parts[1].trimmed());
-            }
-        }
-    }
-
-    jsonConfig[config_key::junkPacketCount] = configMap.value(config_key::junkPacketCount);
-    jsonConfig[config_key::junkPacketMinSize] = configMap.value(config_key::junkPacketMinSize);
-    jsonConfig[config_key::junkPacketMaxSize] = configMap.value(config_key::junkPacketMaxSize);
-    jsonConfig[config_key::initPacketJunkSize] = configMap.value(config_key::initPacketJunkSize);
-    jsonConfig[config_key::responsePacketJunkSize] = configMap.value(config_key::responsePacketJunkSize);
-    jsonConfig[config_key::initPacketMagicHeader] = configMap.value(config_key::initPacketMagicHeader);
-    jsonConfig[config_key::responsePacketMagicHeader] = configMap.value(config_key::responsePacketMagicHeader);
-    jsonConfig[config_key::underloadPacketMagicHeader] = configMap.value(config_key::underloadPacketMagicHeader);
-    jsonConfig[config_key::transportPacketMagicHeader] = configMap.value(config_key::transportPacketMagicHeader);
-
-    return QJsonDocument(jsonConfig).toJson();
-}

client/configurators/awg_configurator.h

@@ -1,18 +0,0 @@
-#ifndef AWGCONFIGURATOR_H
-#define AWGCONFIGURATOR_H
-
-#include <QObject>
-
-#include "wireguard_configurator.h"
-
-class AwgConfigurator : public WireguardConfigurator
-{
-    Q_OBJECT
-public:
-    AwgConfigurator(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
-
-    QString genAwgConfig(const ServerCredentials &credentials, DockerContainer container,
-                                      const QJsonObject &containerConfig, ErrorCode *errorCode = nullptr);
-};
-
-#endif // AWGCONFIGURATOR_H

client/configurators/vpn_configurator.cpp

@@ -1,34 +1,32 @@
 #include "vpn_configurator.h"
-#include "cloak_configurator.h"
-#include "ikev2_configurator.h"
 #include "openvpn_configurator.h"
+#include "cloak_configurator.h"
 #include "shadowsocks_configurator.h"
-#include "ssh_configurator.h"
 #include "wireguard_configurator.h"
-#include "awg_configurator.h"
+#include "ikev2_configurator.h"
+#include "ssh_configurator.h"
 
 #include <QFile>
-#include <QJsonDocument>
 #include <QJsonObject>
+#include <QJsonDocument>
 
 #include "containers/containers_defs.h"
-#include "settings.h"
 #include "utilities.h"
+#include "settings.h"
 
-VpnConfigurator::VpnConfigurator(std::shared_ptr<Settings> settings, QObject *parent)
-    : ConfiguratorBase(settings, parent)
+VpnConfigurator::VpnConfigurator(std::shared_ptr<Settings> settings, QObject *parent):
+    ConfiguratorBase(settings, parent)
 {
     openVpnConfigurator = std::shared_ptr<OpenVpnConfigurator>(new OpenVpnConfigurator(settings, this));
     shadowSocksConfigurator = std::shared_ptr<ShadowSocksConfigurator>(new ShadowSocksConfigurator(settings, this));
     cloakConfigurator = std::shared_ptr<CloakConfigurator>(new CloakConfigurator(settings, this));
-    wireguardConfigurator = std::shared_ptr<WireguardConfigurator>(new WireguardConfigurator(settings, false, this));
+    wireguardConfigurator = std::shared_ptr<WireguardConfigurator>(new WireguardConfigurator(settings, this));
     ikev2Configurator = std::shared_ptr<Ikev2Configurator>(new Ikev2Configurator(settings, this));
     sshConfigurator = std::shared_ptr<SshConfigurator>(new SshConfigurator(settings, this));
-    awgConfigurator = std::shared_ptr<AwgConfigurator>(new AwgConfigurator(settings, this));
 }
 
-QString VpnConfigurator::genVpnProtocolConfig(const ServerCredentials &credentials, DockerContainer container,
-                                              const QJsonObject &containerConfig, Proto proto, ErrorCode *errorCode)
+QString VpnConfigurator::genVpnProtocolConfig(const ServerCredentials &credentials,
+    DockerContainer container, const QJsonObject &containerConfig, Proto proto, ErrorCode *errorCode)
 {
     switch (proto) {
     case Proto::OpenVpn:
@@ -37,17 +35,17 @@ QString VpnConfigurator::genVpnProtocolConfig(const ServerCredentials &credentia
     case Proto::ShadowSocks:
         return shadowSocksConfigurator->genShadowSocksConfig(credentials, container, containerConfig, errorCode);
 
-    case Proto::Cloak: return cloakConfigurator->genCloakConfig(credentials, container, containerConfig, errorCode);
+    case Proto::Cloak:
+        return cloakConfigurator->genCloakConfig(credentials, container, containerConfig, errorCode);
 
     case Proto::WireGuard:
         return wireguardConfigurator->genWireguardConfig(credentials, container, containerConfig, errorCode);
 
-    case Proto::Awg:
-        return awgConfigurator->genAwgConfig(credentials, container, containerConfig, errorCode);
+    case Proto::Ikev2:
+        return ikev2Configurator->genIkev2Config(credentials, container, containerConfig, errorCode);
 
-    case Proto::Ikev2: return ikev2Configurator->genIkev2Config(credentials, container, containerConfig, errorCode);
-
-    default: return "";
+    default:
+        return "";
     }
 }
 
@@ -64,8 +62,8 @@ QPair<QString, QString> VpnConfigurator::getDnsForConfig(int serverIndex)
     if (dns.first.isEmpty() || !Utils::checkIPv4Format(dns.first)) {
         if (useAmneziaDns && m_settings->containers(serverIndex).contains(DockerContainer::Dns)) {
             dns.first = protocols::dns::amneziaDnsIp;
-        } else
-            dns.first = m_settings->primaryDns();
+        }
+        else dns.first = m_settings->primaryDns();
     }
     if (dns.second.isEmpty() || !Utils::checkIPv4Format(dns.second)) {
         dns.second = m_settings->secondaryDns();
@@ -75,8 +73,8 @@ QPair<QString, QString> VpnConfigurator::getDnsForConfig(int serverIndex)
     return dns;
 }
 
-QString &VpnConfigurator::processConfigWithDnsSettings(int serverIndex, DockerContainer container, Proto proto,
-                                                       QString &config)
+QString &VpnConfigurator::processConfigWithDnsSettings(int serverIndex, DockerContainer container,
+    Proto proto, QString &config)
 {
     auto dns = getDnsForConfig(serverIndex);
 
@@ -86,8 +84,8 @@ QString &VpnConfigurator::processConfigWithDnsSettings(int serverIndex, DockerCo
     return config;
 }
 
-QString &VpnConfigurator::processConfigWithLocalSettings(int serverIndex, DockerContainer container, Proto proto,
-                                                         QString &config)
+QString &VpnConfigurator::processConfigWithLocalSettings(int serverIndex, DockerContainer container,
+    Proto proto, QString &config)
 {
     processConfigWithDnsSettings(serverIndex, container, proto, config);
 
@@ -97,8 +95,8 @@ QString &VpnConfigurator::processConfigWithLocalSettings(int serverIndex, Docker
     return config;
 }
 
-QString &VpnConfigurator::processConfigWithExportSettings(int serverIndex, DockerContainer container, Proto proto,
-                                                          QString &config)
+QString &VpnConfigurator::processConfigWithExportSettings(int serverIndex, DockerContainer container,
+    Proto proto, QString &config)
 {
     processConfigWithDnsSettings(serverIndex, container, proto, config);
 
@@ -109,7 +107,7 @@ QString &VpnConfigurator::processConfigWithExportSettings(int serverIndex, Docke
 }
 
 void VpnConfigurator::updateContainerConfigAfterInstallation(DockerContainer container, QJsonObject &containerConfig,
-                                                             const QString &stdOut)
+    const QString &stdOut)
 {
     Proto mainProto = ContainerProps::defaultProtocol(container);
 

client/configurators/vpn_configurator.h

@@ -13,14 +13,13 @@ class CloakConfigurator;
 class WireguardConfigurator;
 class Ikev2Configurator;
 class SshConfigurator;
-class AwgConfigurator;
 
 // Retrieve connection settings from server
 class VpnConfigurator : ConfiguratorBase
 {
     Q_OBJECT
 public:
-    explicit VpnConfigurator(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
+    VpnConfigurator(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
 
     QString genVpnProtocolConfig(const ServerCredentials &credentials, DockerContainer container,
         const QJsonObject &containerConfig, Proto proto, ErrorCode *errorCode = nullptr);
@@ -41,7 +40,6 @@ public:
     std::shared_ptr<WireguardConfigurator> wireguardConfigurator;
     std::shared_ptr<Ikev2Configurator> ikev2Configurator;
     std::shared_ptr<SshConfigurator> sshConfigurator;
-    std::shared_ptr<AwgConfigurator> awgConfigurator;
 };
 
 #endif // VPN_CONFIGURATOR_H

client/configurators/wireguard_configurator.cpp

@@ -19,20 +19,9 @@
 #include "settings.h"
 #include "utilities.h"
 
-WireguardConfigurator::WireguardConfigurator(std::shared_ptr<Settings> settings, bool isAwg, QObject *parent)
-    : ConfiguratorBase(settings, parent), m_isAwg(isAwg)
+WireguardConfigurator::WireguardConfigurator(std::shared_ptr<Settings> settings, QObject *parent)
+    : ConfiguratorBase(settings, parent)
 {
-    m_serverConfigPath = m_isAwg ? amnezia::protocols::awg::serverConfigPath
-                                              : amnezia::protocols::wireguard::serverConfigPath;
-    m_serverPublicKeyPath = m_isAwg ? amnezia::protocols::awg::serverPublicKeyPath
-                                                 : amnezia::protocols::wireguard::serverPublicKeyPath;
-    m_serverPskKeyPath = m_isAwg ? amnezia::protocols::awg::serverPskKeyPath
-                                              : amnezia::protocols::wireguard::serverPskKeyPath;
-    m_configTemplate = m_isAwg ? ProtocolScriptType::awg_template
-                                            : ProtocolScriptType::wireguard_template;
-
-    m_protocolName = m_isAwg ? config_key::awg : config_key::wireguard;
-    m_defaultPort = m_isAwg ? protocols::wireguard::defaultPort : protocols::awg::defaultPort;
 }
 
 WireguardConfigurator::ConnectionData WireguardConfigurator::genClientKeys()
@@ -73,7 +62,7 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
 {
     WireguardConfigurator::ConnectionData connData = WireguardConfigurator::genClientKeys();
     connData.host = credentials.hostName;
-    connData.port = containerConfig.value(m_protocolName).toObject().value(config_key::port).toString(m_defaultPort);
+    connData.port = containerConfig.value(config_key::port).toString(protocols::wireguard::defaultPort);
 
     if (connData.clientPrivKey.isEmpty() || connData.clientPubKey.isEmpty()) {
         if (errorCode)
@@ -87,7 +76,7 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
     // Get list of already created clients (only IP addresses)
     QString nextIpNumber;
     {
-        QString script = QString("cat %1 | grep AllowedIPs").arg(m_serverConfigPath);
+        QString script = QString("cat %1 | grep AllowedIPs").arg(amnezia::protocols::wireguard::serverConfigPath);
         QString stdOut;
         auto cbReadStdOut = [&](const QString &data, libssh::Client &) {
             stdOut += data + "\n";
@@ -134,7 +123,8 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
     }
 
     // Get keys
-    connData.serverPubKey = serverController.getTextFileFromContainer(container, credentials, m_serverPublicKeyPath, &e);
+    connData.serverPubKey = serverController.getTextFileFromContainer(
+            container, credentials, amnezia::protocols::wireguard::serverPublicKeyPath, &e);
     connData.serverPubKey.replace("\n", "");
     if (e) {
         if (errorCode)
@@ -142,7 +132,8 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
         return connData;
     }
 
-    connData.pskKey = serverController.getTextFileFromContainer(container, credentials, m_serverPskKeyPath, &e);
+    connData.pskKey = serverController.getTextFileFromContainer(container, credentials,
+                                                                amnezia::protocols::wireguard::serverPskKeyPath, &e);
     connData.pskKey.replace("\n", "");
 
     if (e) {
@@ -156,9 +147,12 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
                                  "PublicKey = %1\n"
                                  "PresharedKey = %2\n"
                                  "AllowedIPs = %3/32\n\n")
-                                 .arg(connData.clientPubKey, connData.pskKey, connData.clientIP);
+                                 .arg(connData.clientPubKey)
+                                 .arg(connData.pskKey)
+                                 .arg(connData.clientIP);
 
-    e = serverController.uploadTextFileToContainer(container, credentials, configPart, m_serverConfigPath,
+    e = serverController.uploadTextFileToContainer(container, credentials, configPart,
+                                                   protocols::wireguard::serverConfigPath,
                                                    libssh::SftpOverwriteMode::SftpAppendToExisting);
 
     if (e) {
@@ -167,11 +161,11 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
         return connData;
     }
 
-    QString script = QString("sudo docker exec -i $CONTAINER_NAME bash -c 'wg syncconf wg0 <(wg-quick strip %1)'")
-                             .arg(m_serverConfigPath);
-
     e = serverController.runScript(
-            credentials, serverController.replaceVars(script, serverController.genVarsForScript(credentials, container)));
+            credentials,
+            serverController.replaceVars("sudo docker exec -i $CONTAINER_NAME bash -c 'wg syncconf wg0 <(wg-quick "
+                                         "strip /opt/amnezia/wireguard/wg0.conf)'",
+                                         serverController.genVarsForScript(credentials, container)));
 
     return connData;
 }
@@ -180,9 +174,9 @@ QString WireguardConfigurator::genWireguardConfig(const ServerCredentials &crede
                                                   const QJsonObject &containerConfig, ErrorCode *errorCode)
 {
     ServerController serverController(m_settings);
-    QString scriptData = amnezia::scriptData(m_configTemplate, container);
-    QString config = serverController.replaceVars(
-            scriptData, serverController.genVarsForScript(credentials, container, containerConfig));
+    QString config =
+            serverController.replaceVars(amnezia::scriptData(ProtocolScriptType::wireguard_template, container),
+                                         serverController.genVarsForScript(credentials, container, containerConfig));
 
     ConnectionData connData = prepareWireguardConfig(credentials, container, containerConfig, errorCode);
     if (errorCode && *errorCode) {

client/configurators/wireguard_configurator.h

@@ -6,44 +6,35 @@
 
 #include "configurator_base.h"
 #include "core/defs.h"
-#include "core/scripts_registry.h"
 
-class WireguardConfigurator : public ConfiguratorBase
+class WireguardConfigurator : ConfiguratorBase
 {
     Q_OBJECT
 public:
-    WireguardConfigurator(std::shared_ptr<Settings> settings, bool isAwg, QObject *parent = nullptr);
+    WireguardConfigurator(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
 
-    struct ConnectionData
-    {
+    struct ConnectionData {
         QString clientPrivKey; // client private key
-        QString clientPubKey;  // client public key
-        QString clientIP;      // internal client IP address
-        QString serverPubKey;  // tls-auth key
-        QString pskKey;        // preshared key
-        QString host;          // host ip
+        QString clientPubKey; // client public key
+        QString clientIP; // internal client IP address
+        QString serverPubKey; // tls-auth key
+        QString pskKey; // preshared key
+        QString host; // host ip
         QString port;
     };
 
     QString genWireguardConfig(const ServerCredentials &credentials, DockerContainer container,
-                               const QJsonObject &containerConfig, ErrorCode *errorCode = nullptr);
+        const QJsonObject &containerConfig, ErrorCode *errorCode = nullptr);
 
     QString processConfigWithLocalSettings(QString config);
     QString processConfigWithExportSettings(QString config);
 
+
 private:
-    ConnectionData prepareWireguardConfig(const ServerCredentials &credentials, DockerContainer container,
-                                          const QJsonObject &containerConfig, ErrorCode *errorCode = nullptr);
+    ConnectionData prepareWireguardConfig(const ServerCredentials &credentials,
+        DockerContainer container, const QJsonObject &containerConfig, ErrorCode *errorCode = nullptr);
 
     ConnectionData genClientKeys();
-    
-    bool m_isAwg;
-    QString m_serverConfigPath;
-    QString m_serverPublicKeyPath;
-    QString m_serverPskKeyPath;
-    amnezia::ProtocolScriptType m_configTemplate;
-    QString m_protocolName;
-    QString m_defaultPort;
 };
 
 #endif // WIREGUARD_CONFIGURATOR_H

client/containers/containers_defs.cpp

@@ -84,11 +84,11 @@ QMap<DockerContainer, QString> ContainerProps::containerHumanNames()
              { DockerContainer::ShadowSocks, "ShadowSocks" },
              { DockerContainer::Cloak, "OpenVPN over Cloak" },
              { DockerContainer::WireGuard, "WireGuard" },
-             { DockerContainer::Awg, "AmneziaWG" },
              { DockerContainer::Ipsec, QObject::tr("IPsec") },
 
              { DockerContainer::TorWebSite, QObject::tr("Website in Tor network") },
              { DockerContainer::Dns, QObject::tr("Amnezia DNS") },
+             //{DockerContainer::FileShare, QObject::tr("SMB file sharing service")},
              { DockerContainer::Sftp, QObject::tr("Sftp file sharing service") } };
 }
 
@@ -107,10 +107,6 @@ QMap<DockerContainer, QString> ContainerProps::containerDescriptions()
              { DockerContainer::WireGuard,
                QObject::tr("WireGuard - New popular VPN protocol with high performance, high speed and low power "
                            "consumption. Recommended for regions with low levels of censorship.") },
-             { DockerContainer::Awg,
-               QObject::tr("AmneziaWG - Special protocol from Amnezia, based on WireGuard. It's fast like WireGuard, "
-                           "but very resistant to blockages. "
-                           "Recommended for regions with high levels of censorship.") },
              { DockerContainer::Ipsec,
                QObject::tr("IKEv2 -  Modern stable protocol, a bit faster than others, restores connection after "
                            "signal loss. It has native support on the latest versions of Android and iOS.") },
@@ -118,108 +114,42 @@ QMap<DockerContainer, QString> ContainerProps::containerDescriptions()
              { DockerContainer::TorWebSite, QObject::tr("Deploy a WordPress site on the Tor network in two clicks.") },
              { DockerContainer::Dns,
                QObject::tr("Replace the current DNS server with your own. This will increase your privacy level.") },
+             //{DockerContainer::FileShare, QObject::tr("SMB file sharing service - is Window file sharing protocol")},
              { DockerContainer::Sftp,
                QObject::tr("Creates a file vault on your server to securely store and transfer files.") } };
 }
 
 QMap<DockerContainer, QString> ContainerProps::containerDetailedDescriptions()
 {
-    return {
-        { DockerContainer::OpenVpn,
-          QObject::tr(
-                      "OpenVPN stands as one of the most popular and time-tested VPN protocols available.\n"
-                      "It employs its unique security protocol, "
-                      "leveraging the strength of SSL/TLS for encryption and key exchange. "
-                      "Furthermore, OpenVPN's support for a multitude of authentication methods makes it versatile and adaptable, "
-                      "catering to a wide range of devices and operating systems. "
-                      "Due to its open-source nature, OpenVPN benefits from extensive scrutiny by the global community, "
-                      "which continually reinforces its security. "
-                      "With a strong balance of performance, security, and compatibility, "
-                      "OpenVPN remains a top choice for privacy-conscious individuals and businesses alike.\n\n"
-                      "* Available in the AmneziaVPN across all platforms\n"
-                      "* Normal power consumption on mobile devices\n"
-                      "* Flexible customisation to suit user needs to work with different operating systems and devices\n"
-                      "* Recognised by DPI analysis systems and therefore susceptible to blocking\n"
-                      "* Can operate over both TCP and UDP network protocols.") },
-        { DockerContainer::ShadowSocks,
-          QObject::tr("Shadowsocks, inspired by the SOCKS5 protocol, safeguards the connection using the AEAD cipher. "
-                      "Although Shadowsocks is designed to be discreet and challenging to identify, it isn't identical to a standard HTTPS connection."
-                      "However, certain traffic analysis systems might still detect a Shadowsocks connection. "
-                      "Due to limited support in Amnezia, it's recommended to use AmneziaWG protocol.\n\n"
-                      "* Available in the AmneziaVPN only on desktop platforms\n"
-                      "* Normal power consumption on mobile devices\n\n"
-                      "* Configurable encryption protocol\n"
-                      "* Detectable by some DPI systems\n"
-                      "* Works over TCP network protocol.") },
-        { DockerContainer::Cloak,
-          QObject::tr("This is a combination of the OpenVPN protocol and the Cloak plugin designed specifically for "
-                      "blocking protection.\n\n"
-                      "OpenVPN provides a secure VPN connection by encrypting all Internet traffic between the client "
-                      "and the server.\n\n"
-                      "Cloak protects OpenVPN from detection and blocking. \n\n"
-                      "Cloak can modify packet metadata so that it completely masks VPN traffic as normal web traffic, "
-                      "and also protects the VPN from detection by Active Probing. This makes it very resistant to "
-                      "being detected\n\n"
-                      "Immediately after receiving the first data packet, Cloak authenticates the incoming connection. "
-                      "If authentication fails, the plugin masks the server as a fake website and your VPN becomes "
-                      "invisible to analysis systems.\n\n"
-                      "If there is a extreme level of Internet censorship in your region, we advise you to use only "
-                      "OpenVPN over Cloak from the first connection\n\n"
-                      "* Available in the AmneziaVPN across all platforms\n"
-                      "* High power consumption on mobile devices\n"
-                      "* Flexible settings\n"
-                      "* Not recognised by DPI analysis systems\n"
-                      "* Works over TCP network protocol, 443 port.\n") },
-        { DockerContainer::WireGuard,
-          QObject::tr("A relatively new popular VPN protocol with a simplified architecture.\n"
-                      "Provides stable VPN connection, high performance on all devices. Uses hard-coded encryption "
-                      "settings. WireGuard compared to OpenVPN has lower latency and better data transfer throughput.\n"
-                      "WireGuard is very susceptible to blocking due to its distinct packet signatures. "
-                      "Unlike some other VPN protocols that employ obfuscation techniques, "
-                      "the consistent signature patterns of WireGuard packets can be more easily identified and "
-                      "thus blocked by advanced Deep Packet Inspection (DPI) systems and other network monitoring tools.\n\n"
-                      "* Available in the AmneziaVPN across all platforms\n"
-                      "* Low power consumption\n"
-                      "* Minimum number of settings\n"
-                      "* Easily recognised by DPI analysis systems, susceptible to blocking\n"
-                      "* Works over UDP network protocol.") },
-        { DockerContainer::Awg,
-          QObject::tr("A modern iteration of the popular VPN protocol, "
-                      "AmneziaWG builds upon the foundation set by WireGuard, "
-                      "retaining its simplified architecture and high-performance capabilities across devices.\n"
-                      "While WireGuard is known for its efficiency, "
-                      "it had issues with being easily detected due to its distinct packet signatures. "
-                      "AmneziaWG solves this problem by using better obfuscation methods, "
-                      "making its traffic blend in with regular internet traffic.\n"
-                      "This means that AmneziaWG keeps the fast performance of the original "
-                      "while adding an extra layer of stealth, "
-                      "making it a great choice for those wanting a fast and discreet VPN connection.\n\n"
-                      "* Available in the AmneziaVPN across all platforms\n"
-                      "* Low power consumption\n"
-                      "* Minimum number of settings\n"
-                      "* Not recognised by DPI analysis systems, resistant to blocking\n"
-                      "* Works over UDP network protocol.") },
-        { DockerContainer::Ipsec,
-          QObject::tr("IKEv2, paired with the IPSec encryption layer, stands as a modern and stable VPN protocol.\n"
-                      "One of its distinguishing features is its ability to swiftly switch between networks and devices, "
-                      "making it particularly adaptive in dynamic network environments. \n"
-                      "While it offers a blend of security, stability, and speed, "
-                      "it's essential to note that IKEv2 can be easily detected and is susceptible to blocking.\n\n"
-                      "* Available in the AmneziaVPN only on Windows\n"
-                      "* Low power consumption, on mobile devices\n"
-                      "* Minimal configuration\n"
-                      "* Recognised by DPI analysis systems\n"
-                      "* Works over UDP network protocol, ports 500 and 4500.") },
+    return { { DockerContainer::OpenVpn, QObject::tr("OpenVPN container") },
+             { DockerContainer::ShadowSocks, QObject::tr("Container with OpenVpn and ShadowSocks") },
+             { DockerContainer::Cloak,
+               QObject::tr("Container with OpenVpn and ShadowSocks protocols "
+                           "configured with traffic masking by Cloak plugin") },
+             { DockerContainer::WireGuard, QObject::tr("WireGuard container") },
+             { DockerContainer::Ipsec, QObject::tr("IPsec container") },
 
-        { DockerContainer::TorWebSite, QObject::tr("Website in Tor network") },
-        { DockerContainer::Dns, QObject::tr("DNS Service") },
-        { DockerContainer::Sftp, QObject::tr("Sftp file sharing service - is secure FTP service") }
-    };
+             { DockerContainer::TorWebSite, QObject::tr("Website in Tor network") },
+             { DockerContainer::Dns, QObject::tr("DNS Service") },
+             //{DockerContainer::FileShare, QObject::tr("SMB file sharing service - is Window file sharing protocol")},
+             { DockerContainer::Sftp, QObject::tr("Sftp file sharing service - is secure FTP service") } };
 }
 
 amnezia::ServiceType ContainerProps::containerService(DockerContainer c)
 {
-    return ProtocolProps::protocolService(defaultProtocol(c));
+    switch (c) {
+    case DockerContainer::None: return ServiceType::None;
+    case DockerContainer::OpenVpn: return ServiceType::Vpn;
+    case DockerContainer::Cloak: return ServiceType::Vpn;
+    case DockerContainer::ShadowSocks: return ServiceType::Vpn;
+    case DockerContainer::WireGuard: return ServiceType::Vpn;
+    case DockerContainer::Ipsec: return ServiceType::Vpn;
+    case DockerContainer::TorWebSite: return ServiceType::Other;
+    case DockerContainer::Dns: return ServiceType::Other;
+    // case DockerContainer::FileShare :    return ServiceType::Other;
+    case DockerContainer::Sftp: return ServiceType::Other;
+    default: return ServiceType::Other;
+    }
 }
 
 Proto ContainerProps::defaultProtocol(DockerContainer c)
@@ -230,11 +160,11 @@ Proto ContainerProps::defaultProtocol(DockerContainer c)
     case DockerContainer::Cloak: return Proto::Cloak;
     case DockerContainer::ShadowSocks: return Proto::ShadowSocks;
     case DockerContainer::WireGuard: return Proto::WireGuard;
-    case DockerContainer::Awg: return Proto::Awg;
     case DockerContainer::Ipsec: return Proto::Ikev2;
 
     case DockerContainer::TorWebSite: return Proto::TorWebSite;
     case DockerContainer::Dns: return Proto::Dns;
+    // case DockerContainer::FileShare :    return Protocol::FileShare;
     case DockerContainer::Sftp: return Proto::Sftp;
     default: return Proto::Any;
     }
@@ -249,7 +179,6 @@ bool ContainerProps::isSupportedByCurrentPlatform(DockerContainer c)
     switch (c) {
     case DockerContainer::WireGuard: return true;
     case DockerContainer::OpenVpn: return true;
-    case DockerContainer::Awg: return true;
     case DockerContainer::Cloak:
         return true;
         //    case DockerContainer::ShadowSocks: return true;
@@ -267,7 +196,6 @@ bool ContainerProps::isSupportedByCurrentPlatform(DockerContainer c)
     case DockerContainer::WireGuard: return true;
     case DockerContainer::OpenVpn: return true;
     case DockerContainer::ShadowSocks: return true;
-    case DockerContainer::Awg: return true;
     case DockerContainer::Cloak: return true;
     default: return false;
     }
@@ -296,8 +224,8 @@ bool ContainerProps::isEasySetupContainer(DockerContainer container)
 {
     switch (container) {
     case DockerContainer::WireGuard: return true;
-    case DockerContainer::Awg: return true;
     case DockerContainer::Cloak: return true;
+    case DockerContainer::OpenVpn: return true;
     default: return false;
     }
 }
@@ -306,8 +234,8 @@ QString ContainerProps::easySetupHeader(DockerContainer container)
 {
     switch (container) {
     case DockerContainer::WireGuard: return tr("Low");
-    case DockerContainer::Awg: return tr("Medium or High");
-    case DockerContainer::Cloak: return tr("Extreme");
+    case DockerContainer::Cloak: return tr("High");
+    case DockerContainer::OpenVpn: return tr("Medium");
     default: return "";
     }
 }
@@ -315,10 +243,9 @@ QString ContainerProps::easySetupHeader(DockerContainer container)
 QString ContainerProps::easySetupDescription(DockerContainer container)
 {
     switch (container) {
-    case DockerContainer::WireGuard: return tr("I just want to increase the level of my privacy.");
-    case DockerContainer::Awg: return tr("I want to bypass censorship. This option recommended in most cases.");
-    case DockerContainer::Cloak:
-        return tr("Most VPN protocols are blocked. Recommended if other options are not working.");
+    case DockerContainer::WireGuard: return tr("I just want to increase the level of privacy");
+    case DockerContainer::Cloak: return tr("Many foreign websites and VPN providers are blocked");
+    case DockerContainer::OpenVpn: return tr("Some foreign sites are blocked, but VPN providers are not blocked");
     default: return "";
     }
 }
@@ -326,9 +253,9 @@ QString ContainerProps::easySetupDescription(DockerContainer container)
 int ContainerProps::easySetupOrder(DockerContainer container)
 {
     switch (container) {
-    case DockerContainer::WireGuard: return 3;
-    case DockerContainer::Awg: return 2;
-    case DockerContainer::Cloak: return 1;
+    case DockerContainer::WireGuard: return 1;
+    case DockerContainer::Cloak: return 3;
+    case DockerContainer::OpenVpn: return 2;
     default: return 0;
     }
 }

client/containers/containers_defs.h

@@ -16,16 +16,16 @@ namespace amnezia
         Q_NAMESPACE
         enum DockerContainer {
             None = 0,
-            Awg,
-            WireGuard,
             OpenVpn,
-            Cloak,
             ShadowSocks,
+            Cloak,
+            WireGuard,
             Ipsec,
 
             // non-vpn
             TorWebSite,
             Dns,
+            // FileShare,
             Sftp
         };
         Q_ENUM_NS(DockerContainer)

client/core/scripts_registry.cpp

@@ -1,8 +1,8 @@
 #include "scripts_registry.h"
 
+#include <QObject>
 #include <QDebug>
 #include <QFile>
-#include <QObject>
 
 QString amnezia::scriptFolder(amnezia::DockerContainer container)
 {
@@ -11,11 +11,11 @@ QString amnezia::scriptFolder(amnezia::DockerContainer container)
     case DockerContainer::Cloak: return QLatin1String("openvpn_cloak");
     case DockerContainer::ShadowSocks: return QLatin1String("openvpn_shadowsocks");
     case DockerContainer::WireGuard: return QLatin1String("wireguard");
-    case DockerContainer::Awg: return QLatin1String("awg");
     case DockerContainer::Ipsec: return QLatin1String("ipsec");
 
     case DockerContainer::TorWebSite: return QLatin1String("website_tor");
     case DockerContainer::Dns: return QLatin1String("dns");
+    //case DockerContainer::FileShare: return QLatin1String("file_share");
     case DockerContainer::Sftp: return QLatin1String("sftp");
     default: return "";
     }
@@ -45,7 +45,6 @@ QString amnezia::scriptName(ProtocolScriptType type)
     case ProtocolScriptType::container_startup: return QLatin1String("start.sh");
     case ProtocolScriptType::openvpn_template: return QLatin1String("template.ovpn");
     case ProtocolScriptType::wireguard_template: return QLatin1String("template.conf");
-    case ProtocolScriptType::awg_template: return QLatin1String("template.conf");
     }
 }
 
@@ -53,7 +52,7 @@ QString amnezia::scriptData(amnezia::SharedScriptType type)
 {
     QString fileName = QString(":/server_scripts/%1").arg(amnezia::scriptName(type));
     QFile file(fileName);
-    if (!file.open(QIODevice::ReadOnly)) {
+    if (! file.open(QIODevice::ReadOnly)) {
         qDebug() << "Warning: script missing" << fileName;
         return "";
     }
@@ -68,7 +67,7 @@ QString amnezia::scriptData(amnezia::ProtocolScriptType type, DockerContainer co
 {
     QString fileName = QString(":/server_scripts/%1/%2").arg(amnezia::scriptFolder(container), amnezia::scriptName(type));
     QFile file(fileName);
-    if (!file.open(QIODevice::ReadOnly)) {
+    if (! file.open(QIODevice::ReadOnly)) {
         qDebug() << "Warning: script missing" << fileName;
         return "";
     }

client/core/scripts_registry.h

@@ -26,8 +26,7 @@ enum ProtocolScriptType {
     configure_container,
     container_startup,
     openvpn_template,
-    wireguard_template,
-    awg_template
+    wireguard_template
 };
 
 

client/core/servercontroller.cpp

@@ -338,10 +338,6 @@ bool ServerController::isReinstallContainerRequired(DockerContainer container, c
             return true;
     }
 
-    if (container == DockerContainer::Awg) {
-        return true;
-    }
-
     return false;
 }
 
@@ -490,7 +486,6 @@ ServerController::Vars ServerController::genVarsForScript(const ServerCredential
     const QJsonObject &cloakConfig = config.value(ProtocolProps::protoToString(Proto::Cloak)).toObject();
     const QJsonObject &ssConfig = config.value(ProtocolProps::protoToString(Proto::ShadowSocks)).toObject();
     const QJsonObject &wireguarConfig = config.value(ProtocolProps::protoToString(Proto::WireGuard)).toObject();
-    const QJsonObject &amneziaWireguarConfig = config.value(ProtocolProps::protoToString(Proto::Awg)).toObject();
     const QJsonObject &sftpConfig = config.value(ProtocolProps::protoToString(Proto::Sftp)).toObject();
 
     Vars vars;
@@ -587,25 +582,6 @@ ServerController::Vars ServerController::genVarsForScript(const ServerCredential
     vars.append({ { "$SFTP_USER", sftpConfig.value(config_key::userName).toString() } });
     vars.append({ { "$SFTP_PASSWORD", sftpConfig.value(config_key::password).toString() } });
 
-    // Amnezia wireguard vars
-    vars.append({ { "$AWG_SERVER_PORT",
-                    amneziaWireguarConfig.value(config_key::port).toString(protocols::awg::defaultPort) } });
-
-    vars.append({ { "$JUNK_PACKET_COUNT", amneziaWireguarConfig.value(config_key::junkPacketCount).toString() } });
-    vars.append({ { "$JUNK_PACKET_MIN_SIZE", amneziaWireguarConfig.value(config_key::junkPacketMinSize).toString() } });
-    vars.append({ { "$JUNK_PACKET_MAX_SIZE", amneziaWireguarConfig.value(config_key::junkPacketMaxSize).toString() } });
-    vars.append({ { "$INIT_PACKET_JUNK_SIZE", amneziaWireguarConfig.value(config_key::initPacketJunkSize).toString() } });
-    vars.append({ { "$RESPONSE_PACKET_JUNK_SIZE",
-                    amneziaWireguarConfig.value(config_key::responsePacketJunkSize).toString() } });
-    vars.append({ { "$INIT_PACKET_MAGIC_HEADER",
-                    amneziaWireguarConfig.value(config_key::initPacketMagicHeader).toString() } });
-    vars.append({ { "$RESPONSE_PACKET_MAGIC_HEADER",
-                    amneziaWireguarConfig.value(config_key::responsePacketMagicHeader).toString() } });
-    vars.append({ { "$UNDERLOAD_PACKET_MAGIC_HEADER",
-                    amneziaWireguarConfig.value(config_key::underloadPacketMagicHeader).toString() } });
-    vars.append({ { "$TRANSPORT_PACKET_MAGIC_HEADER",
-                    amneziaWireguarConfig.value(config_key::transportPacketMagicHeader).toString() } });
-
     QString serverIp = Utils::getIPAddress(credentials.hostName);
     if (!serverIp.isEmpty()) {
         vars.append({ { "$SERVER_IP_ADDRESS", serverIp } });
@@ -834,34 +810,6 @@ ErrorCode ServerController::getAlreadyInstalledContainers(const ServerCredential
                     containerConfig.insert(config_key::port, port);
                     containerConfig.insert(config_key::transport_proto, transportProto);
 
-                    if (protocol == Proto::Awg) {
-                        QString serverConfig = getTextFileFromContainer(container, credentials, protocols::awg::serverConfigPath, &errorCode);
-
-                        QMap<QString, QString> serverConfigMap;
-                        auto serverConfigLines = serverConfig.split("\n");
-                        for (auto &line : serverConfigLines) {
-                            auto trimmedLine = line.trimmed();
-                            if (trimmedLine.startsWith("[") && trimmedLine.endsWith("]")) {
-                                continue;
-                            } else {
-                                QStringList parts = trimmedLine.split(" = ");
-                                if (parts.count() == 2) {
-                                    serverConfigMap.insert(parts[0].trimmed(), parts[1].trimmed());
-                                }
-                            }
-                        }
-
-                        containerConfig[config_key::junkPacketCount] = serverConfigMap.value(config_key::junkPacketCount);
-                        containerConfig[config_key::junkPacketMinSize] = serverConfigMap.value(config_key::junkPacketMinSize);
-                        containerConfig[config_key::junkPacketMaxSize] = serverConfigMap.value(config_key::junkPacketMaxSize);
-                        containerConfig[config_key::initPacketJunkSize] = serverConfigMap.value(config_key::initPacketJunkSize);
-                        containerConfig[config_key::responsePacketJunkSize] = serverConfigMap.value(config_key::responsePacketJunkSize);
-                        containerConfig[config_key::initPacketMagicHeader] = serverConfigMap.value(config_key::initPacketMagicHeader);
-                        containerConfig[config_key::responsePacketMagicHeader] = serverConfigMap.value(config_key::responsePacketMagicHeader);
-                        containerConfig[config_key::underloadPacketMagicHeader] = serverConfigMap.value(config_key::underloadPacketMagicHeader);
-                        containerConfig[config_key::transportPacketMagicHeader] = serverConfigMap.value(config_key::transportPacketMagicHeader);
-                    }
-
                     config.insert(config_key::container, ContainerProps::containerToString(container));
                 }
                 config.insert(ProtocolProps::protoToString(protocol), containerConfig);

client/daemon/daemon.cpp

@@ -359,23 +359,6 @@ bool Daemon::parseConfig(const QJsonObject& obj, InterfaceConfig& config) {
   if (!parseStringList(obj, "vpnDisabledApps", config.m_vpnDisabledApps)) {
     return false;
   }
-
-  if (!obj.value("Jc").isNull() && !obj.value("Jmin").isNull() 
-  && !obj.value("Jmax").isNull() && !obj.value("S1").isNull() 
-  && !obj.value("S2").isNull() && !obj.value("H1").isNull() 
-  && !obj.value("H2").isNull() && !obj.value("H3").isNull() 
-  && !obj.value("H4").isNull()) {
-    config.m_junkPacketCount = obj.value("Jc").toString();
-    config.m_junkPacketMinSize = obj.value("Jmin").toString();
-    config.m_junkPacketMaxSize = obj.value("Jmax").toString();
-    config.m_initPacketJunkSize = obj.value("S1").toString();
-    config.m_responsePacketJunkSize = obj.value("S2").toString();
-    config.m_initPacketMagicHeader = obj.value("H1").toString();
-    config.m_responsePacketMagicHeader = obj.value("H2").toString();
-    config.m_underloadPacketMagicHeader = obj.value("H3").toString();
-    config.m_transportPacketMagicHeader = obj.value("H4").toString();
-  }
-
   return true;
 }
 

client/daemon/interfaceconfig.cpp

@@ -97,34 +97,6 @@ QString InterfaceConfig::toWgConf(const QMap<QString, QString>& extra) const {
     out << "DNS = " << dnsServers.join(", ") << "\n";
   }
 
-  if (!m_junkPacketCount.isNull()) {
-    out << "Jc = " << m_junkPacketCount << "\n";
-  }
-  if (!m_junkPacketMinSize.isNull()) {
-    out << "JMin = " << m_junkPacketMinSize << "\n";
-  }
-  if (!m_junkPacketMaxSize.isNull()) {
-    out << "JMax = " << m_junkPacketMaxSize << "\n";
-  }
-  if (!m_initPacketJunkSize.isNull()) {
-    out << "S1 = " << m_initPacketJunkSize << "\n";
-  }
-  if (!m_responsePacketJunkSize.isNull()) {
-    out << "S2 = " << m_responsePacketJunkSize << "\n";
-  }
-  if (!m_initPacketMagicHeader.isNull()) {
-    out << "H1 = " << m_initPacketMagicHeader << "\n";
-  }
-  if (!m_responsePacketMagicHeader.isNull()) {
-    out << "H2 = " << m_responsePacketMagicHeader << "\n";
-  }
-  if (!m_underloadPacketMagicHeader.isNull()) {
-    out << "H3 = " << m_underloadPacketMagicHeader << "\n";
-  }
-  if (!m_transportPacketMagicHeader.isNull()) {
-    out << "H4 = " << m_transportPacketMagicHeader << "\n";
-  }
-
   // If any extra config was provided, append it now.
   for (const QString& key : extra.keys()) {
     out << key << " = " << extra[key] << "\n";

client/daemon/interfaceconfig.h

@@ -40,16 +40,6 @@ class InterfaceConfig {
   QString m_installationId;
 #endif
 
-  QString m_junkPacketCount;
-  QString m_junkPacketMinSize;
-  QString m_junkPacketMaxSize;
-  QString m_initPacketJunkSize;
-  QString m_responsePacketJunkSize;
-  QString m_initPacketMagicHeader;
-  QString m_responsePacketMagicHeader;
-  QString m_underloadPacketMagicHeader;
-  QString m_transportPacketMagicHeader;
-
   QJsonObject toJson() const;
   QString toWgConf(
       const QMap<QString, QString>& extra = QMap<QString, QString>()) const;

client/images/controls/x-circle.svg

@@ -1,5 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M15 9L9 15" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9 9L15 15" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

client/ios/networkextension/CMakeLists.txt

@@ -58,7 +58,7 @@ target_link_libraries(networkextension PRIVATE ${FW_UI_KIT})
 target_compile_options(networkextension PRIVATE -DGROUP_ID=\"${BUILD_IOS_GROUP_IDENTIFIER}\")
 target_compile_options(networkextension PRIVATE -DNETWORK_EXTENSION=1)
 
-set(WG_APPLE_SOURCE_DIR ${CLIENT_ROOT_DIR}/3rd/awg-apple/Sources)
+set(WG_APPLE_SOURCE_DIR ${CLIENT_ROOT_DIR}/3rd/wireguard-apple/Sources)
 
 target_sources(networkextension PRIVATE
     ${WG_APPLE_SOURCE_DIR}/WireGuardKit/WireGuardAdapter.swift

client/ios/networkextension/WireGuardNetworkExtension-Bridging-Header.h

@@ -1,6 +1,6 @@
 #include "wireguard-go-version.h"
-#include "3rd/awg-apple/Sources/WireGuardKitGo/wireguard.h"
-#include "3rd/awg-apple/Sources/WireGuardKitC/WireGuardKitC.h"
+#include "3rd/wireguard-apple/Sources/WireGuardKitGo/wireguard.h"
+#include "3rd/wireguard-apple/Sources/WireGuardKitC/WireGuardKitC.h"
 
 #include <stdbool.h>
 #include <stdint.h>

client/macos/app/WireGuard-Bridging-Header.h

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "wireguard-go-version.h"
-#include "3rd/awg-apple/Sources/WireGuardKitC/WireGuardKitC.h"
+#include "3rd/wireguard-apple/Sources/WireGuardKitC/WireGuardKitC.h"
 
 #include <stdbool.h>
 #include <stdint.h>

client/macos/networkextension/WireGuardNetworkExtension-Bridging-Header.h

@@ -4,7 +4,7 @@
 
 #include "macos/gobridge/wireguard.h"
 #include "wireguard-go-version.h"
-#include "3rd/awg-apple/Sources/WireGuardKitC/WireGuardKitC.h"
+#include "3rd/wireguard-apple/Sources/WireGuardKitC/WireGuardKitC.h"
 #include "3rd/ShadowSocks/ShadowSocks/ShadowSocks.h"
 #include "platforms/ios/ssconnectivity.h"
 #include "platforms/ios/iosopenvpn2ssadapter.h"

client/main.cpp

@@ -26,11 +26,6 @@ int main(int argc, char *argv[])
     AllowSetForegroundWindow(ASFW_ANY);
 #endif
 
-// QTBUG-95974 QTBUG-95764 QTBUG-102168
-#ifdef Q_OS_ANDROID
-    qputenv("QT_ANDROID_DISABLE_ACCESSIBILITY", "1");
-#endif
-
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
     AmneziaApplication app(argc, argv);
 #else
@@ -58,6 +53,7 @@ int main(int argc, char *argv[])
     app.setOrganizationName(ORGANIZATION_NAME);
     app.setApplicationDisplayName(APPLICATION_NAME);
 
+    app.loadTranslator();
     app.loadFonts();
 
     bool doExec = app.parseCommands();

client/mozilla/localsocketcontroller.cpp

@@ -115,9 +115,7 @@ void LocalSocketController::daemonConnected() {
 }
 
 void LocalSocketController::activate(const QJsonObject &rawConfig) {
-  QString protocolName = rawConfig.value("protocol").toString();
-
-  QJsonObject wgConfig = rawConfig.value(protocolName + "_config_data").toObject();
+  QJsonObject wgConfig = rawConfig.value("wireguard_config_data").toObject();
 
   QJsonObject json;
   json.insert("type", "activate");
@@ -162,19 +160,6 @@ void LocalSocketController::activate(const QJsonObject &rawConfig) {
   //    splitTunnelApps.append(QJsonValue(uri));
   //  }
   //  json.insert("vpnDisabledApps", splitTunnelApps);
-  
-  if (protocolName == amnezia::config_key::awg) {
-    json.insert(amnezia::config_key::junkPacketCount, wgConfig.value(amnezia::config_key::junkPacketCount));
-    json.insert(amnezia::config_key::junkPacketMinSize, wgConfig.value(amnezia::config_key::junkPacketMinSize));
-    json.insert(amnezia::config_key::junkPacketMaxSize, wgConfig.value(amnezia::config_key::junkPacketMaxSize));
-    json.insert(amnezia::config_key::initPacketJunkSize, wgConfig.value(amnezia::config_key::initPacketJunkSize));
-    json.insert(amnezia::config_key::responsePacketJunkSize, wgConfig.value(amnezia::config_key::responsePacketJunkSize));
-    json.insert(amnezia::config_key::initPacketMagicHeader, wgConfig.value(amnezia::config_key::initPacketMagicHeader));
-    json.insert(amnezia::config_key::responsePacketMagicHeader, wgConfig.value(amnezia::config_key::responsePacketMagicHeader));
-    json.insert(amnezia::config_key::underloadPacketMagicHeader, wgConfig.value(amnezia::config_key::underloadPacketMagicHeader));
-    json.insert(amnezia::config_key::transportPacketMagicHeader, wgConfig.value(amnezia::config_key::transportPacketMagicHeader));
-  }
-
   write(json);
 }
 

client/platforms/ios/WireGuard-Bridging-Header.h

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "3rd/awg-apple/Sources/WireGuardKitC/WireGuardKitC.h"
+#include "3rd/wireguard-apple/Sources/WireGuardKitC/WireGuardKitC.h"
 
 #include <stdbool.h>
 #include <stdint.h>

client/platforms/ios/ios_controller.h

@@ -62,7 +62,6 @@ private:
     bool setupOpenVPN();
     bool setupCloak();
     bool setupWireGuard();
-    bool setupAwg();
 
     bool startOpenVPN(const QString &config);
     bool startWireGuard(const QString &jsonConfig);

client/platforms/ios/ios_controller.mm

@@ -204,9 +204,6 @@ bool IosController::connectVpn(amnezia::Proto proto, const QJsonObject& configur
     if (proto == amnezia::Proto::WireGuard) {
         return setupWireGuard();
     }
-    if (proto == amnezia::Proto::Awg) {
-        return setupAwg();
-    }
 
     return false;
 }
@@ -310,15 +307,6 @@ bool IosController::setupWireGuard()
     return startWireGuard(wgConfig);
 }
 
-bool IosController::setupAwg()
-{
-    QJsonObject config = m_rawConfig[ProtocolProps::key_proto_config_data(amnezia::Proto::Awg)].toObject();
-
-    QString wgConfig = config[config_key::config].toString();
-    
-    return startWireGuard(wgConfig);
-}
-
 bool IosController::startOpenVPN(const QString &config)
 {
     qDebug() << "IosController::startOpenVPN";

client/platforms/linux/daemon/wireguardutilslinux.cpp

@@ -100,19 +100,6 @@ bool WireguardUtilsLinux::addInterface(const InterfaceConfig& config) {
     QTextStream out(&message);
     out << "private_key=" << QString(privateKey.toHex()) << "\n";
     out << "replace_peers=true\n";
-
-    if (config.m_junkPacketCount != "") {
-        out << "jc=" << config.m_junkPacketCount << "\n";
-        out << "jmin=" << config.m_junkPacketMinSize << "\n";
-        out << "jmax=" << config.m_junkPacketMaxSize << "\n";
-        out << "s1=" << config.m_initPacketJunkSize << "\n";
-        out << "s2=" << config.m_responsePacketJunkSize << "\n";
-        out << "h1=" << config.m_initPacketMagicHeader << "\n";
-        out << "h2=" << config.m_responsePacketMagicHeader << "\n";
-        out << "h3=" << config.m_underloadPacketMagicHeader << "\n";
-        out << "h4=" << config.m_transportPacketMagicHeader << "\n";
-    }
-
     int err = uapiErrno(uapiCommand(message));
     if (err != 0) {
         logger.error() << "Interface configuration failed:" << strerror(err);

client/platforms/macos/daemon/wireguardutilsmacos.cpp

@@ -100,19 +100,6 @@ bool WireguardUtilsMacos::addInterface(const InterfaceConfig& config) {
   QTextStream out(&message);
   out << "private_key=" << QString(privateKey.toHex()) << "\n";
   out << "replace_peers=true\n";
-
-  if (config.m_junkPacketCount != "") {
-    out << "jc=" << config.m_junkPacketCount << "\n";
-    out << "jmin=" << config.m_junkPacketMinSize << "\n";
-    out << "jmax=" << config.m_junkPacketMaxSize << "\n";
-    out << "s1=" << config.m_initPacketJunkSize << "\n";
-    out << "s2=" << config.m_responsePacketJunkSize << "\n";
-    out << "h1=" << config.m_initPacketMagicHeader << "\n";
-    out << "h2=" << config.m_responsePacketMagicHeader << "\n";
-    out << "h3=" << config.m_underloadPacketMagicHeader << "\n";
-    out << "h4=" << config.m_transportPacketMagicHeader << "\n";
-  }
-
   int err = uapiErrno(uapiCommand(message));
   if (err != 0) {
     logger.error() << "Interface configuration failed:" << strerror(err);

client/protocols/awgprotocol.cpp

@@ -1,10 +0,0 @@
-#include "awgprotocol.h"
-
-Awg::Awg(const QJsonObject &configuration, QObject *parent)
-    : WireguardProtocol(configuration, parent)
-{
-}
-
-Awg::~Awg()
-{
-}

client/protocols/awgprotocol.h

@@ -1,17 +0,0 @@
-#ifndef AWGPROTOCOL_H
-#define AWGPROTOCOL_H
-
-#include <QObject>
-
-#include "wireguardprotocol.h"
-
-class Awg : public WireguardProtocol
-{
-    Q_OBJECT
-
-public:
-    explicit Awg(const QJsonObject &configuration, QObject *parent = nullptr);
-    virtual ~Awg() override;
-};
-
-#endif // AWGPROTOCOL_H

client/protocols/protocols_defs.cpp

@@ -1,7 +1,5 @@
 #include "protocols_defs.h"
 
-#include <QRandomGenerator>
-
 using namespace amnezia;
 
 QDebug operator<<(QDebug debug, const amnezia::ProtocolEnumNS::Proto &p)
@@ -68,12 +66,12 @@ QMap<amnezia::Proto, QString> ProtocolProps::protocolHumanNames()
              { Proto::ShadowSocks, "ShadowSocks" },
              { Proto::Cloak, "Cloak" },
              { Proto::WireGuard, "WireGuard" },
-             { Proto::Awg, "AmneziaWG" },
              { Proto::Ikev2, "IKEv2" },
              { Proto::L2tp, "L2TP" },
 
              { Proto::TorWebSite, "Website in Tor network" },
              { Proto::Dns, "DNS Service" },
+             { Proto::FileShare, "File Sharing Service" },
              { Proto::Sftp, QObject::tr("Sftp service") } };
 }
 
@@ -90,43 +88,27 @@ amnezia::ServiceType ProtocolProps::protocolService(Proto p)
     case Proto::Cloak: return ServiceType::Vpn;
     case Proto::ShadowSocks: return ServiceType::Vpn;
     case Proto::WireGuard: return ServiceType::Vpn;
-    case Proto::Awg: return ServiceType::Vpn;
-    case Proto::Ikev2: return ServiceType::Vpn;
-
     case Proto::TorWebSite: return ServiceType::Other;
     case Proto::Dns: return ServiceType::Other;
-    case Proto::Sftp: return ServiceType::Other;
+    case Proto::FileShare: return ServiceType::Other;
     default: return ServiceType::Other;
     }
 }
 
-int ProtocolProps::getPortForInstall(Proto p)
-{
-    switch (p) {
-    case Awg:
-    case WireGuard:
-    case ShadowSocks:
-    case OpenVpn:
-        return QRandomGenerator::global()->bounded(30000, 50000);
-    default:
-        return defaultPort(p);
-    }
-}
-
 int ProtocolProps::defaultPort(Proto p)
 {
     switch (p) {
     case Proto::Any: return -1;
-    case Proto::OpenVpn: return QString(protocols::openvpn::defaultPort).toInt();
-    case Proto::Cloak: return QString(protocols::cloak::defaultPort).toInt();
-    case Proto::ShadowSocks: return QString(protocols::shadowsocks::defaultPort).toInt();
-    case Proto::WireGuard: return QString(protocols::wireguard::defaultPort).toInt();
-    case Proto::Awg: return QString(protocols::awg::defaultPort).toInt();
+    case Proto::OpenVpn: return 1194;
+    case Proto::Cloak: return 443;
+    case Proto::ShadowSocks: return 6789;
+    case Proto::WireGuard: return 51820;
     case Proto::Ikev2: return -1;
     case Proto::L2tp: return -1;
 
     case Proto::TorWebSite: return -1;
     case Proto::Dns: return 53;
+    case Proto::FileShare: return 139;
     case Proto::Sftp: return 222;
     default: return -1;
     }
@@ -140,14 +122,13 @@ bool ProtocolProps::defaultPortChangeable(Proto p)
     case Proto::Cloak: return true;
     case Proto::ShadowSocks: return true;
     case Proto::WireGuard: return true;
-    case Proto::Awg: return true;
     case Proto::Ikev2: return false;
     case Proto::L2tp: return false;
 
-    case Proto::TorWebSite: return false;
+    case Proto::TorWebSite: return true;
     case Proto::Dns: return false;
-    case Proto::Sftp: return true;
-    default: return false;
+    case Proto::FileShare: return false;
+    default: return -1;
     }
 }
 
@@ -159,12 +140,12 @@ TransportProto ProtocolProps::defaultTransportProto(Proto p)
     case Proto::Cloak: return TransportProto::Tcp;
     case Proto::ShadowSocks: return TransportProto::Tcp;
     case Proto::WireGuard: return TransportProto::Udp;
-    case Proto::Awg: return TransportProto::Udp;
     case Proto::Ikev2: return TransportProto::Udp;
     case Proto::L2tp: return TransportProto::Udp;
     // non-vpn
     case Proto::TorWebSite: return TransportProto::Tcp;
     case Proto::Dns: return TransportProto::Udp;
+    case Proto::FileShare: return TransportProto::Udp;
     case Proto::Sftp: return TransportProto::Tcp;
     }
 }
@@ -177,12 +158,12 @@ bool ProtocolProps::defaultTransportProtoChangeable(Proto p)
     case Proto::Cloak: return false;
     case Proto::ShadowSocks: return false;
     case Proto::WireGuard: return false;
-    case Proto::Awg: return false;
     case Proto::Ikev2: return false;
     case Proto::L2tp: return false;
     // non-vpn
     case Proto::TorWebSite: return false;
     case Proto::Dns: return false;
+    case Proto::FileShare: return false;
     case Proto::Sftp: return false;
     default: return false;
     }

client/protocols/protocols_defs.h

@@ -2,8 +2,8 @@
 #define PROTOCOLS_DEFS_H
 
 #include <QDebug>
-#include <QMetaEnum>
 #include <QObject>
+#include <QMetaEnum>
 
 namespace amnezia
 {
@@ -61,22 +61,11 @@ namespace amnezia
 
         constexpr char isThirdPartyConfig[] = "isThirdPartyConfig";
 
-        constexpr char junkPacketCount[] = "Jc";
-        constexpr char junkPacketMinSize[] = "Jmin";
-        constexpr char junkPacketMaxSize[] = "Jmax";
-        constexpr char initPacketJunkSize[] = "S1";
-        constexpr char responsePacketJunkSize[] = "S2";
-        constexpr char initPacketMagicHeader[] = "H1";
-        constexpr char responsePacketMagicHeader[] = "H2";
-        constexpr char underloadPacketMagicHeader[] = "H3";
-        constexpr char transportPacketMagicHeader[] = "H4";
-
         constexpr char openvpn[] = "openvpn";
         constexpr char wireguard[] = "wireguard";
         constexpr char shadowsocks[] = "shadowsocks";
         constexpr char cloak[] = "cloak";
         constexpr char sftp[] = "sftp";
-        constexpr char awg[] = "awg";
 
     }
 
@@ -151,25 +140,6 @@ namespace amnezia
 
         } // namespace sftp
 
-        namespace awg
-        {
-            constexpr char defaultPort[] = "55424";
-
-            constexpr char serverConfigPath[] = "/opt/amnezia/awg/wg0.conf";
-            constexpr char serverPublicKeyPath[] = "/opt/amnezia/awg/wireguard_server_public_key.key";
-            constexpr char serverPskKeyPath[] = "/opt/amnezia/awg/wireguard_psk.key";
-
-            constexpr char defaultJunkPacketCount[] = "3";
-            constexpr char defaultJunkPacketMinSize[] = "10";
-            constexpr char defaultJunkPacketMaxSize[] = "30";
-            constexpr char defaultInitPacketJunkSize[] = "15";
-            constexpr char defaultResponsePacketJunkSize[] = "18";
-            constexpr char defaultInitPacketMagicHeader[] = "1020325451";
-            constexpr char defaultResponsePacketMagicHeader[] = "3288052141";
-            constexpr char defaultTransportPacketMagicHeader[] = "2528465083";
-            constexpr char defaultUnderloadPacketMagicHeader[] = "1766607858";
-        }
-
     } // namespace protocols
 
     namespace ProtocolEnumNS
@@ -188,13 +158,13 @@ namespace amnezia
             ShadowSocks,
             Cloak,
             WireGuard,
-            Awg,
             Ikev2,
             L2tp,
 
             // non-vpn
             TorWebSite,
             Dns,
+            FileShare,
             Sftp
         };
         Q_ENUM_NS(Proto)
@@ -228,8 +198,6 @@ namespace amnezia
 
         Q_INVOKABLE static ServiceType protocolService(Proto p);
 
-        Q_INVOKABLE static int getPortForInstall(Proto p);
-
         Q_INVOKABLE static int defaultPort(Proto p);
         Q_INVOKABLE static bool defaultPortChangeable(Proto p);
 

client/protocols/vpnprotocol.cpp

@@ -1,21 +1,22 @@
 #include <QDebug>
 #include <QTimer>
 
-#include "core/errorstrings.h"
 #include "vpnprotocol.h"
+#include "core/errorstrings.h"
 
 #if defined(Q_OS_WINDOWS) || defined(Q_OS_MACX) || (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID))
-    #include "openvpnovercloakprotocol.h"
-    #include "openvpnprotocol.h"
-    #include "shadowsocksvpnprotocol.h"
-    #include "wireguardprotocol.h"
+#include "openvpnprotocol.h"
+#include "shadowsocksvpnprotocol.h"
+#include "openvpnovercloakprotocol.h"
+#include "wireguardprotocol.h"
 #endif
 
 #ifdef Q_OS_WINDOWS
-    #include "ikev2_vpn_protocol_windows.h"
+#include "ikev2_vpn_protocol_windows.h"
 #endif
 
-VpnProtocol::VpnProtocol(const QJsonObject &configuration, QObject *parent)
+
+VpnProtocol::VpnProtocol(const QJsonObject &configuration, QObject* parent)
     : QObject(parent),
       m_connectionState(Vpn::ConnectionState::Unknown),
       m_rawConfig(configuration),
@@ -30,7 +31,7 @@ VpnProtocol::VpnProtocol(const QJsonObject &configuration, QObject *parent)
 void VpnProtocol::setLastError(ErrorCode lastError)
 {
     m_lastError = lastError;
-    if (lastError) {
+    if (lastError){
         setConnectionState(Vpn::ConnectionState::Error);
     }
     qCritical().noquote() << "VpnProtocol error, code" << m_lastError << errorString(m_lastError);
@@ -102,7 +103,7 @@ QString VpnProtocol::vpnGateway() const
     return m_vpnGateway;
 }
 
-VpnProtocol *VpnProtocol::factory(DockerContainer container, const QJsonObject &configuration)
+VpnProtocol *VpnProtocol::factory(DockerContainer container, const QJsonObject& configuration)
 {
     switch (container) {
 #if defined(Q_OS_WINDOWS)
@@ -113,7 +114,6 @@ VpnProtocol *VpnProtocol::factory(DockerContainer container, const QJsonObject &
     case DockerContainer::Cloak: return new OpenVpnOverCloakProtocol(configuration);
     case DockerContainer::ShadowSocks: return new ShadowSocksVpnProtocol(configuration);
     case DockerContainer::WireGuard: return new WireguardProtocol(configuration);
-    case DockerContainer::Awg: return new WireguardProtocol(configuration);
 #endif
     default: return nullptr;
     }
@@ -135,7 +135,8 @@ QString VpnProtocol::textConnectionState(Vpn::ConnectionState connectionState)
     case Vpn::ConnectionState::Disconnecting: return tr("Disconnecting...");
     case Vpn::ConnectionState::Reconnecting: return tr("Reconnecting...");
     case Vpn::ConnectionState::Error: return tr("Error");
-    default:;
+    default:
+        ;
     }
 
     return QString();

client/protocols/wireguardprotocol.cpp

@@ -101,6 +101,8 @@ void WireguardProtocol::stop()
 #if defined(Q_OS_MAC) || defined(Q_OS_WIN) || defined(Q_OS_LINUX)
 ErrorCode WireguardProtocol::startMzImpl()
 {
+
+    qDebug() << "WireguardProtocol::startMzImpl():" << m_rawConfig;
     m_impl->activate(m_rawConfig);
     return ErrorCode::NoError;
 }

client/resources.qrc

@@ -215,12 +215,5 @@
         <file>ui/qml/Controls2/ListViewWithLabelsType.qml</file>
         <file>ui/qml/Pages2/PageServiceDnsSettings.qml</file>
         <file>ui/qml/Controls2/TopCloseButtonType.qml</file>
-        <file>images/controls/x-circle.svg</file>
-        <file>ui/qml/Pages2/PageProtocolAwgSettings.qml</file>
-        <file>server_scripts/awg/template.conf</file>
-        <file>server_scripts/awg/start.sh</file>
-        <file>server_scripts/awg/configure_container.sh</file>
-        <file>server_scripts/awg/run_container.sh</file>
-        <file>server_scripts/awg/Dockerfile</file>
     </qresource>
 </RCC>

client/server_scripts/awg/Dockerfile

@@ -1,46 +0,0 @@
-FROM amneziavpn/amnezia-wg:latest
-
-LABEL maintainer="AmneziaVPN"
-
-#Install required packages
-RUN apk add --no-cache bash curl dumb-init
-RUN apk --update upgrade --no-cache
-
-RUN mkdir -p /opt/amnezia
-RUN echo -e "#!/bin/bash\ntail -f /dev/null" > /opt/amnezia/start.sh
-RUN chmod a+x /opt/amnezia/start.sh
-
-# Tune network  
-RUN echo -e " \n\
-  fs.file-max = 51200 \n\
-  \n\
-  net.core.rmem_max = 67108864 \n\
-  net.core.wmem_max = 67108864 \n\
-  net.core.netdev_max_backlog = 250000 \n\
-  net.core.somaxconn = 4096 \n\
-  \n\
-  net.ipv4.tcp_syncookies = 1 \n\
-  net.ipv4.tcp_tw_reuse = 1 \n\
-  net.ipv4.tcp_tw_recycle = 0 \n\
-  net.ipv4.tcp_fin_timeout = 30 \n\
-  net.ipv4.tcp_keepalive_time = 1200 \n\
-  net.ipv4.ip_local_port_range = 10000 65000 \n\
-  net.ipv4.tcp_max_syn_backlog = 8192 \n\
-  net.ipv4.tcp_max_tw_buckets = 5000 \n\
-  net.ipv4.tcp_fastopen = 3 \n\
-  net.ipv4.tcp_mem = 25600 51200 102400 \n\
-  net.ipv4.tcp_rmem = 4096 87380 67108864 \n\
-  net.ipv4.tcp_wmem = 4096 65536 67108864 \n\
-  net.ipv4.tcp_mtu_probing = 1 \n\
-  net.ipv4.tcp_congestion_control = hybla \n\
-  # for low-latency network, use cubic instead \n\
-  # net.ipv4.tcp_congestion_control = cubic \n\
-  " | sed -e 's/^\s\+//g' | tee -a /etc/sysctl.conf && \
-  mkdir -p /etc/security && \
-  echo -e " \n\
-  * soft nofile 51200 \n\
-  * hard nofile 51200 \n\
-  " | sed -e 's/^\s\+//g' | tee -a /etc/security/limits.conf  
-
-ENTRYPOINT [ "dumb-init", "/opt/amnezia/start.sh" ]
-CMD [ "" ]

client/server_scripts/awg/configure_container.sh

@@ -1,26 +0,0 @@
-mkdir -p /opt/amnezia/awg
-cd /opt/amnezia/awg
-WIREGUARD_SERVER_PRIVATE_KEY=$(wg genkey)
-echo $WIREGUARD_SERVER_PRIVATE_KEY > /opt/amnezia/awg/wireguard_server_private_key.key
-
-WIREGUARD_SERVER_PUBLIC_KEY=$(echo $WIREGUARD_SERVER_PRIVATE_KEY | wg pubkey)
-echo $WIREGUARD_SERVER_PUBLIC_KEY > /opt/amnezia/awg/wireguard_server_public_key.key
-
-WIREGUARD_PSK=$(wg genpsk)
-echo $WIREGUARD_PSK > /opt/amnezia/awg/wireguard_psk.key
-
-cat > /opt/amnezia/awg/wg0.conf <<EOF
-[Interface]
-PrivateKey = $WIREGUARD_SERVER_PRIVATE_KEY
-Address = $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR
-ListenPort = $AWG_SERVER_PORT
-Jc = $JUNK_PACKET_COUNT
-Jmin = $JUNK_PACKET_MIN_SIZE
-Jmax = $JUNK_PACKET_MAX_SIZE
-S1 = $INIT_PACKET_JUNK_SIZE
-S2 = $RESPONSE_PACKET_JUNK_SIZE
-H1 = $INIT_PACKET_MAGIC_HEADER
-H2 = $RESPONSE_PACKET_MAGIC_HEADER
-H3 = $UNDERLOAD_PACKET_MAGIC_HEADER
-H4 = $TRANSPORT_PACKET_MAGIC_HEADER
-EOF

client/server_scripts/awg/run_container.sh

@@ -1,18 +0,0 @@
-# Run container
-sudo docker run -d \
---log-driver none \
---restart always \
---privileged \
---cap-add=NET_ADMIN \
---cap-add=SYS_MODULE \
--p $AWG_SERVER_PORT:$AWG_SERVER_PORT/udp \
--v /lib/modules:/lib/modules \
---sysctl="net.ipv4.conf.all.src_valid_mark=1" \
---name $CONTAINER_NAME \
-$CONTAINER_NAME
-
-sudo docker network connect amnezia-dns-net $CONTAINER_NAME
-
-# Prevent to route packets outside of the container in case if server behind of the NAT
-#sudo docker exec -i $CONTAINER_NAME sh -c "ifconfig eth0:0 $SERVER_IP_ADDRESS netmask 255.255.255.255 up"
-

client/server_scripts/awg/start.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-# This scripts copied from Amnezia client to Docker container to /opt/amnezia and launched every time container starts
-
-echo "Container startup"
-#ifconfig eth0:0 $SERVER_IP_ADDRESS netmask 255.255.255.255 up
-
-# kill daemons in case of restart
-wg-quick down /opt/amnezia/awg/wg0.conf
-
-# start daemons if configured
-if [ -f /opt/amnezia/awg/wg0.conf ]; then (wg-quick up /opt/amnezia/awg/wg0.conf); fi
-
-# Allow traffic on the TUN interface.
-iptables -A INPUT -i wg0 -j ACCEPT
-iptables -A FORWARD -i wg0 -j ACCEPT
-iptables -A OUTPUT -o wg0 -j ACCEPT
-
-# Allow forwarding traffic only from the VPN.
-iptables -A FORWARD -i wg0 -o eth0 -s $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR -j ACCEPT
-iptables -A FORWARD -i wg0 -o eth1 -s $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR -j ACCEPT
-
-iptables -A FORWARD -m state --state ESTABLISHED,RELATED -j ACCEPT
-
-iptables -t nat -A POSTROUTING -s $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR -o eth0 -j MASQUERADE
-iptables -t nat -A POSTROUTING -s $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR -o eth1 -j MASQUERADE
-
-tail -f /dev/null

client/server_scripts/awg/template.conf

@@ -1,20 +0,0 @@
-[Interface]
-Address = $WIREGUARD_CLIENT_IP/32
-DNS = $PRIMARY_DNS, $SECONDARY_DNS
-PrivateKey = $WIREGUARD_CLIENT_PRIVATE_KEY
-Jc = $JUNK_PACKET_COUNT
-Jmin = $JUNK_PACKET_MIN_SIZE
-Jmax = $JUNK_PACKET_MAX_SIZE
-S1 = $INIT_PACKET_JUNK_SIZE
-S2 = $RESPONSE_PACKET_JUNK_SIZE
-H1 = $INIT_PACKET_MAGIC_HEADER
-H2 = $RESPONSE_PACKET_MAGIC_HEADER
-H3 = $UNDERLOAD_PACKET_MAGIC_HEADER
-H4 = $TRANSPORT_PACKET_MAGIC_HEADER
-
-[Peer]
-PublicKey = $WIREGUARD_SERVER_PUBLIC_KEY
-PresharedKey = $WIREGUARD_PSK
-AllowedIPs = 0.0.0.0/0, ::/0
-Endpoint = $SERVER_IP_ADDRESS:$AWG_SERVER_PORT
-PersistentKeepalive = 25

client/server_scripts/build_container.sh

@@ -1 +1 @@
-sudo docker build --no-cache --pull -t $CONTAINER_NAME $DOCKERFILE_FOLDER --build-arg SERVER_ARCH=$(uname -m)
+sudo docker build -t $CONTAINER_NAME $DOCKERFILE_FOLDER --build-arg SERVER_ARCH=$(uname -m)

client/server_scripts/install_docker.sh

@@ -5,10 +5,10 @@ else echo "Packet manager not found"; exit 1; fi;\
 echo "Dist: $dist, Packet manager: $pm, Docker pkg: $docker_pkg";\
 if [ "$dist" = "debian" ]; then export DEBIAN_FRONTEND=noninteractive; fi;\
 if ! command -v sudo > /dev/null 2>&1; then $pm update -yq; $pm install -yq sudo; fi;\
-if ! command -v fuser > /dev/null 2>&1; then sudo $pm install -yq psmisc; fi;\
-if ! command -v lsof > /dev/null 2>&1; then sudo $pm install -yq lsof; fi;\
-if ! command -v docker > /dev/null 2>&1; then sudo $pm update -yq; sudo $pm install -yq $docker_pkg;\
-  if [ "$dist" = "fedora" ] || [ "$dist" = "centos" ] || [ "$dist" = "debian" ]; then sudo systemctl enable docker && sudo systemctl start docker; fi;\
+if ! command -v fuser > /dev/null 2>&1; then $pm install -yq psmisc; fi;\
+if ! command -v lsof > /dev/null 2>&1; then $pm install -yq lsof; fi;\
+if ! command -v docker > /dev/null 2>&1; then $pm update -yq; $pm install -yq $docker_pkg;\
+  if [ "$dist" = "fedora" ] || [ "$dist" = "debian" ]; then sudo systemctl enable docker && sudo systemctl start docker; fi;\
 fi;\
 if [ "$dist" = "debian" ]; then \
   docker_service=$(systemctl list-units --full --all | grep docker.service | grep -v inactive | grep -v dead | grep -v failed);\
@@ -17,3 +17,4 @@ if [ "$dist" = "debian" ]; then \
 fi;\
 if ! command -v sudo > /dev/null 2>&1; then echo "Failed to install Docker";exit 1;fi;\
 docker --version
+

client/translations/translations.qrc.in

@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/translations">
-				@QM_FILE_LIST@
-    </qresource>
-</RCC>

client/ui/controllers/connectionController.cpp

@@ -19,8 +19,23 @@ ConnectionController::ConnectionController(const QSharedPointer<ServersModel> &s
             Qt::QueuedConnection);
     connect(this, &ConnectionController::disconnectFromVpn, m_vpnConnection.get(), &VpnConnection::disconnectFromVpn,
             Qt::QueuedConnection);
+}
 
-    m_state = Vpn::ConnectionState::Disconnected;
+ConnectionController::~ConnectionController()
+{
+// todo use ConnectionController instead of using m_vpnConnection directly
+#ifdef AMNEZIA_DESKTOP
+    if (m_vpnConnection->connectionState() != Vpn::ConnectionState::Disconnected) {
+        m_vpnConnection->disconnectFromVpn();
+        for (int i = 0; i < 50; i++) {
+            qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
+            QThread::msleep(100);
+            if (m_vpnConnection->isDisconnected()) {
+                break;
+            }
+        }
+    }
+#endif
 }
 
 void ConnectionController::openConnection()
@@ -55,8 +70,6 @@ QString ConnectionController::getLastConnectionError()
 
 void ConnectionController::onConnectionStateChanged(Vpn::ConnectionState state)
 {
-    m_state = state;
-
     m_isConnected = false;
     m_connectionStateText = tr("Connection...");
     switch (state) {
@@ -113,17 +126,6 @@ void ConnectionController::onCurrentContainerUpdated()
     }
 }
 
-void ConnectionController::onTranslationsUpdated()
-{
-    // get translated text of current state
-    onConnectionStateChanged(getCurrentConnectionState());
-}
-
-Vpn::ConnectionState ConnectionController::getCurrentConnectionState()
-{
-    return m_state;
-}
-
 QString ConnectionController::connectionStateText() const
 {
     return m_connectionStateText;

client/ui/controllers/connectionController.h

@@ -19,7 +19,7 @@ public:
                                   const QSharedPointer<ContainersModel> &containersModel,
                                   const QSharedPointer<VpnConnection> &vpnConnection, QObject *parent = nullptr);
 
-    ~ConnectionController() = default;
+    ~ConnectionController();
 
     bool isConnected() const;
     bool isConnectionInProgress() const;
@@ -34,8 +34,6 @@ public slots:
 
     void onCurrentContainerUpdated();
 
-    void onTranslationsUpdated();
-
 signals:
     void connectToVpn(int serverIndex, const ServerCredentials &credentials, DockerContainer container,
                       const QJsonObject &containerConfig);
@@ -46,8 +44,6 @@ signals:
     void reconnectWithUpdatedContainer(const QString &message);
 
 private:
-    Vpn::ConnectionState getCurrentConnectionState();
-
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<ContainersModel> m_containersModel;
 
@@ -56,8 +52,6 @@ private:
     bool m_isConnected = false;
     bool m_isConnectionInProgress = false;
     QString m_connectionStateText = tr("Connect");
-
-    Vpn::ConnectionState m_state;
 };
 
 #endif // CONNECTIONCONTROLLER_H

client/ui/controllers/importController.cpp

@@ -144,6 +144,8 @@ void ImportController::importConfig()
     if (credentials.isValid() || m_config.contains(config_key::containers)) {
         m_serversModel->addServer(m_config);
 
+        m_serversModel->setDefaultServerIndex(m_serversModel->getServersCount() - 1);
+
         emit importFinished();
     } else {
         qDebug() << "Failed to import profile";
@@ -212,75 +214,21 @@ QJsonObject ImportController::extractOpenVpnConfig(const QString &data)
 
 QJsonObject ImportController::extractWireGuardConfig(const QString &data)
 {
-    QMap<QString, QString> configMap;
-    auto configByLines = data.split("\n");
-    for (const QString &line : configByLines) {
-        QString trimmedLine = line.trimmed();
-        if (trimmedLine.startsWith("[") && trimmedLine.endsWith("]")) {
-            continue;
-        } else {
-            QStringList parts = trimmedLine.split(" = ");
-            if (parts.count() == 2) {
-                configMap[parts.at(0).trimmed()] = parts.at(1).trimmed();
-            }
-        }
-    }
-
     QJsonObject lastConfig;
     lastConfig[config_key::config] = data;
 
-    const static QRegularExpression hostNameAndPortRegExp("Endpoint = (.*):([0-9]*)");
+    const static QRegularExpression hostNameAndPortRegExp("Endpoint = (.*)(?::([0-9]*))?");
     QRegularExpressionMatch hostNameAndPortMatch = hostNameAndPortRegExp.match(data);
     QString hostName;
     QString port;
     if (hostNameAndPortMatch.hasCaptured(1)) {
         hostName = hostNameAndPortMatch.captured(1);
-    } else {
-        qDebug() << "Failed to import profile";
-        emit importErrorOccurred(errorString(ErrorCode::ImportInvalidConfigError));
-    }
+    } /*else {
+        qDebug() << "send error?"
+    }*/
 
     if (hostNameAndPortMatch.hasCaptured(2)) {
         port = hostNameAndPortMatch.captured(2);
-    } else {
-        port = protocols::wireguard::defaultPort;
-    }
-
-    lastConfig[config_key::hostName] = hostName;
-    lastConfig[config_key::port] = port.toInt();
-
-//    if (!configMap.value("PrivateKey").isEmpty() && !configMap.value("Address").isEmpty()
-//        && !configMap.value("PresharedKey").isEmpty() && !configMap.value("PublicKey").isEmpty()) {
-        lastConfig[config_key::client_priv_key] = configMap.value("PrivateKey");
-        lastConfig[config_key::client_ip] = configMap.value("Address");
-        lastConfig[config_key::psk_key] = configMap.value("PresharedKey");
-        lastConfig[config_key::server_pub_key] = configMap.value("PublicKey");
-//    } else {
-//        qDebug() << "Failed to import profile";
-//        emit importErrorOccurred(errorString(ErrorCode::ImportInvalidConfigError));
-//        return QJsonObject();
-//    }
-
-    QString protocolName = "wireguard";
-    if (!configMap.value(config_key::junkPacketCount).isEmpty()
-        && !configMap.value(config_key::junkPacketMinSize).isEmpty()
-        && !configMap.value(config_key::junkPacketMaxSize).isEmpty()
-        && !configMap.value(config_key::initPacketJunkSize).isEmpty()
-        && !configMap.value(config_key::responsePacketJunkSize).isEmpty()
-        && !configMap.value(config_key::initPacketMagicHeader).isEmpty()
-        && !configMap.value(config_key::responsePacketMagicHeader).isEmpty()
-        && !configMap.value(config_key::underloadPacketMagicHeader).isEmpty()
-        && !configMap.value(config_key::transportPacketMagicHeader).isEmpty()) {
-        lastConfig[config_key::junkPacketCount] = configMap.value(config_key::junkPacketCount);
-        lastConfig[config_key::junkPacketMinSize] = configMap.value(config_key::junkPacketMinSize);
-        lastConfig[config_key::junkPacketMaxSize] = configMap.value(config_key::junkPacketMaxSize);
-        lastConfig[config_key::initPacketJunkSize] = configMap.value(config_key::initPacketJunkSize);
-        lastConfig[config_key::responsePacketJunkSize] = configMap.value(config_key::responsePacketJunkSize);
-        lastConfig[config_key::initPacketMagicHeader] = configMap.value(config_key::initPacketMagicHeader);
-        lastConfig[config_key::responsePacketMagicHeader] = configMap.value(config_key::responsePacketMagicHeader);
-        lastConfig[config_key::underloadPacketMagicHeader] = configMap.value(config_key::underloadPacketMagicHeader);
-        lastConfig[config_key::transportPacketMagicHeader] = configMap.value(config_key::transportPacketMagicHeader);
-        protocolName = "awg";
     }
 
     QJsonObject wireguardConfig;
@@ -290,15 +238,15 @@ QJsonObject ImportController::extractWireGuardConfig(const QString &data)
     wireguardConfig[config_key::transport_proto] = "udp";
 
     QJsonObject containers;
-    containers.insert(config_key::container, QJsonValue("amnezia-" + protocolName));
-    containers.insert(protocolName, QJsonValue(wireguardConfig));
+    containers.insert(config_key::container, QJsonValue("amnezia-wireguard"));
+    containers.insert(config_key::wireguard, QJsonValue(wireguardConfig));
 
     QJsonArray arr;
     arr.push_back(containers);
 
     QJsonObject config;
     config[config_key::containers] = arr;
-    config[config_key::defaultContainer] = "amnezia-" + protocolName;
+    config[config_key::defaultContainer] = "amnezia-wireguard";
     config[config_key::description] = m_settings->nextAvailableServerName();
 
     const static QRegularExpression dnsRegExp(

client/ui/controllers/installController.cpp

@@ -5,7 +5,6 @@
 #include <QEventLoop>
 #include <QJsonObject>
 #include <QStandardPaths>
-#include <QRandomGenerator>
 
 #include "core/errorstrings.h"
 #include "core/servercontroller.h"
@@ -74,38 +73,6 @@ void InstallController::install(DockerContainer container, int port, TransportPr
             containerConfig.insert(config_key::transport_proto,
                                    ProtocolProps::transportProtoToString(transportProto, protocol));
 
-            if (container == DockerContainer::Awg) {
-                QString junkPacketCount = QString::number(QRandomGenerator::global()->bounded(3, 10));
-                QString junkPacketMinSize = QString::number(50);
-                QString junkPacketMaxSize = QString::number(1000);
-                QString initPacketJunkSize = QString::number(QRandomGenerator::global()->bounded(15, 150));
-                QString responsePacketJunkSize = QString::number(QRandomGenerator::global()->bounded(15, 150));
-
-                QSet<QString> headersValue;
-                while (headersValue.size() != 4) {
-
-                    auto max = (std::numeric_limits<qint32>::max)();
-                    headersValue.insert(QString::number(QRandomGenerator::global()->bounded(1, max)));
-                }
-
-                auto headersValueList = headersValue.values();
-
-                QString initPacketMagicHeader = headersValueList.at(0);
-                QString responsePacketMagicHeader = headersValueList.at(1);
-                QString underloadPacketMagicHeader = headersValueList.at(2);
-                QString transportPacketMagicHeader = headersValueList.at(3);
-
-                containerConfig[config_key::junkPacketCount] = junkPacketCount;
-                containerConfig[config_key::junkPacketMinSize] = junkPacketMinSize;
-                containerConfig[config_key::junkPacketMaxSize] = junkPacketMaxSize;
-                containerConfig[config_key::initPacketJunkSize] = initPacketJunkSize;
-                containerConfig[config_key::responsePacketJunkSize] = responsePacketJunkSize;
-                containerConfig[config_key::initPacketMagicHeader] = initPacketMagicHeader;
-                containerConfig[config_key::responsePacketMagicHeader] = responsePacketMagicHeader;
-                containerConfig[config_key::underloadPacketMagicHeader] = underloadPacketMagicHeader;
-                containerConfig[config_key::transportPacketMagicHeader] = transportPacketMagicHeader;
-            }
-
             if (container == DockerContainer::Sftp) {
                 containerConfig.insert(config_key::userName, protocols::sftp::defaultUserName);
                 containerConfig.insert(config_key::password, Utils::getRandomString(10));
@@ -140,9 +107,10 @@ void InstallController::installServer(DockerContainer container, QJsonObject &co
     if (!installedContainers.contains(container)) {
         errorCode = serverController.setupContainer(m_currentlyInstalledServerCredentials, container, config);
         installedContainers.insert(container, config);
-        finishMessage = tr("%1 installed successfully. ").arg(ContainerProps::containerHumanNames().value(container));
+        finishMessage = ContainerProps::containerHumanNames().value(container) + tr(" installed successfully. ");
     } else {
-        finishMessage = tr("%1 is already installed on the server. ").arg(ContainerProps::containerHumanNames().value(container));
+        finishMessage =
+                ContainerProps::containerHumanNames().value(container) + tr(" is already installed on the server. ");
     }
     if (installedContainers.size() > 1) {
         finishMessage += tr("\nAdded containers that were already installed on the server");
@@ -165,6 +133,7 @@ void InstallController::installServer(DockerContainer container, QJsonObject &co
         server.insert(config_key::defaultContainer, ContainerProps::containerToString(container));
 
         m_serversModel->addServer(server);
+        m_serversModel->setDefaultServerIndex(m_serversModel->getServersCount() - 1);
 
         emit installServerFinished(finishMessage);
         return;
@@ -190,9 +159,10 @@ void InstallController::installContainer(DockerContainer container, QJsonObject
     if (!installedContainers.contains(container)) {
         errorCode = serverController.setupContainer(serverCredentials, container, config);
         installedContainers.insert(container, config);
-        finishMessage = tr("%1 installed successfully. ").arg(ContainerProps::containerHumanNames().value(container));
+        finishMessage = ContainerProps::containerHumanNames().value(container) + tr(" installed successfully. ");
     } else {
-        finishMessage = tr("%1 is already installed on the server. ").arg(ContainerProps::containerHumanNames().value(container));
+        finishMessage =
+                ContainerProps::containerHumanNames().value(container) + tr(" is already installed on the server. ");
     }
 
     bool isInstalledContainerAddedToGui = false;
@@ -307,7 +277,7 @@ void InstallController::removeCurrentlyProcessedServer()
     QString serverName = m_serversModel->data(serverIndex, ServersModel::Roles::NameRole).toString();
 
     m_serversModel->removeServer();
-    emit removeCurrentlyProcessedServerFinished(tr("Server '%1' was removed").arg(serverName));
+    emit removeCurrentlyProcessedServerFinished(tr("Server '") + serverName + tr("' was removed"));
 }
 
 void InstallController::removeAllContainers()
@@ -317,7 +287,7 @@ void InstallController::removeAllContainers()
 
     ErrorCode errorCode = m_containersModel->removeAllContainers();
     if (errorCode == ErrorCode::NoError) {
-        emit removeAllContainersFinished(tr("All containers from server '%1' have been removed").arg(serverName));
+        emit removeAllContainersFinished(tr("All containers from server '") + serverName + ("' have been removed"));
         return;
     }
     emit installationErrorOccurred(errorString(errorCode));
@@ -333,8 +303,8 @@ void InstallController::removeCurrentlyProcessedContainer()
 
     ErrorCode errorCode = m_containersModel->removeCurrentlyProcessedContainer();
     if (errorCode == ErrorCode::NoError) {
-
-        emit removeCurrentlyProcessedContainerFinished(tr("%1 has been removed from the server '%2'").arg(containerName).arg(serverName));
+        emit removeCurrentlyProcessedContainerFinished(containerName + tr(" has been removed from the server '")
+                                                       + serverName + "'");
         return;
     }
     emit installationErrorOccurred(errorString(errorCode));
@@ -504,9 +474,8 @@ void InstallController::addEmptyServer()
     server.insert(config_key::port, m_currentlyInstalledServerCredentials.port);
     server.insert(config_key::description, m_settings->nextAvailableServerName());
 
-    server.insert(config_key::defaultContainer, ContainerProps::containerToString(DockerContainer::None));
-
     m_serversModel->addServer(server);
+    m_serversModel->setDefaultServerIndex(m_serversModel->getServersCount() - 1);
 
     emit installServerFinished(tr("Server added successfully"));
 }

client/ui/controllers/pageController.cpp

@@ -157,8 +157,3 @@ void PageController::setTriggeredBtConnectButton(bool trigger)
 {
     m_isTriggeredByConnectButton = trigger;
 }
-
-void PageController::closeApplication()
-{
-    qApp->quit();
-}

client/ui/controllers/pageController.h

@@ -49,7 +49,6 @@ namespace PageLoader
         PageProtocolShadowSocksSettings,
         PageProtocolCloakSettings,
         PageProtocolWireGuardSettings,
-        PageProtocolAwgSettings,
         PageProtocolIKev2Settings,
         PageProtocolRaw
     };
@@ -85,11 +84,10 @@ public slots:
     void drawerOpen();
     void drawerClose();
 
+
     bool isTriggeredByConnectButton();
     void setTriggeredBtConnectButton(bool trigger);
 
-    void closeApplication();
-
 signals:
     void goToPage(PageLoader::PageEnum page, bool slide = true);
     void goToStartPage();

client/ui/controllers/settingsController.cpp

@@ -22,7 +22,7 @@ SettingsController::SettingsController(const QSharedPointer<ServersModel> &serve
       m_languageModel(languageModel),
       m_settings(settings)
 {
-    m_appVersion = QString("%1: %2 (%3)").arg(tr("Software version"), QString(APP_VERSION), __DATE__);
+    m_appVersion = QString("%1: %2 (%3)").arg(tr("Software version"), QString(APP_MAJOR_VERSION), __DATE__);
 
 #ifdef Q_OS_ANDROID
     if (!m_settings->isScreenshotsEnabled()) {
@@ -193,4 +193,4 @@ void SettingsController::toggleScreenshotsEnabled(bool enable)
         }
     });
 #endif
-}
+}

client/ui/controllers/sitesController.cpp

@@ -64,7 +64,7 @@ void SitesController::addSite(QString hostname)
         QHostInfo::lookupHost(hostname, this, resolveCallback);
     }
 
-    emit finished(tr("New site added: %1").arg(hostname));
+    emit finished(tr("New site added: ") + hostname);
 }
 
 void SitesController::removeSite(int index)
@@ -77,7 +77,7 @@ void SitesController::removeSite(int index)
                               Q_ARG(QStringList, QStringList() << hostname));
     QMetaObject::invokeMethod(m_vpnConnection.get(), "flushDns", Qt::QueuedConnection);
 
-    emit finished(tr("Site removed: %1").arg(hostname));
+    emit finished(tr("Site removed: ") + hostname);
 }
 
 void SitesController::importSites(const QString &fileName, bool replaceExisting)
@@ -85,19 +85,19 @@ void SitesController::importSites(const QString &fileName, bool replaceExisting)
     QFile file(fileName);
 
     if (!file.open(QIODevice::ReadOnly)) {
-        emit errorOccurred(tr("Can't open file: %1").arg(fileName));
+        emit errorOccurred(tr("Can't open file: ") + fileName);
         return;
     }
 
     QByteArray jsonData = file.readAll();
     QJsonDocument jsonDocument = QJsonDocument::fromJson(jsonData);
     if (jsonDocument.isNull()) {
-        emit errorOccurred(tr("Failed to parse JSON data from file: %1").arg(fileName));
+        emit errorOccurred(tr("Failed to parse JSON data from file: ") + fileName);
         return;
     }
 
     if (!jsonDocument.isArray()) {
-        emit errorOccurred(tr("The JSON data is not an array in file: %1").arg(fileName));
+        emit errorOccurred(tr("The JSON data is not an array in file: ") + fileName);
         return;
     }
 

client/ui/models/containers_model.cpp

@@ -41,7 +41,7 @@ bool ContainersModel::setData(const QModelIndex &index, const QVariant &value, i
         //        return container;
     case IsInstalledRole:
     //        return m_settings->containers(m_currentlyProcessedServerIndex).contains(container);
-    case IsDefaultRole: { //todo remove
+    case IsDefaultRole: {
         m_settings->setDefaultContainer(m_currentlyProcessedServerIndex, container);
         m_defaultContainerIndex = container;
         emit defaultContainerChanged();
@@ -117,14 +117,6 @@ QString ContainersModel::getDefaultContainerName()
     return ContainerProps::containerHumanNames().value(m_defaultContainerIndex);
 }
 
-void ContainersModel::setDefaultContainer(int index)
-{
-    auto container = static_cast<DockerContainer>(index);
-    m_settings->setDefaultContainer(m_currentlyProcessedServerIndex, container);
-    m_defaultContainerIndex = container;
-    emit defaultContainerChanged();
-}
-
 int ContainersModel::getCurrentlyProcessedContainerIndex()
 {
     return m_currentlyProcessedContainerIndex;
@@ -236,11 +228,6 @@ bool ContainersModel::isAnyContainerInstalled()
     return false;
 }
 
-void ContainersModel::updateContainersConfig()
-{
-    m_containers = m_settings->containers(m_currentlyProcessedServerIndex);
-}
-
 QHash<int, QByteArray> ContainersModel::roleNames() const
 {
     QHash<int, QByteArray> roles;

client/ui/models/containers_model.h

@@ -46,7 +46,6 @@ public:
 public slots:
     DockerContainer getDefaultContainer();
     QString getDefaultContainerName();
-    void setDefaultContainer(int index);
 
     void setCurrentlyProcessedServerIndex(const int index);
 
@@ -66,8 +65,6 @@ public slots:
 
     bool isAnyContainerInstalled();
 
-    void updateContainersConfig();
-
 protected:
     QHash<int, QByteArray> roleNames() const override;
 

client/ui/models/languageModel.cpp

@@ -6,8 +6,7 @@ LanguageModel::LanguageModel(std::shared_ptr<Settings> settings, QObject *parent
     QMetaEnum metaEnum = QMetaEnum::fromType<LanguageSettings::AvailableLanguageEnum>();
     for (int i = 0; i < metaEnum.keyCount(); i++) {
         m_availableLanguages.push_back(
-            LanguageModelData {getLocalLanguageName(static_cast<LanguageSettings::AvailableLanguageEnum>(i)),
-                              static_cast<LanguageSettings::AvailableLanguageEnum>(i) });
+                LanguageModelData { metaEnum.valueToKey(i), static_cast<LanguageSettings::AvailableLanguageEnum>(i) });
     }
 }
 
@@ -37,26 +36,11 @@ QHash<int, QByteArray> LanguageModel::roleNames() const
     return roles;
 }
 
-QString LanguageModel::getLocalLanguageName(const LanguageSettings::AvailableLanguageEnum language)
-{
-    QString strLanguage("");
-    switch (language) {
-    case LanguageSettings::AvailableLanguageEnum::English: strLanguage = "English"; break;
-    case LanguageSettings::AvailableLanguageEnum::Russian: strLanguage = "Русский"; break;
-    case LanguageSettings::AvailableLanguageEnum::China_cn: strLanguage = "\347\256\200\344\275\223\344\270\255\346\226\207"; break;
-    default:
-        break;
-    }
-
-    return strLanguage;
-}
-
 void LanguageModel::changeLanguage(const LanguageSettings::AvailableLanguageEnum language)
 {
     switch (language) {
     case LanguageSettings::AvailableLanguageEnum::English: emit updateTranslations(QLocale::English); break;
     case LanguageSettings::AvailableLanguageEnum::Russian: emit updateTranslations(QLocale::Russian); break;
-    case LanguageSettings::AvailableLanguageEnum::China_cn: emit updateTranslations(QLocale::Chinese); break;
     default: emit updateTranslations(QLocale::English); break;
     }
 }
@@ -67,7 +51,6 @@ int LanguageModel::getCurrentLanguageIndex()
     switch (locale.language()) {
     case QLocale::English: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::English); break;
     case QLocale::Russian: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::Russian); break;
-    case QLocale::Chinese: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::China_cn); break;
     default: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::English); break;
     }
 }

client/ui/models/languageModel.h

@@ -11,8 +11,7 @@ namespace LanguageSettings
     Q_NAMESPACE
     enum class AvailableLanguageEnum {
         English,
-        Russian,
-        China_cn
+        Russian
     };
     Q_ENUM_NS(AvailableLanguageEnum)
 
@@ -60,8 +59,6 @@ protected:
     QHash<int, QByteArray> roleNames() const override;
 
 private:
-    QString getLocalLanguageName(const LanguageSettings::AvailableLanguageEnum language);
-
     QVector<LanguageModelData> m_availableLanguages;
 
     std::shared_ptr<Settings> m_settings;

client/ui/models/protocols/awgConfigModel.cpp

@@ -1,137 +0,0 @@
-#include "awgConfigModel.h"
-
-#include <QJsonDocument>
-
-#include "protocols/protocols_defs.h"
-
-AwgConfigModel::AwgConfigModel(QObject *parent) : QAbstractListModel(parent)
-{
-}
-
-int AwgConfigModel::rowCount(const QModelIndex &parent) const
-{
-    Q_UNUSED(parent);
-    return 1;
-}
-
-bool AwgConfigModel::setData(const QModelIndex &index, const QVariant &value, int role)
-{
-    if (!index.isValid() || index.row() < 0 || index.row() >= ContainerProps::allContainers().size()) {
-        return false;
-    }
-
-    switch (role) {
-    case Roles::PortRole: m_protocolConfig.insert(config_key::port, value.toString()); break;
-    case Roles::JunkPacketCountRole: m_protocolConfig.insert(config_key::junkPacketCount, value.toString()); break;
-    case Roles::JunkPacketMinSizeRole: m_protocolConfig.insert(config_key::junkPacketMinSize, value.toString()); break;
-    case Roles::JunkPacketMaxSizeRole: m_protocolConfig.insert(config_key::junkPacketMaxSize, value.toString()); break;
-    case Roles::InitPacketJunkSizeRole:
-        m_protocolConfig.insert(config_key::initPacketJunkSize, value.toString());
-        break;
-    case Roles::ResponsePacketJunkSizeRole:
-        m_protocolConfig.insert(config_key::responsePacketJunkSize, value.toString());
-        break;
-    case Roles::InitPacketMagicHeaderRole:
-        m_protocolConfig.insert(config_key::initPacketMagicHeader, value.toString());
-        break;
-    case Roles::ResponsePacketMagicHeaderRole:
-        m_protocolConfig.insert(config_key::responsePacketMagicHeader, value.toString());
-        break;
-    case Roles::UnderloadPacketMagicHeaderRole:
-        m_protocolConfig.insert(config_key::underloadPacketMagicHeader, value.toString());
-        break;
-    case Roles::TransportPacketMagicHeaderRole:
-        m_protocolConfig.insert(config_key::transportPacketMagicHeader, value.toString());
-        break;
-    }
-
-    emit dataChanged(index, index, QList { role });
-    return true;
-}
-
-QVariant AwgConfigModel::data(const QModelIndex &index, int role) const
-{
-    if (!index.isValid() || index.row() < 0 || index.row() >= rowCount()) {
-        return false;
-    }
-
-    switch (role) {
-    case Roles::PortRole: return m_protocolConfig.value(config_key::port).toString();
-    case Roles::JunkPacketCountRole: return m_protocolConfig.value(config_key::junkPacketCount);
-    case Roles::JunkPacketMinSizeRole: return m_protocolConfig.value(config_key::junkPacketMinSize);
-    case Roles::JunkPacketMaxSizeRole: return m_protocolConfig.value(config_key::junkPacketMaxSize);
-    case Roles::InitPacketJunkSizeRole: return m_protocolConfig.value(config_key::initPacketJunkSize);
-    case Roles::ResponsePacketJunkSizeRole: return m_protocolConfig.value(config_key::responsePacketJunkSize);
-    case Roles::InitPacketMagicHeaderRole: return m_protocolConfig.value(config_key::initPacketMagicHeader);
-    case Roles::ResponsePacketMagicHeaderRole: return m_protocolConfig.value(config_key::responsePacketMagicHeader);
-    case Roles::UnderloadPacketMagicHeaderRole: return m_protocolConfig.value(config_key::underloadPacketMagicHeader);
-    case Roles::TransportPacketMagicHeaderRole: return m_protocolConfig.value(config_key::transportPacketMagicHeader);
-    }
-
-    return QVariant();
-}
-
-void AwgConfigModel::updateModel(const QJsonObject &config)
-{
-    beginResetModel();
-    m_container = ContainerProps::containerFromString(config.value(config_key::container).toString());
-
-    m_fullConfig = config;
-
-    QJsonObject protocolConfig = config.value(config_key::awg).toObject();
-
-    m_protocolConfig[config_key::port] =
-            protocolConfig.value(config_key::port).toString(protocols::awg::defaultPort);
-    m_protocolConfig[config_key::junkPacketCount] =
-            protocolConfig.value(config_key::junkPacketCount).toString(protocols::awg::defaultJunkPacketCount);
-    m_protocolConfig[config_key::junkPacketMinSize] =
-            protocolConfig.value(config_key::junkPacketMinSize)
-                    .toString(protocols::awg::defaultJunkPacketMinSize);
-    m_protocolConfig[config_key::junkPacketMaxSize] =
-            protocolConfig.value(config_key::junkPacketMaxSize)
-                    .toString(protocols::awg::defaultJunkPacketMaxSize);
-    m_protocolConfig[config_key::initPacketJunkSize] =
-            protocolConfig.value(config_key::initPacketJunkSize)
-                    .toString(protocols::awg::defaultInitPacketJunkSize);
-    m_protocolConfig[config_key::responsePacketJunkSize] =
-            protocolConfig.value(config_key::responsePacketJunkSize)
-                    .toString(protocols::awg::defaultResponsePacketJunkSize);
-    m_protocolConfig[config_key::initPacketMagicHeader] =
-            protocolConfig.value(config_key::initPacketMagicHeader)
-                    .toString(protocols::awg::defaultInitPacketMagicHeader);
-    m_protocolConfig[config_key::responsePacketMagicHeader] =
-            protocolConfig.value(config_key::responsePacketMagicHeader)
-                    .toString(protocols::awg::defaultResponsePacketMagicHeader);
-    m_protocolConfig[config_key::underloadPacketMagicHeader] =
-            protocolConfig.value(config_key::underloadPacketMagicHeader)
-                    .toString(protocols::awg::defaultUnderloadPacketMagicHeader);
-    m_protocolConfig[config_key::transportPacketMagicHeader] =
-            protocolConfig.value(config_key::transportPacketMagicHeader)
-                    .toString(protocols::awg::defaultTransportPacketMagicHeader);
-
-    endResetModel();
-}
-
-QJsonObject AwgConfigModel::getConfig()
-{
-    m_fullConfig.insert(config_key::awg, m_protocolConfig);
-    return m_fullConfig;
-}
-
-QHash<int, QByteArray> AwgConfigModel::roleNames() const
-{
-    QHash<int, QByteArray> roles;
-
-    roles[PortRole] = "port";
-    roles[JunkPacketCountRole] = "junkPacketCount";
-    roles[JunkPacketMinSizeRole] = "junkPacketMinSize";
-    roles[JunkPacketMaxSizeRole] = "junkPacketMaxSize";
-    roles[InitPacketJunkSizeRole] = "initPacketJunkSize";
-    roles[ResponsePacketJunkSizeRole] = "responsePacketJunkSize";
-    roles[InitPacketMagicHeaderRole] = "initPacketMagicHeader";
-    roles[ResponsePacketMagicHeaderRole] = "responsePacketMagicHeader";
-    roles[UnderloadPacketMagicHeaderRole] = "underloadPacketMagicHeader";
-    roles[TransportPacketMagicHeaderRole] = "transportPacketMagicHeader";
-
-    return roles;
-}

client/ui/models/protocols/awgConfigModel.h

@@ -1,47 +0,0 @@
-#ifndef AWGCONFIGMODEL_H
-#define AWGCONFIGMODEL_H
-
-#include <QAbstractListModel>
-#include <QJsonObject>
-
-#include "containers/containers_defs.h"
-
-class AwgConfigModel : public QAbstractListModel
-{
-    Q_OBJECT
-
-public:
-    enum Roles {
-        PortRole = Qt::UserRole + 1,
-        JunkPacketCountRole,
-        JunkPacketMinSizeRole,
-        JunkPacketMaxSizeRole,
-        InitPacketJunkSizeRole,
-        ResponsePacketJunkSizeRole,
-        InitPacketMagicHeaderRole,
-        ResponsePacketMagicHeaderRole,
-        UnderloadPacketMagicHeaderRole,
-        TransportPacketMagicHeaderRole
-    };
-
-    explicit AwgConfigModel(QObject *parent = nullptr);
-
-    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-
-    bool setData(const QModelIndex &index, const QVariant &value, int role) override;
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-
-public slots:
-    void updateModel(const QJsonObject &config);
-    QJsonObject getConfig();
-
-protected:
-    QHash<int, QByteArray> roleNames() const override;
-
-private:
-    DockerContainer m_container;
-    QJsonObject m_protocolConfig;
-    QJsonObject m_fullConfig;
-};
-
-#endif // AWGCONFIGMODEL_H

client/ui/models/protocols_model.cpp

@@ -78,11 +78,12 @@ PageLoader::PageEnum ProtocolsModel::protocolPage(Proto protocol) const
     case Proto::ShadowSocks: return PageLoader::PageEnum::PageProtocolShadowSocksSettings;
     case Proto::WireGuard: return PageLoader::PageEnum::PageProtocolWireGuardSettings;
     case Proto::Ikev2: return PageLoader::PageEnum::PageProtocolIKev2Settings;
-    case Proto::L2tp: return PageLoader::PageEnum::PageProtocolIKev2Settings;
+    case Proto::L2tp: return PageLoader::PageEnum::PageProtocolOpenVpnSettings;
     // non-vpn
-    case Proto::TorWebSite: return PageLoader::PageEnum::PageServiceTorWebsiteSettings;
-    case Proto::Dns: return PageLoader::PageEnum::PageServiceDnsSettings;
-    case Proto::Sftp: return PageLoader::PageEnum::PageServiceSftpSettings;
+    case Proto::TorWebSite: return PageLoader::PageEnum::PageProtocolOpenVpnSettings;
+    case Proto::Dns: return PageLoader::PageEnum::PageProtocolOpenVpnSettings;
+    case Proto::FileShare: return PageLoader::PageEnum::PageProtocolOpenVpnSettings;
+    case Proto::Sftp: return PageLoader::PageEnum::PageProtocolOpenVpnSettings;
     default: return PageLoader::PageEnum::PageProtocolOpenVpnSettings;
     }
 }

client/ui/models/servers_model.cpp

@@ -96,7 +96,7 @@ void ServersModel::setDefaultServerIndex(const int index)
 {
     m_settings->setDefaultServer(index);
     m_defaultServerIndex = m_settings->defaultServerIndex();
-    emit defaultServerIndexChanged(m_defaultServerIndex);
+    emit defaultServerIndexChanged();
 }
 
 const int ServersModel::getDefaultServerIndex()

client/ui/models/servers_model.h

@@ -64,7 +64,7 @@ protected:
 
 signals:
     void currentlyProcessedServerIndexChanged(const int index);
-    void defaultServerIndexChanged(const int index);
+    void defaultServerIndexChanged();
     void defaultServerNameChanged();
 
 private:

client/ui/models/sites_model.cpp

@@ -3,14 +3,7 @@
 SitesModel::SitesModel(std::shared_ptr<Settings> settings, QObject *parent)
     : QAbstractListModel(parent), m_settings(settings)
 {
-    auto routeMode = m_settings->routeMode();
-    if (routeMode == Settings::RouteMode::VpnAllSites) {
-        m_isSplitTunnelingEnabled = false;
-        m_currentRouteMode = Settings::RouteMode::VpnOnlyForwardSites;
-    } else {
-        m_isSplitTunnelingEnabled = true;
-        m_currentRouteMode = routeMode;
-    }
+    m_currentRouteMode = m_settings->routeMode();
     fillSites();
 }
 
@@ -100,21 +93,6 @@ void SitesModel::setRouteMode(int routeMode)
     emit routeModeChanged();
 }
 
-bool SitesModel::isSplitTunnelingEnabled()
-{
-    return m_isSplitTunnelingEnabled;
-}
-
-void SitesModel::toggleSplitTunneling(bool enabled)
-{
-    if (enabled) {
-        setRouteMode(m_currentRouteMode);
-    } else {
-        m_settings->setRouteMode(Settings::RouteMode::VpnAllSites);
-    }
-    m_isSplitTunnelingEnabled = enabled;
-}
-
 QVector<QPair<QString, QString> > SitesModel::getCurrentSites()
 {
     return m_sites;

client/ui/models/sites_model.h

@@ -31,9 +31,6 @@ public slots:
     int getRouteMode();
     void setRouteMode(int routeMode);
 
-    bool isSplitTunnelingEnabled();
-    void toggleSplitTunneling(bool enabled);
-
     QVector<QPair<QString, QString>> getCurrentSites();
 
 signals:
@@ -47,7 +44,6 @@ private:
 
     std::shared_ptr<Settings> m_settings;
 
-    bool m_isSplitTunnelingEnabled;
     Settings::RouteMode m_currentRouteMode;
 
     QVector<QPair<QString, QString>> m_sites;

client/ui/notificationhandler.cpp

@@ -88,10 +88,6 @@ void NotificationHandler::setConnectionState(Vpn::ConnectionState state)
     }
 }
 
-void NotificationHandler::onTranslationsUpdated()
-{
-}
-
 void NotificationHandler::unsecuredNetworkNotification(const QString& networkName) {
     qDebug() << "Unsecured network notification shown";
 

client/ui/notificationhandler.h

@@ -32,7 +32,6 @@ public:
 
 public slots:
     virtual void setConnectionState(Vpn::ConnectionState state);
-    virtual void onTranslationsUpdated();
 
 signals:
     void notificationShown(const QString& title, const QString& message);

client/ui/qml/Components/ConnectButton.qml

@@ -142,7 +142,6 @@ Button {
             PageController.setTriggeredBtConnectButton(true)
 
             ServersModel.currentlyProcessedIndex = ServersModel.getDefaultServerIndex()
-            InstallController.setShouldCreateServer(false)
             PageController.goToPage(PageEnum.PageSetupWizardEasy)
 
             return

client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml

@@ -20,14 +20,16 @@ DrawerType {
         anchors.right: parent.right
         spacing: 0
 
-        Header2Type {
+        Header2TextType {
             Layout.fillWidth: true
             Layout.topMargin: 24
             Layout.rightMargin: 16
             Layout.leftMargin: 16
-            Layout.bottomMargin: 16
+            Layout.bottomMargin: 32
+            Layout.alignment: Qt.AlignHCenter
 
-            headerText: qsTr("Add new connection")
+            text: qsTr("Connection data")
+            wrapMode: Text.WordWrap
         }
 
         LabelWithButtonType {
@@ -35,7 +37,7 @@ DrawerType {
             Layout.fillWidth: true
             Layout.topMargin: 16
 
-            text: qsTr("Configure your server")
+            text: qsTr("Server IP, login and password")
             rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
             clickedFunction: function() {
@@ -49,7 +51,7 @@ DrawerType {
         LabelWithButtonType {
             Layout.fillWidth: true
 
-            text: qsTr("Open config file, key or QR code")
+            text: qsTr("QR code, key or configuration file")
             rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
             clickedFunction: function() {

client/ui/qml/Components/HomeContainersListView.qml

@@ -50,30 +50,41 @@ ListView {
                 imageSource: "qrc:/images/controls/download.svg"
                 showImage: !isInstalled
 
-                checkable: isInstalled && !ConnectionController.isConnected && isSupported
+                checkable: isInstalled
                 checked: isDefault
 
-                onClicked: {
-                    if (ConnectionController.isConnected && isInstalled) {
-                        PageController.showNotificationMessage(qsTr("Unable change protocol while there is an active connection"))
-                        return
+                onPressed: function(mouse) {
+                    if (!isSupported) {
+                        PageController.showErrorMessage(qsTr("The selected protocol is not supported on the current platform"))
                     }
+                }
 
+                onClicked: {
                     if (checked) {
+                        var needReconnected = false
+                        if (!isDefault) {
+                            needReconnected = true
+                        }
+
                         isDefault = true
 
                         menuContent.currentIndex = index
                         containersDropDown.menuVisible = false
-                    } else {
-                        if (!isSupported && isInstalled) {
-                            PageController.showErrorMessage(qsTr("The selected protocol is not supported on the current platform"))
-                            return
-                        }
 
+
+                        if (needReconnected &&
+                                (ConnectionController.isConnected || ConnectionController.isConnectionInProgress)) {
+                            PageController.showNotificationMessage(qsTr("Reconnect via VPN Procotol: ") + name)
+                            PageController.goToPageHome()
+                            menu.visible = false
+                            ConnectionController.openConnection()
+                        }
+                    } else {
                         ContainersModel.setCurrentlyProcessedContainerIndex(proxyContainersModel.mapToSource(index))
                         InstallController.setShouldCreateServer(false)
                         PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
                         containersDropDown.menuVisible = false
+                        menu.visible = false
                     }
                 }
 

client/ui/qml/Components/QuestionDrawer.qml

@@ -17,11 +17,9 @@ DrawerType {
     property var noButtonFunction
 
     width: parent.width
-    height: content.implicitHeight + 32
+    height: parent.height * 0.5
 
     ColumnLayout {
-        id: content
-
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right

client/ui/qml/Components/SettingsContainersListView.qml

@@ -64,11 +64,6 @@ ListView {
     //                        goToPage(PageEnum.PageProtocolWireGuardSettings)
                             break
                         }
-                        case ContainerEnum.Awg: {
-                            AwgConfigModel.updateModel(config)
-                            PageController.goToPage(PageEnum.PageProtocolAwgSettings)
-                            break
-                        }
                         case ContainerEnum.Ipsec: {
                             ProtocolsModel.updateModel(config)
                             PageController.goToPage(PageEnum.PageProtocolRaw)

client/ui/qml/Components/ShareConnectionDrawer.qml

@@ -213,7 +213,6 @@ DrawerType {
 
                     Image {
                         anchors.fill: parent
-                        anchors.margins: 2
                         smooth: false
 
                         source: ExportController.qrCodesCount ? ExportController.qrCodes[0] : ""

client/ui/qml/Config/GlobalConfig.qml

@@ -26,16 +26,4 @@ Item {
         }
         return false
     }
-
-    TextEdit{
-        id: clipboard
-        visible: false
-    }
-
-    function copyToClipBoard(text) {
-        clipboard.text = text
-        clipboard.selectAll()
-        clipboard.copy()
-        clipboard.select(0, 0)
-    }
 }

client/ui/qml/Controls2/CardType.qml

@@ -81,7 +81,6 @@ RadioButton {
 
         Text {
             text: root.headerText
-            wrapMode: Text.WordWrap
             color: "#D7D8DB"
             font.pixelSize: 25
             font.weight: 700
@@ -111,7 +110,6 @@ RadioButton {
 
         Text {
             text: root.footerText
-            wrapMode: Text.WordWrap
             visible: root.footerText !== ""
             color: "#878B91"
             font.pixelSize: 13

client/ui/qml/Controls2/DrawerType.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls
 
-import "../Config"
-
 Drawer {
     id: drawer
     property bool needCloseButton: true
@@ -41,18 +39,6 @@ Drawer {
 
         border.color: "#2C2D30"
         border.width: 1
-
-        Rectangle {
-            visible: GC.isMobile()
-
-            anchors.top: parent.top
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.topMargin: 10
-
-            width: 20
-            height: 2
-            color: "#2C2D30"
-        }
     }
 
     Overlay.modal: Rectangle {

client/ui/qml/Controls2/LabelWithButtonType.qml

@@ -17,12 +17,9 @@ Item {
 
     property string rightImageSource
     property string leftImageSource
-    property bool isLeftImageHoverEnabled: true //todo separete this qml file to 3
 
     property string textColor: "#d7d8db"
-    property string textDisabledColor: "#878B91"
     property string descriptionColor: "#878B91"
-    property string descriptionDisabledColor: "#494B50"
     property real textOpacity: 1.0
 
     property string rightImageColor: "#d7d8db"
@@ -45,9 +42,9 @@ Item {
 
             visible: leftImageSource ? true : false
 
-            Layout.preferredHeight: rightImageSource || !isLeftImageHoverEnabled ? leftImage.implicitHeight : 56
-            Layout.preferredWidth: rightImageSource || !isLeftImageHoverEnabled ? leftImage.implicitWidth : 56
-            Layout.rightMargin: rightImageSource || !isLeftImageHoverEnabled ? 16 : 0
+            Layout.preferredHeight: rightImageSource ? leftImage.implicitHeight : 56
+            Layout.preferredWidth: rightImageSource ? leftImage.implicitWidth : 56
+            Layout.rightMargin: rightImageSource ? 16 : 0
 
             radius: 12
             color: "transparent"
@@ -73,14 +70,7 @@ Item {
 
             ListItemTitleType {
                 text: root.text
-                color: {
-                    if (root.enabled) {
-                        return root.descriptionOnTop ? root.descriptionColor : root.textColor
-                    } else {
-                        return root.descriptionOnTop ? root.descriptionDisabledColor : root.textDisabledColor
-                    }
-                }
-
+                color: root.descriptionOnTop ? root.descriptionColor : root.textColor
                 maximumLineCount: root.textMaximumLineCount
                 elide: root.textElide
 
@@ -105,13 +95,7 @@ Item {
                 id: description
 
                 text: root.descriptionText
-                color: {
-                    if (root.enabled) {
-                        return root.descriptionOnTop ? root.textColor : root.descriptionColor
-                    } else {
-                        return root.descriptionOnTop ? root.textDisabledColor : root.descriptionDisabledColor
-                    }
-                }
+                color: root.descriptionOnTop ? root.textColor : root.descriptionColor
 
                 opacity: root.textOpacity
 
@@ -172,7 +156,7 @@ Item {
     MouseArea {
         anchors.fill: parent
         cursorShape: Qt.PointingHandCursor
-        hoverEnabled: root.enabled
+        hoverEnabled: true
 
         onEntered: {
             if (rightImageSource) {

client/ui/qml/Controls2/SwitcherType.qml

@@ -30,13 +30,17 @@ Switch {
     property string hoveredIndicatorBackgroundColor: Qt.rgba(1, 1, 1, 0.08)
     property string defaultIndicatorBackgroundColor: "transparent"
 
+    implicitWidth: content.implicitWidth + switcher.implicitWidth
+    implicitHeight: content.implicitHeight
+
     hoverEnabled: enabled ? true : false
 
     indicator: Rectangle {
         id: switcher
 
-        anchors.right: parent.right
+        anchors.left: content.right
         anchors.verticalCenter: parent.verticalCenter
+        anchors.leftMargin: 4
 
         implicitWidth: 52
         implicitHeight: 32
@@ -86,11 +90,11 @@ Switch {
     contentItem: ColumnLayout {
         id: content
 
-        anchors.verticalCenter: parent.verticalCenter
+        anchors.fill: parent
+        anchors.rightMargin: switcher.implicitWidth
 
         ListItemTitleType {
             Layout.fillWidth: true
-            rightPadding: indicator.width
 
             text: root.text
             color: root.enabled ? root.textColor : root.textDisabledColor
@@ -100,7 +104,6 @@ Switch {
             id: description
 
             Layout.fillWidth: true
-            rightPadding: indicator.width
 
             color: root.enabled ? root.descriptionTextColor : root.descriptionTextDisabledColor
 

client/ui/qml/Controls2/TextFieldWithHeaderType.qml

@@ -12,7 +12,6 @@ Item {
     property string headerTextColor: "#878b91"
 
     property alias errorText: errorField.text
-    property bool checkEmptyText: false
 
     property string buttonText
     property string buttonImageSource
@@ -100,12 +99,6 @@ Item {
                             root.errorText = ""
                         }
 
-                        onActiveFocusChanged: {
-                            if (checkEmptyText && textFieldText === "") {
-                                errorText = qsTr("The field can't be empty")
-                            }
-                        }
-
                         MouseArea {
                             anchors.fill: parent
                             acceptedButtons: Qt.RightButton

client/ui/qml/Controls2/TopCloseButtonType.qml

@@ -5,8 +5,6 @@ import QtQuick.Shapes
 Popup {
     id: root
 
-    property alias buttonWidth: button.implicitWidth
-
     modal: false
     closePolicy: Popup.NoAutoClose
     padding: 4
@@ -22,8 +20,6 @@ Popup {
     }
 
     ImageButtonType {
-        id: button
-
         image: "qrc:/images/svg/close_black_24dp.svg"
         imageColor: "#D7D8DB"
 

client/ui/qml/Pages2/PageDeinstalling.qml

@@ -59,7 +59,7 @@ PageType {
                             Layout.fillWidth: true
                             Layout.topMargin: 20
 
-                            headerText: qsTr("Removing services from %1").arg(name)
+                            headerText: qsTr("Removing services from ") + name
                         }
 
                         ProgressBarType {

client/ui/qml/Pages2/PageHome.qml

@@ -26,55 +26,6 @@ PageType {
     property string defaultServerHostName: ServersModel.defaultServerHostName
     property string defaultContainerName: ContainersModel.defaultContainerName
 
-    Connections {
-        target: PageController
-
-        function onRestorePageHomeState(isContainerInstalled) {
-            buttonContent.state = "expanded"
-            if (isContainerInstalled) {
-                containersDropDown.menuVisible = true
-            }
-        }
-        function onForceCloseDrawer() {
-            buttonContent.state = "collapsed"
-        }
-    }
-
-    Connections {
-        target: ServersModel
-
-        function onDefaultServerIndexChanged() {
-            updateDescriptions()
-        }
-    }
-
-    Connections {
-        target: ContainersModel
-
-        function onDefaultContainerChanged() {
-            updateDescriptions()
-        }
-    }
-
-    function updateDescriptions() {
-        var description = ""
-        if (ServersModel.isDefaultServerHasWriteAccess()) {
-            if (SettingsController.isAmneziaDnsEnabled()
-                    && ContainersModel.isAmneziaDnsContainerInstalled(ServersModel.getDefaultServerIndex())) {
-                description += "Amnezia DNS | "
-            }
-        } else {
-            if (ServersModel.isDefaultServerConfigContainsAmneziaDns()) {
-                description += "Amnezia DNS | "
-            }
-        }
-
-        collapsedServerMenuDescription.text = description + root.defaultContainerName + " | " + root.defaultServerHostName
-        expandedServersMenuDescription.text = description + root.defaultServerHostName
-    }
-
-    Component.onCompleted: updateDescriptions()
-
     MouseArea {
         anchors.fill: parent
         enabled: buttonContent.state === "expanded"
@@ -92,11 +43,25 @@ PageType {
         }
     }
 
+    Connections {
+        target: PageController
+
+        function onRestorePageHomeState(isContainerInstalled) {
+            buttonContent.state = "expanded"
+            if (isContainerInstalled) {
+                containersDropDown.menuVisible = true
+            }
+        }
+        function onForceCloseDrawer() {
+            buttonContent.state = "collapsed"
+        }
+    }
+
     MouseArea {
         id: dragArea
 
         anchors.fill: buttonBackground
-        cursorShape: buttonContent.state === "collapsed" ? Qt.PointingHandCursor : Qt.ArrowCursor
+        cursorShape: Qt.PointingHandCursor
         hoverEnabled: true
 
         drag.target: buttonContent
@@ -241,18 +206,8 @@ PageType {
             }
         ]
 
-        DividerType {
-            Layout.topMargin: 10
-            Layout.fillWidth: false
-            Layout.preferredWidth: 20
-            Layout.preferredHeight: 2
-            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-
-            visible: (buttonContent.collapsedVisibility || buttonContent.expandedVisibility)
-        }
-
         RowLayout {
-            Layout.topMargin: 14
+            Layout.topMargin: 24
             Layout.leftMargin: 24
             Layout.rightMargin: 24
             Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
@@ -300,10 +255,26 @@ PageType {
         }
 
         LabelTextType {
-            id: collapsedServerMenuDescription
             Layout.bottomMargin: 44
             Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
             visible: buttonContent.collapsedVisibility
+
+            text: {
+                var description = ""
+                if (ServersModel.isDefaultServerHasWriteAccess()) {
+                    if (SettingsController.isAmneziaDnsEnabled()
+                            && ContainersModel.isAmneziaDnsContainerInstalled(ServersModel.getDefaultServerIndex())) {
+                        description += "Amnezia DNS | "
+                    }
+                } else {
+                    if (ServersModel.isDefaultServerConfigContainsAmneziaDns()) {
+                        description += "Amnezia DNS | "
+                    }
+                }
+
+                description += root.defaultContainerName + " | " + root.defaultServerHostName
+                return description
+            }
         }
 
         ColumnLayout {
@@ -315,7 +286,7 @@ PageType {
 
             Header1TextType {
                 Layout.fillWidth: true
-                Layout.topMargin: 14
+                Layout.topMargin: 24
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
 
@@ -326,11 +297,10 @@ PageType {
             }
 
             LabelTextType {
-                id: expandedServersMenuDescription
                 Layout.bottomMargin: 24
-                Layout.fillWidth: true
-                horizontalAlignment: Qt.AlignHCenter
-                verticalAlignment: Qt.AlignVCenter
+                Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+
+                text: root.defaultServerHostName
             }
 
             RowLayout {
@@ -395,7 +365,18 @@ PageType {
                 Layout.rightMargin: 16
                 visible: buttonContent.expandedVisibility
 
+                actionButtonImage: "qrc:/images/controls/plus.svg"
+
                 headerText: qsTr("Servers")
+
+                actionButtonFunction: function() {
+                    buttonContent.state = "collapsed"
+                    connectionTypeSelection.visible = true
+                }
+            }
+
+            ConnectionTypeSelectionDrawer {
+                id: connectionTypeSelection
             }
         }
 
@@ -469,11 +450,11 @@ PageType {
                                         if (hasWriteAccess) {
                                             if (SettingsController.isAmneziaDnsEnabled()
                                                     && ContainersModel.isAmneziaDnsContainerInstalled(index)) {
-                                                description += "Amnezia DNS | "
+                                                description += "AmneziaDNS | "
                                             }
                                         } else {
                                             if (containsAmneziaDns) {
-                                                description += "Amnezia DNS | "
+                                                description += "AmneziaDNS | "
                                             }
                                         }
 
@@ -481,16 +462,10 @@ PageType {
                                     }
 
                                     checked: index === serversMenuContent.currentIndex
-                                    checkable: !ConnectionController.isConnected
 
                                     ButtonGroup.group: serversRadioButtonGroup
 
                                     onClicked: {
-                                        if (ConnectionController.isConnected) {
-                                            PageController.showNotificationMessage(qsTr("Unable change server while there is an active connection"))
-                                            return
-                                        }
-
                                         serversMenuContent.currentIndex = index
 
                                         ServersModel.currentlyProcessedIndex = index

client/ui/qml/Pages2/PageNewConnection.qml

@@ -0,0 +1,112 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Dialogs
+
+import PageEnum 1.0
+
+import "./"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+
+PageType {
+    id: root
+
+    FlickableType {
+        id: fl
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+        contentHeight: content.height
+
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            spacing: 0
+
+            HeaderType {
+                Layout.fillWidth: true
+                Layout.topMargin: 24
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
+
+                headerText: qsTr("Settings")
+            }
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+
+                text: qsTr("Servers")
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
+                leftImageSource: "qrc:/images/controls/server.svg"
+
+                clickedFunction: function() {
+                    PageController.goToPage(PageEnum.PageSettingsServersList)
+                }
+            }
+
+            DividerType {}
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+
+                text: qsTr("Connection")
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
+                leftImageSource: "qrc:/images/controls/radio.svg"
+
+                clickedFunction: function() {
+                    PageController.goToPage(PageEnum.PageSettingsConnection)
+                }
+            }
+
+            DividerType {}
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+
+                text: qsTr("Application")
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
+                leftImageSource: "qrc:/images/controls/app.svg"
+
+                clickedFunction: function() {
+                    PageController.goToPage(PageEnum.PageSettingsApplication)
+                }
+            }
+
+            DividerType {}
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+
+                text: qsTr("Backup")
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
+                leftImageSource: "qrc:/images/controls/save.svg"
+
+                clickedFunction: function() {
+                    PageController.goToPage(PageEnum.PageSettingsBackup)
+                }
+            }
+
+            DividerType {}
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+
+                text: qsTr("About AmneziaVPN")
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
+                leftImageSource: "qrc:/images/controls/amnezia.svg"
+
+                clickedFunction: function() {
+                    PageController.goToPage(PageEnum.PageSettingsAbout)
+                }
+            }
+
+            DividerType {}
+        }
+    }
+}

client/ui/qml/Pages2/PageProtocolAwgSettings.qml

@@ -1,329 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-import SortFilterProxyModel 0.2
-
-import PageEnum 1.0
-
-import "./"
-import "../Controls2"
-import "../Controls2/TextTypes"
-import "../Config"
-import "../Components"
-
-PageType {
-    id: root
-
-    ColumnLayout {
-        id: backButton
-
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        anchors.topMargin: 20
-
-        BackButtonType {
-        }
-    }
-
-    FlickableType {
-        id: fl
-        anchors.top: backButton.bottom
-        anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight
-
-        Column {
-            id: content
-
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-
-            enabled: ServersModel.isCurrentlyProcessedServerHasWriteAccess()
-
-            ListView {
-                id: listview
-
-                width: parent.width
-                height: listview.contentItem.height
-
-                clip: true
-                interactive: false
-
-                model: AwgConfigModel
-
-                delegate: Item {
-                    implicitWidth: listview.width
-                    implicitHeight: col.implicitHeight
-
-                    ColumnLayout {
-                        id: col
-
-                        anchors.top: parent.top
-                        anchors.left: parent.left
-                        anchors.right: parent.right
-
-                        anchors.leftMargin: 16
-                        anchors.rightMargin: 16
-
-                        spacing: 0
-
-                        HeaderType {
-                            Layout.fillWidth: true
-
-                            headerText: qsTr("AmneziaWG settings")
-                        }
-
-                        TextFieldWithHeaderType {
-                            id: portTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 40
-
-                            headerText: qsTr("Port")
-                            textFieldText: port
-                            textField.maximumLength: 5
-                            textField.validator: IntValidator { bottom: 1; top: 65535 }
-
-                            textField.onEditingFinished: {
-                                if (textFieldText !== port) {
-                                    port = textFieldText
-                                }
-                            }
-
-                            checkEmptyText: true
-                        }
-
-                        TextFieldWithHeaderType {
-                            id: junkPacketCountTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
-
-                            headerText: qsTr("Junk packet count")
-                            textFieldText: junkPacketCount
-                            textField.validator: IntValidator { bottom: 0 }
-
-                            textField.onEditingFinished: {
-                                console.log("1")
-                                if (textFieldText === "") {
-                                    textFieldText = "0"
-                                }
-
-                                if (textFieldText !== junkPacketCount) {
-                                    junkPacketCount = textFieldText
-                                }
-                            }
-
-                            checkEmptyText: true
-                        }
-
-                        TextFieldWithHeaderType {
-                            id: junkPacketMinSizeTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
-
-                            headerText: qsTr("Junk packet minimum size")
-                            textFieldText: junkPacketMinSize
-                            textField.validator: IntValidator { bottom: 0 }
-
-                            textField.onEditingFinished: {
-                                if (textFieldText !== junkPacketMinSize) {
-                                    junkPacketMinSize = textFieldText
-                                }
-                            }
-
-                            checkEmptyText: true
-                        }
-
-                        TextFieldWithHeaderType {
-                            id: junkPacketMaxSizeTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
-
-                            headerText: qsTr("Junk packet maximum size")
-                            textFieldText: junkPacketMaxSize
-                            textField.validator: IntValidator { bottom: 0 }
-
-                            textField.onEditingFinished: {
-                                if (textFieldText !== junkPacketMaxSize) {
-                                    junkPacketMaxSize = textFieldText
-                                }
-                            }
-
-                            checkEmptyText: true
-                        }
-
-                        TextFieldWithHeaderType {
-                            id: initPacketJunkSizeTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
-
-                            headerText: qsTr("Init packet junk size")
-                            textFieldText: initPacketJunkSize
-                            textField.validator: IntValidator { bottom: 0 }
-
-                            textField.onEditingFinished: {
-                                if (textFieldText !== initPacketJunkSize) {
-                                    initPacketJunkSize = textFieldText
-                                }
-                            }
-
-                            checkEmptyText: true
-                        }
-
-                        TextFieldWithHeaderType {
-                            id: responsePacketJunkSizeTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
-
-                            headerText: qsTr("Response packet junk size")
-                            textFieldText: responsePacketJunkSize
-                            textField.validator: IntValidator { bottom: 0 }
-
-                            textField.onEditingFinished: {
-                                if (textFieldText !== responsePacketJunkSize) {
-                                    responsePacketJunkSize = textFieldText
-                                }
-                            }
-
-                            checkEmptyText: true
-                        }
-
-                        TextFieldWithHeaderType {
-                            id: initPacketMagicHeaderTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
-
-                            headerText: qsTr("Init packet magic header")
-                            textFieldText: initPacketMagicHeader
-                            textField.validator: IntValidator { bottom: 0 }
-
-                            textField.onEditingFinished: {
-                                if (textFieldText !== initPacketMagicHeader) {
-                                    initPacketMagicHeader = textFieldText
-                                }
-                            }
-
-                            checkEmptyText: true
-                        }
-
-                        TextFieldWithHeaderType {
-                            id: responsePacketMagicHeaderTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
-
-                            headerText: qsTr("Response packet magic header")
-                            textFieldText: responsePacketMagicHeader
-                            textField.validator: IntValidator { bottom: 0 }
-
-                            textField.onEditingFinished: {
-                                if (textFieldText !== responsePacketMagicHeader) {
-                                    responsePacketMagicHeader = textFieldText
-                                }
-                            }
-
-                            checkEmptyText: true
-                        }
-
-                        TextFieldWithHeaderType {
-                            id: transportPacketMagicHeaderTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
-
-                            headerText: qsTr("Transport packet magic header")
-                            textFieldText: transportPacketMagicHeader
-                            textField.validator: IntValidator { bottom: 0 }
-
-                            textField.onEditingFinished: {
-                                if (textFieldText !== transportPacketMagicHeader) {
-                                    transportPacketMagicHeader = textFieldText
-                                }
-                            }
-
-                            checkEmptyText: true
-                        }
-
-                        TextFieldWithHeaderType {
-                            id: underloadPacketMagicHeaderTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
-
-                            headerText: qsTr("Underload packet magic header")
-                            textFieldText: underloadPacketMagicHeader
-                            textField.validator: IntValidator { bottom: 0 }
-
-                            textField.onEditingFinished: {
-                                if (textFieldText !== underloadPacketMagicHeader) {
-                                    underloadPacketMagicHeader = textFieldText
-                                }
-                            }
-
-                            checkEmptyText: true
-                        }
-
-                        BasicButtonType {
-                            Layout.topMargin: 24
-                            Layout.leftMargin: -8
-                            implicitHeight: 32
-
-                            defaultColor: "transparent"
-                            hoveredColor: Qt.rgba(1, 1, 1, 0.08)
-                            pressedColor: Qt.rgba(1, 1, 1, 0.12)
-                            textColor: "#EB5757"
-
-                            text: qsTr("Remove AmneziaWG")
-
-                            onClicked: {
-                                questionDrawer.headerText = qsTr("Remove AmneziaWG from server?")
-                                questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it.")
-                                questionDrawer.yesButtonText = qsTr("Continue")
-                                questionDrawer.noButtonText = qsTr("Cancel")
-
-                                questionDrawer.yesButtonFunction = function() {
-                                    questionDrawer.visible = false
-                                    PageController.goToPage(PageEnum.PageDeinstalling)
-                                    InstallController.removeCurrentlyProcessedContainer()
-                                }
-                                questionDrawer.noButtonFunction = function() {
-                                    questionDrawer.visible = false
-                                }
-                                questionDrawer.visible = true
-                            }
-                        }
-
-                        BasicButtonType {
-                            Layout.fillWidth: true
-                            Layout.topMargin: 24
-                            Layout.bottomMargin: 24
-
-                            enabled: underloadPacketMagicHeaderTextField.errorText === "" &&
-                                     transportPacketMagicHeaderTextField.errorText === "" &&
-                                     responsePacketMagicHeaderTextField.errorText === "" &&
-                                     initPacketMagicHeaderTextField.errorText === "" &&
-                                     responsePacketJunkSizeTextField.errorText === "" &&
-                                     initPacketJunkSizeTextField.errorText === "" &&
-                                     junkPacketMaxSizeTextField.errorText === "" &&
-                                     junkPacketMinSizeTextField.errorText === "" &&
-                                     junkPacketCountTextField.errorText === "" &&
-                                     portTextField.errorText === ""
-
-                            text: qsTr("Save and Restart Amnezia")
-
-                            onClicked: {
-                                forceActiveFocus()
-                                PageController.showBusyIndicator(true)
-                                InstallController.updateContainer(AwgConfigModel.getConfig())
-                                PageController.showBusyIndicator(false)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        QuestionDrawer {
-            id: questionDrawer
-        }
-    }
-}

client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml

@@ -5,7 +5,6 @@ import QtQuick.Layouts
 import SortFilterProxyModel 0.2
 
 import PageEnum 1.0
-import ContainerEnum 1.0
 
 import "./"
 import "../Controls2"
@@ -253,8 +252,6 @@ PageType {
 
                             ColumnLayout {
                                 id: checkboxLayout
-
-                                anchors.fill: parent
                                 CheckBoxType {
                                     Layout.fillWidth: true
 
@@ -354,8 +351,6 @@ PageType {
                             Layout.leftMargin: -8
                             implicitHeight: 32
 
-                            visible: ContainersModel.getCurrentlyProcessedContainerIndex() === ContainerEnum.OpenVpn
-
                             defaultColor: "transparent"
                             hoveredColor: Qt.rgba(1, 1, 1, 0.08)
                             pressedColor: Qt.rgba(1, 1, 1, 0.12)
@@ -365,7 +360,7 @@ PageType {
 
                             onClicked: {
                                 questionDrawer.headerText = qsTr("Remove OpenVpn from server?")
-                                questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it.")
+                                questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it")
                                 questionDrawer.yesButtonText = qsTr("Continue")
                                 questionDrawer.noButtonText = qsTr("Cancel")
 

client/ui/qml/Pages2/PageProtocolRaw.qml

@@ -127,7 +127,7 @@ PageType {
                                         Layout.fillWidth: true
                                         Layout.topMargin: 16
 
-                                        headerText: qsTr("Connection options %1").arg(protocolName)
+                                        headerText: qsTr("Connection options ") + protocolName
                                     }
 
                                     TextArea {
@@ -169,14 +169,12 @@ PageType {
 
                 width: parent.width
 
-                visible: ServersModel.isCurrentlyProcessedServerHasWriteAccess()
-
                 text: qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName()
                 textColor: "#EB5757"
 
                 clickedFunction: function() {
-                    questionDrawer.headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getCurrentlyProcessedContainerName())
-                    questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it.")
+                    questionDrawer.headerText = qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName() + qsTr(" from server?")
+                    questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it")
                     questionDrawer.yesButtonText = qsTr("Continue")
                     questionDrawer.noButtonText = qsTr("Cancel")
 

client/ui/qml/Pages2/PageServiceDnsSettings.qml

@@ -63,7 +63,7 @@ PageType {
                 textColor: "#EB5757"
 
                 clickedFunction: function() {
-                    questionDrawer.headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getCurrentlyProcessedContainerName())
+                    questionDrawer.headerText = qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName() + qsTr(" from server?")
                     questionDrawer.yesButtonText = qsTr("Continue")
                     questionDrawer.noButtonText = qsTr("Cancel")
 

client/ui/qml/Pages2/PageServiceSftpSettings.qml

@@ -96,7 +96,7 @@ PageType {
                             rightImageColor: "#D7D8DB"
 
                             clickedFunction: function() {
-                                GC.copyToClipBoard(descriptionText)
+                                col.copyToClipBoard(descriptionText)
                                 PageController.showNotificationMessage(qsTr("Copied"))
                             }
                         }
@@ -113,7 +113,7 @@ PageType {
                             rightImageColor: "#D7D8DB"
 
                             clickedFunction: function() {
-                                GC.copyToClipBoard(descriptionText)
+                                col.copyToClipBoard(descriptionText)
                                 PageController.showNotificationMessage(qsTr("Copied"))
                             }
                         }
@@ -130,7 +130,7 @@ PageType {
                             rightImageColor: "#D7D8DB"
 
                             clickedFunction: function() {
-                                GC.copyToClipBoard(descriptionText)
+                                col.copyToClipBoard(descriptionText)
                                 PageController.showNotificationMessage(qsTr("Copied"))
                             }
                         }
@@ -147,11 +147,23 @@ PageType {
                             rightImageColor: "#D7D8DB"
 
                             clickedFunction: function() {
-                                GC.copyToClipBoard(descriptionText)
+                                col.copyToClipBoard(descriptionText)
                                 PageController.showNotificationMessage(qsTr("Copied"))
                             }
                         }
 
+                        TextEdit{
+                            id: clipboard
+                            visible: false
+                        }
+
+                        function copyToClipBoard(text) {
+                            clipboard.text = text
+                            clipboard.selectAll()
+                            clipboard.copy()
+                            clipboard.select(0, 0)
+                        }
+
                         BasicButtonType {
                             visible: !GC.isMobile()
 

client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml

@@ -78,11 +78,23 @@ PageType {
                 rightImageColor: "#D7D8DB"
 
                 clickedFunction: function() {
-                    GC.copyToClipBoard(descriptionText)
+                    content.copyToClipBoard(descriptionText)
                     PageController.showNotificationMessage(qsTr("Copied"))
                 }
             }
 
+            TextEdit{
+                id: clipboard
+                visible: false
+            }
+
+            function copyToClipBoard(text) {
+                clipboard.text = text
+                clipboard.selectAll()
+                clipboard.copy()
+                clipboard.select(0, 0)
+            }
+
             ParagraphTextType {
                 Layout.fillWidth: true
                 Layout.topMargin: 40
@@ -109,7 +121,7 @@ PageType {
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
 
-                text: qsTr("When configuring WordPress set the this onion address as domain.")
+                text: qsTr("When configuring WordPress set the domain as this onion address.")
             }
 
             BasicButtonType {