summaryrefslogtreecommitdiffhomepage
path: root/android/lib/model
diff options
context:
space:
mode:
authorJonatan Rhodin <jonatan.rhodin@mullvad.net>2024-12-02 10:46:36 +0100
committerJonatan Rhodin <jonatan.rhodin@mullvad.net>2024-12-02 11:05:06 +0100
commite0ef5463c2087f073fbf86a347903644aa4543ed (patch)
tree0308fdc27a7800608898ca00b96c959b2b87f81f /android/lib/model
parent64a5704fd0dc57cc73669251da43d4285fa42e92 (diff)
downloadmullvadvpn-e0ef5463c2087f073fbf86a347903644aa4543ed.tar.xz
mullvadvpn-e0ef5463c2087f073fbf86a347903644aa4543ed.zip
Implement support for daita with multihop
Diffstat (limited to 'android/lib/model')
-rw-r--r--android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/DaitaSettings.kt8
-rw-r--r--android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Settings.kt2
-rw-r--r--android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/WireguardTunnelOptions.kt9
3 files changed, 15 insertions, 4 deletions
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/DaitaSettings.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/DaitaSettings.kt
new file mode 100644
index 0000000000..791970cf70
--- /dev/null
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/DaitaSettings.kt
@@ -0,0 +1,8 @@
+package net.mullvad.mullvadvpn.lib.model
+
+import arrow.optics.optics
+
+@optics
+data class DaitaSettings(val enabled: Boolean, val directOnly: Boolean) {
+ companion object
+}
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Settings.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Settings.kt
index b3f1a2e8a0..99e8a2b8dc 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Settings.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Settings.kt
@@ -14,7 +14,5 @@ data class Settings(
val splitTunnelSettings: SplitTunnelSettings,
val apiAccessMethodSettings: List<ApiAccessMethodSetting>,
) {
- fun isDaitaEnabled() = tunnelOptions.wireguard.daita
-
companion object
}
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/WireguardTunnelOptions.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/WireguardTunnelOptions.kt
index 70b1599c55..f6a489df12 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/WireguardTunnelOptions.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/WireguardTunnelOptions.kt
@@ -1,7 +1,12 @@
package net.mullvad.mullvadvpn.lib.model
+import arrow.optics.optics
+
+@optics
data class WireguardTunnelOptions(
val mtu: Mtu?,
val quantumResistant: QuantumResistantState,
- val daita: Boolean,
-)
+ val daitaSettings: DaitaSettings,
+) {
+ companion object
+}