Fix initial sync flag.

horde · May 5, 2015 · f8268eb · f8268eb
1 parent 60fd144
commit f8268eb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Folder/Base.php b/framework/ActiveSync/lib/Horde/ActiveSync/Folder/Base.php
@@ -52,7 +52,7 @@ abstract class Horde_ActiveSync_Folder_Base
      *
      * @var boolean
      */
-    public $haveInitialSync = true;
+    public $haveInitialSync = false;
 
     /**
      * Timestamp for the last sincedate used for SOFTDELETE.

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Folder/Collection.php b/framework/ActiveSync/lib/Horde/ActiveSync/Folder/Collection.php
@@ -28,13 +28,6 @@ class Horde_ActiveSync_Folder_Collection extends Horde_ActiveSync_Folder_Base im
 {
     const VERSION = 1;
 
-    /**
-     * Flag for indicating we have an initial sync for this collection.
-     *
-     * @var boolean
-     */
-    public $haveInitialSync = false;
-
     /**
      * Updates the internal UID cache, and clears the internal
      * update/deleted/changed cache.

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Folder/Imap.php b/framework/ActiveSync/lib/Horde/ActiveSync/Folder/Imap.php
@@ -294,6 +294,7 @@ public function updateState()
         $this->_changed = array();
         $this->_flags = array();
         $this->_softDeleted = array();
+        $this->haveInitialSync = true;
     }
 
     /**
@@ -474,6 +475,7 @@ public function unserialize($data)
         $this->_class = $d_data['c'];
         $this->_lastSinceDate = $d_data['lsd'];
         $this->_softDelete = $d_data['sd'];
+        $this->haveInitialSync = !empty($this->_messages);
 
         if (!empty($this->_status[self::HIGHESTMODSEQ]) && is_string($this->_messages)) {
             $this->_messages = $this->_fromSequenceString($this->_messages);