android: Import excluded subnets from profile file

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java
index 679e4195380a921bbba109033e4442bec1160d52..16f3530fffc2e9c552c296252e6b4860d689adc5 100644 (file)
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java
@@ -55,6 +55,7 @@ import org.strongswan.android.logic.TrustedCertificateManager;
 import org.strongswan.android.security.TrustedCertificateEntry;
 import org.strongswan.android.ui.widget.TextInputLayoutHelper;
 import org.strongswan.android.utils.Constants;
+import org.strongswan.android.utils.IPRangeSet;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -489,6 +490,16 @@ public class VpnProfileImportActivity extends AppCompatActivity
                JSONObject split = obj.optJSONObject("split-tunneling");
                if (split != null)
                {
+                       String excluded = split.optString("excluded", null);
+                       if (excluded != null && !excluded.isEmpty())
+                       {
+                               if (IPRangeSet.fromString(excluded) == null)
+                               {
+                                       throw new JSONException(getString(R.string.profile_import_failed_value,
+                                                                                                         "split-tunneling.excluded"));
+                               }
+                               profile.setExcludedSubnets(excluded);
+                       }
                        int st = 0;
                        st |= split.optBoolean("block-ipv4") ? VpnProfile.SPLIT_TUNNELING_BLOCK_IPV4 : 0;
                        st |= split.optBoolean("block-ipv6") ? VpnProfile.SPLIT_TUNNELING_BLOCK_IPV6 : 0;

diff --git a/src/frontends/android/app/src/main/res/values-de/strings.xml b/src/frontends/android/app/src/main/res/values-de/strings.xml
index 0bb73cb1e437a2730639fe82b453aad856a887bd..941c163707bda386d2aa9e8e45820963f86312fc 100644 (file)
--- a/src/frontends/android/app/src/main/res/values-de/strings.xml
+++ b/src/frontends/android/app/src/main/res/values-de/strings.xml
@@ -88,6 +88,7 @@
     <string name="profile_import_failed_not_found">Datei nicht gefunden</string>
     <string name="profile_import_failed_host">Host unbekannt</string>
     <string name="profile_import_failed_tls">TLS-Handshake fehlgeschlagen</string>
+    <string name="profile_import_failed_value">Ungültiger Wert in \"%1$s\"</string>
     <string name="profile_import_exists">Dieses VPN Profil existiert bereits, die bestehenden Einstellungen werden ersetzt.</string>
     <string name="profile_cert_import">Zertifikat aus VPN Profil importieren</string>
     <string name="profile_cert_alias">Zertifikat für \"%1$s\"</string>

diff --git a/src/frontends/android/app/src/main/res/values-pl/strings.xml b/src/frontends/android/app/src/main/res/values-pl/strings.xml
index 36cdff69a76e0ec75840b17dba134d1cafd62403..08d11c6f8e9768c17b9a103249cf28fcc334b694 100644 (file)
--- a/src/frontends/android/app/src/main/res/values-pl/strings.xml
+++ b/src/frontends/android/app/src/main/res/values-pl/strings.xml
@@ -88,6 +88,7 @@
     <string name="profile_import_failed_not_found">File not found</string>
     <string name="profile_import_failed_host">Host unknown</string>
     <string name="profile_import_failed_tls">TLS handshake failed</string>
+    <string name="profile_import_failed_value">Invalid value in \"%1$s\"</string>
     <string name="profile_import_exists">This VPN profile already exists, its current settings will be replaced.</string>
     <string name="profile_cert_import">Import certificate from VPN profile</string>
     <string name="profile_cert_alias">Certificate for \"%1$s\"</string>

diff --git a/src/frontends/android/app/src/main/res/values-ru/strings.xml b/src/frontends/android/app/src/main/res/values-ru/strings.xml
index 6f336fd4575c732b2c7243cd7d4c3360bd5beffc..092d734973951fab61ac2afedf55773760a3d64b 100644 (file)
--- a/src/frontends/android/app/src/main/res/values-ru/strings.xml
+++ b/src/frontends/android/app/src/main/res/values-ru/strings.xml
@@ -85,6 +85,7 @@
     <string name="profile_import_failed_not_found">File not found</string>
     <string name="profile_import_failed_host">Host unknown</string>
     <string name="profile_import_failed_tls">TLS handshake failed</string>
+    <string name="profile_import_failed_value">Invalid value in \"%1$s\"</string>
     <string name="profile_import_exists">This VPN profile already exists, its current settings will be replaced.</string>
     <string name="profile_cert_import">Import certificate from VPN profile</string>
     <string name="profile_cert_alias">Certificate for \"%1$s\"</string>

diff --git a/src/frontends/android/app/src/main/res/values-ua/strings.xml b/src/frontends/android/app/src/main/res/values-ua/strings.xml
index e8cdc5383aedbd7fbcc7e5ac14dc564ef6955451..b1b71034d0aa3c84ffce26d8a4b5e851d6070a46 100644 (file)
--- a/src/frontends/android/app/src/main/res/values-ua/strings.xml
+++ b/src/frontends/android/app/src/main/res/values-ua/strings.xml
@@ -86,6 +86,7 @@
     <string name="profile_import_failed_not_found">File not found</string>
     <string name="profile_import_failed_host">Host unknown</string>
     <string name="profile_import_failed_tls">TLS handshake failed</string>
+    <string name="profile_import_failed_value">Invalid value in \"%1$s\"</string>
     <string name="profile_import_exists">This VPN profile already exists, its current settings will be replaced.</string>
     <string name="profile_cert_import">Import certificate from VPN profile</string>
     <string name="profile_cert_alias">Certificate for \"%1$s\"</string>

diff --git a/src/frontends/android/app/src/main/res/values-zh-rCN/strings.xml b/src/frontends/android/app/src/main/res/values-zh-rCN/strings.xml
index 591aea41215024ecf88e0a4128d0a7973f852268..e9ad8e02b0a1483456085a490d3bcc194b55ed41 100644 (file)
--- a/src/frontends/android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/src/frontends/android/app/src/main/res/values-zh-rCN/strings.xml
@@ -85,6 +85,7 @@
     <string name="profile_import_failed_not_found">文件未找到</string>
     <string name="profile_import_failed_host">未知主机</string>
     <string name="profile_import_failed_tls">TLS握手失败</string>
+    <string name="profile_import_failed_value">Invalid value in \"%1$s\"</string>
     <string name="profile_import_exists">此VPN配置已经存在，当前设定将被覆盖。</string>
     <string name="profile_cert_import">从VPN配置导入证书</string>
     <string name="profile_cert_alias">\"%1$s\" 所对应的证书</string>

diff --git a/src/frontends/android/app/src/main/res/values-zh-rTW/strings.xml b/src/frontends/android/app/src/main/res/values-zh-rTW/strings.xml
index 79eb301144b310582b06d97c317efb3ccd814433..3be4a6d551aa8f76b1b3efd919667d09eded9d51 100644 (file)
--- a/src/frontends/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/src/frontends/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -85,6 +85,7 @@
     <string name="profile_import_failed_not_found">沒有找到檔案</string>
     <string name="profile_import_failed_host">不明主機</string>
     <string name="profile_import_failed_tls">TLS連線失敗</string>
+    <string name="profile_import_failed_value">Invalid value in \"%1$s\"</string>
     <string name="profile_import_exists">這個VPN設定檔已經存在，當前設定檔會被覆蓋。</string>
     <string name="profile_cert_import">從VPN設定檔匯入憑證</string>
     <string name="profile_cert_alias">\"%1$s\" 對應的憑證</string>

diff --git a/src/frontends/android/app/src/main/res/values/strings.xml b/src/frontends/android/app/src/main/res/values/strings.xml
index 3577d978a4946a0360f783d20115ef32c4a9ff62..1e9a0ee8a3f549d32630661bdbcc8da8f8a1e329 100644 (file)
--- a/src/frontends/android/app/src/main/res/values/strings.xml
+++ b/src/frontends/android/app/src/main/res/values/strings.xml
@@ -88,6 +88,7 @@
     <string name="profile_import_failed_not_found">File not found</string>
     <string name="profile_import_failed_host">Host unknown</string>
     <string name="profile_import_failed_tls">TLS handshake failed</string>
+    <string name="profile_import_failed_value">Invalid value in \"%1$s\"</string>
     <string name="profile_import_exists">This VPN profile already exists, its current settings will be replaced.</string>
     <string name="profile_cert_import">Import certificate from VPN profile</string>
     <string name="profile_cert_alias">Certificate for \"%1$s\"</string>