Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clear out incoming call when removing last connection for a user

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2022-10-18 19:15:14 +02:00
parent 0c0e8688ed
commit 6c322dc835
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/collab/src/integration_tests.rs
View file

@ -418,7 +418,7 @@ async fn test_calls_on_multiple_connections(
let mut server = TestServer::start(cx_a.foreground(), cx_a.background()).await; let mut server = TestServer::start(cx_a.foreground(), cx_a.background()).await;
let client_a = server.create_client(cx_a, "user_a").await; let client_a = server.create_client(cx_a, "user_a").await;
let client_b1 = server.create_client(cx_b1, "user_b").await; let client_b1 = server.create_client(cx_b1, "user_b").await;
let _client_b2 = server.create_client(cx_b2, "user_b").await; let client_b2 = server.create_client(cx_b2, "user_b").await;
server server
.make_contacts(&mut [(&client_a, cx_a), (&client_b1, cx_b1)]) .make_contacts(&mut [(&client_a, cx_a), (&client_b1, cx_b1)])
.await; .await;
@ -548,8 +548,9 @@ async fn test_calls_on_multiple_connections(
assert!(incoming_call_b2.next().await.unwrap().is_some()); assert!(incoming_call_b2.next().await.unwrap().is_some());
// User B disconnects all clients, causing user A to no longer see a pending call for them. // User B disconnects all clients, causing user A to no longer see a pending call for them.
println!("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); server.forbid_connections();
server.disconnect_client(client_b1.peer_id().unwrap()); server.disconnect_client(client_b1.peer_id().unwrap());
server.disconnect_client(client_b2.peer_id().unwrap());
deterministic.advance_clock(rpc::RECEIVE_TIMEOUT); deterministic.advance_clock(rpc::RECEIVE_TIMEOUT);
active_call_a.read_with(cx_a, |call, _| assert!(call.room().is_none())); active_call_a.read_with(cx_a, |call, _| assert!(call.room().is_none()));
} }

3
crates/collab/src/rpc/store.rs
View file

@ -221,6 +221,9 @@ impl Store {
result.guest_projects = left_room.left_projects; result.guest_projects = left_room.left_projects;
result.room_id = Some(room_id); result.room_id = Some(room_id);
result.canceled_call_connection_ids = left_room.canceled_call_connection_ids; result.canceled_call_connection_ids = left_room.canceled_call_connection_ids;
} else if connected_user.connection_ids.len() == 1 {
self.decline_call(room_id, connection_id)?;
result.room_id = Some(room_id);
} }
} }