[geary/wip/713150-conversations] Revert "Fix edge conditions in AccountSynchonizer"



commit 17d6bab6361fe56b9f813e37067555ae01466bf4
Author: Jim Nelson <jim yorba org>
Date:   Fri Apr 17 10:20:35 2015 -0700

    Revert "Fix edge conditions in AccountSynchonizer"
    
    This reverts commit ff1e195d496dc8d2b0a0b024a1dbf4c78a9cebdf.
    
    A partial revert, as only some of the code in the original commit
    was causing trouble.

 .../imap-engine-account-synchronizer.vala          |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/src/engine/imap-engine/imap-engine-account-synchronizer.vala 
b/src/engine/imap-engine/imap-engine-account-synchronizer.vala
index 3b30d02..9e1c3a1 100644
--- a/src/engine/imap-engine/imap-engine-account-synchronizer.vala
+++ b/src/engine/imap-engine/imap-engine-account-synchronizer.vala
@@ -332,10 +332,6 @@ private class Geary.ImapEngine.AccountSynchronizer : Geary.BaseObject {
             debug("Unable to fetch oldest local email for %s: %s", folder.to_string(), err.message);
         }
         
-        ImapDB.EmailIdentifier? imapdb_id = oldest_local_id as ImapDB.EmailIdentifier;
-        if (imapdb_id != null && imapdb_id.uid.value == Imap.UID.MIN)
-            return true;
-        
         if (availability_check) {
             // Compare the oldest mail in the local store and see if it is before the epoch; if so, no
             // need to synchronize simply because this Folder is available; wait for its contents to
@@ -344,7 +340,7 @@ private class Geary.ImapEngine.AccountSynchronizer : Geary.BaseObject {
                 if (oldest_local.compare(epoch) < 0) {
                     // Oldest local email before epoch, don't sync from network
                     return true;
-                } else if (folder.properties.email_total <= local_count) {
+                } else if (folder.properties.email_total == local_count) {
                     // Local earliest email is after epoch, but there's nothing before it
                     return true;
                 } else if (!epoch.equal(max_epoch)) {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]