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

mullvad · Nov 16, 2023 · 8a01911 · 8a01911
1 parent 13ea601
commit 8a01911
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 0 deletions.
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/RelayListListener.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/RelayListListener.kt
@@ -50,5 +50,12 @@ class RelayListListener(
         messageHandler.trySendRequest(Request.SetProviders(value))
     }
 
+    fun updateSelectedOwnershipAndProviderFilter(
+        ownership: Constraint<Ownership>,
+        providers: Constraint<Providers>
+    ) {
+        messageHandler.trySendRequest(Request.SetOwnershipAndProviders(ownership, providers))
+    }
+
     private fun defaultRelayList() = RelayList(ArrayList(), WireguardEndpointData(ArrayList()))
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/RelayListFilterUseCase.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/RelayListFilterUseCase.kt
@@ -23,6 +23,13 @@ class RelayListFilterUseCase(
         relayListListener.updateSelectedProvidersFilter(providers)
     }
 
+    fun updateOwnershipAndProviderFilter(
+        ownership: Constraint<Ownership>,
+        providers: Constraint<Providers>
+    ) {
+        relayListListener.updateSelectedOwnershipAndProviderFilter(ownership, providers)
+    }
+
     fun selectedOwnership(): Flow<Constraint<Ownership>> =
         settingsRepository.settingsUpdates.map { settings ->
             settings?.relaySettings?.relayConstraints()?.ownership ?: Constraint.Any()

diff --git a/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Request.kt b/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Request.kt
@@ -109,6 +109,12 @@ sealed class Request : Message.RequestMessage() {
 
     @Parcelize data object FetchRelayList : Request()
 
+    @Parcelize
+    data class SetOwnershipAndProviders(
+        val ownership: Constraint<Ownership>,
+        val providers: Constraint<Providers>
+    ) : Request()
+
     companion object {
         private const val MESSAGE_KEY = "request"
 

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
@@ -87,6 +87,17 @@ class RelayListListener(
                 relayList = daemon.await().getRelayLocations()
             }
         }
+
+        scope.launch {
+            endpoint.dispatcher.parsedMessages
+                .filterIsInstance<Request.SetOwnershipAndProviders>()
+                .collect { request ->
+                    val update =
+                        getCurrentRelayConstraints()
+                            .copy(ownership = request.ownership, providers = request.providers)
+                    daemon.await().setRelaySettings(RelaySettings.Normal(update))
+                }
+        }
     }
 
     fun onDestroy() {