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

refactor: remove Aheader::new

Browse Source
This commit is contained in:
link2xt
2025-09-02 19:15:48 +00:00
committed by l
parent bed1623dcb
commit 4033566b4a
3 changed files with 25 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/aheader.rs
View File

@@ -48,21 +48,6 @@ pub struct Aheader {
pub prefer_encrypt: EncryptPreference,
}
impl Aheader {
/// Creates new autocrypt header
pub fn new(
addr: String,
public_key: SignedPublicKey,
prefer_encrypt: EncryptPreference,
) -> Self {
Aheader {
addr,
public_key,
prefer_encrypt,
}
}
}
impl fmt::Display for Aheader {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
write!(fmt, "addr={};", self.addr.to_lowercase())?;
@@ -243,11 +228,11 @@ mod tests {
assert!(
format!(
"{}",
Aheader::new(
"test@example.com".to_string(),
SignedPublicKey::from_base64(RAWKEY).unwrap(),
EncryptPreference::Mutual
)
Aheader {
addr: "test@example.com".to_string(),
public_key: SignedPublicKey::from_base64(RAWKEY).unwrap(),
prefer_encrypt: EncryptPreference::Mutual
}
)
.contains("prefer-encrypt=mutual;")
);
@@ -258,11 +243,11 @@ mod tests {
assert!(
!format!(
"{}",
Aheader::new(
"test@example.com".to_string(),
SignedPublicKey::from_base64(RAWKEY).unwrap(),
EncryptPreference::NoPreference
)
Aheader {
addr: "test@example.com".to_string(),
public_key: SignedPublicKey::from_base64(RAWKEY).unwrap(),
prefer_encrypt: EncryptPreference::NoPreference
}
)
.contains("prefer-encrypt")
);
@@ -271,11 +256,11 @@ mod tests {
assert!(
format!(
"{}",
Aheader::new(
"TeSt@eXaMpLe.cOm".to_string(),
SignedPublicKey::from_base64(RAWKEY).unwrap(),
EncryptPreference::Mutual
)
Aheader {
addr: "TeSt@eXaMpLe.cOm".to_string(),
public_key: SignedPublicKey::from_base64(RAWKEY).unwrap(),
prefer_encrypt: EncryptPreference::Mutual
}
)
.contains("test@example.com")
);

8
src/e2ee.rs
View File

@@ -31,9 +31,11 @@ impl EncryptHelper {
}
pub fn get_aheader(&self) -> Aheader {
let pk = self.public_key.clone();
let addr = self.addr.to_string();
Aheader::new(addr, pk, self.prefer_encrypt)
Aheader {
addr: self.addr.clone(),
public_key: self.public_key.clone(),
prefer_encrypt: self.prefer_encrypt,
}
}
/// Tries to encrypt the passed in `mail`.

10
src/mimefactory.rs
View File

@@ -1092,13 +1092,13 @@ impl MimeFactory {
continue;
}
let header = Aheader::new(
addr.clone(),
key.clone(),
let header = Aheader {
addr: addr.clone(),
public_key: key.clone(),
// Autocrypt 1.1.0 specification says that
// `prefer-encrypt` attribute SHOULD NOT be included.
EncryptPreference::NoPreference,
)
prefer_encrypt: EncryptPreference::NoPreference,
}
.to_string();
message = message.header(