From b8702f69466e03050ded0dbf7c3f712b79efc412 Mon Sep 17 00:00:00 2001
From: aiamnezia <ai@amnezia.org>
Date: Tue, 8 Apr 2025 16:47:24 +0400
Subject: [PATCH 1/4] Disable split tunneling with empty list

---
 client/vpnconnection.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/client/vpnconnection.cpp b/client/vpnconnection.cpp
index 042c51c7..60e61ee4 100644
--- a/client/vpnconnection.cpp
+++ b/client/vpnconnection.cpp
@@ -359,6 +359,10 @@ void VpnConnection::appendSplitTunnelingConfig()
         }
     }
 
+    if (sitesJsonArray.isEmpty()) {
+        sitesRouteMode = Settings::RouteMode::VpnAllSites;
+    }
+
     m_vpnConfiguration.insert(config_key::splitTunnelType, sitesRouteMode);
     m_vpnConfiguration.insert(config_key::splitTunnelSites, sitesJsonArray);
 
@@ -373,6 +377,10 @@ void VpnConnection::appendSplitTunnelingConfig()
         }
     }
 
+    if (appsJsonArray.isEmpty()) {
+        appsRouteMode = Settings::AppsRouteMode::VpnAllApps;
+    }
+
     m_vpnConfiguration.insert(config_key::appSplitTunnelType, appsRouteMode);
     m_vpnConfiguration.insert(config_key::splitTunnelApps, appsJsonArray);
 

From 3e47a41985c2bd8e4eb7abc5dea01e0637804a4b Mon Sep 17 00:00:00 2001
From: aiamnezia <ai@amnezia.org>
Date: Tue, 8 Apr 2025 17:31:20 +0400
Subject: [PATCH 2/4] Fix bug with Amnezia DNS in split tunneling list

---
 client/vpnconnection.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/client/vpnconnection.cpp b/client/vpnconnection.cpp
index 60e61ee4..ff875b39 100644
--- a/client/vpnconnection.cpp
+++ b/client/vpnconnection.cpp
@@ -351,18 +351,16 @@ void VpnConnection::appendSplitTunnelingConfig()
                 sitesJsonArray.append(site);
             }
 
-            // Allow traffic to Amnezia DNS
-            if (sitesRouteMode == Settings::VpnOnlyForwardSites) {
+            if (sitesJsonArray.isEmpty()) {
+                sitesRouteMode = Settings::RouteMode::VpnAllSites;
+            } else if (sitesRouteMode == Settings::VpnOnlyForwardSites) {
+                // Allow traffic to Amnezia DNS
                 sitesJsonArray.append(m_vpnConfiguration.value(config_key::dns1).toString());
                 sitesJsonArray.append(m_vpnConfiguration.value(config_key::dns2).toString());
             }
         }
     }
 
-    if (sitesJsonArray.isEmpty()) {
-        sitesRouteMode = Settings::RouteMode::VpnAllSites;
-    }
-
     m_vpnConfiguration.insert(config_key::splitTunnelType, sitesRouteMode);
     m_vpnConfiguration.insert(config_key::splitTunnelSites, sitesJsonArray);
 
@@ -375,10 +373,10 @@ void VpnConnection::appendSplitTunnelingConfig()
         for (const auto &app : apps) {
             appsJsonArray.append(app.appPath.isEmpty() ? app.packageName : app.appPath);
         }
-    }
 
-    if (appsJsonArray.isEmpty()) {
-        appsRouteMode = Settings::AppsRouteMode::VpnAllApps;
+        if (appsJsonArray.isEmpty()) {
+            appsRouteMode = Settings::AppsRouteMode::VpnAllApps;
+        }
     }
 
     m_vpnConfiguration.insert(config_key::appSplitTunnelType, appsRouteMode);

From f0d841d649eb18a33998bde0961551e2db159236 Mon Sep 17 00:00:00 2001
From: aiamnezia <ai@amnezia.org>
Date: Tue, 8 Apr 2025 17:43:26 +0400
Subject: [PATCH 3/4] update ubuntu version for linux deploy pipeline

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 23df2d8f..688b57d3 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -10,7 +10,7 @@ env:
 
 jobs:
   Build-Linux-Ubuntu:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     env:
       QT_VERSION: 6.6.2

From 341faac4f25d07c208d1858944da28aab3143d39 Mon Sep 17 00:00:00 2001
From: aiamnezia <ai@amnezia.org>
Date: Tue, 8 Apr 2025 18:06:08 +0400
Subject: [PATCH 4/4] Fix deploy script

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 688b57d3..a6f7c4c6 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -47,7 +47,7 @@ jobs:
 
     - name: 'Build project'
       run: |
-        sudo apt-get install libxkbcommon-x11-0
+        sudo apt-get install libxkbcommon-x11-0 libsecret-1-dev
         export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/gcc_64/bin
         export QIF_BIN_DIR=${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin
         bash deploy/build_linux.sh