Consolidate two mutexes into one

4 files changed, 18 insertions, 18 deletions

diff --git a/mullvad-daemon/src/api.rs b/mullvad-daemon/src/api.rs
index acfdbb7664..ac54382a57 100644
--- a/mullvad-daemon/src/api.rs
+++ b/mullvad-daemon/src/api.rs
@@ -11,7 +11,7 @@ use futures::{
     StreamExt,
 };
 use mullvad_api::{
-    availability::ApiAvailabilityHandle,
+    availability::ApiAvailability,
     proxy::{ApiConnectionMode, ConnectionModeProvider, ProxyConfig},
     AddressCache,
 };
@@ -578,9 +578,9 @@ pub fn allowed_clients(connection_mode: &ApiConnectionMode) -> AllowedClients {
     }
 }
 
-/// Forwards the received values from `offline_state_rx` to the [`ApiAvailabilityHandle`].
+/// Forwards the received values from `offline_state_rx` to the [`ApiAvailability`].
 pub(crate) fn forward_offline_state(
-    api_availability: ApiAvailabilityHandle,
+    api_availability: ApiAvailability,
     mut offline_state_rx: mpsc::UnboundedReceiver<Connectivity>,
 ) {
     tokio::spawn(async move {
diff --git a/mullvad-daemon/src/device/service.rs b/mullvad-daemon/src/device/service.rs
index c4c949ceba..093dd14f67 100644
--- a/mullvad-daemon/src/device/service.rs
+++ b/mullvad-daemon/src/device/service.rs
@@ -13,7 +13,7 @@ use talpid_types::net::wireguard::PrivateKey;
 
 use super::{Error, PrivateAccountAndDevice, PrivateDevice};
 use mullvad_api::{
-    availability::ApiAvailabilityHandle,
+    availability::ApiAvailability,
     rest::{self, MullvadRestHandle},
     AccountsProxy, DevicesProxy,
 };
@@ -28,12 +28,12 @@ const RETRY_BACKOFF_STRATEGY: Jittered<ExponentialBackoff> = Jittered::jitter(
 
 #[derive(Clone)]
 pub struct DeviceService {
-    api_availability: ApiAvailabilityHandle,
+    api_availability: ApiAvailability,
     proxy: DevicesProxy,
 }
 
 impl DeviceService {
-    pub fn new(handle: rest::MullvadRestHandle, api_availability: ApiAvailabilityHandle) -> Self {
+    pub fn new(handle: rest::MullvadRestHandle, api_availability: ApiAvailability) -> Self {
         Self {
             proxy: DevicesProxy::new(handle),
             api_availability,
@@ -255,7 +255,7 @@ impl DeviceService {
 
 #[derive(Clone)]
 pub struct AccountService {
-    api_availability: ApiAvailabilityHandle,
+    api_availability: ApiAvailability,
     initial_check_abort_handle: AbortHandle,
     proxy: AccountsProxy,
 }
@@ -368,7 +368,7 @@ impl AccountService {
 pub fn spawn_account_service(
     api_handle: MullvadRestHandle,
     token: Option<String>,
-    api_availability: ApiAvailabilityHandle,
+    api_availability: ApiAvailability,
 ) -> AccountService {
     let accounts_proxy = AccountsProxy::new(api_handle);
     api_availability.pause_background();
@@ -403,7 +403,7 @@ pub fn spawn_account_service(
 
 fn handle_account_data_result(
     result: &Result<AccountData, rest::Error>,
-    api_availability: &ApiAvailabilityHandle,
+    api_availability: &ApiAvailability,
 ) -> bool {
     match result {
         Ok(_data) if _data.expiry >= chrono::Utc::now() => {
@@ -425,9 +425,9 @@ fn handle_account_data_result(
     }
 }
 
-fn should_retry<T>(result: &Result<T, rest::Error>, api_handle: &ApiAvailabilityHandle) -> bool {
+fn should_retry<T>(result: &Result<T, rest::Error>, api_handle: &ApiAvailability) -> bool {
     match result {
-        Err(error) if error.is_network_error() => !api_handle.get_state().is_offline(),
+        Err(error) if error.is_network_error() => !api_handle.is_offline(),
         _ => false,
     }
 }
diff --git a/mullvad-daemon/src/relay_list/mod.rs b/mullvad-daemon/src/relay_list/mod.rs
index 2b4be3db54..99fa60df57 100644
--- a/mullvad-daemon/src/relay_list/mod.rs
+++ b/mullvad-daemon/src/relay_list/mod.rs
@@ -11,7 +11,7 @@ use std::{
 };
 use tokio::fs::File;
 
-use mullvad_api::{availability::ApiAvailabilityHandle, rest::MullvadRestHandle, RelayListProxy};
+use mullvad_api::{availability::ApiAvailability, rest::MullvadRestHandle, RelayListProxy};
 use mullvad_relay_selector::RelaySelector;
 use mullvad_types::relay_list::RelayList;
 use talpid_future::retry::{retry_future, ExponentialBackoff, Jittered};
@@ -68,7 +68,7 @@ pub struct RelayListUpdater {
     relay_selector: RelaySelector,
     on_update: Box<dyn Fn(&RelayList) + Send + 'static>,
     last_check: SystemTime,
-    api_availability: ApiAvailabilityHandle,
+    api_availability: ApiAvailability,
 }
 
 impl RelayListUpdater {
@@ -163,7 +163,7 @@ impl RelayListUpdater {
     }
 
     fn download_relay_list(
-        api_handle: ApiAvailabilityHandle,
+        api_handle: ApiAvailability,
         proxy: RelayListProxy,
         tag: Option<String>,
     ) -> impl Future<Output = Result<Option<RelayList>, mullvad_api::Error>> + 'static {
diff --git a/mullvad-daemon/src/version_check.rs b/mullvad-daemon/src/version_check.rs
index 4aae30f574..ed50eb6ff5 100644
--- a/mullvad-daemon/src/version_check.rs
+++ b/mullvad-daemon/src/version_check.rs
@@ -4,7 +4,7 @@ use futures::{
     future::{BoxFuture, FusedFuture},
     FutureExt, SinkExt, StreamExt, TryFutureExt,
 };
-use mullvad_api::{availability::ApiAvailabilityHandle, rest::MullvadRestHandle, AppVersionProxy};
+use mullvad_api::{availability::ApiAvailability, rest::MullvadRestHandle, AppVersionProxy};
 use mullvad_types::version::{AppVersionInfo, ParsedAppVersion};
 use serde::{Deserialize, Serialize};
 use std::{
@@ -149,7 +149,7 @@ impl VersionUpdaterHandle {
 impl VersionUpdater {
     pub async fn spawn(
         mut api_handle: MullvadRestHandle,
-        availability_handle: ApiAvailabilityHandle,
+        availability_handle: ApiAvailability,
         cache_dir: PathBuf,
         update_sender: DaemonEventSender<AppVersionInfo>,
         show_beta_releases: bool,
@@ -413,7 +413,7 @@ impl UpdateContext {
 
 #[derive(Clone)]
 struct ApiContext {
-    api_handle: ApiAvailabilityHandle,
+    api_handle: ApiAvailability,
     version_proxy: AppVersionProxy,
     platform_version: String,
 }
@@ -435,7 +435,7 @@ fn do_version_check(
     // retry immediately on network errors (unless we're offline)
     let should_retry_immediate = move |result: &Result<_, Error>| {
         if let Err(Error::Download(error)) = result {
-            error.is_network_error() && !api.api_handle.get_state().is_offline()
+            error.is_network_error() && !api.api_handle.is_offline()
         } else {
             false
         }