Request 3187 (accepted)

This request supersedes: request 3186 (Show diff)

Overview

Request 3187 (accepted)

2.4.1

Created by mollekopf 10 months ago
In state accepted
Supersedes 3186
Open review for Admin
Open review for vanmeeuwen
Open review for mollekopf
Open review for kolab-developers

Submit kolab-syncroton

Submit package Kolab:16:Testing / kolab-syncroton to package Kolab:16 / kolab-syncroton

kolab-syncroton.spec Changed

buildtarball.sh Changed

debian.changelog Changed

kolab-syncroton-2.4.0.tar.gz/lib/kolab_sync.php -> kolab-syncroton-2.4.1.tar.gz/lib/kolab_sync.php Changed

kolab-syncroton-2.4.0.tar.gz/lib/kolab_sync_backend.php -> kolab-syncroton-2.4.1.tar.gz/lib/kolab_sync_backend.php Changed

kolab-syncroton-2.4.0.tar.gz/lib/kolab_sync_data_email.php -> kolab-syncroton-2.4.1.tar.gz/lib/kolab_sync_data_email.php Changed

@@ -602,30 +602,34 @@
      */
     public function updateEntry($folderId, $serverId, Syncroton_Model_IEntry $entry)
     {
-        $msg     = $this->parseMessageId($serverId);
-        $message = $this->getObject($serverId);
+        $msg = $this->parseMessageId($serverId);
 
-        if (empty($message)) {
+        if (empty($msg)) {
             throw new Syncroton_Exception_Status_Sync(Syncroton_Exception_Status_Sync::SYNC_SERVER_ERROR);
         }
 
-        $is_flagged = !empty($message->headers->flags'FLAGGED');
+        if (isset($entry->categories)) {
+            // Read the message headers only when they are needed
+            $message = $this->getObject($serverId);
+
+            if (empty($message)) {
+                throw new Syncroton_Exception_Status_Sync(Syncroton_Exception_Status_Sync::SYNC_SERVER_ERROR);
+            }
+        }
 
         // Read status change
         if (isset($entry->read)) {
             // here we update only Read flag
-            $flag = (((int)$entry->read != 1) ? 'UN' : '') . 'SEEN';
+            $flag = !empty($entry->read) ? 'SEEN' : 'UNSEEN';
             $this->storage->set_flag($msg'uid', $flag, $msg'foldername');
         }
 
         // Flag change
-        if (isset($entry->flag) && (empty($entry->flag) || empty($entry->flag->flagType))) {
-            if ($is_flagged) {
+        if (isset($entry->flag)) {
+            if (empty($entry->flag) || empty($entry->flag->flagType)) {
                 $this->storage->set_flag($msg'uid', 'UNFLAGGED', $msg'foldername');
             }
-        }
-        else if (!$is_flagged && !empty($entry->flag)) {
-            if ($entry->flag->flagType && preg_match('/follow\s*up/i', $entry->flag->flagType)) {
+            else if (preg_match('/follow\s*up/i', $entry->flag->flagType)) {
                 $this->storage->set_flag($msg'uid', 'FLAGGED', $msg'foldername');
             }
         }

kolab-syncroton.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 3187 0

Request History

mollekopf created request 10 months ago

2.4.1

mollekopf accepted request 10 months ago