diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-10-25 17:05:06 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-10-25 17:05:06 +0200 |
| commit | beb1fe5aa803aa347b82832f4a875aa8adfed849 (patch) | |
| tree | 940a1bd1436c48011251e83254a04a2ffef48987 /android | |
| parent | 5d424ee0fb38d97a17d0b7cccdb005347ff3dfd3 (diff) | |
| parent | 285f89f5bb803acaf6748c63149ff75d6b65e531 (diff) | |
| download | mullvadvpn-beb1fe5aa803aa347b82832f4a875aa8adfed849.tar.xz mullvadvpn-beb1fe5aa803aa347b82832f4a875aa8adfed849.zip | |
Merge branch 'add-providers-data-model-from-the-daemon-droid-435'
Diffstat (limited to 'android')
5 files changed, 11 insertions, 1 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 fe68c63408..d0f54a0cf6 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 @@ -101,6 +101,7 @@ class RelayListListener( location = Constraint.Any(), ownership = Constraint.Any(), wireguardConstraints = WireguardConstraints(Constraint.Any()), + providers = Constraint.Any() ) ) diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Providers.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Providers.kt new file mode 100644 index 0000000000..5d97588ca6 --- /dev/null +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Providers.kt @@ -0,0 +1,6 @@ +package net.mullvad.mullvadvpn.model + +import android.os.Parcelable +import kotlinx.parcelize.Parcelize + +@JvmInline @Parcelize value class Providers(val providers: HashSet<String>) : Parcelable 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 21b1575edc..031b09bace 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,6 +6,7 @@ import kotlinx.parcelize.Parcelize @Parcelize data class RelayConstraints( val location: Constraint<LocationConstraint>, + val providers: Constraint<Providers>, 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 9d07ba92c3..8a382a87d9 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,6 +2,7 @@ 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/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 cb57e7585d..6974d804a1 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 @@ -99,7 +99,8 @@ class RelayListListener(endpoint: ServiceEndpoint) { RelayConstraintsUpdate( location = location, wireguardConstraints = wireguardConstraints, - ownership = Constraint.Any() + ownership = Constraint.Any(), + providers = Constraint.Any() ) ) |