Set is_gossiped to true when Autocrypt-Gossip header is added

This commit is contained in:
Alexander Krotov
2019-12-10 16:41:38 +03:00
committed by holger krekel
parent 4d1357568b
commit 88923173c2

View File

@@ -511,6 +511,8 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
unprotected_headers.push(Header::new_with_value("To".into(), to).unwrap()); unprotected_headers.push(Header::new_with_value("To".into(), to).unwrap());
unprotected_headers.push(Header::new_with_value("From".into(), vec![from]).unwrap()); unprotected_headers.push(Header::new_with_value("From".into(), vec![from]).unwrap());
let mut is_gossiped = false;
let outer_message = if is_encrypted { let outer_message = if is_encrypted {
// Add gossip headers // Add gossip headers
if do_gossip { if do_gossip {
@@ -519,6 +521,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
if let Some(header) = peerstate.render_gossip_header(min_verified) { if let Some(header) = peerstate.render_gossip_header(min_verified) {
message = message =
message.header(Header::new("Autocrypt-Gossip".into(), header)); message.header(Header::new("Autocrypt-Gossip".into(), header));
is_gossiped = true;
} }
} }
} }
@@ -599,8 +602,6 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
message message
}; };
let is_gossiped = is_encrypted && do_gossip && !peerstates.is_empty();
let MimeFactory { let MimeFactory {
recipients_addr, recipients_addr,
from_addr, from_addr,