diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-11-27 08:57:53 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-11-27 08:57:53 +0100 |
| commit | 0d155385e1cb7075012bd270de0398d83a438bc5 (patch) | |
| tree | 43ab56fd00a39cb37dce3b60cb594f509d7057f4 /android/lib/model | |
| parent | 56e46c5cf783d41937e4eb2531a4d2e287381ee6 (diff) | |
| parent | ffde55987991aeb7b7aad0e36e2a8402e0ab47d6 (diff) | |
| download | mullvadvpn-0d155385e1cb7075012bd270de0398d83a438bc5.tar.xz mullvadvpn-0d155385e1cb7075012bd270de0398d83a438bc5.zip | |
Merge branch 'implement-multihop-ui-droid-822'
Diffstat (limited to 'android/lib/model')
3 files changed, 14 insertions, 2 deletions
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/FeatureIndicator.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/FeatureIndicator.kt index 3c8df824f4..0da5704b4b 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/FeatureIndicator.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/FeatureIndicator.kt @@ -4,7 +4,7 @@ package net.mullvad.mullvadvpn.lib.model enum class FeatureIndicator { DAITA, QUANTUM_RESISTANCE, - // MULTIHOP, + MULTIHOP, SPLIT_TUNNELING, UDP_2_TCP, SHADOWSOCKS, diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/RelayItemSelection.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/RelayItemSelection.kt new file mode 100644 index 0000000000..c4c78ffe4c --- /dev/null +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/RelayItemSelection.kt @@ -0,0 +1,12 @@ +package net.mullvad.mullvadvpn.lib.model + +sealed interface RelayItemSelection { + val exitLocation: Constraint<RelayItemId> + + data class Single(override val exitLocation: Constraint<RelayItemId>) : RelayItemSelection + + data class Multiple( + val entryLocation: Constraint<RelayItemId>, + override val exitLocation: Constraint<RelayItemId>, + ) : RelayItemSelection +} 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 7af0144cf4..dcc3a957df 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 @@ -5,7 +5,7 @@ import arrow.optics.optics @optics data class WireguardConstraints( val port: Constraint<Port>, - val useMultihop: Boolean, + val isMultihopEnabled: Boolean, val entryLocation: Constraint<RelayItemId>, ) { companion object |