From 2367cda71e3e4c8c0ced3e1a3d22e602e7a33e2a Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Sun, 12 Jul 2026 17:22:37 +0200 Subject: [PATCH] android: Fix reading split-tunneling block settings in managed configs The key in a Bundle is apparently case-sensitive. Also align the spelling with the rest of the app. Fixes: c2007d5b09a3 ("android: Add managed_configuration.xml") --- .../org/strongswan/android/data/ManagedVpnProfile.java | 8 ++++---- .../app/src/main/res/xml/managed_configuration.xml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/data/ManagedVpnProfile.java b/src/frontends/android/app/src/main/java/org/strongswan/android/data/ManagedVpnProfile.java index dfe519a23..6634aec8d 100644 --- a/src/frontends/android/app/src/main/java/org/strongswan/android/data/ManagedVpnProfile.java +++ b/src/frontends/android/app/src/main/java/org/strongswan/android/data/ManagedVpnProfile.java @@ -41,8 +41,8 @@ public class ManagedVpnProfile extends VpnProfile private static final String KEY_LOCAL_USER_CERTIFICATE_ALIAS = "user_certificate_alias"; private static final String KEY_LOCAL_RSA_PSS_FLAG = "local_rsa_pss"; - private static final String KEY_SPLIT_TUNNELLING_BLOCK_IPV4_FLAG = "split_tunnelling_block_ipv4"; - private static final String KEY_SPLIT_TUNNELLING_BLOCK_IPV6_FLAG = "split_tunnelling_block_ipv6"; + private static final String KEY_SPLIT_TUNNELING_BLOCK_IPV4_FLAG = "split_tunneling_block_ipv4"; + private static final String KEY_SPLIT_TUNNELING_BLOCK_IPV6_FLAG = "split_tunneling_block_ipv6"; private ManagedTrustedCertificate trustedCertificate; private ManagedUserCertificate userCertificate; @@ -77,8 +77,8 @@ public class ManagedVpnProfile extends VpnProfile final Bundle splitTunneling = bundle.getBundle(VpnProfileDataSource.KEY_SPLIT_TUNNELING); if (splitTunneling != null) { - splitFlags = addPositiveFlag(splitFlags, splitTunneling, KEY_SPLIT_TUNNELLING_BLOCK_IPV4_FLAG, VpnProfile.SPLIT_TUNNELING_BLOCK_IPV4); - splitFlags = addPositiveFlag(splitFlags, splitTunneling, KEY_SPLIT_TUNNELLING_BLOCK_IPV6_FLAG, VpnProfile.SPLIT_TUNNELING_BLOCK_IPV6); + splitFlags = addPositiveFlag(splitFlags, splitTunneling, KEY_SPLIT_TUNNELING_BLOCK_IPV4_FLAG, VpnProfile.SPLIT_TUNNELING_BLOCK_IPV4); + splitFlags = addPositiveFlag(splitFlags, splitTunneling, KEY_SPLIT_TUNNELING_BLOCK_IPV6_FLAG, VpnProfile.SPLIT_TUNNELING_BLOCK_IPV6); setExcludedSubnets(getString(splitTunneling, VpnProfileDataSource.KEY_EXCLUDED_SUBNETS)); setIncludedSubnets(getString(splitTunneling, VpnProfileDataSource.KEY_INCLUDED_SUBNETS)); diff --git a/src/frontends/android/app/src/main/res/xml/managed_configuration.xml b/src/frontends/android/app/src/main/res/xml/managed_configuration.xml index aae843f8b..3a1261972 100644 --- a/src/frontends/android/app/src/main/res/xml/managed_configuration.xml +++ b/src/frontends/android/app/src/main/res/xml/managed_configuration.xml @@ -300,14 +300,14 @@