Merge branch 'improve_load_animation' into 'master'

Improve load animation

Closes #9066 and #9071

See merge request leap/bitmask_android!173

1 files changed, 3 insertions, 0 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 060e69f2..0dd4c26c 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
@@ -211,6 +211,9 @@ public class GatewaysManager {
 
     public Load getLoadForLocation(@Nullable String name, TransportType transportType) {
         Location location = getLocation(name);
+        if (location == null) {
+            return Load.UNKNOWN;
+        }
         return Load.getLoadByValue(location.getAverageLoad(transportType));
     }