Merge branch 'handle-null-values-from-daemon'

3 files changed, 13 insertions, 11 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/AccountCache.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/AccountCache.kt
index cc13ec125a..7c10d4b822 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/AccountCache.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/AccountCache.kt
@@ -108,7 +108,9 @@ class AccountCache(val daemon: MullvadDaemon, val settingsListener: SettingsList
 
     private fun fetchAccountHistory() {
         jobTracker.newBackgroundJob("fetchHistory") {
-            accountHistory = daemon.getAccountHistory()
+            daemon.getAccountHistory()?.let { history ->
+                accountHistory = history
+            }
         }
     }
 
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt
index e460d27cd8..eda0ba6759 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt
@@ -194,7 +194,7 @@ class ConnectionProxy(val context: Context, val daemon: MullvadDaemon) {
         val currentState = daemon.getState()
 
         synchronized(this) {
-            if (state === initialState) {
+            if (state === initialState && currentState != null) {
                 state = currentState
             }
         }
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 2ba0ba42cb..838fe80c31 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
@@ -50,19 +50,19 @@ class MullvadDaemon(val vpnService: MullvadVpnService) {
         return getAccountData(daemonInterfaceAddress, accountToken)
     }
 
-    fun getAccountHistory(): ArrayList<String> {
+    fun getAccountHistory(): ArrayList<String>? {
         return getAccountHistory(daemonInterfaceAddress)
     }
 
     fun getWwwAuthToken(): String {
-        return getWwwAuthToken(daemonInterfaceAddress)
+        return getWwwAuthToken(daemonInterfaceAddress) ?: ""
     }
 
     fun getCurrentLocation(): GeoIpLocation? {
         return getCurrentLocation(daemonInterfaceAddress)
     }
 
-    fun getCurrentVersion(): String {
+    fun getCurrentVersion(): String? {
         return getCurrentVersion(daemonInterfaceAddress)
     }
 
@@ -74,7 +74,7 @@ class MullvadDaemon(val vpnService: MullvadVpnService) {
         return getSettings(daemonInterfaceAddress)
     }
 
-    fun getState(): TunnelState {
+    fun getState(): TunnelState? {
         return getState(daemonInterfaceAddress)
     }
 
@@ -141,13 +141,13 @@ class MullvadDaemon(val vpnService: MullvadVpnService) {
         daemonInterfaceAddress: Long,
         accountToken: String
     ): GetAccountDataResult
-    private external fun getAccountHistory(daemonInterfaceAddress: Long): ArrayList<String>
-    private external fun getWwwAuthToken(daemonInterfaceAddress: Long): String
+    private external fun getAccountHistory(daemonInterfaceAddress: Long): ArrayList<String>?
+    private external fun getWwwAuthToken(daemonInterfaceAddress: Long): String?
     private external fun getCurrentLocation(daemonInterfaceAddress: Long): GeoIpLocation?
-    private external fun getCurrentVersion(daemonInterfaceAddress: Long): String
+    private external fun getCurrentVersion(daemonInterfaceAddress: Long): String?
     private external fun getRelayLocations(daemonInterfaceAddress: Long): RelayList?
-    private external fun getSettings(daemonInterfaceAddress: Long): Settings
-    private external fun getState(daemonInterfaceAddress: Long): TunnelState
+    private external fun getSettings(daemonInterfaceAddress: Long): Settings?
+    private external fun getState(daemonInterfaceAddress: Long): TunnelState?
     private external fun getVersionInfo(daemonInterfaceAddress: Long): AppVersionInfo?
     private external fun getWireguardKey(daemonInterfaceAddress: Long): PublicKey?
     private external fun reconnect(daemonInterfaceAddress: Long)