summaryrefslogtreecommitdiffhomepage
path: root/android/lib/ipc
diff options
context:
space:
mode:
authorJonatan Rhodin <jonatan.rhodin@mullvad.net>2023-11-13 13:09:03 +0100
committerAlbin <albin@mullvad.net>2023-11-17 16:37:07 +0100
commitb441a66572238dee87a8fcf7698524a8d75b416d (patch)
tree127033a92e871ced25f06c7683f1ccf8c07811ed /android/lib/ipc
parentd5fe71a19e58d340c01a713d99393a1389724c4a (diff)
downloadmullvadvpn-b441a66572238dee87a8fcf7698524a8d75b416d.tar.xz
mullvadvpn-b441a66572238dee87a8fcf7698524a8d75b416d.zip
Fix race condition when updating provider and ownership at the same time
Diffstat (limited to 'android/lib/ipc')
-rw-r--r--android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Request.kt10
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"