Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 09:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: Use the correct securejoin strings used in the UI, remove old TODO (#5047)

Browse Source
This commit is contained in:
Hocuri
2023-11-26 15:54:11 +01:00
committed by GitHub
parent 5e6869403e
commit 616faff96b
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deltachat-ffi/deltachat.h
View File

@@ -6621,7 +6621,7 @@ void dc_event_unref(dc_event_t* event);
/// - %1$s will be replaced by the name of the verified contact /// - %1$s will be replaced by the name of the verified contact
#define DC_STR_CONTACT_VERIFIED 35 #define DC_STR_CONTACT_VERIFIED 35
/// "Cannot verify %1$s." /// "Cannot establish guaranteed end-to-end encryption with %1$s."
/// ///
/// Used in status messages. /// Used in status messages.
/// - %1$s will be replaced by the name of the contact that cannot be verified /// - %1$s will be replaced by the name of the contact that cannot be verified

1
src/securejoin/bob.rs
View File

@@ -58,7 +58,6 @@ pub(super) async fn start_protocol(context: &Context, invite: QrInvite) -> Resul
QrInvite::Group { .. } => { QrInvite::Group { .. } => {
// For a secure-join we need to create the group and add the contact. The group will // For a secure-join we need to create the group and add the contact. The group will
// only become usable once the protocol is finished. // only become usable once the protocol is finished.
// TODO: how does this group become usable?
let group_chat_id = state.joining_chat_id(context).await?; let group_chat_id = state.joining_chat_id(context).await?;
if !is_contact_in_chat(context, group_chat_id, invite.contact_id()).await? { if !is_contact_in_chat(context, group_chat_id, invite.contact_id()).await? {
chat::add_to_chat_contacts_table(context, group_chat_id, &[invite.contact_id()]) chat::add_to_chat_contacts_table(context, group_chat_id, &[invite.contact_id()])

4
src/stock_str.rs
View File

@@ -92,7 +92,7 @@ pub enum StockMessage {
#[strum(props(fallback = "%1$s verified."))] #[strum(props(fallback = "%1$s verified."))]
ContactVerified = 35, ContactVerified = 35,
#[strum(props(fallback = "Cannot verify %1$s"))] #[strum(props(fallback = "Cannot establish guaranteed end-to-end encryption with %1$s"))]
ContactNotVerified = 36, ContactNotVerified = 36,
#[strum(props(fallback = "Changed setup for %1$s"))] #[strum(props(fallback = "Changed setup for %1$s"))]
@@ -832,7 +832,7 @@ pub(crate) async fn contact_verified(context: &Context, contact: &Contact) -> St
.replace1(addr) .replace1(addr)
} }
/// Stock string: `Cannot verify %1$s`. /// Stock string: `Cannot establish guaranteed end-to-end encryption with %1$s`.
pub(crate) async fn contact_not_verified(context: &Context, contact: &Contact) -> String { pub(crate) async fn contact_not_verified(context: &Context, contact: &Contact) -> String {
let addr = &contact.get_name_n_addr(); let addr = &contact.get_name_n_addr();
translated(context, StockMessage::ContactNotVerified) translated(context, StockMessage::ContactNotVerified)