From 88e8a444609d66a62130e911154230c46fb9da1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= <g@leirbag.net>
Date: Thu, 16 Nov 2023 21:06:11 +0100
Subject: [PATCH] Use tokio::sync::Mutex

---
 presage/Cargo.toml                | 2 +-
 presage/src/manager/registered.rs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/presage/Cargo.toml b/presage/Cargo.toml
index d1023be23..4a23d6e35 100644
--- a/presage/Cargo.toml
+++ b/presage/Cargo.toml
@@ -18,7 +18,7 @@ serde_json = "1.0"
 thiserror = "1.0"
 url = "2.2"
 parking_lot = "0.11"
-tokio = { version = "1.0", default-features = false, features = ["time"] }
+tokio = { version = "1.0", default-features = false, features = ["sync", "time"] }
 
 [dev-dependencies]
 quickcheck = "1.0.3"
diff --git a/presage/src/manager/registered.rs b/presage/src/manager/registered.rs
index e67243d29..0ae0ada7a 100644
--- a/presage/src/manager/registered.rs
+++ b/presage/src/manager/registered.rs
@@ -36,10 +36,10 @@ use libsignal_service::zkgroup::profiles::ProfileKey;
 use libsignal_service::{cipher, AccountManager, Profile, ServiceAddress};
 use libsignal_service_hyper::push_service::HyperPushService;
 use log::{debug, error, info, trace, warn};
-use parking_lot::Mutex;
 use rand::rngs::StdRng;
 use rand::SeedableRng;
 use serde::{Deserialize, Serialize};
+use tokio::sync::Mutex;
 
 use crate::cache::CacheCell;
 use crate::serde::serde_profile_key;
@@ -201,7 +201,7 @@ impl<S: Store> Manager<S, Registered> {
 
     /// Returns the current identified websocket, or creates a new one
     async fn identified_websocket(&self) -> Result<SignalWebSocket, Error<S::Error>> {
-        let mut identified_ws = self.state.identified_websocket.lock();
+        let mut identified_ws = self.state.identified_websocket.lock().await;
         match identified_ws.clone() {
             Some(ws) => Ok(ws),
             None => {
@@ -220,7 +220,7 @@ impl<S: Store> Manager<S, Registered> {
     }
 
     async fn unidentified_websocket(&self) -> Result<SignalWebSocket, Error<S::Error>> {
-        let mut unidentified_ws = self.state.unidentified_websocket.lock();
+        let mut unidentified_ws = self.state.unidentified_websocket.lock().await;
         match unidentified_ws.clone() {
             Some(ws) => Ok(ws),
             None => {