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

Fixes bug where changes to flags (i.e. Unread or Flagged) was not

Browse source 
reported to client when discovered at folder open.
This commit is contained in:
Jim Nelson 2012-02-14 17:08:00 -08:00
parent a619e7350e
commit 368e94be8e
4 changed files with 45 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/engine/api/geary-email-flags.vala
View file

@ -5,7 +5,6 @@
*/
public class Geary.EmailFlags : Geary.Equalable {
private static EmailFlag? _unread = null;
public static EmailFlag UNREAD { get {
if (_unread == null)
@ -60,12 +59,12 @@ public class Geary.EmailFlags : Geary.Equalable {
}
public string to_string() {
string ret = "";
string ret = "[";
foreach (EmailFlag flag in list) {
ret += flag.to_string() + " ";
}
return "[" + ret + "]";
return ret + "]";
}
}

5
src/engine/api/geary-email-properties.vala
View file

@ -5,11 +5,14 @@
*/
public abstract class Geary.EmailProperties : Object {
// Flags set on the email object.
public EmailFlags email_flags { get; set; }
public EmailProperties() {
}
public virtual string to_string() {
return "EmailProperties:%s".printf(email_flags.to_string());
}
}

9
src/engine/imap/api/imap-email-properties.vala
View file

@ -43,7 +43,7 @@ public class Geary.Imap.EmailProperties : Geary.EmailProperties, Equalable {
if (rfc822_size == null || other.rfc822_size == null)
return false;
return get_message_flags().equals(get_message_flags()) &&
return get_message_flags().equals(other.get_message_flags()) &&
internaldate.equals(other.internaldate) &&
rfc822_size.equals(other.rfc822_size);
}
@ -51,5 +51,12 @@ public class Geary.Imap.EmailProperties : Geary.EmailProperties, Equalable {
public Geary.Imap.MessageFlags get_message_flags() {
return ((Geary.Imap.EmailFlags) this.email_flags).message_flags;
}
public override string to_string() {
return base.to_string() + "/answered:%s/deleted:%s/draft:%s/flagged:%s/seen:%s/internaldate:%s/size:%s".printf(
answered.to_string(), deleted.to_string(), draft.to_string(), flagged.to_string(),
seen.to_string(), (internaldate != null) ? internaldate.to_string() : "(none)",
(rfc822_size != null) ? rfc822_size.to_string() : "(none)");
}
}

46
src/engine/impl/geary-generic-imap-folder.vala
View file

@ -162,38 +162,43 @@ private class Geary.GenericImapFolder : Geary.EngineFolder {
int remote_ctr = 0;
int local_ctr = 0;
Gee.ArrayList<Geary.EmailIdentifier> removed_ids = new Gee.ArrayList<Geary.EmailIdentifier>();
Gee.Map<Geary.EmailIdentifier, Geary.EmailFlags> flags_changed = new Gee.HashMap<Geary.EmailIdentifier,
Geary.EmailFlags>();
for (;;) {
if (local_ctr >= local_length || remote_ctr >= remote_length)
break;
Geary.Imap.UID remote_uid =
((Geary.Imap.EmailIdentifier) old_remote[remote_ctr].id).uid;
Geary.Imap.UID local_uid =
((Geary.Imap.EmailIdentifier) old_local[local_ctr].id).uid;
Geary.Email remote_email = old_remote[remote_ctr];
Geary.Email local_email = old_local[local_ctr];
Geary.Imap.UID remote_uid = ((Geary.Imap.EmailIdentifier) remote_email.id).uid;
Geary.Imap.UID local_uid = ((Geary.Imap.EmailIdentifier) local_email.id).uid;
if (remote_uid.value == local_uid.value) {
// same, update flags (if changed) and move on
Geary.Imap.EmailProperties local_email_properties =
(Geary.Imap.EmailProperties) old_local[local_ctr].properties;
(Geary.Imap.EmailProperties) local_email.properties;
Geary.Imap.EmailProperties remote_email_properties =
(Geary.Imap.EmailProperties) old_remote[remote_ctr].properties;
(Geary.Imap.EmailProperties) remote_email.properties;
if (!local_email_properties.equals(remote_email_properties))
batch.add(new CreateEmailOperation(local_folder, old_remote[remote_ctr]));
if (!local_email_properties.equals(remote_email_properties)) {
batch.add(new CreateEmailOperation(local_folder, remote_email));
flags_changed.set(remote_email.id, remote_email.properties.email_flags);
}
remote_ctr++;
local_ctr++;
} else if (remote_uid.value < local_uid.value) {
// one we'd not seen before is present, add and move to next remote
batch.add(new CreateEmailOperation(local_folder, old_remote[remote_ctr]));
batch.add(new CreateEmailOperation(local_folder, remote_email));
remote_ctr++;
} else {
assert(remote_uid.value > local_uid.value);
// local's email on the server has been removed, remove locally
batch.add(new RemoveEmailOperation(local_folder, old_local[local_ctr].id));
removed_ids.add(old_local[local_ctr].id);
batch.add(new RemoveEmailOperation(local_folder, local_email.id));
removed_ids.add(local_email.id);
local_ctr++;
}
@ -229,14 +234,25 @@ private class Geary.GenericImapFolder : Geary.EngineFolder {
// notify emails that have been removed (see note above about why not all Creates are
// signalled)
foreach (Geary.EmailIdentifier removed_id in removed_ids)
notify_message_removed(removed_id);
if (removed_ids.size > 0) {
debug("Notifying of %d removed emails since %s last seen", removed_ids.size, to_string());
foreach (Geary.EmailIdentifier removed_id in removed_ids)
notify_message_removed(removed_id);
}
// notify additions
if (appended > 0)
if (appended > 0) {
debug("Notifying of %d appended emails since %s last seen", appended, to_string());
notify_messages_appended(appended);
}
debug("completed prepare_opened_folder %s", to_string());
// notify flag changes
if (flags_changed.size > 0) {
debug("Notifying of %d changed flags since %s last seen", flags_changed.size, to_string());
notify_email_flags_changed(flags_changed);
}
debug("Completed prepare_opened_folder %s", to_string());
return true;
}