Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 01:16:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of DC_FP_* constants

Browse Source
This commit is contained in:
Alexander Krotov
2019-12-31 10:30:32 +01:00
parent ff175e661b
commit cb6376094c
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/constants.rs
View File

@@ -61,10 +61,6 @@ pub const DC_GCL_ADD_SELF: usize = 0x02;
// unchanged user avatars are resent to the recipients every some days // unchanged user avatars are resent to the recipients every some days
pub const DC_RESEND_USER_AVATAR_DAYS: i64 = 14; pub const DC_RESEND_USER_AVATAR_DAYS: i64 = 14;
// values for DC_PARAM_FORCE_PLAINTEXT
pub(crate) const DC_FP_NO_AUTOCRYPT_HEADER: i32 = 2;
pub(crate) const DC_FP_ADD_AUTOCRYPT_HEADER: i32 = 1;
/// virtual chat showing all messages belonging to chats flagged with chats.blocked=2 /// virtual chat showing all messages belonging to chats flagged with chats.blocked=2
pub(crate) const DC_CHAT_ID_DEADDROP: u32 = 1; pub(crate) const DC_CHAT_ID_DEADDROP: u32 = 1;
/// messages that should be deleted get this chat_id; the messages are deleted from the working thread later then. This is also needed as rfc724_mid should be preset as long as the message is not deleted on the server (otherwise it is downloaded again) /// messages that should be deleted get this chat_id; the messages are deleted from the working thread later then. This is also needed as rfc724_mid should be preset as long as the message is not deleted on the server (otherwise it is downloaded again)

6
src/imex.rs
View File

@@ -143,8 +143,10 @@ fn do_initiate_key_transfer(context: &Context) -> Result<String> {
msg.param msg.param
.set(Param::MimeType, "application/autocrypt-setup"); .set(Param::MimeType, "application/autocrypt-setup");
msg.param.set_cmd(SystemMessage::AutocryptSetupMessage); msg.param.set_cmd(SystemMessage::AutocryptSetupMessage);
msg.param msg.param.set_int(
.set_int(Param::ForcePlaintext, DC_FP_NO_AUTOCRYPT_HEADER); Param::ForcePlaintext,
ForcePlaintext::NoAutocryptHeader as i32,
);
ensure!(!context.shall_stop_ongoing(), "canceled"); ensure!(!context.shall_stop_ongoing(), "canceled");
let msg_id = chat::send_msg(context, chat_id, &mut msg)?; let msg_id = chat::send_msg(context, chat_id, &mut msg)?;

4
src/mimefactory.rs
View File

@@ -295,7 +295,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
.unwrap_or_default() .unwrap_or_default()
} }
} }
Loaded::MDN => DC_FP_NO_AUTOCRYPT_HEADER, Loaded::MDN => ForcePlaintext::NoAutocryptHeader as i32,
} }
} }
@@ -477,7 +477,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
Loaded::MDN => self.render_mdn()?, Loaded::MDN => self.render_mdn()?,
}; };
if force_plaintext != DC_FP_NO_AUTOCRYPT_HEADER { if force_plaintext != ForcePlaintext::NoAutocryptHeader as i32 {
// unless determined otherwise we add the Autocrypt header // unless determined otherwise we add the Autocrypt header
let aheader = encrypt_helper.get_aheader().to_string(); let aheader = encrypt_helper.get_aheader().to_string();
unprotected_headers.push(Header::new("Autocrypt".into(), aheader)); unprotected_headers.push(Header::new("Autocrypt".into(), aheader));