mirror of
https://github.com/chatmail/core.git
synced 2026-05-08 17:36:29 +03:00
Remove unused dest_uid argument from Imap.mv()
It was always set to 0 because we don't know the destination UID.
This commit is contained in:
@@ -794,7 +794,6 @@ impl Imap {
|
|||||||
folder: &str,
|
folder: &str,
|
||||||
uid: u32,
|
uid: u32,
|
||||||
dest_folder: &str,
|
dest_folder: &str,
|
||||||
dest_uid: &mut u32,
|
|
||||||
) -> ImapActionResult {
|
) -> ImapActionResult {
|
||||||
task::block_on(async move {
|
task::block_on(async move {
|
||||||
if folder == dest_folder {
|
if folder == dest_folder {
|
||||||
@@ -811,10 +810,6 @@ impl Imap {
|
|||||||
return imapresult;
|
return imapresult;
|
||||||
}
|
}
|
||||||
// we are connected, and the folder is selected
|
// 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 set = format!("{}", uid);
|
||||||
let display_folder_id = format!("{}/{}", folder, uid);
|
let display_folder_id = format!("{}/{}", folder, uid);
|
||||||
|
|
||||||
|
|||||||
19
src/job.rs
19
src/job.rs
@@ -413,18 +413,12 @@ impl Job {
|
|||||||
|
|
||||||
if let Some(dest_folder) = dest_folder {
|
if let Some(dest_folder) = dest_folder {
|
||||||
let server_folder = msg.server_folder.as_ref().unwrap();
|
let server_folder = msg.server_folder.as_ref().unwrap();
|
||||||
let mut dest_uid = 0;
|
|
||||||
|
|
||||||
match imap_inbox.mv(
|
match imap_inbox.mv(context, server_folder, msg.server_uid, &dest_folder) {
|
||||||
context,
|
|
||||||
server_folder,
|
|
||||||
msg.server_uid,
|
|
||||||
&dest_folder,
|
|
||||||
&mut dest_uid,
|
|
||||||
) {
|
|
||||||
ImapActionResult::RetryLater => Status::RetryLater,
|
ImapActionResult::RetryLater => Status::RetryLater,
|
||||||
ImapActionResult::Success => {
|
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(()))
|
Status::Finished(Ok(()))
|
||||||
}
|
}
|
||||||
ImapActionResult::Failed => {
|
ImapActionResult::Failed => {
|
||||||
@@ -583,12 +577,15 @@ impl Job {
|
|||||||
.sql
|
.sql
|
||||||
.get_raw_config(context, "configured_mvbox_folder");
|
.get_raw_config(context, "configured_mvbox_folder");
|
||||||
if let Some(dest_folder) = dest_folder {
|
if let Some(dest_folder) = dest_folder {
|
||||||
let mut dest_uid = 0;
|
|
||||||
if ImapActionResult::RetryLater
|
if ImapActionResult::RetryLater
|
||||||
== imap_inbox.mv(context, &folder, uid, &dest_folder, &mut dest_uid)
|
== imap_inbox.mv(context, &folder, uid, &dest_folder)
|
||||||
{
|
{
|
||||||
Status::RetryLater
|
Status::RetryLater
|
||||||
} else {
|
} 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(()))
|
Status::Finished(Ok(()))
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user