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

Do not schedule delayed DeleteMsgOnImap jobs

Browse Source 
All IMAP deletion jobs are scheduled either immediately, or later by
job::add_imap_deletion_jobs().
This commit is contained in:
Alexander Krotov
2020-03-08 01:24:17 +03:00
parent bdb2a47743
commit efb7280e99
3 changed files with 8 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/dc_receive_imf.rs
View File

@@ -192,39 +192,23 @@ pub fn dc_receive_imf(
};
}
if needs_delete_job && !created_db_entries.is_empty() {
for db_entry in &created_db_entries {
job_add(
context,
Action::DeleteMsgOnImap,
db_entry.1.to_u32() as i32,
Params::new(),
0,
);
}
} else {
// Get user-configured server deletion
let delete_server_after = context.get_config_delete_server_after();
// Get user-configured server deletion
let delete_server_after = context.get_config_delete_server_after();
if delete_server_after != Some(0) {
// Move message if we don't delete it immediately.
context.do_heuristics_moves(server_folder.as_ref(), insert_msg_id);
}
if let Some(delete_server_after) = delete_server_after {
info!(
context,
"Scheduling message deletion in {} seconds", delete_server_after
);
if !created_db_entries.is_empty() {
if needs_delete_job || delete_server_after == Some(0) {
for db_entry in &created_db_entries {
job_add(
context,
Action::DeleteMsgOnImap,
db_entry.1.to_u32() as i32,
Params::new(),
delete_server_after as i64,
0,
);
}
} else {
// Move message if we don't delete it immediately.
context.do_heuristics_moves(server_folder.as_ref(), insert_msg_id);
}
}