Skip to content

Commit f296c63

Browse files
committed
feat: hide the To header in encrypted messages
1 parent 4ba7a09 commit f296c63

File tree

2 files changed

+5
-22
lines changed

2 files changed

+5
-22
lines changed

src/chat/chat_tests.rs

-9
Original file line numberDiff line numberDiff line change
@@ -774,15 +774,6 @@ async fn test_self_talk() -> Result<()> {
774774
assert!(msg.get_showpadlock());
775775

776776
let sent_msg = t.pop_sent_msg().await;
777-
let payload = sent_msg.payload();
778-
// Make sure the `To` field contains the address and not
779-
// "undisclosed recipients".
780-
// Otherwise Delta Chat core <1.153.0 assigns the message
781-
// to the trash chat.
782-
assert_eq!(
783-
payload.match_indices("To: <[email protected]>\r\n").count(),
784-
1
785-
);
786777

787778
let t2 = TestContext::new_alice().await;
788779
t2.recv_msg(&sent_msg).await;

src/mimefactory.rs

+5-13
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use anyhow::{bail, Context as _, Result};
88
use base64::Engine as _;
99
use chrono::TimeZone;
1010
use deltachat_contact_tools::sanitize_bidi_characters;
11-
use mail_builder::headers::address::{Address, EmailAddress};
11+
use mail_builder::headers::address::Address;
1212
use mail_builder::headers::HeaderType;
1313
use mail_builder::mime::MimePart;
1414
use tokio::fs;
@@ -890,18 +890,10 @@ impl MimeFactory {
890890
if is_encrypted {
891891
unprotected_headers.push((
892892
original_header_name,
893-
Address::new_list(
894-
to.clone()
895-
.into_iter()
896-
.filter_map(|header| match header {
897-
Address::Address(mb) => Some(Address::Address(EmailAddress {
898-
name: None,
899-
email: mb.email,
900-
})),
901-
_ => None,
902-
})
903-
.collect::<Vec<_>>(),
904-
)
893+
Address::new_list(vec![Address::new_group(
894+
Some("hidden-recipients".to_string()),
895+
Vec::new(),
896+
)])
905897
.into(),
906898
));
907899
} else {

0 commit comments

Comments
 (0)