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

fix: Don't fail if going to send plaintext, but some peerstate is missing

Browse Source 
F.e. this allows to reexecute Securejoin and fix the problem.
This commit is contained in:
iequidoo
2024-06-26 14:21:44 -03:00
committed by iequidoo
parent 71104e9312
commit ce44312ac0
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mimefactory.rs
View File

@@ -615,7 +615,6 @@ impl MimeFactory {
let verified = self.verified();
let grpimage = self.grpimage();
let force_plaintext = self.should_force_plaintext();
let skip_autocrypt = self.should_skip_autocrypt();
let e2ee_guaranteed = self.is_e2ee_guaranteed();
let encrypt_helper = EncryptHelper::new(context).await?;
@@ -642,9 +641,8 @@ impl MimeFactory {
let mut is_gossiped = false;
let peerstates = self.peerstates_for_recipients(context).await?;
let should_encrypt =
encrypt_helper.should_encrypt(context, e2ee_guaranteed, &peerstates)?;
let is_encrypted = should_encrypt && !force_plaintext;
let is_encrypted = !self.should_force_plaintext()
&& encrypt_helper.should_encrypt(context, e2ee_guaranteed, &peerstates)?;
let is_securejoin_message = if let Loaded::Message { msg, .. } = &self.loaded {
msg.param.get_cmd() == SystemMessage::SecurejoinMessage
} else {