Always rely on the server to cancel the incoming call

Antonio Scandurra created 3 years ago

Change summary

crates/client/src/user.rs              | 8 ++------
crates/collab/src/integration_tests.rs | 4 ++++
2 files changed, 6 insertions(+), 6 deletions(-)

Detailed changes

crates/client/src/user.rs

@@ -246,12 +246,8 @@ impl UserStore {
     }
 
     pub fn decline_call(&mut self) -> Result<()> {
-        let mut incoming_call = self.incoming_call.0.borrow_mut();
-        if incoming_call.is_some() {
-            if let Some(client) = self.client.upgrade() {
-                client.send(proto::DeclineCall {})?;
-            }
-            *incoming_call = None;
+        if let Some(client) = self.client.upgrade() {
+            client.send(proto::DeclineCall {})?;
         }
         Ok(())
     }

crates/collab/src/integration_tests.rs

@@ -118,6 +118,8 @@ async fn test_share_project_in_room(
         .update(cx_a, |room, cx| room.call(client_b.user_id().unwrap(), cx))
         .await
         .unwrap();
+
+    deterministic.run_until_parked();
     assert_eq!(
         participants(&room_a, &client_a, cx_a).await,
         RoomParticipants {
@@ -156,6 +158,8 @@ async fn test_share_project_in_room(
         .update(cx_a, |room, cx| room.call(client_c.user_id().unwrap(), cx))
         .await
         .unwrap();
+
+    deterministic.run_until_parked();
     assert_eq!(
         participants(&room_a, &client_a, cx_a).await,
         RoomParticipants {