diff --git a/deltachat-ffi/deltachat.h b/deltachat-ffi/deltachat.h index 829aed592..dd887a306 100644 --- a/deltachat-ffi/deltachat.h +++ b/deltachat-ffi/deltachat.h @@ -7712,7 +7712,7 @@ void dc_event_unref(dc_event_t* event); /// Used in summaries. #define DC_STR_REACTED_BY 177 -/// "Establishing guaranteed end-to-end encryption, please wait…" +/// "Establishing connection, please wait…" /// /// Used as info message. #define DC_STR_SECUREJOIN_WAIT 190 diff --git a/deltachat-rpc-client/tests/test_securejoin.py b/deltachat-rpc-client/tests/test_securejoin.py index f258bfad2..e2d6e1cef 100644 --- a/deltachat-rpc-client/tests/test_securejoin.py +++ b/deltachat-rpc-client/tests/test_securejoin.py @@ -164,7 +164,7 @@ def test_qr_securejoin_broadcast(acfactory, all_devices_online): if please_wait_info_msg: first_msg = chat_msgs.pop(0).get_snapshot() - assert first_msg.text == "Establishing guaranteed end-to-end encryption, please wait…" + assert first_msg.text == "Establishing connection, please wait…" assert first_msg.is_info member_added_msg = chat_msgs.pop(0).get_snapshot() diff --git a/deltachat-rpc-client/tests/test_something.py b/deltachat-rpc-client/tests/test_something.py index ffe9caa90..64154f527 100644 --- a/deltachat-rpc-client/tests/test_something.py +++ b/deltachat-rpc-client/tests/test_something.py @@ -873,7 +873,7 @@ def test_leave_broadcast(acfactory, all_devices_online): if please_wait_info_msg: first_msg = chat_msgs.pop(0).get_snapshot() - assert first_msg.text == "Establishing guaranteed end-to-end encryption, please wait…" + assert first_msg.text == "Establishing connection, please wait…" assert first_msg.is_info member_added_msg = chat_msgs.pop(0).get_snapshot() diff --git a/src/securejoin/bob.rs b/src/securejoin/bob.rs index b65ebb3c4..8ed5aa97d 100644 --- a/src/securejoin/bob.rs +++ b/src/securejoin/bob.rs @@ -145,7 +145,7 @@ pub(super) async fn start_protocol(context: &Context, invite: QrInvite) -> Resul // If we were not in the broadcast channel before, show a 'please wait' info message. // Since we don't have any specific stock string for this, - // use the generic `Establishing guaranteed end-to-end encryption, please wait…` + // use the generic `Establishing connection, please wait…` if !is_contact_in_chat(context, joining_chat_id, ContactId::SELF).await? { let msg = stock_str::securejoin_wait(context).await; chat::add_info_msg(context, joining_chat_id, &msg).await?; diff --git a/src/stock_str.rs b/src/stock_str.rs index 993ab7368..6d073869a 100644 --- a/src/stock_str.rs +++ b/src/stock_str.rs @@ -392,7 +392,7 @@ pub enum StockMessage { #[strum(props(fallback = "Member %1$s removed."))] MsgDelMember = 178, - #[strum(props(fallback = "Establishing guaranteed end-to-end encryption, please wait…"))] + #[strum(props(fallback = "Establishing connection, please wait…"))] SecurejoinWait = 190, #[strum(props(fallback = "❤️ Seems you're enjoying Delta Chat! @@ -811,7 +811,7 @@ pub(crate) async fn secure_join_replies(context: &Context, contact_id: ContactId .replace1(&contact_id.get_stock_name(context).await) } -/// Stock string: `Establishing guaranteed end-to-end encryption, please wait…`. +/// Stock string: `Establishing connection, please wait…`. pub(crate) async fn securejoin_wait(context: &Context) -> String { translated(context, StockMessage::SecurejoinWait).await } diff --git a/test-data/golden/test_broadcast_joining_golden_bob b/test-data/golden/test_broadcast_joining_golden_bob index 99204487a..93ef5ab6a 100644 --- a/test-data/golden/test_broadcast_joining_golden_bob +++ b/test-data/golden/test_broadcast_joining_golden_bob @@ -1,6 +1,6 @@ InBroadcast#Chat#2002: My Channel [2 member(s)] Icon: e9b6c7a78aa2e4f415644f55a553e73.png -------------------------------------------------------------------------------- Msg#2003: info (Contact#Contact#Info): Messages are end-to-end encrypted. [NOTICED][INFO] -Msg#2004: info (Contact#Contact#Info): Establishing guaranteed end-to-end encryption, please wait… [NOTICED][INFO] +Msg#2004: info (Contact#Contact#Info): Establishing connection, please wait… [NOTICED][INFO] Msg#2007🔒: (Contact#Contact#2001): You joined the channel. [FRESH][INFO] -------------------------------------------------------------------------------- diff --git a/test-data/golden/test_sync_broadcast_bob b/test-data/golden/test_sync_broadcast_bob index 6085d765b..fa8c862ee 100644 --- a/test-data/golden/test_sync_broadcast_bob +++ b/test-data/golden/test_sync_broadcast_bob @@ -1,7 +1,7 @@ InBroadcast#Chat#2002: Channel [1 member(s)] -------------------------------------------------------------------------------- Msg#2003: info (Contact#Contact#Info): Messages are end-to-end encrypted. [NOTICED][INFO] -Msg#2004: info (Contact#Contact#Info): Establishing guaranteed end-to-end encryption, please wait… [NOTICED][INFO] +Msg#2004: info (Contact#Contact#Info): Establishing connection, please wait… [NOTICED][INFO] Msg#2008🔒: (Contact#Contact#2001): You joined the channel. [FRESH][INFO] Msg#2010🔒: (Contact#Contact#2001): hi [FRESH] Msg#2011🔒: (Contact#Contact#2001): Member Me removed by alice@example.org. [FRESH][INFO]