Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-22 16:06:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "mimeparser: assume all Thunderbird users prefer encryption" except for the test (#3778)

Browse Source 
This partially reverts commit b341cfd4d9.
This commit is contained in:
iequidoo
2022-12-05 23:01:31 -03:00
committed by iequidoo
parent 1f14767fe9
commit 4cbcd3c606
2 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/decrypt.rs
View File

@@ -5,7 +5,7 @@ use std::collections::HashSet;
use anyhow::{Context as _, Result};
use mailparse::ParsedMail;
use crate::aheader::{Aheader, EncryptPreference};
use crate::aheader::Aheader;
use crate::authres::handle_authres;
use crate::authres::{self, DkimResults};
use crate::contact::addr_cmp;
@@ -61,7 +61,6 @@ pub(crate) async fn prepare_decryption(
mail: &ParsedMail<'_>,
from: &str,
message_time: i64,
is_thunderbird: bool,
) -> Result<DecryptionInfo> {
if mail.headers.get_header(HeaderDef::ListPost).is_some() {
if mail.headers.get_header(HeaderDef::Autocrypt).is_some() {
@@ -84,16 +83,10 @@ pub(crate) async fn prepare_decryption(
});
}
let mut autocrypt_header = Aheader::from_headers(from, &mail.headers)
let autocrypt_header = Aheader::from_headers(from, &mail.headers)
.ok_or_log_msg(context, "Failed to parse Autocrypt header")
.flatten();
if is_thunderbird {
if let Some(autocrypt_header) = &mut autocrypt_header {
autocrypt_header.prefer_encrypt = EncryptPreference::Mutual;
}
}
let dkim_results = handle_authres(context, mail, from, message_time).await?;
let peerstate = get_autocrypt_peerstate(