randre03
/
meli
forked from meli/meli
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix account menu reload bug

embed
Manos Pitsidianakis 2018-08-17 13:40:21 +03:00
parent c8611926fa
commit ae209e2545
Signed by: Manos Pitsidianakis
GPG Key ID: 73627C2F690DF710
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
melib/src/mailbox/accounts.rs
View File

@ -99,8 +99,8 @@ impl Account {
pub fn workers(&mut self) -> &mut Vec<Worker> {
&mut self.workers
}
fn load_mailbox(&mut self, index: usize, envelopes: Result<Vec<Envelope>>) -> Option<NewMailEvent> {
let mut ret: Option<NewMailEvent> = None;
fn load_mailbox(&mut self, index: usize, envelopes: Result<Vec<Envelope>>) -> Option<Option<NewMailEvent>> {
let mut ret: Option<Option<NewMailEvent>> = None;
// TODO: Cleanup this function
let folders = self.backend.folders();
@ -115,14 +115,15 @@ impl Account {
let diff = self.folders[index].as_ref().map(|v| v.as_ref().unwrap().collection.len()).unwrap_or(0).saturating_sub(old_m.as_ref().map(|v| v.collection.len()).unwrap_or(0));
if diff > 0 {
let mut index = old_m.as_ref().unwrap().collection.iter().zip(&self.folders[index].as_ref().unwrap().as_ref().unwrap().collection).count();
ret = Some(NewMailEvent {
ret = Some(Some(NewMailEvent {
folder: folder.hash(),
index: (index.saturating_sub(1)..(self.folders[index].as_ref().unwrap().as_ref().unwrap().collection.len().saturating_sub(1))).collect(),
});
}));
}
}
} else {
ret = Some(None);
}
/* ======================== */
} else {
@ -147,14 +148,16 @@ impl Account {
let diff = cur[0].as_ref().map(|v| v.as_ref().unwrap().collection.len()).unwrap_or(0).saturating_sub(old_m.as_ref().map(|v| v.collection.len()).unwrap_or(0));
if diff > 0 {
let mut index = old_m.as_ref().unwrap().collection.iter().zip(&cur[0].as_ref().unwrap().as_ref().unwrap().collection).count();
ret = Some(NewMailEvent {
ret = Some(Some(NewMailEvent {
folder: folder.hash(),
index: (index.saturating_sub(1)..(cur[0].as_ref().unwrap().as_ref().unwrap().collection.len()).saturating_sub(1)).collect(),
});
}));
}
}
} else {
ret = Some(None);
}
/* ======================== */
}
@ -166,14 +169,15 @@ impl Account {
let diff = self.folders[index].as_ref().map(|v| v.as_ref().unwrap().collection.len()).unwrap_or(0).saturating_sub(old_m.as_ref().map(|v| v.collection.len()).unwrap_or(0));
if diff > 0 {
let mut index = old_m.as_ref().unwrap().collection.iter().zip(&self.folders[index].as_ref().unwrap().as_ref().unwrap().collection).count();
ret = Some(NewMailEvent {
ret = Some(Some(NewMailEvent {
folder: folder.hash(),
index: (index.saturating_sub(1)..(self.folders[index].as_ref().unwrap().as_ref().unwrap().collection.len().saturating_sub(1))).collect(),
});
}));
}
}
} else {
ret = Some(None);
}
/* ======================== */
};
@ -181,7 +185,7 @@ impl Account {
ret
}
pub fn status(&mut self, index: usize) -> result::Result<Option<NewMailEvent>, usize> {
pub fn status(&mut self, index: usize) -> result::Result<Option<Option<NewMailEvent>>, usize> {
match self.workers[index].as_mut() {
None => {
return Ok(None);

9
ui/src/state.rs
View File

@ -100,7 +100,7 @@ impl Context {
}
pub fn account_status(&mut self, idx_a: usize, idx_m: usize) -> result::Result<bool, usize> {
let s = self.accounts[idx_a].status(idx_m)?;
if let Some(event) = s {
if let Some(Some(event)) = s {
eprintln!("setting up notification");
let (idx_a, idx_m) = self.mailbox_hashes[&event.folder];
let subjects = {
@ -112,9 +112,12 @@ impl Context {
ret
};
self.replies.push_back(UIEvent { id: 0, event_type: UIEventType::Notification(format!("Update in {}/{}, indexes {:?}", self.accounts[idx_a].name(), self.accounts[idx_a][idx_m].as_ref().unwrap().folder.name(), subjects)) });
return Ok(true);
Ok(true)
} else if let Some(None) = s {
Ok(true)
} else {
Ok(false)
}
Ok(false)
}
}