create one vpnprofile per transport per gateway. implement basis to switch between obfs4 and plain openvpn connections

1 files changed, 6 insertions, 44 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java b/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
index cd3ec1c6..f7038bab 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
@@ -28,20 +28,14 @@ import org.json.JSONObject;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.List;
+import java.util.LinkedHashMap;
 
-import de.blinkt.openvpn.VpnProfile;
-import de.blinkt.openvpn.core.connection.Connection;
 import se.leap.bitmaskclient.Provider;
 import se.leap.bitmaskclient.utils.PreferenceHelper;
 
-import static se.leap.bitmaskclient.Constants.CAPABILITIES;
 import static se.leap.bitmaskclient.Constants.GATEWAYS;
 import static se.leap.bitmaskclient.Constants.PROVIDER_PRIVATE_KEY;
 import static se.leap.bitmaskclient.Constants.PROVIDER_VPN_CERTIFICATE;
-import static se.leap.bitmaskclient.Constants.TRANSPORT;
-import static se.leap.bitmaskclient.Constants.TYPE;
-import static se.leap.bitmaskclient.Constants.VERSION;
 
 /**
  * @author parmegv
@@ -52,7 +46,7 @@ public class GatewaysManager {
 
     private Context context;
     private SharedPreferences preferences;
-    private List<Gateway> gateways = new ArrayList<>();
+    private LinkedHashMap<String, Gateway> gateways = new LinkedHashMap<>();
     private Type listType = new TypeToken<ArrayList<Gateway>>() {}.getType();
 
     GatewaysManager(Context context, SharedPreferences preferences) {
@@ -65,7 +59,7 @@ public class GatewaysManager {
       * @return the n closest Gateway
      */
     public Gateway select(int nClosest) {
-        GatewaySelector gatewaySelector = new GatewaySelector(gateways);
+        GatewaySelector gatewaySelector = new GatewaySelector(new ArrayList<>(gateways.values()));
         return gatewaySelector.select(nClosest);
     }
 
@@ -96,52 +90,20 @@ public class GatewaysManager {
     void fromEipServiceJson(JSONObject eipDefinition) {
         try {
             JSONArray gatewaysDefined = eipDefinition.getJSONArray(GATEWAYS);
-            int apiVersion = eipDefinition.getInt(VERSION);
             for (int i = 0; i < gatewaysDefined.length(); i++) {
                 JSONObject gw = gatewaysDefined.getJSONObject(i);
                 JSONObject secrets = secretsConfiguration();
                 Gateway aux = new Gateway(eipDefinition, secrets, gw);
-                if (!gateways.contains(aux)) {
+                if (gateways.get(aux.getRemoteIP()) == null) {
                     addGateway(aux);
                 }
             }
-        } catch (JSONException e) {
+        } catch (Exception e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
         }
     }
 
-    /**
-     * check if a gateway is an OpenVpn gateway
-     * @param gateway to check
-     * @return true if gateway is an OpenVpn gateway otherwise false
-     */
-    private boolean isOpenVpnGateway(JSONObject gateway, int apiVersion) {
-        switch (apiVersion) {
-            default:
-            case 1:
-                try {
-                    String transport = gateway.getJSONObject(CAPABILITIES).getJSONArray(TRANSPORT).toString();
-                    return transport.contains("openvpn");
-                } catch (JSONException e) {
-                    return false;
-                }
-            case 2:
-                try {
-                    JSONArray transports = gateway.getJSONObject(CAPABILITIES).getJSONArray(TRANSPORT);
-                    for (int i = 0; i < transports.length(); i++) {
-                        JSONObject transport = transports.getJSONObject(i);
-                        if (transport.optString(TYPE).equals("openvpn")) {
-                            return true;
-                        }
-                    }
-                    return false;
-                } catch (JSONException e) {
-                    return false;
-                }
-        }
-    }
-
     private JSONObject secretsConfiguration() {
         JSONObject result = new JSONObject();
         try {
@@ -160,7 +122,7 @@ public class GatewaysManager {
     }
 
     private void addGateway(Gateway gateway) {
-        gateways.add(gateway);
+        gateways.put(gateway.getRemoteIP(), gateway);
     }
 
     /**