Fix race condition when updating provider and ownership at the same time

1 files changed, 10 insertions, 15 deletions

diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/RelayListListener.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/RelayListListener.kt
index 186ac21092..2f18c09064 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/RelayListListener.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/RelayListListener.kt
@@ -67,25 +67,20 @@ class RelayListListener(
         }
 
         scope.launch {
-            endpoint.dispatcher.parsedMessages.filterIsInstance<Request.SetOwnership>().collect {
-                request ->
-                val update = getCurrentRelayConstraints().copy(ownership = request.ownership)
-                daemon.await().setRelaySettings(RelaySettings.Normal(update))
-            }
-        }
-
-        scope.launch {
-            endpoint.dispatcher.parsedMessages.filterIsInstance<Request.SetProviders>().collect {
-                request ->
-                val update = getCurrentRelayConstraints().copy(providers = request.providers)
-                daemon.await().setRelaySettings(RelaySettings.Normal(update))
+            endpoint.dispatcher.parsedMessages.filterIsInstance<Request.FetchRelayList>().collect {
+                relayList = daemon.await().getRelayLocations()
             }
         }
 
         scope.launch {
-            endpoint.dispatcher.parsedMessages.filterIsInstance<Request.FetchRelayList>().collect {
-                relayList = daemon.await().getRelayLocations()
-            }
+            endpoint.dispatcher.parsedMessages
+                .filterIsInstance<Request.SetOwnershipAndProviders>()
+                .collect { request ->
+                    val update =
+                        getCurrentRelayConstraints()
+                            .copy(ownership = request.ownership, providers = request.providers)
+                    daemon.await().setRelaySettings(RelaySettings.Normal(update))
+                }
         }
     }