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

2 files changed, 10 insertions, 12 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
index 30b8540bf9..d04e7394f9 100644
--- 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
@@ -42,12 +42,11 @@ class RelayListListener(
         messageHandler.trySendRequest(Request.SetWireguardConstraints(value))
     }
 
-    fun updateSelectedOwnershipFilter(value: Constraint<Ownership>) {
-        messageHandler.trySendRequest(Request.SetOwnership(value))
-    }
-
-    fun updateSelectedProvidersFilter(value: Constraint<Providers>) {
-        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
index a26f302f9c..f480e6a23a 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/RelayListFilterUseCase.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/RelayListFilterUseCase.kt
@@ -15,12 +15,11 @@ class RelayListFilterUseCase(
     private val relayListListener: RelayListListener,
     private val settingsRepository: SettingsRepository
 ) {
-    fun updateOwnershipFilter(ownership: Constraint<Ownership>) {
-        relayListListener.updateSelectedOwnershipFilter(ownership)
-    }
-
-    fun updateProviderFilter(providers: Constraint<Providers>) {
-        relayListListener.updateSelectedProvidersFilter(providers)
+    fun updateOwnershipAndProviderFilter(
+        ownership: Constraint<Ownership>,
+        providers: Constraint<Providers>
+    ) {
+        relayListListener.updateSelectedOwnershipAndProviderFilter(ownership, providers)
     }
 
     fun selectedOwnership(): Flow<Constraint<Ownership>> =