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

Remove unused dest_uid argument from Imap.mv()

Browse Source 
It was always set to 0 because we don't know the destination UID.
This commit is contained in:
Alexander Krotov
2020-03-08 21:24:03 +03:00
parent cb0c00bc6d
commit 65fdfac866
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/imap/mod.rs
View File

@@ -794,7 +794,6 @@ impl Imap {
folder: &str,
uid: u32,
dest_folder: &str,
dest_uid: &mut u32,
) -> ImapActionResult {
task::block_on(async move {
if folder == dest_folder {
@@ -811,10 +810,6 @@ impl Imap {
return imapresult;
}
// we are connected, and the folder is selected
// XXX Rust-Imap provides no target uid on mv, so just set it to 0
*dest_uid = 0;
let set = format!("{}", uid);
let display_folder_id = format!("{}/{}", folder, uid);

19
src/job.rs
View File

@@ -413,18 +413,12 @@ impl Job {
if let Some(dest_folder) = dest_folder {
let server_folder = msg.server_folder.as_ref().unwrap();
let mut dest_uid = 0;
match imap_inbox.mv(
context,
server_folder,
msg.server_uid,
&dest_folder,
&mut dest_uid,
) {
match imap_inbox.mv(context, server_folder, msg.server_uid, &dest_folder) {
ImapActionResult::RetryLater => Status::RetryLater,
ImapActionResult::Success => {
message::update_server_uid(context, &msg.rfc724_mid, &dest_folder, dest_uid);
// XXX Rust-Imap provides no target uid on mv, so just set it to 0
message::update_server_uid(context, &msg.rfc724_mid, &dest_folder, 0);
Status::Finished(Ok(()))
}
ImapActionResult::Failed => {
@@ -583,12 +577,15 @@ impl Job {
.sql
.get_raw_config(context, "configured_mvbox_folder");
if let Some(dest_folder) = dest_folder {
let mut dest_uid = 0;
if ImapActionResult::RetryLater
== imap_inbox.mv(context, &folder, uid, &dest_folder, &mut dest_uid)
== imap_inbox.mv(context, &folder, uid, &dest_folder)
{
Status::RetryLater
} else {
// FIXME: server UID should be updated for all
// hidden MDN entries, but it does not happen
// because we don't know Message-ID here and can't
// find corresponding MsgId.
Status::Finished(Ok(()))
}
} else {