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

revert logic to get last_seen_uid

Browse Source
This commit is contained in:
holger krekel
2019-11-30 03:35:20 +01:00
parent d9f2b60e5a
commit 1382c506cb
2 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/configure/mod.rs
View File

@@ -383,11 +383,10 @@ pub fn JobConfigureImap(context: &Context) {
// (~30 seconds on a Moto G4 play) and might looks as if message sending is always that slow. // (~30 seconds on a Moto G4 play) and might looks as if message sending is always that slow.
e2ee::ensure_secret_key_exists(context); e2ee::ensure_secret_key_exists(context);
success = true; success = true;
info!(context, "Configure completed."); info!(context, "key generation completed");
progress!(context, 940); progress!(context, 940);
break; // We are done here break; // We are done here
} }
_ => { _ => {
error!(context, "Internal error: step counter out of bound",); error!(context, "Internal error: step counter out of bound",);
break; break;
@@ -410,24 +409,6 @@ pub fn JobConfigureImap(context: &Context) {
context.smtp.clone().lock().unwrap().disconnect(); context.smtp.clone().lock().unwrap().disconnect();
} }
/*
if !success {
// disconnect if configure did not succeed
if imap_connected_here {
// context.inbox.read().unwrap().disconnect(context);
}
if smtp_connected_here {
// context.smtp.clone().lock().unwrap().disconnect();
}
} else {
assert!(imap_connected_here && smtp_connected_here);
info!(
context,
0, "Keeping IMAP/SMTP connections open after successful configuration"
);
}
*/
// remember the entered parameters on success // remember the entered parameters on success
// and restore to last-entered on failure. // and restore to last-entered on failure.
// this way, the parameters visible to the ui are always in-sync with the current configuration. // this way, the parameters visible to the ui are always in-sync with the current configuration.

14
src/imap.rs
View File

@@ -587,13 +587,12 @@ impl Imap {
); );
if let Some(ref mut session) = &mut *self.session.lock().await { if let Some(ref mut session) = &mut *self.session.lock().await {
// `FETCH <message sequence number> (UID)` // `FETCH <message sequence number> (UID)`
let set = format!("{}:*", mailbox.exists); // note that we use fetch by sequence number
// and thus we only need to get exactly the
// last-index message.
let set = format!("{}", mailbox.exists);
match session.fetch(set, JUST_UID).await { match session.fetch(set, JUST_UID).await {
Ok(list) => list Ok(list) => list[0].uid.unwrap_or_else(|| 0),
.iter()
.last()
.and_then(|res| res.uid)
.unwrap_or_default(),
Err(err) => { Err(err) => {
bail!("fetch failed: {:?}", err); bail!("fetch failed: {:?}", err);
} }
@@ -602,7 +601,7 @@ impl Imap {
return Err(Error::ImapNoConnection); return Err(Error::ImapNoConnection);
} }
} else { } else {
mailbox.uid_next.unwrap() - 1 max(0, mailbox.uid_next.unwrap() - 1)
}; };
self.set_config_last_seen_uid(context, &folder, new_uid_validity, new_last_seen_uid); self.set_config_last_seen_uid(context, &folder, new_uid_validity, new_last_seen_uid);
@@ -1334,6 +1333,7 @@ impl Imap {
.set_raw_config_int(context, "folders_configured", 3) .set_raw_config_int(context, "folders_configured", 3)
.ok(); .ok();
} }
info!(context, "FINISHED configuring IMAP-folders.");
}) })
} }