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

shortcut fetch/idle on mvbox/sentbox if we don't know the folder and prevent busy-looping

Browse Source
This commit is contained in:
holger krekel
2019-11-12 13:27:38 +01:00
committed by dignifiedquire
parent 5b73951b9b
commit b43d9d2ffe
2 changed files with 45 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/job_thread.rs
View File

@@ -110,9 +110,14 @@ impl JobThread {
if async_std::task::block_on(async move { self.imap.is_connected().await }) {
return true;
}
let watch_folder_name = match context.sql.get_raw_config(context, self.folder_config_name) {
Some(name) => name,
None => {
return false;
}
};
let mut ret_connected = dc_connect_to_configured_imap(context, &self.imap) != 0;
let ret_connected = dc_connect_to_configured_imap(context, &self.imap) != 0;
if ret_connected {
if context
.sql
@@ -123,12 +128,7 @@ impl JobThread {
self.imap.configure_folders(context, 0x1);
}
if let Some(mvbox_name) = context.sql.get_raw_config(context, self.folder_config_name) {
self.imap.set_watch_folder(mvbox_name);
} else {
self.imap.disconnect(context);
ret_connected = false;
}
self.imap.set_watch_folder(watch_folder_name);
}
ret_connected
@@ -170,10 +170,18 @@ impl JobThread {
}
}
self.connect_to_imap(context);
info!(context, "{}-IDLE started...", self.name,);
self.imap.idle(context);
info!(context, "{}-IDLE ended.", self.name);
if self.connect_to_imap(context) {
info!(context, "{}-IDLE started...", self.name,);
self.imap.idle(context);
info!(context, "{}-IDLE ended.", self.name);
} else {
// It's probably wrong that the thread even runs
// but let's call fake_idle and tell it to not try network at all.
// (once we move to rust-managed threads this problem goes away)
info!(context, "{}-IDLE not connected, fake-idling", self.name);
async_std::task::block_on(async move { self.imap.fake_idle(context, false).await });
info!(context, "{}-IDLE fake-idling finished", self.name);
}
self.state.0.lock().unwrap().using_handle = false;
}