Merge branch 'filter-select-location-relay-list-on-ownership-and-selected-droid-466'

2 files changed, 11 insertions, 0 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 cbd1f28b27..38237e84b3 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
@@ -4,9 +4,12 @@ import android.os.Message as RawMessage
 import android.os.Messenger
 import java.net.InetAddress
 import kotlinx.parcelize.Parcelize
+import net.mullvad.mullvadvpn.model.Constraint
 import net.mullvad.mullvadvpn.model.DnsOptions
 import net.mullvad.mullvadvpn.model.GeographicLocationConstraint
 import net.mullvad.mullvadvpn.model.ObfuscationSettings
+import net.mullvad.mullvadvpn.model.Ownership
+import net.mullvad.mullvadvpn.model.Providers
 import net.mullvad.mullvadvpn.model.QuantumResistantState
 import net.mullvad.mullvadvpn.model.WireguardConstraints
 
@@ -95,6 +98,12 @@ 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()
+
     companion object {
         private const val MESSAGE_KEY = "request"
 
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 381305f2c3..642046f1b8 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
@@ -7,4 +7,6 @@ sealed class RelaySettings : Parcelable {
     @Parcelize data object CustomTunnelEndpoint : RelaySettings()
 
     @Parcelize data class Normal(val relayConstraints: RelayConstraints) : RelaySettings()
+
+    fun relayConstraints(): RelayConstraints? = (this as? Normal)?.relayConstraints
 }