Merge branch 'race-condition-when-updating-two-relay-constraints-at-the-droid-488'

1 files changed, 6 insertions, 4 deletions

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
index b73010785a..267f1f2619 100644
--- 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
@@ -103,12 +103,14 @@ sealed class Request : Message.RequestMessage() {
     data class SetWireGuardQuantumResistant(val quantumResistant: QuantumResistantState) :
         Request()
 
-    @Parcelize data class SetOwnership(val ownership: Constraint<Ownership>) : Request()
-
-    @Parcelize data class SetProviders(val providers: Constraint<Providers>) : Request()
-
     @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"