From cebc9e3e9177c3d228c7a76de9f16388d604940b Mon Sep 17 00:00:00 2001 From: bjoern Date: Sun, 7 Nov 2021 20:30:55 +0100 Subject: [PATCH] add 'waiting for being added to the group' only for group-joins (#2797) * add 'waiting for being added to the group' only for group-joins, not for setup-contact * add a comment why the message is not added on setup-contact --- src/securejoin.rs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/securejoin.rs b/src/securejoin.rs index 7ae4d27ea..ef7929966 100644 --- a/src/securejoin.rs +++ b/src/securejoin.rs @@ -533,9 +533,18 @@ pub(crate) async fn handle_securejoin_handshake( Ok(HandshakeMessage::Done) } Some(_stage) => { - let msg = stock_str::secure_join_replies(context, contact_id).await; - chat::add_info_msg(context, bobstate.chat_id(context).await?, msg, time()) + if join_vg { + // the message reads "Alice replied, waiting for being added to the group…"; + // show it only on secure-join and not on setup-contact therefore. + let msg = stock_str::secure_join_replies(context, contact_id).await; + chat::add_info_msg( + context, + bobstate.chat_id(context).await?, + msg, + time(), + ) .await?; + } joiner_progress!(context, bobstate.invite().contact_id(), 400); Ok(HandshakeMessage::Done) }