diff options
| author | David Lönnhager <david.l@mullvad.net> | 2022-04-27 11:06:03 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2022-04-27 11:06:03 +0200 |
| commit | fa4876768cd889b4a7b951d3be607f87b65323d1 (patch) | |
| tree | 6caaa9d3986cd56e440d9e3df3406691a1ef545f | |
| parent | 9a5580ecbd7fed165138e08eb4ff3a270e8bfa31 (diff) | |
| parent | 5b48f5c8cbebe8e8db440d8a70ccd318930f2d6f (diff) | |
| download | mullvadvpn-fa4876768cd889b4a7b951d3be607f87b65323d1.tar.xz mullvadvpn-fa4876768cd889b4a7b951d3be607f87b65323d1.zip | |
Merge branch 'fix-oneshot-rotation'
| -rw-r--r-- | mullvad-daemon/src/device/mod.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mullvad-daemon/src/device/mod.rs b/mullvad-daemon/src/device/mod.rs index 65a872e24b..1321fb3e69 100644 --- a/mullvad-daemon/src/device/mod.rs +++ b/mullvad-daemon/src/device/mod.rs @@ -307,7 +307,8 @@ impl AccountManager { } match self.initiate_key_rotation() { Ok(api_call) => { - current_api_call.set_oneshot_rotation(Box::pin(api_call)) + current_api_call.set_oneshot_rotation(Box::pin(api_call)); + self.rotation_requests.push(tx); }, Err(err) => { let _ = tx.send(Err(err)); @@ -594,7 +595,7 @@ impl AccountManager { self.last_validation = None; if let Some(old_data) = self.data.take() { - if data.as_ref().map(|d| &d.device.id) == Some(&old_data.device.id) { + if data.as_ref().map(|d| &d.device.id) != Some(&old_data.device.id) { tokio::spawn(self.logout_api_call(old_data)); } } |