From 65fdfac86689376082c4316e21727876a08ee6dc Mon Sep 17 00:00:00 2001
From: Alexander Krotov <ilabdsf@gmail.com>
Date: Sun, 8 Mar 2020 21:24:03 +0300
Subject: [PATCH] Remove unused dest_uid argument from Imap.mv()

It was always set to 0 because we don't know the destination UID.
---
 src/imap/mod.rs |  5 -----
 src/job.rs      | 19 ++++++++-----------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/imap/mod.rs b/src/imap/mod.rs
index 554fd8e1c..6209f5e10 100644
--- a/src/imap/mod.rs
+++ b/src/imap/mod.rs
@@ -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);
 
diff --git a/src/job.rs b/src/job.rs
index 8731fdb7d..31933686b 100644
--- a/src/job.rs
+++ b/src/job.rs
@@ -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 {