adapt gateway parsing and generation of VpnProfiles to apiv5

3 files changed, 105 insertions, 4 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/base/models/Provider.java b/app/src/main/java/se/leap/bitmaskclient/base/models/Provider.java
index cdec9e7a..b826d338 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/models/Provider.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/models/Provider.java
@@ -545,11 +545,17 @@ public final class Provider implements Parcelable {
     }
 
     public boolean hasGatewaysInDifferentLocations() {
-        try {
-            return getEipServiceJson().getJSONObject(LOCATIONS).length() > 1;
-        } catch (NullPointerException | JSONException e) {
-            return false;
+        if (apiVersion >= 5) {
+            //FIXME: getService().getLocations()
+            return true;
+        } else {
+            try {
+                return getEipServiceJson().getJSONObject(LOCATIONS).length() > 1;
+            } catch (NullPointerException | JSONException e) {
+                return false;
+            }
         }
+
     }
 
     @Override
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/models/Transport.java b/app/src/main/java/se/leap/bitmaskclient/base/models/Transport.java
index c2590012..abd42812 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/models/Transport.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/models/Transport.java
@@ -1,5 +1,14 @@
 package se.leap.bitmaskclient.base.models;
 
+import static de.blinkt.openvpn.core.connection.Connection.TransportType.OPENVPN;
+import static se.leap.bitmaskclient.base.models.Constants.CAPABILITIES;
+import static se.leap.bitmaskclient.base.models.Constants.CERT;
+import static se.leap.bitmaskclient.base.models.Constants.IAT_MODE;
+import static se.leap.bitmaskclient.base.models.Constants.PORTS;
+import static se.leap.bitmaskclient.base.models.Constants.PROTOCOLS;
+import static se.leap.bitmaskclient.base.models.Constants.TRANSPORT;
+
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.google.gson.FieldNamingPolicy;
@@ -7,11 +16,16 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.SerializedName;
 
+import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.io.Serializable;
+import java.util.Map;
+import java.util.Vector;
 
 import de.blinkt.openvpn.core.connection.Connection;
+import io.swagger.client.model.ModelsBridge;
+import io.swagger.client.model.ModelsGateway;
 
 public class Transport implements Serializable {
     private final String type;
@@ -32,6 +46,13 @@ public class Transport implements Serializable {
         this.options = options;
     }
 
+    public Transport(String type, String[] protocols, @Nullable String[] ports) {
+        this.type = type;
+        this.protocols = protocols;
+        this.ports = ports;
+        this.options = null;
+    }
+
     public String getType() {
         return type;
     }
@@ -67,6 +88,78 @@ public class Transport implements Serializable {
                 fromJson(json.toString(), Transport.class);
     }
 
+    public static Transport createTransportFrom(ModelsBridge modelsBridge) {
+        if (modelsBridge == null) {
+            return null;
+        }
+        Map<String, Object> options = modelsBridge.getOptions();
+        Transport.Options transportOptions = new Transport.Options((String) options.get(CERT), (String) options.get(IAT_MODE));
+        Transport transport = new Transport(
+                modelsBridge.getType(),
+                new String[]{modelsBridge.getTransport()},
+                new String[]{String.valueOf(modelsBridge.getPort())},
+                transportOptions
+        );
+        return transport;
+    }
+
+    public static Transport createTransportFrom(ModelsGateway modelsGateway) {
+        if (modelsGateway == null) {
+            return null;
+        }
+        Transport transport = new Transport(
+                modelsGateway.getType(),
+                new String[]{modelsGateway.getTransport()},
+                new String[]{String.valueOf(modelsGateway.getPort())}
+        );
+        return transport;
+    }
+
+
+    @NonNull
+    public static Vector<Transport> createTransportsFrom(JSONObject gateway, int apiVersion) throws IllegalArgumentException {
+        Vector<Transport> transports = new Vector<>();
+        try {
+            if (apiVersion >= 3) {
+                JSONArray supportedTransports = gateway.getJSONObject(CAPABILITIES).getJSONArray(TRANSPORT);
+                for (int i = 0; i < supportedTransports.length(); i++) {
+                    Transport transport = Transport.fromJson(supportedTransports.getJSONObject(i));
+                    transports.add(transport);
+                }
+            } else {
+                JSONObject capabilities =  gateway.getJSONObject(CAPABILITIES);
+                JSONArray ports = capabilities.getJSONArray(PORTS);
+                JSONArray protocols = capabilities.getJSONArray(PROTOCOLS);
+                String[] portArray = new String[ports.length()];
+                String[] protocolArray = new String[protocols.length()];
+                for (int i = 0; i < ports.length(); i++) {
+                    portArray[i] = String.valueOf(ports.get(i));
+                }
+                for (int i = 0; i < protocols.length(); i++) {
+                    protocolArray[i] = protocols.optString(i);
+                }
+                Transport transport = new Transport(OPENVPN.toString(), protocolArray, portArray);
+                transports.add(transport);
+            }
+        } catch (Exception e) {
+            throw new IllegalArgumentException();
+            //throw new ConfigParser.ConfigParseError("Api version ("+ apiVersion +") did not match required JSON fields");
+        }
+        return transports;
+    }
+
+    public static Vector<Transport> createTransportsFrom(ModelsBridge modelsBridge) {
+        Vector<Transport> transports = new Vector<>();
+        transports.add(Transport.createTransportFrom(modelsBridge));
+        return transports;
+    }
+
+    public static Vector<Transport> createTransportsFrom(ModelsGateway modelsGateway) {
+        Vector<Transport> transports = new Vector<>();
+        transports.add(Transport.createTransportFrom(modelsGateway));
+        return transports;
+    }
+
     public static class Options implements Serializable {
         @Nullable
         private final String cert;
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/utils/BitmaskCoreProvider.java b/app/src/main/java/se/leap/bitmaskclient/base/utils/BitmaskCoreProvider.java
new file mode 100644
index 00000000..a9797142
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/base/utils/BitmaskCoreProvider.java
@@ -0,0 +1,2 @@
+package se.leap.bitmaskclient.base.utils;public class BitmaskCoreProvider {
+}