diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-05-21 19:38:34 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-05-22 19:55:46 +0000 |
| commit | a823bd0c69ef233c4a6d516c4b03d5f0e68dbbec (patch) | |
| tree | d534fa4d6cb3d3089ceebe27bcf8f0089b07588d | |
| parent | ae072b38f0f3b83da4863287899c4bf0dcf0ef8f (diff) | |
| download | mullvadvpn-a823bd0c69ef233c4a6d516c4b03d5f0e68dbbec.tar.xz mullvadvpn-a823bd0c69ef233c4a6d516c4b03d5f0e68dbbec.zip | |
Implement `DaemonInterface::get_settings`
| -rw-r--r-- | mullvad-jni/src/daemon_interface.rs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mullvad-jni/src/daemon_interface.rs b/mullvad-jni/src/daemon_interface.rs index 67bf179879..21dabea9aa 100644 --- a/mullvad-jni/src/daemon_interface.rs +++ b/mullvad-jni/src/daemon_interface.rs @@ -1,6 +1,6 @@ use futures::{sync::oneshot, Future}; use mullvad_daemon::{DaemonCommandSender, ManagementCommand}; -use mullvad_types::account::AccountData; +use mullvad_types::{account::AccountData, settings::Settings}; #[derive(Debug, err_derive::Error)] pub enum Error { @@ -45,6 +45,14 @@ impl DaemonInterface { .map_err(Error::RpcError) } + pub fn get_settings(&self) -> Result<Settings> { + let (tx, rx) = oneshot::channel(); + + self.send_command(ManagementCommand::GetSettings(tx))?; + + Ok(rx.wait().map_err(|_| Error::NoResponse)?) + } + pub fn set_account(&self, account_token: Option<String>) -> Result<()> { let (tx, rx) = oneshot::channel(); |
