From b0bb0214c0499d87d3bd5dcba387862281466a45 Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Sun, 6 Sep 2020 09:38:04 +0300 Subject: [PATCH] Transpose if branches This removes three ifs and adds two ifs, making it more clear that nothing is done if there is no Autocrypt header. --- src/e2ee.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/e2ee.rs b/src/e2ee.rs index e1c8f7c23..f6bfeec4a 100644 --- a/src/e2ee.rs +++ b/src/e2ee.rs @@ -135,18 +135,18 @@ pub async fn try_decrypt( .map(|from| from.addr) .unwrap_or_default(); - // Apply Autocrypt header - let autocryptheader = Aheader::from_headers(context, &from, &mail.headers); let mut peerstate = Peerstate::from_addr(context, &from).await?; - if let Some(ref mut peerstate) = peerstate { - if let Some(ref header) = autocryptheader { + + // Apply Autocrypt header + if let Some(ref header) = Aheader::from_headers(context, &from, &mail.headers) { + if let Some(ref mut peerstate) = peerstate { peerstate.apply_header(&header, message_time); peerstate.save_to_db(&context.sql, false).await?; + } else { + let p = Peerstate::from_header(context, header, message_time); + p.save_to_db(&context.sql, true).await?; + peerstate = Some(p); } - } else if let Some(ref header) = autocryptheader { - let p = Peerstate::from_header(context, header, message_time); - p.save_to_db(&context.sql, true).await?; - peerstate = Some(p); } // Possibly perform decryption