diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-04-16 01:47:03 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-04-22 13:46:50 +0000 |
| commit | 242771d330ac29982c9be240dc6c18efbc2a2b77 (patch) | |
| tree | e840ba89609f029379ea192507874683b8ac748a | |
| parent | 3f221a9e644bc77fe64fa63e32c1c0d02e6397c8 (diff) | |
| download | mullvadvpn-242771d330ac29982c9be240dc6c18efbc2a2b77.tar.xz mullvadvpn-242771d330ac29982c9be240dc6c18efbc2a2b77.zip | |
Remove `get_settings_path()` method
| -rw-r--r-- | mullvad-types/src/settings/mod.rs | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/mullvad-types/src/settings/mod.rs b/mullvad-types/src/settings/mod.rs index 7ffd27222d..269fc93cf4 100644 --- a/mullvad-types/src/settings/mod.rs +++ b/mullvad-types/src/settings/mod.rs @@ -7,7 +7,6 @@ use jnix::IntoJava; use log::{debug, info}; use serde::{Deserialize, Serialize}; use serde_json; -use std::path::PathBuf; use talpid_types::net::{openvpn, wireguard, GenericTunnelOptions}; mod migrations; @@ -17,9 +16,6 @@ pub type Result<T> = std::result::Result<T, Error>; #[derive(err_derive::Error, Debug)] #[error(no_from)] pub enum Error { - #[error(display = "Unable to create settings directory")] - DirectoryError(#[error(source)] mullvad_paths::Error), - #[error(display = "Malformed settings")] ParseError(#[error(source)] serde_json::Error), @@ -27,8 +23,6 @@ pub enum Error { NoMatchingVersion, } -static SETTINGS_FILE: &str = "settings.json"; - /// Mullvad daemon settings. #[derive(Debug, Clone, Deserialize, Serialize, PartialEq)] @@ -91,11 +85,6 @@ impl Settings { migrations::try_migrate_settings(&bytes) } - pub fn get_settings_path() -> Result<PathBuf> { - let dir = ::mullvad_paths::settings_dir().map_err(Error::DirectoryError)?; - Ok(dir.join(SETTINGS_FILE)) - } - pub fn get_account_token(&self) -> Option<String> { self.account_token.clone() } |
