denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: Fix reading split-tunneling block settings in managed configs

Browse Source 
The key in a Bundle is apparently case-sensitive.  Also align the
spelling with the rest of the app.

Fixes: c2007d5b09 ("android: Add managed_configuration.xml")
This commit is contained in:
Tobias Brunner
2026-07-24 08:47:38 +02:00
parent e03ec46466
commit 2367cda71e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/app/src/main/java/org/strongswan/android/data/ManagedVpnProfile.java
+4 -4
View File
@@ -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_USER_CERTIFICATE_ALIAS = "user_certificate_alias";
private static final String KEY_LOCAL_RSA_PSS_FLAG = "local_rsa_pss"; 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_TUNNELING_BLOCK_IPV4_FLAG = "split_tunneling_block_ipv4";
private static final String KEY_SPLIT_TUNNELLING_BLOCK_IPV6_FLAG = "split_tunnelling_block_ipv6"; private static final String KEY_SPLIT_TUNNELING_BLOCK_IPV6_FLAG = "split_tunneling_block_ipv6";
private ManagedTrustedCertificate trustedCertificate; private ManagedTrustedCertificate trustedCertificate;
private ManagedUserCertificate userCertificate; private ManagedUserCertificate userCertificate;
@@ -77,8 +77,8 @@ public class ManagedVpnProfile extends VpnProfile
final Bundle splitTunneling = bundle.getBundle(VpnProfileDataSource.KEY_SPLIT_TUNNELING); final Bundle splitTunneling = bundle.getBundle(VpnProfileDataSource.KEY_SPLIT_TUNNELING);
if (splitTunneling != null) if (splitTunneling != null)
{ {
splitFlags = addPositiveFlag(splitFlags, splitTunneling, KEY_SPLIT_TUNNELLING_BLOCK_IPV4_FLAG, VpnProfile.SPLIT_TUNNELING_BLOCK_IPV4); splitFlags = addPositiveFlag(splitFlags, splitTunneling, KEY_SPLIT_TUNNELING_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_IPV6_FLAG, VpnProfile.SPLIT_TUNNELING_BLOCK_IPV6);
setExcludedSubnets(getString(splitTunneling, VpnProfileDataSource.KEY_EXCLUDED_SUBNETS)); setExcludedSubnets(getString(splitTunneling, VpnProfileDataSource.KEY_EXCLUDED_SUBNETS));
setIncludedSubnets(getString(splitTunneling, VpnProfileDataSource.KEY_INCLUDED_SUBNETS)); setIncludedSubnets(getString(splitTunneling, VpnProfileDataSource.KEY_INCLUDED_SUBNETS));
src/frontends/android/app/src/main/res/xml/managed_configuration.xml
+2 -2
View File
@@ -300,14 +300,14 @@
<restriction <restriction
android:defaultValue="false" android:defaultValue="false"
android:description="@string/managed_config_split_tunneling_block_ipv4_description" android:description="@string/managed_config_split_tunneling_block_ipv4_description"
android:key="split_tunnelling_block_IPv4" android:key="split_tunneling_block_ipv4"
android:restrictionType="bool" android:restrictionType="bool"
android:title="@string/managed_config_split_tunneling_block_ipv4_title" /> android:title="@string/managed_config_split_tunneling_block_ipv4_title" />
<restriction <restriction
android:defaultValue="false" android:defaultValue="false"
android:description="@string/managed_config_split_tunneling_block_ipv6_description" android:description="@string/managed_config_split_tunneling_block_ipv6_description"
android:key="split_tunnelling_block_IPv6" android:key="split_tunneling_block_ipv6"
android:restrictionType="bool" android:restrictionType="bool"
android:title="@string/managed_config_split_tunneling_block_ipv6_title" /> android:title="@string/managed_config_split_tunneling_block_ipv6_title" />