Merge branch 'support_geoip' into 'master'

Support geoip

See merge request leap/bitmask_android!108

1 files changed, 9 insertions, 0 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/Gateway.java b/app/src/main/java/se/leap/bitmaskclient/eip/Gateway.java
index 66c9fe84..f3eea415 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/Gateway.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/Gateway.java
@@ -34,6 +34,7 @@ import de.blinkt.openvpn.core.ConfigParser;
 import de.blinkt.openvpn.core.connection.Connection;
 import se.leap.bitmaskclient.utils.PreferenceHelper;
 
+import static se.leap.bitmaskclient.Constants.HOST;
 import static se.leap.bitmaskclient.Constants.IP_ADDRESS;
 import static se.leap.bitmaskclient.Constants.LOCATION;
 import static se.leap.bitmaskclient.Constants.LOCATIONS;
@@ -114,6 +115,10 @@ public class Gateway {
         return gateway.optString(IP_ADDRESS);
     }
 
+    public String getHost() {
+        return gateway.optString(HOST);
+    }
+
     private String locationAsName(JSONObject eipDefinition) {
         JSONObject location = getLocationInfo(eipDefinition);
         return location.optString(NAME);
@@ -152,6 +157,10 @@ public class Gateway {
         return vpnProfiles.get(transportType);
     }
 
+    public boolean suppoortsTransport(Connection.TransportType transportType) {
+        return vpnProfiles.get(transportType) != null;
+    }
+
     public int getTimezone() {
         return timezone;
     }