nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Unable to construct internaldate (clean up incomplete db): Closes #5349

Browse source 
Previous commit:b092e407 fixed this problem but didn't clean up the
db of users who'd saved the incomplete PROPERTIES data.  This patch
will catch when properties are unavailable, forcing the engine to
pull them from the network and repair the hole.
This commit is contained in:
Jim Nelson 2012-06-06 12:17:14 -07:00
parent a4b116457c
commit ba1570582c
2 changed files with 49 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/engine/sqlite/api/sqlite-folder.vala
View file

@ -377,11 +377,21 @@ private class Geary.Sqlite.Folder : Object, Geary.ReferenceSemantics {
: new Geary.Email(position, email_id);
if (properties != null) {
if (required_fields.require(Geary.Email.Field.PROPERTIES))
email.set_email_properties(properties.get_imap_email_properties());
if (required_fields.require(Geary.Email.Field.PROPERTIES)) {
Imap.EmailProperties? email_properties = properties.get_imap_email_properties();
if (email_properties != null)
email.set_email_properties(email_properties);
else if (!partial_ok)
continue;
}
if (required_fields.require(Geary.Email.Field.FLAGS))
email.set_flags(properties.get_email_flags());
if (required_fields.require(Geary.Email.Field.FLAGS)) {
EmailFlags? email_flags = properties.get_email_flags();
if (email_flags != null)
email.set_flags(email_flags);
else if (!partial_ok)
continue;
}
}
emails.add(email);
@ -454,11 +464,25 @@ private class Geary.Sqlite.Folder : Object, Geary.ReferenceSemantics {
new Geary.Email(position, id);
if (properties != null) {
if (required_fields.require(Geary.Email.Field.PROPERTIES))
email.set_email_properties(properties.get_imap_email_properties());
if (required_fields.require(Geary.Email.Field.PROPERTIES)) {
Imap.EmailProperties? email_properties = properties.get_imap_email_properties();
if (email_properties != null) {
email.set_email_properties(email_properties);
} else if (!partial_ok) {
throw new EngineError.INCOMPLETE_MESSAGE("Message %s in folder %s does not have PROPERTIES fields",
id.to_string(), to_string());
}
}
if (required_fields.require(Geary.Email.Field.FLAGS))
email.set_flags(properties.get_email_flags());
if (required_fields.require(Geary.Email.Field.FLAGS)) {
EmailFlags? email_flags = properties.get_email_flags();
if (email_flags != null) {
email.set_flags(email_flags);
} else if (!partial_ok) {
throw new EngineError.INCOMPLETE_MESSAGE("Message %s in folder %s does not have FLAGS fields",
id.to_string(), to_string());
}
}
}
return email;
@ -539,7 +563,9 @@ private class Geary.Sqlite.Folder : Object, Geary.ReferenceSemantics {
if (row == null)
continue;
map.set(id, row.get_email_flags());
EmailFlags? email_flags = row.get_email_flags();
if (email_flags != null)
map.set(id, email_flags);
}
yield transaction.commit_async(cancellable);