summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-01-28 20:05:40 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-02-10 15:40:36 +0000
commitac5f51d61edc2b2e9627c747fd0daae97f6fb67e (patch)
tree6fe6fbac18dfaae15de32795d494caabe8a7b24f
parentc0451c41263859f6498143898062c9b6216e7630 (diff)
downloadmullvadvpn-ac5f51d61edc2b2e9627c747fd0daae97f6fb67e.tar.xz
mullvadvpn-ac5f51d61edc2b2e9627c747fd0daae97f6fb67e.zip
Send `allowLan` updates to UI
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt6
-rw-r--r--mullvad-types/src/settings/mod.rs1
2 files changed, 5 insertions, 2 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 9e4985820f..6cc83b157f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt
@@ -1,3 +1,7 @@
package net.mullvad.mullvadvpn.model
-data class Settings(var accountToken: String?, var relaySettings: RelaySettings)
+data class Settings(
+ var accountToken: String?,
+ var relaySettings: RelaySettings,
+ var allowLan: Boolean
+)
diff --git a/mullvad-types/src/settings/mod.rs b/mullvad-types/src/settings/mod.rs
index 89b0fa2ad7..19f350b7f7 100644
--- a/mullvad-types/src/settings/mod.rs
+++ b/mullvad-types/src/settings/mod.rs
@@ -65,7 +65,6 @@ pub struct Settings {
#[cfg_attr(target_os = "android", jnix(skip))]
bridge_state: BridgeState,
/// If the daemon should allow communication with private (LAN) networks.
- #[cfg_attr(target_os = "android", jnix(skip))]
allow_lan: bool,
/// Extra level of kill switch. When this setting is on, the disconnected state will block
/// the firewall to not allow any traffic in or out.