fixup

Author: dlon

Diff for: mullvad-api/src/rest.rs

@@ -125,7 +125,7 @@ pub(crate) struct RequestService<T: ConnectionModeProvider> {
     connector_handle: HttpsConnectorWithSniHandle,
     client: hyper::Client<HttpsConnectorWithSni, hyper::Body>,
     connection_mode_provider: T,
-    connection_mode_generation: usize,
+    allow_new_mode: bool,
     api_availability: ApiAvailabilityHandle,
 }
 
@@ -158,7 +158,7 @@ impl<T: ConnectionModeProvider + 'static> RequestService<T> {
             connector_handle,
             client,
             connection_mode_provider,
-            connection_mode_generation: 0,
+            allow_new_mode: true,
             api_availability,
         };
         let handle = RequestServiceHandle { tx: command_tx };
@@ -190,15 +190,15 @@ impl<T: ConnectionModeProvider + 'static> RequestService<T> {
     async fn process_command(&mut self, command: RequestCommand) {
         match command {
             RequestCommand::NewRequest(request, completion_tx) => {
+                self.allow_new_mode = true;
                 self.handle_new_request(request, completion_tx);
             }
             RequestCommand::Reset => {
                 self.connector_handle.reset();
             }
-            RequestCommand::NextApiConfig(generation) => {
-                if generation == self.connection_mode_generation {
-                    self.connection_mode_generation =
-                        self.connection_mode_generation.wrapping_add(1);
+            RequestCommand::NextApiConfig => {
+                if self.allow_new_mode {
+                    self.allow_new_mode = false;
                     self.connection_mode_provider.rotate().await;
                 }
             }
@@ -215,8 +215,6 @@ impl<T: ConnectionModeProvider + 'static> RequestService<T> {
         let api_availability = self.api_availability.clone();
         let request_future = request.into_future(self.client.clone(), api_availability.clone());
 
-        let connection_mode_generation = self.connection_mode_generation;
-
         tokio::spawn(async move {
             let response = request_future.await.map_err(|error| error.map_aborted());
 
@@ -225,9 +223,7 @@ impl<T: ConnectionModeProvider + 'static> RequestService<T> {
                 if err.is_network_error() && !api_availability.get_state().is_offline() {
                     log::error!("{}", err.display_chain_with_msg("HTTP request failed"));
                     if let Some(tx) = tx {
-                        let _ = tx.unbounded_send(RequestCommand::NextApiConfig(
-                            connection_mode_generation,
-                        ));
+                        let _ = tx.unbounded_send(RequestCommand::NextApiConfig);
                     }
                 }
             }
@@ -266,7 +262,7 @@ pub(crate) enum RequestCommand {
         oneshot::Sender<std::result::Result<Response, Error>>,
     ),
     Reset,
-    NextApiConfig(usize),
+    NextApiConfig,
 }
 
 /// A REST request that is sent to the RequestService to be executed.