diff options
| author | David Lönnhager <david.l@mullvad.net> | 2023-10-31 15:24:22 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2023-10-31 15:24:22 +0100 |
| commit | f073ef8c37ecc4a0cd3d4525ed3bc310cfd2f7e0 (patch) | |
| tree | f817e43aa5b924bf1b56aeb03e941913fa35e339 /android/lib | |
| parent | 9b33f4440fd35d01eea663df5de7d83f65d96918 (diff) | |
| parent | 3cedaf529da04bbd25fee4829fad4cc0ae2f561f (diff) | |
| download | mullvadvpn-f073ef8c37ecc4a0cd3d4525ed3bc310cfd2f7e0.tar.xz mullvadvpn-f073ef8c37ecc4a0cd3d4525ed3bc310cfd2f7e0.zip | |
Merge branch 'refactor-relay-settings-update' into main
Diffstat (limited to 'android/lib')
4 files changed, 4 insertions, 19 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 2a8636fa95..cbd1f28b27 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 @@ -74,7 +74,7 @@ sealed class Request : Message.RequestMessage() { @Parcelize data class SetEnableSplitTunneling(val enable: Boolean) : Request() @Parcelize - data class SetRelayLocation(val relayLocation: GeographicLocationConstraint?) : Request() + data class SetRelayLocation(val relayLocation: GeographicLocationConstraint) : Request() @Parcelize data class SetWireGuardMtu(val mtu: Int?) : Request() @@ -89,7 +89,7 @@ sealed class Request : Message.RequestMessage() { @Parcelize data class SetObfuscationSettings(val settings: ObfuscationSettings?) : Request() @Parcelize - data class SetWireguardConstraints(val wireguardConstraints: WireguardConstraints?) : Request() + data class SetWireguardConstraints(val wireguardConstraints: WireguardConstraints) : Request() @Parcelize data class SetWireGuardQuantumResistant(val quantumResistant: QuantumResistantState) : diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraintsUpdate.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraintsUpdate.kt deleted file mode 100644 index 8a382a87d9..0000000000 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraintsUpdate.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.mullvad.mullvadvpn.model - -data class RelayConstraintsUpdate( - val location: Constraint<LocationConstraint>?, - val providers: Constraint<Providers>?, - val ownership: Constraint<Ownership>?, - val wireguardConstraints: WireguardConstraints? -) diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettings.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettings.kt index 7832a00e77..381305f2c3 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettings.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettings.kt @@ -4,7 +4,7 @@ import android.os.Parcelable import kotlinx.parcelize.Parcelize sealed class RelaySettings : Parcelable { - @Parcelize object CustomTunnelEndpoint : RelaySettings() + @Parcelize data object CustomTunnelEndpoint : RelaySettings() - @Parcelize class Normal(val relayConstraints: RelayConstraints) : RelaySettings() + @Parcelize data class Normal(val relayConstraints: RelayConstraints) : RelaySettings() } diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt deleted file mode 100644 index f8d27f115e..0000000000 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt +++ /dev/null @@ -1,7 +0,0 @@ -package net.mullvad.mullvadvpn.model - -sealed class RelaySettingsUpdate { - object CustomTunnelEndpoint : RelaySettingsUpdate() - - data class Normal(val constraints: RelayConstraintsUpdate) : RelaySettingsUpdate() -} |