diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-10-09 16:32:56 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-10-09 16:32:56 +0200 |
| commit | 3b30a3f4f45c5ed36aae7186c9d6ac5300fa0aa4 (patch) | |
| tree | 06b46a345d96b0aa3283faeffc9f3fc5f58e550f /android/lib/model | |
| parent | 0962150429d7fce47c33e6dafe3a195e890eab7f (diff) | |
| parent | cfe99ea983818b9462a9240c67ba7d2c28ba6c94 (diff) | |
| download | mullvadvpn-3b30a3f4f45c5ed36aae7186c9d6ac5300fa0aa4.tar.xz mullvadvpn-3b30a3f4f45c5ed36aae7186c9d6ac5300fa0aa4.zip | |
Merge branch 'implement-multihop-daemon-communication-droid-823'
Diffstat (limited to 'android/lib/model')
| -rw-r--r-- | android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/GeoIpLocation.kt | 1 | ||||
| -rw-r--r-- | android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/WireguardConstraints.kt | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/GeoIpLocation.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/GeoIpLocation.kt index d312382a02..8bf50613ba 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/GeoIpLocation.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/GeoIpLocation.kt @@ -12,6 +12,7 @@ data class GeoIpLocation( val latitude: Double, val longitude: Double, val hostname: String?, + val entryHostname: String?, ) { companion object } diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/WireguardConstraints.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/WireguardConstraints.kt index 8affb81077..7af0144cf4 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/WireguardConstraints.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/WireguardConstraints.kt @@ -3,6 +3,10 @@ package net.mullvad.mullvadvpn.lib.model import arrow.optics.optics @optics -data class WireguardConstraints(val port: Constraint<Port>) { +data class WireguardConstraints( + val port: Constraint<Port>, + val useMultihop: Boolean, + val entryLocation: Constraint<RelayItemId>, +) { companion object } |