1 files changed, 5 insertions, 2 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 17b200f2..ac3aba7a 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
@@ -549,8 +549,11 @@ public final class Provider implements Parcelable {
 
     public boolean hasGatewaysInDifferentLocations() {
         if (apiVersion >= 5) {
-            //FIXME: getService().getLocations()
-            return true;
+            try {
+                return getService().getLocations().size() > 1;
+            } catch (NullPointerException e) {
+                return false;
+            }
         } else {
             try {
                 return getEipServiceJson().getJSONObject(LOCATIONS).length() > 1;