Allow `getRelayLocations` to return `null`

This allows the `RelayListListener` to become more robust to any issues
when retrieving the list from the daemon. It should now not crash with a
`NullPointerException` if the daemon stops, for example.

2 files changed, 3 insertions, 3 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/RelayListListener.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/RelayListListener.kt
index 5fe1918551..2012947ed8 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/RelayListListener.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/RelayListListener.kt
@@ -59,7 +59,7 @@ class RelayListListener(val daemon: MullvadDaemon, val settingsListener: Setting
         val relayLocations = daemon.getRelayLocations()
 
         synchronized(this) {
-            if (relayList == null) {
+            if (relayList == null && relayLocations != null) {
                 relayListChanged(RelayList(relayLocations))
             }
         }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
index a175efc5ca..8e8806cc70 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
@@ -57,7 +57,7 @@ class MullvadDaemon(val vpnService: MullvadVpnService) {
         return getCurrentVersion(daemonInterfaceAddress)
     }
 
-    fun getRelayLocations(): RelayList {
+    fun getRelayLocations(): RelayList? {
         return getRelayLocations(daemonInterfaceAddress)
     }
 
@@ -106,7 +106,7 @@ class MullvadDaemon(val vpnService: MullvadVpnService) {
     private external fun getWwwAuthToken(daemonInterfaceAddress: Long): String
     private external fun getCurrentLocation(daemonInterfaceAddress: Long): GeoIpLocation?
     private external fun getCurrentVersion(daemonInterfaceAddress: Long): String
-    private external fun getRelayLocations(daemonInterfaceAddress: Long): RelayList
+    private external fun getRelayLocations(daemonInterfaceAddress: Long): RelayList?
     private external fun getSettings(daemonInterfaceAddress: Long): Settings
     private external fun getState(daemonInterfaceAddress: Long): TunnelState
     private external fun getVersionInfo(daemonInterfaceAddress: Long): AppVersionInfo?