diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2020-10-07 20:09:10 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2020-10-09 13:44:29 +0200 |
| commit | 8b56af1d1cd0805b5945563bcf94f4322bd87788 (patch) | |
| tree | 5fa070ac668afcb585ea381d8ba7ae7c4c2397ff | |
| parent | d9b6ff4473e4f03d18f4a9a04fff768fe5842380 (diff) | |
| download | mullvadvpn-8b56af1d1cd0805b5945563bcf94f4322bd87788.tar.xz mullvadvpn-8b56af1d1cd0805b5945563bcf94f4322bd87788.zip | |
Update Android daemon interface with new daemon command data
| -rw-r--r-- | mullvad-jni/src/daemon_interface.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mullvad-jni/src/daemon_interface.rs b/mullvad-jni/src/daemon_interface.rs index 40d9e9cc35..b00a1b6b50 100644 --- a/mullvad-jni/src/daemon_interface.rs +++ b/mullvad-jni/src/daemon_interface.rs @@ -42,7 +42,7 @@ impl DaemonInterface { self.send_command(DaemonCommand::SetTargetState(tx, TargetState::Secured))?; - block_on(rx).map_err(|_| Error::NoResponse) + block_on(rx).map(|_| ()).map_err(|_| Error::NoResponse) } pub fn create_new_account(&self) -> Result<String> { @@ -60,7 +60,7 @@ impl DaemonInterface { self.send_command(DaemonCommand::SetTargetState(tx, TargetState::Unsecured))?; - block_on(rx).map_err(|_| Error::NoResponse) + block_on(rx).map(|_| ()).map_err(|_| Error::NoResponse) } pub fn generate_wireguard_key(&self) -> Result<KeygenEvent> { @@ -148,7 +148,9 @@ impl DaemonInterface { } pub fn reconnect(&self) -> Result<()> { - self.send_command(DaemonCommand::Reconnect)?; + let (tx, _) = oneshot::channel(); + + self.send_command(DaemonCommand::Reconnect(tx))?; Ok(()) } |