feat: Start IMAP loop for sentbox only if it is configured (#5105)

deltachat · Mar 9, 2024 · 7d7289b · 7d7289b
1 parent ebdc522
commit 7d7289b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/config.rs b/src/config.rs
@@ -475,6 +475,15 @@ impl Context {
             || self.get_config_bool(Config::OnlyFetchMvbox).await?)
     }
 
+    /// Returns true if sentbox ("Sent" folder) should be watched.
+    pub(crate) async fn should_watch_sentbox(&self) -> Result<bool> {
+        Ok(self.get_config_bool(Config::SentboxWatch).await?
+            && self
+                .get_config(Config::ConfiguredSentboxFolder)
+                .await?
+                .is_some())
+    }
+
     /// Gets configured "delete_server_after" value.
     ///
     /// `None` means never delete the message, `Some(0)` means delete

diff --git a/src/scheduler.rs b/src/scheduler.rs
@@ -830,10 +830,7 @@ impl Scheduler {
 
         for (meaning, should_watch) in [
             (FolderMeaning::Mvbox, ctx.should_watch_mvbox().await),
-            (
-                FolderMeaning::Sent,
-                ctx.get_config_bool(Config::SentboxWatch).await,
-            ),
+            (FolderMeaning::Sent, ctx.should_watch_sentbox().await),
         ] {
             if should_watch? {
                 let (conn_state, handlers) = ImapConnectionState::new(ctx).await?;