Conflicts:

	ActiveSync/SOGoActiveSyncDispatcher+Sync.m
pull/91/head
Ludovic Marcotte 2015-06-29 13:49:41 -04:00
parent 013e316e7d
commit 647f052486
1 changed files with 7 additions and 1 deletions

View File

@ -474,7 +474,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
acquire: NO];
if (![sogoObject isKindOfClass: [NSException class]])
[sogoObject delete];
{
// FIXME: handle errors here
if (deletesAsMoves && theFolderType == ActiveSyncMailFolder)
[(SOGoMailFolder *)[sogoObject container] deleteUIDs: [NSArray arrayWithObjects: serverId, nil] useTrashFolder: &useTrash inContext: context];
else
[sogoObject delete];
}
[theBuffer appendString: @"<Delete>"];
[theBuffer appendFormat: @"<ServerId>%@</ServerId>", serverId];