Replace simple getters with direct field access

9 files changed, 22 insertions, 46 deletions

diff --git a/mullvad-cli/src/cmds/auto_connect.rs b/mullvad-cli/src/cmds/auto_connect.rs
index bad4c5c1e6..385a2de7b6 100644
--- a/mullvad-cli/src/cmds/auto_connect.rs
+++ b/mullvad-cli/src/cmds/auto_connect.rs
@@ -49,7 +49,7 @@ impl AutoConnect {
 
     fn get(&self) -> Result<()> {
         let mut rpc = new_rpc_client()?;
-        let auto_connect = rpc.get_settings()?.get_auto_connect();
+        let auto_connect = rpc.get_settings()?.auto_connect;
         println!("Autoconnect: {}", if auto_connect { "on" } else { "off" });
         Ok(())
     }
diff --git a/mullvad-cli/src/cmds/beta_program.rs b/mullvad-cli/src/cmds/beta_program.rs
index c63027ccfd..602de81db0 100644
--- a/mullvad-cli/src/cmds/beta_program.rs
+++ b/mullvad-cli/src/cmds/beta_program.rs
@@ -29,7 +29,7 @@ impl Command for BetaProgram {
             ("get", Some(_)) => {
                 let mut rpc = new_rpc_client()?;
                 let settings = rpc.get_settings()?;
-                let enabled_str = if settings.get_show_beta_releases().unwrap_or(false) {
+                let enabled_str = if settings.show_beta_releases.unwrap_or(false) {
                     "on"
                 } else {
                     "off"
diff --git a/mullvad-cli/src/cmds/block_when_disconnected.rs b/mullvad-cli/src/cmds/block_when_disconnected.rs
index 9d9081a650..cd585720dd 100644
--- a/mullvad-cli/src/cmds/block_when_disconnected.rs
+++ b/mullvad-cli/src/cmds/block_when_disconnected.rs
@@ -49,7 +49,7 @@ impl BlockWhenDisconnected {
 
     fn get(&self) -> Result<()> {
         let mut rpc = new_rpc_client()?;
-        let block_when_disconnected = rpc.get_settings()?.get_block_when_disconnected();
+        let block_when_disconnected = rpc.get_settings()?.block_when_disconnected;
         println!(
             "Network traffic will be {} when the VPN is disconnected",
             if block_when_disconnected {
diff --git a/mullvad-cli/src/cmds/bridge.rs b/mullvad-cli/src/cmds/bridge.rs
index d0538e0d7c..0e5c339744 100644
--- a/mullvad-cli/src/cmds/bridge.rs
+++ b/mullvad-cli/src/cmds/bridge.rs
@@ -162,7 +162,7 @@ impl Bridge {
         let mut rpc = new_rpc_client()?;
         let settings = rpc.get_settings()?;
         println!("Bridge state - {}", settings.get_bridge_state());
-        match settings.get_bridge_settings() {
+        match settings.bridge_settings {
             BridgeSettings::Custom(proxy) => {
                 match proxy {
                     openvpn::ProxySettings::Local(local_proxy) => {
diff --git a/mullvad-cli/src/cmds/lan.rs b/mullvad-cli/src/cmds/lan.rs
index 3a29bdd226..15d30cde50 100644
--- a/mullvad-cli/src/cmds/lan.rs
+++ b/mullvad-cli/src/cmds/lan.rs
@@ -49,7 +49,7 @@ impl Lan {
 
     fn get(&self) -> Result<()> {
         let mut rpc = new_rpc_client()?;
-        let allow_lan = rpc.get_settings()?.get_allow_lan();
+        let allow_lan = rpc.get_settings()?.allow_lan;
         println!(
             "Local network sharing setting: {}",
             if allow_lan { "allow" } else { "block" }
diff --git a/mullvad-cli/src/cmds/tunnel.rs b/mullvad-cli/src/cmds/tunnel.rs
index 8b995cdc6b..5349174d4c 100644
--- a/mullvad-cli/src/cmds/tunnel.rs
+++ b/mullvad-cli/src/cmds/tunnel.rs
@@ -258,7 +258,7 @@ impl Tunnel {
 
     fn get_tunnel_options() -> Result<TunnelOptions> {
         let mut rpc = new_rpc_client()?;
-        Ok(rpc.get_settings()?.get_tunnel_options().clone())
+        Ok(rpc.get_settings()?.tunnel_options)
     }
 
     fn process_openvpn_mssfix_unset() -> Result<()> {
diff --git a/mullvad-cli/src/cmds/version.rs b/mullvad-cli/src/cmds/version.rs
index 2acde8f76f..99df7b6d19 100644
--- a/mullvad-cli/src/cmds/version.rs
+++ b/mullvad-cli/src/cmds/version.rs
@@ -20,7 +20,7 @@ impl Command for Version {
         println!("\tIs supported: {}", version_info.current_is_supported);
 
         let settings = rpc.get_settings()?;
-        let is_updated = if settings.get_show_beta_releases().unwrap_or(false) {
+        let is_updated = if settings.show_beta_releases.unwrap_or(false) {
             version_info.latest == current_version
         } else {
             version_info.latest_stable == current_version
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index d16fab4e92..c645eb1ed5 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -509,7 +509,7 @@ where
 
         let mut settings = SettingsPersister::load();
 
-        if version::is_beta_version() && settings.get_show_beta_releases().is_none() {
+        if version::is_beta_version() && settings.show_beta_releases.is_none() {
             let _ = settings.set_show_beta_releases(true);
         }
 
@@ -544,8 +544,8 @@ where
             tx: internal_event_tx.clone(),
         };
         let tunnel_command_tx = tunnel_state_machine::spawn(
-            settings.get_allow_lan(),
-            settings.get_block_when_disconnected(),
+            settings.allow_lan,
+            settings.block_when_disconnected,
             tunnel_parameters_generator,
             log_dir,
             resource_dir,
@@ -567,7 +567,7 @@ where
         relay_selector.update();
 
         let initial_target_state = if settings.get_account_token().is_some() {
-            if settings.get_auto_connect() {
+            if settings.auto_connect {
                 // Note: Auto-connect overrides the cached target state
                 info!("Automatically connecting since auto-connect is turned on");
                 TargetState::Secured
@@ -612,7 +612,7 @@ where
                 token,
                 daemon
                     .settings
-                    .get_tunnel_options()
+                    .tunnel_options
                     .wireguard
                     .automatic_rotation
                     .map(|hours| Duration::from_secs(60u64 * 60u64 * hours as u64)),
@@ -758,7 +758,7 @@ where
                     self.last_generated_relay = None;
                     custom_relay
                         // TODO(emilsp): generate proxy settings for custom tunnels
-                        .to_tunnel_parameters(self.settings.get_tunnel_options().clone(), None)
+                        .to_tunnel_parameters(self.settings.tunnel_options.clone(), None)
                         .map_err(|e| {
                             log::error!("Failed to resolve hostname for custom tunnel config: {}", e);
                             ParameterGenerationError::CustomTunnelHostResultionError
@@ -820,12 +820,12 @@ where
         account_token: String,
         retry_attempt: u32,
     ) -> Result<TunnelParameters, Error> {
-        let tunnel_options = self.settings.get_tunnel_options().clone();
+        let tunnel_options = self.settings.tunnel_options.clone();
         let location = relay.location.as_ref().expect("Relay has no location set");
         self.last_generated_bridge_relay = None;
         match endpoint {
             MullvadEndpoint::OpenVpn(endpoint) => {
-                let proxy_settings = match self.settings.get_bridge_settings() {
+                let proxy_settings = match &self.settings.bridge_settings {
                     BridgeSettings::Normal(settings) => {
                         let bridge_constraints = InternalBridgeConstraints {
                             location: settings.location.clone(),
@@ -1637,7 +1637,7 @@ where
                         &mut self.account_history,
                         account_token,
                         self.settings
-                            .get_tunnel_options()
+                            .tunnel_options
                             .wireguard
                             .automatic_rotation
                             .map(|hours| Duration::from_secs(60u64 * 60u64 * hours as u64)),
diff --git a/mullvad-types/src/settings/mod.rs b/mullvad-types/src/settings/mod.rs
index ca9d4adfe7..130a37d4a1 100644
--- a/mullvad-types/src/settings/mod.rs
+++ b/mullvad-types/src/settings/mod.rs
@@ -58,22 +58,22 @@ pub struct Settings {
     account_token: Option<String>,
     relay_settings: RelaySettings,
     #[cfg_attr(target_os = "android", jnix(skip))]
-    bridge_settings: BridgeSettings,
+    pub bridge_settings: BridgeSettings,
     #[cfg_attr(target_os = "android", jnix(skip))]
     bridge_state: BridgeState,
     /// If the daemon should allow communication with private (LAN) networks.
-    allow_lan: bool,
+    pub 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.
     #[cfg_attr(target_os = "android", jnix(skip))]
-    block_when_disconnected: bool,
+    pub block_when_disconnected: bool,
     /// If the daemon should connect the VPN tunnel directly on start or not.
-    auto_connect: bool,
+    pub auto_connect: bool,
     /// Options that should be applied to tunnels of a specific type regardless of where the relays
     /// might be located.
-    tunnel_options: TunnelOptions,
+    pub tunnel_options: TunnelOptions,
     /// Whether to notify users of beta updates.
-    show_beta_releases: Option<bool>,
+    pub show_beta_releases: Option<bool>,
     /// Specifies settings schema version
     #[cfg_attr(target_os = "android", jnix(skip))]
     settings_version: migrations::SettingsVersion,
@@ -219,10 +219,6 @@ impl Settings {
         }
     }
 
-    pub fn get_allow_lan(&self) -> bool {
-        self.allow_lan
-    }
-
     pub fn set_allow_lan(&mut self, allow_lan: bool) -> Result<bool> {
         if allow_lan != self.allow_lan {
             self.allow_lan = allow_lan;
@@ -232,10 +228,6 @@ impl Settings {
         }
     }
 
-    pub fn get_block_when_disconnected(&self) -> bool {
-        self.block_when_disconnected
-    }
-
     pub fn set_block_when_disconnected(&mut self, block_when_disconnected: bool) -> Result<bool> {
         if block_when_disconnected != self.block_when_disconnected {
             self.block_when_disconnected = block_when_disconnected;
@@ -245,10 +237,6 @@ impl Settings {
         }
     }
 
-    pub fn get_auto_connect(&self) -> bool {
-        self.auto_connect
-    }
-
     pub fn set_auto_connect(&mut self, auto_connect: bool) -> Result<bool> {
         if auto_connect != self.auto_connect {
             self.auto_connect = auto_connect;
@@ -297,14 +285,6 @@ impl Settings {
         }
     }
 
-    pub fn get_tunnel_options(&self) -> &TunnelOptions {
-        &self.tunnel_options
-    }
-
-    pub fn get_show_beta_releases(&self) -> Option<bool> {
-        self.show_beta_releases.clone()
-    }
-
     pub fn set_show_beta_releases(&mut self, enabled: bool) -> Result<bool> {
         if Some(enabled) != self.show_beta_releases {
             self.show_beta_releases = Some(enabled);
@@ -314,10 +294,6 @@ impl Settings {
         }
     }
 
-    pub fn get_bridge_settings(&self) -> &BridgeSettings {
-        &self.bridge_settings
-    }
-
     pub fn set_bridge_settings(&mut self, bridge_settings: BridgeSettings) -> Result<bool> {
         if self.bridge_settings != bridge_settings {
             self.bridge_settings = bridge_settings;