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

Revert "imap: simplify select_folder() interface"

Browse Source 
This reverts commit b614de2f80.
This commit is contained in:
Alexander Krotov
2020-05-12 00:32:18 +03:00
committed by holger krekel
parent 0594034ee6
commit 3ee81cbee0
4 changed files with 46 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/imap/mod.rs
View File

@@ -477,7 +477,7 @@ impl Imap {
folder: &str,
) -> Result<(u32, u32)> {
task::block_on(async move {
self.select_folder(context, folder).await?;
self.select_folder(context, Some(folder)).await?;
// compare last seen UIDVALIDITY against the current one
let (uid_validity, last_seen_uid) = self.get_config_last_seen_uid(context, &folder);
@@ -915,7 +915,7 @@ impl Imap {
return Some(ImapActionResult::RetryLater);
}
}
match self.select_folder(context, &folder).await {
match self.select_folder(context, Some(&folder)).await {
Ok(()) => None,
Err(select_folder::Error::ConnectionLost) => {
warn!(context, "Lost imap connection");
@@ -1186,7 +1186,7 @@ impl Imap {
error!(context, "could not setup imap connection: {}", err);
return;
}
if let Err(err) = self.select_folder(context, &folder).await {
if let Err(err) = self.select_folder(context, Some(&folder)).await {
error!(
context,
"Could not select {} for expunging: {}", folder, err
@@ -1204,7 +1204,7 @@ impl Imap {
// we now trigger expunge to actually delete messages
self.config.write().await.selected_folder_needs_expunge = true;
match self.select_folder(context, &folder).await {
match self.select_folder::<String>(context, None).await {
Ok(()) => {
emit_event!(context, Event::ImapFolderEmptied(folder.to_string()));
}