summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-03-19 12:46:13 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-03-30 16:46:26 +0000
commit6403def1ae84df543686a1922d3bf322d671e924 (patch)
treeceb8ff10c52099e8b605f310e31ef6ed523bf9b6
parentc65061b693c6f3470a6d73a531a71e1a3819471e (diff)
downloadmullvadvpn-6403def1ae84df543686a1922d3bf322d671e924.tar.xz
mullvadvpn-6403def1ae84df543686a1922d3bf322d671e924.zip
Add `tunnelOptions` property to `Settings` class
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt1
-rw-r--r--mullvad-types/src/settings/mod.rs1
2 files changed, 1 insertions, 1 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt
index 2b8aa28b53..d9c10a6a01 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt
@@ -5,5 +5,6 @@ data class Settings(
var relaySettings: RelaySettings,
var allowLan: Boolean,
var autoConnect: Boolean,
+ var tunnelOptions: TunnelOptions,
var showBetaReleases: Boolean?
)
diff --git a/mullvad-types/src/settings/mod.rs b/mullvad-types/src/settings/mod.rs
index 105e8b4d10..b7beecac85 100644
--- a/mullvad-types/src/settings/mod.rs
+++ b/mullvad-types/src/settings/mod.rs
@@ -74,7 +74,6 @@ pub struct Settings {
auto_connect: bool,
/// Options that should be applied to tunnels of a specific type regardless of where the relays
/// might be located.
- #[cfg_attr(target_os = "android", jnix(skip))]
tunnel_options: TunnelOptions,
/// Whether to notify users of beta updates.
show_beta_releases: Option<bool>,