diff options
Diffstat (limited to 'android')
5 files changed, 25 insertions, 3 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 574f7a2004..fe68c63408 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 @@ -97,7 +97,11 @@ class RelayListListener( relaySettings = newRelaySettings ?: RelaySettings.Normal( - RelayConstraints(Constraint.Any(), WireguardConstraints(Constraint.Any())) + RelayConstraints( + location = Constraint.Any(), + ownership = Constraint.Any(), + wireguardConstraints = WireguardConstraints(Constraint.Any()), + ) ) if (relayCountries != null) { diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Ownership.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Ownership.kt new file mode 100644 index 0000000000..43037be676 --- /dev/null +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Ownership.kt @@ -0,0 +1,10 @@ +package net.mullvad.mullvadvpn.model + +import android.os.Parcelable +import kotlinx.parcelize.Parcelize + +@Parcelize +enum class Ownership : Parcelable { + MullvadOwned, + Rented +} diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraints.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraints.kt index da2acb39f6..21b1575edc 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraints.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraints.kt @@ -6,5 +6,6 @@ import kotlinx.parcelize.Parcelize @Parcelize data class RelayConstraints( val location: Constraint<LocationConstraint>, - val wireguardConstraints: WireguardConstraints + val ownership: Constraint<Ownership>, + val wireguardConstraints: WireguardConstraints, ) : Parcelable 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 index 991ae7dbde..9d07ba92c3 100644 --- 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 @@ -2,5 +2,6 @@ package net.mullvad.mullvadvpn.model data class RelayConstraintsUpdate( val location: Constraint<LocationConstraint>?, + val ownership: Constraint<Ownership>?, val wireguardConstraints: WireguardConstraints? ) diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/RelayListListener.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/RelayListListener.kt index 09f90a44d5..cb57e7585d 100644 --- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/RelayListListener.kt +++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/RelayListListener.kt @@ -95,7 +95,13 @@ class RelayListListener(endpoint: ServiceEndpoint) { val wireguardConstraints: WireguardConstraints? = selectedWireguardConstraints val update = - RelaySettingsUpdate.Normal(RelayConstraintsUpdate(location, wireguardConstraints)) + RelaySettingsUpdate.Normal( + RelayConstraintsUpdate( + location = location, + wireguardConstraints = wireguardConstraints, + ownership = Constraint.Any() + ) + ) daemon.await().updateRelaySettings(update) } |