Account manager now always rotates key if needed

Previously the account manager would not rotate the wireguard key unless
any account manager command was given. This resulted in old keys not
being rotated sometimes when not using the GUI. This fixes this by
always starting a key rotation when the account manager starts.

1 files changed, 6 insertions, 6 deletions

diff --git a/mullvad-daemon/src/device/mod.rs b/mullvad-daemon/src/device/mod.rs
index b2b9976501..22a073738d 100644
--- a/mullvad-daemon/src/device/mod.rs
+++ b/mullvad-daemon/src/device/mod.rs
@@ -448,6 +448,12 @@ impl AccountManager {
         let mut current_api_call = api::CurrentApiCall::new();
 
         loop {
+            if current_api_call.is_idle() {
+                if let Some(timed_rotation) = self.spawn_timed_key_rotation() {
+                    current_api_call.set_timed_rotation(Box::pin(timed_rotation))
+                }
+            }
+
             futures::select! {
                 api_result = current_api_call => {
                     self.consume_api_result(api_result, &mut current_api_call).await;
@@ -523,12 +529,6 @@ impl AccountManager {
                     }
                 }
             }
-
-            if current_api_call.is_idle() {
-                if let Some(timed_rotation) = self.spawn_timed_key_rotation() {
-                    current_api_call.set_timed_rotation(Box::pin(timed_rotation))
-                }
-            }
         }
         self.shutdown().await;
         if let Some(tx) = shutdown_tx {