android: Use arrays as primary config option for subnets in profile files

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 d4c9d32e803346c236173a3ebacc68580d9bb8c8..5833258d21a690ffc022e2328acb62e73bcda1c8 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
@@ -527,15 +527,33 @@ public class VpnProfileImportActivity extends AppCompatActivity
 
        private String getSubnets(JSONObject split, String key) throws JSONException
        {
-               String subnets = split.optString(key, null);
-               if (subnets != null && !subnets.isEmpty())
+               ArrayList<String> subnets = new ArrayList<>();
+               JSONArray arr = split.optJSONArray(key);
+               if (arr != null)
+               {
+                       for (int i = 0; i < arr.length(); i++)
+                       {       /* replace all spaces, e.g. in "192.168.1.1 - 192.168.1.10" */
+                               subnets.add(arr.getString(i).replace(" ", ""));
+                       }
+               }
+               else
+               {
+                       String value = split.optString(key, null);
+                       if (!TextUtils.isEmpty(value))
+                       {
+                               subnets.add(value);
+                       }
+               }
+               if (subnets.size() > 0)
                {
-                       if (IPRangeSet.fromString(subnets) == null)
+                       String joined = TextUtils.join(" ", subnets);
+                       IPRangeSet ranges = IPRangeSet.fromString(joined);
+                       if (ranges == null)
                        {
                                throw new JSONException(getString(R.string.profile_import_failed_value,
                                                                                                  "split-tunneling." + key));
                        }
-                       return subnets;
+                       return ranges.toString();
                }
                return null;
        }