From 06476abdf7018337116b1608ffe2016196f3924c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enrique=20J=2E=20Hern=C3=A1ndez=20Blasco?=
 <ejhernandez@zentyal.com>
Date: Thu, 26 Mar 2015 22:05:43 +0100
Subject: [PATCH] oc-mail: return soft-deleted mails while syncing

As well as hard deleted

As explained in [MS-OXCFXICS] Section 2.2.1.3.1, the
property MetaTagIdsetDeleted must include both types
of messages and this idset is filled with the return
value of this message.
---
 OpenChange/MAPIStoreMailFolder.m | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/OpenChange/MAPIStoreMailFolder.m b/OpenChange/MAPIStoreMailFolder.m
index e8f25e183..11e1154be 100644
--- a/OpenChange/MAPIStoreMailFolder.m
+++ b/OpenChange/MAPIStoreMailFolder.m
@@ -1009,6 +1009,7 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
   NSString *changeNumber;
   uint64_t modseq;
   NSDictionary *versionProperties;
+  EOQualifier *deletedQualifier, *kvQualifier, *searchQualifier;
 
   if (tableType == MAPISTORE_MESSAGE_TABLE)
     {
@@ -1017,8 +1018,33 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
                  unsignedLongLongValue];
       if (modseq > 0)
         {
+          /* Hard deleted items */
           deletedUIDs = [(SOGoMailFolder *) sogoObject
                            fetchUIDsOfVanishedItems: modseq];
+
+          /* Soft deleted items */
+          kvQualifier = [[EOKeyValueQualifier alloc]
+                                initWithKey: @"modseq"
+                           operatorSelector: EOQualifierOperatorGreaterThanOrEqualTo
+                                      value: [NSNumber numberWithUnsignedLongLong: modseq]];
+          deletedQualifier
+            = [[EOKeyValueQualifier alloc]
+                 initWithKey: @"FLAGS"
+                operatorSelector: EOQualifierOperatorContains
+                       value: [NSArray arrayWithObject: @"Deleted"]];
+
+          searchQualifier = [[EOAndQualifier alloc]
+                              initWithQualifiers:
+                                kvQualifier, deletedQualifier, nil];
+
+          deletedUIDs = [deletedUIDs arrayByAddingObjectsFromArray:
+                                       [sogoObject fetchUIDsMatchingQualifier: searchQualifier
+                                                                 sortOrdering: nil]];
+
+          [deletedQualifier release];
+          [kvQualifier release];
+          [searchQualifier release];
+
           deletedKeys = [deletedUIDs stringsWithFormat: @"%@.eml"];
           if ([deletedUIDs count] > 0)
             {