diff --git a/src/chat/chat_tests.rs b/src/chat/chat_tests.rs index c217407e7..f6681e573 100644 --- a/src/chat/chat_tests.rs +++ b/src/chat/chat_tests.rs @@ -2893,8 +2893,6 @@ async fn test_broadcast_joining_golden() -> Result<()> { let qr = get_securejoin_qr(alice, Some(alice_chat_id)).await.unwrap(); let bob_chat_id = tcm.exec_securejoin_qr(bob, alice, &qr).await; - // TODO it's not nice that it says 'you added member bob' - // and 'Secure-Join: vb-request-with-auth' alice .golden_test_chat(alice_chat_id, "test_broadcast_joining_golden_alice") .await; diff --git a/src/securejoin.rs b/src/securejoin.rs index a52fae4ef..80e31477f 100644 --- a/src/securejoin.rs +++ b/src/securejoin.rs @@ -445,16 +445,9 @@ pub(crate) async fn handle_securejoin_handshake( .await?; inviter_progress(context, contact_id, 800); inviter_progress(context, contact_id, 1000); - if step.starts_with("vb-") { - // For broadcasts, we don't want to delete the message, - // because the other device should also internally add the member - // and see the key (because it won't see the member via autocrypt-gossip). - Ok(HandshakeMessage::Propagate) - } else { - // IMAP-delete the message to avoid handling it by another device and adding the - // member twice. Another device will know the member's key from Autocrypt-Gossip. - Ok(HandshakeMessage::Done) - } + // IMAP-delete the message to avoid handling it by another device and adding the + // member twice. Another device will know the member's key from Autocrypt-Gossip. + Ok(HandshakeMessage::Done) } else { // Setup verified contact. secure_connection_established( diff --git a/test-data/golden/test_broadcast_joining_golden_alice b/test-data/golden/test_broadcast_joining_golden_alice index de6e8c9cd..46128b029 100644 --- a/test-data/golden/test_broadcast_joining_golden_alice +++ b/test-data/golden/test_broadcast_joining_golden_alice @@ -2,5 +2,4 @@ OutBroadcast#Chat#10: My Channel [1 member(s)] Icon: e9b6c7a78aa2e4f415644f55a55 -------------------------------------------------------------------------------- Msg#10🔒: Me (Contact#Contact#Self): You changed the group image. [INFO] √ Msg#12🔒: Me (Contact#Contact#Self): Member bob@example.net added. [INFO] √ -Msg#13🔒: (Contact#Contact#10): Secure-Join: vb-request-with-auth [FRESH] --------------------------------------------------------------------------------