Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-07 17:06:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

chore(imap): cleanup

Browse Source
This commit is contained in:
dignifiedquire
2019-05-14 23:08:08 +02:00
parent 7dd2cc660b
commit 0632c1756a
1 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/dc_imap.rs
View File

@@ -1068,8 +1068,8 @@ impl Imap {
// a good value that is also used by other MUAs is 23 minutes. // a good value that is also used by other MUAs is 23 minutes.
// if needed, the ui can call dc_imap_interrupt_idle() to trigger a reconnect. // if needed, the ui can call dc_imap_interrupt_idle() to trigger a reconnect.
idle.set_keepalive(Duration::from_secs(23 * 60)); idle.set_keepalive(Duration::from_secs(23 * 60));
let res = idle.wait_keepalive(); let res = idle.wait_keepalive();
// Ignoring the error, as this happens when we try sending after the drop // Ignoring the error, as this happens when we try sending after the drop
let _send_res = sender.send(res); let _send_res = sender.send(res);
@@ -1085,30 +1085,26 @@ impl Imap {
let &(ref lock, ref cvar) = &*self.watch.clone(); let &(ref lock, ref cvar) = &*self.watch.clone();
let mut watch = lock.lock().unwrap(); let mut watch = lock.lock().unwrap();
let handle_res = |res| { let handle_res = |res| match res {
info!(context, 0, format!("IMAP-IDLE done: {:?}", res)); Ok(()) => {
info!(context, 0, "IMAP-IDLE has data.");
match res {
Ok(()) => {
info!(context, 0, "IMAP-IDLE has data.");
}
Err(err) => match err {
imap::error::Error::ConnectionLost => {
info!(
context,
0, "IMAP-IDLE wait cancelled, we will reconnect soon."
);
self.config.write().unwrap().should_reconnect = true;
}
_ => {
warn!(
context,
0,
format!("IMAP-IDLE returns unknown value: {:?}", err)
);
}
},
} }
Err(err) => match err {
imap::error::Error::ConnectionLost => {
info!(
context,
0, "IMAP-IDLE wait cancelled, we will reconnect soon."
);
self.config.write().unwrap().should_reconnect = true;
}
_ => {
warn!(
context,
0,
format!("IMAP-IDLE returns unknown value: {:?}", err)
);
}
},
}; };
loop { loop {