Request 3187 (accepted)

You're not reviewing the full diff of request 3187 , but the diff to the superseded request 3186 (Show full diff)

Overview

Request 3187 (accepted)

2.4.1

Created by mollekopf over 1 year 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.1.tar.gz/lib/kolab_sync.php -> kolab-syncroton-2.4.0.tar.gz/lib/kolab_sync.php Changed

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

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

2.4.1

mollekopf accepted request over 1 year ago