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 679e41953..16f3530ff 100644 --- 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 0bb73cb1e..941c16370 100644 --- 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 @@ Datei nicht gefunden Host unbekannt TLS-Handshake fehlgeschlagen + Ungültiger Wert in \"%1$s\" Dieses VPN Profil existiert bereits, die bestehenden Einstellungen werden ersetzt. Zertifikat aus VPN Profil importieren Zertifikat für \"%1$s\" 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 36cdff69a..08d11c6f8 100644 --- 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 @@ File not found Host unknown TLS handshake failed + Invalid value in \"%1$s\" This VPN profile already exists, its current settings will be replaced. Import certificate from VPN profile Certificate for \"%1$s\" 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 6f336fd45..092d73497 100644 --- 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 @@ File not found Host unknown TLS handshake failed + Invalid value in \"%1$s\" This VPN profile already exists, its current settings will be replaced. Import certificate from VPN profile Certificate for \"%1$s\" 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 e8cdc5383..b1b71034d 100644 --- 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 @@ File not found Host unknown TLS handshake failed + Invalid value in \"%1$s\" This VPN profile already exists, its current settings will be replaced. Import certificate from VPN profile Certificate for \"%1$s\" 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 591aea412..e9ad8e02b 100644 --- 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 @@ 文件未找到 未知主机 TLS握手失败 + Invalid value in \"%1$s\" 此VPN配置已经存在,当前设定将被覆盖。 从VPN配置导入证书 \"%1$s\" 所对应的证书 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 79eb30114..3be4a6d55 100644 --- 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 @@ 沒有找到檔案 不明主機 TLS連線失敗 + Invalid value in \"%1$s\" 這個VPN設定檔已經存在,當前設定檔會被覆蓋。 從VPN設定檔匯入憑證 \"%1$s\" 對應的憑證 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 3577d978a..1e9a0ee8a 100644 --- 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 @@ File not found Host unknown TLS handshake failed + Invalid value in \"%1$s\" This VPN profile already exists, its current settings will be replaced. Import certificate from VPN profile Certificate for \"%1$s\"