Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-26 01:46:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

docs: SecurejoinInviterProgress never returns an error

Browse Source
This commit is contained in:
link2xt
2025-09-23 14:33:35 +00:00
committed by l
parent 42b4b83f8e
commit 4c66518a68
4 changed files with 11 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/securejoin.rs
View File

@@ -16,7 +16,6 @@ use crate::events::EventType;
use crate::headerdef::HeaderDef;
use crate::key::{DcKey, Fingerprint, load_self_public_key};
use crate::log::{error, info, warn};
use crate::logged_debug_assert;
use crate::message::{Message, Viewtype};
use crate::mimeparser::{MimeMessage, SystemMessage};
use crate::param::Param;
@@ -32,23 +31,15 @@ use qrinvite::QrInvite;
use crate::token::Namespace;
fn inviter_progress(
context: &Context,
contact_id: ContactId,
is_group: bool,
progress: usize,
) -> Result<()> {
logged_debug_assert!(
context,
progress == 0 || progress == 1000,
"inviter_progress: contact {contact_id}, progress={progress}, but value is not 0 (error) or 1000 (success)."
);
fn inviter_progress(context: &Context, contact_id: ContactId, is_group: bool) -> Result<()> {
let chat_type = if is_group {
Chattype::Group
} else {
Chattype::Single
};
// No other values are used.
let progress = 1000;
context.emit_event(EventType::SecurejoinInviterProgress {
contact_id,
chat_type,
@@ -427,7 +418,7 @@ pub(crate) async fn handle_securejoin_handshake(
chat::add_contact_to_chat_ex(context, Nosync, group_chat_id, contact_id, true)
.await?;
let is_group = true;
inviter_progress(context, contact_id, is_group, 1000)?;
inviter_progress(context, contact_id, is_group)?;
// 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)
@@ -445,7 +436,7 @@ pub(crate) async fn handle_securejoin_handshake(
.context("failed sending vc-contact-confirm message")?;
let is_group = false;
inviter_progress(context, contact_id, is_group, 1000)?;
inviter_progress(context, contact_id, is_group)?;
Ok(HandshakeMessage::Ignore) // "Done" would delete the message and break multi-device (the key from Autocrypt-header is needed)
}
}
@@ -568,7 +559,7 @@ pub(crate) async fn observe_securejoin_on_other_device(
let is_group = mime_message
.get_header(HeaderDef::ChatGroupMemberAdded)
.is_some();
inviter_progress(context, contact_id, is_group, 1000)?;
inviter_progress(context, contact_id, is_group)?;
}
if step == "vg-request-with-auth" || step == "vc-request-with-auth" {