X-Git-Url: https://git.r.bdr.sh/rbdr/olden-mail/blobdiff_plain/bbacb35a0771b6abffde6c4ca82c977e24a9b259..HEAD:/src/middleware/find_mailboxes_compatibility.rs

diff --git a/src/middleware/find_mailboxes_compatibility.rs b/src/middleware/find_mailboxes_compatibility.rs
index acbab82..42938ff 100644
--- a/src/middleware/find_mailboxes_compatibility.rs
+++ b/src/middleware/find_mailboxes_compatibility.rs
@@ -1,5 +1,3 @@
-use log::debug;
-
 use super::Middleware;
 
 /// `MailDrop` can't find folders to sync because it implements `IMAPv3` and
@@ -22,9 +20,8 @@ impl Middleware for FindMailboxesCompatibility {
         if command.contains("FIND MAILBOXES /*") {
             if let Some(tag) = command.split("FIND MAILBOXES /*").next() {
                 // We'll need to convert the LIST to a FIND
-                self.tags.push(tag.to_string());
+                self.tags.push(tag.trim().to_string());
                 let replacement = format!("{} LIST \"\" \"*\"\r\n", tag.trim());
-                debug!("### {replacement}");
                 return replacement.into_bytes();
             }
         }
@@ -53,9 +50,15 @@ impl Middleware for FindMailboxesCompatibility {
 
                 // Transform IMAPv4 "* LIST" lines to IMAPv3 "* MAILBOX"
                 if line.starts_with("* LIST") {
-                    if let Some(last_slash_pos) = line.rfind('/') {
-                        let mailbox_name = line[(last_slash_pos + 1)..].trim();
-                        return Some(format!("* MAILBOX {mailbox_name}\r"));
+                    if let Some(last_slash_pos) = line.rfind("\"/\"") {
+                        let mailbox_name = line[(last_slash_pos + 3)..].replace('"', "");
+                        return Some(format!("* MAILBOX {}\r", mailbox_name.trim()));
+                    }
+                }
+
+                if line.contains("OK") {
+                    if let Some(tag) = line.split("OK").next() {
+                        return Some(format!("{} OK MAILBOX Completed.\r", tag.trim()).to_string());
                     }
                 }
 
@@ -63,6 +66,6 @@ impl Middleware for FindMailboxesCompatibility {
             })
             .collect();
 
-        lines.join("\n").into_bytes()
+        format!("{}\n", lines.join("\n")).into_bytes()
     }
 }