Add IMAP MOVE command support

15 files changed, 348 insertions, 0 deletions

diff --git a/src/async/imap/MCAsyncIMAP.h b/src/async/imap/MCAsyncIMAP.h
index aa6d6b68..1fb51de0 100755
--- a/src/async/imap/MCAsyncIMAP.h
+++ b/src/async/imap/MCAsyncIMAP.h
@@ -15,6 +15,7 @@
 #include <MailCore/MCIMAPFetchFoldersOperation.h>
 #include <MailCore/MCIMAPAppendMessageOperation.h>
 #include <MailCore/MCIMAPCopyMessagesOperation.h>
+#include <MailCore/MCIMAPMoveMessagesOperation.h>
 #include <MailCore/MCIMAPFetchMessagesOperation.h>
 #include <MailCore/MCIMAPFetchContentOperation.h>
 #include <MailCore/MCIMAPFetchParsedContentOperation.h>
diff --git a/src/async/imap/MCIMAPAsyncSession.cpp b/src/async/imap/MCIMAPAsyncSession.cpp
index a8cccea5..7f00d105 100755
--- a/src/async/imap/MCIMAPAsyncSession.cpp
+++ b/src/async/imap/MCIMAPAsyncSession.cpp
@@ -26,6 +26,7 @@
 #include "MCIMAPExpungeOperation.h"
 #include "MCIMAPAppendMessageOperation.h"
 #include "MCIMAPCopyMessagesOperation.h"
+#include "MCIMAPMoveMessagesOperation.h"
 #include "MCIMAPFetchMessagesOperation.h"
 #include "MCIMAPFetchContentOperation.h"
 #include "MCIMAPFetchParsedContentOperation.h"
@@ -453,6 +454,17 @@ IMAPCopyMessagesOperation * IMAPAsyncSession::copyMessagesOperation(String * fol
     return op;
 }
 
+IMAPMoveMessagesOperation * IMAPAsyncSession::moveMessagesOperation(String * folder, IndexSet * uids, String * destFolder)
+{
+    IMAPMoveMessagesOperation * op = new IMAPMoveMessagesOperation();
+    op->setMainSession(this);
+    op->setFolder(folder);
+    op->setUids(uids);
+    op->setDestFolder(destFolder);
+    op->autorelease();
+    return op;
+}
+
 IMAPOperation * IMAPAsyncSession::expungeOperation(String * folder)
 {
     IMAPExpungeOperation * op = new IMAPExpungeOperation();
diff --git a/src/async/imap/MCIMAPAsyncSession.h b/src/async/imap/MCIMAPAsyncSession.h
index 62577a6e..bbffacbd 100755
--- a/src/async/imap/MCIMAPAsyncSession.h
+++ b/src/async/imap/MCIMAPAsyncSession.h
@@ -21,6 +21,7 @@ namespace mailcore {
     class IMAPFetchFoldersOperation;
     class IMAPAppendMessageOperation;
     class IMAPCopyMessagesOperation;
+    class IMAPMoveMessagesOperation;
     class IMAPFetchMessagesOperation;
     class IMAPFetchContentOperation;
     class IMAPFetchParsedContentOperation;
@@ -121,6 +122,7 @@ namespace mailcore {
         virtual IMAPAppendMessageOperation * appendMessageOperation(String * folder, Data * messageData, MessageFlag flags, Array * customFlags = NULL);
         
         virtual IMAPCopyMessagesOperation * copyMessagesOperation(String * folder, IndexSet * uids, String * destFolder);
+        virtual IMAPMoveMessagesOperation * moveMessagesOperation(String * folder, IndexSet * uids, String * destFolder);
         
         virtual IMAPOperation * expungeOperation(String * folder);
         
diff --git a/src/async/imap/MCIMAPMoveMessagesOperation.cpp b/src/async/imap/MCIMAPMoveMessagesOperation.cpp
new file mode 100644
index 00000000..cc8de937
--- /dev/null
+++ b/src/async/imap/MCIMAPMoveMessagesOperation.cpp
@@ -0,0 +1,61 @@
+//
+//  IMAPMoveMessagesOperation.cpp
+//  mailcore2
+//
+//  Created by Nikolay Morev on 02/02/16.
+//  Copyright © 2016 MailCore. All rights reserved.
+//
+
+#include "MCIMAPMoveMessagesOperation.h"
+
+#include "MCIMAPSession.h"
+#include "MCIMAPAsyncConnection.h"
+
+using namespace mailcore;
+
+IMAPMoveMessagesOperation::IMAPMoveMessagesOperation()
+{
+    mUids = NULL;
+    mDestFolder = NULL;
+    mUidMapping = NULL;
+}
+
+IMAPMoveMessagesOperation::~IMAPMoveMessagesOperation()
+{
+    MC_SAFE_RELEASE(mUidMapping);
+    MC_SAFE_RELEASE(mUids);
+    MC_SAFE_RELEASE(mDestFolder);
+}
+
+void IMAPMoveMessagesOperation::setUids(IndexSet * uids)
+{
+    MC_SAFE_REPLACE_RETAIN(IndexSet, mUids, uids);
+}
+
+IndexSet * IMAPMoveMessagesOperation::uids()
+{
+    return mUids;
+}
+
+HashMap * IMAPMoveMessagesOperation::uidMapping()
+{
+    return mUidMapping;
+}
+
+void IMAPMoveMessagesOperation::setDestFolder(String * destFolder)
+{
+    MC_SAFE_REPLACE_COPY(String, mDestFolder, destFolder);
+}
+
+String * IMAPMoveMessagesOperation::destFolder()
+{
+    return mDestFolder;
+}
+
+void IMAPMoveMessagesOperation::main()
+{
+    ErrorCode error;
+    session()->session()->moveMessages(folder(), mUids, mDestFolder, &mUidMapping, &error);
+    MC_SAFE_RETAIN(mUidMapping);
+    setError(error);
+}
diff --git a/src/async/imap/MCIMAPMoveMessagesOperation.h b/src/async/imap/MCIMAPMoveMessagesOperation.h
new file mode 100644
index 00000000..1c4342f5
--- /dev/null
+++ b/src/async/imap/MCIMAPMoveMessagesOperation.h
@@ -0,0 +1,46 @@
+//
+//  IMAPMoveMessagesOperation.hpp
+//  mailcore2
+//
+//  Created by Nikolay Morev on 02/02/16.
+//  Copyright © 2016 MailCore. All rights reserved.
+//
+
+#ifndef MAILCORE_MCIMAPMOVEMESSAGESOPERATION_H
+
+#define MAILCORE_MCIMAPMOVEMESSAGESOPERATION_H
+
+#include <MailCore/MCIMAPOperation.h>
+
+#ifdef __cplusplus
+
+namespace mailcore {
+
+    class MAILCORE_EXPORT IMAPMoveMessagesOperation : public IMAPOperation {
+    public:
+        IMAPMoveMessagesOperation();
+        virtual ~IMAPMoveMessagesOperation();
+
+        virtual void setDestFolder(String * destFolder);
+        virtual String * destFolder();
+
+        virtual void setUids(IndexSet * uids);
+        virtual IndexSet * uids();
+
+        // Result.
+        virtual HashMap * uidMapping();
+
+    public: // subclass behavior
+        virtual void main();
+
+    private:
+        IndexSet * mUids;
+        String * mDestFolder;
+        HashMap * mUidMapping;
+    };
+
+}
+
+#endif
+
+#endif
diff --git a/src/cmake/async.cmake b/src/cmake/async.cmake
index 79c97f5d..329c958e 100644
--- a/src/cmake/async.cmake
+++ b/src/cmake/async.cmake
@@ -8,6 +8,7 @@ set(async_imap_files
   async/imap/MCIMAPCheckAccountOperation.cpp
   async/imap/MCIMAPConnectOperation.cpp
   async/imap/MCIMAPCopyMessagesOperation.cpp
+  async/imap/MCIMAPMoveMessagesOperation.cpp
   async/imap/MCIMAPCreateFolderOperation.cpp
   async/imap/MCIMAPDeleteFolderOperation.cpp
   async/imap/MCIMAPDisconnectOperation.cpp
diff --git a/src/cmake/objc.cmake b/src/cmake/objc.cmake
index 328ceb24..12a06bd1 100644
--- a/src/cmake/objc.cmake
+++ b/src/cmake/objc.cmake
@@ -15,6 +15,7 @@ set(objc_imap_files
   objc/imap/MCOIMAPBaseOperation.mm
   objc/imap/MCOIMAPCapabilityOperation.mm
   objc/imap/MCOIMAPCopyMessagesOperation.mm
+  objc/imap/MCOIMAPMoveMessagesOperation.mm
   objc/imap/MCOIMAPFetchContentOperation.mm
   objc/imap/MCOIMAPFetchParsedContentOperation.mm
   objc/imap/MCOIMAPFetchFoldersOperation.mm
diff --git a/src/cmake/public-headers.cmake b/src/cmake/public-headers.cmake
index 7677a5aa..db0ebd71 100644
--- a/src/cmake/public-headers.cmake
+++ b/src/cmake/public-headers.cmake
@@ -86,6 +86,7 @@ async/imap/MCIMAPOperation.h
 async/imap/MCIMAPFetchFoldersOperation.h
 async/imap/MCIMAPAppendMessageOperation.h
 async/imap/MCIMAPCopyMessagesOperation.h
+async/imap/MCIMAPMoveMessagesOperation.h
 async/imap/MCIMAPFetchMessagesOperation.h
 async/imap/MCIMAPFetchContentOperation.h
 async/imap/MCIMAPFetchParsedContentOperation.h
@@ -161,6 +162,7 @@ objc/imap/MCOIMAPFolderStatusOperation.h
 objc/imap/MCOIMAPFolderStatus.h
 objc/imap/MCOIMAPAppendMessageOperation.h
 objc/imap/MCOIMAPCopyMessagesOperation.h
+objc/imap/MCOIMAPMoveMessagesOperation.h
 objc/imap/MCOIMAPFetchMessagesOperation.h
 objc/imap/MCOIMAPFetchContentOperation.h
 objc/imap/MCOIMAPFetchParsedContentOperation.h
diff --git a/src/core/imap/MCIMAPSession.cpp b/src/core/imap/MCIMAPSession.cpp
index 2fe39d40..c1209c9d 100755
--- a/src/core/imap/MCIMAPSession.cpp
+++ b/src/core/imap/MCIMAPSession.cpp
@@ -1739,6 +1739,90 @@ void IMAPSession::copyMessages(String * folder, IndexSet * uidSet, String * dest
     mailimap_set_free(set);
 }
 
+void IMAPSession::moveMessages(String * folder, IndexSet * uidSet, String * destFolder,
+     HashMap ** pUidMapping, ErrorCode * pError)
+{
+    int r;
+    struct mailimap_set * set;
+    struct mailimap_set * src_uid;
+    struct mailimap_set * dest_uid;
+    uint32_t uidvalidity;
+    clist * setList;
+    IndexSet * uidSetResult;
+    HashMap * uidMapping = NULL;
+
+    selectIfNeeded(folder, pError);
+    if (* pError != ErrorNone)
+        return;
+
+    set = setFromIndexSet(uidSet);
+    if (clist_count(set->set_list) == 0) {
+        mailimap_set_free(set);
+        return;
+    }
+
+    setList = splitSet(set, 10);
+    uidSetResult = NULL;
+
+    for(clistiter * iter = clist_begin(setList) ; iter != NULL ; iter = clist_next(iter)) {
+        struct mailimap_set * current_set;
+
+        current_set = (struct mailimap_set *) clist_content(iter);
+
+        r = mailimap_uidplus_uid_move(mImap, current_set, MCUTF8(destFolder),
+            &uidvalidity, &src_uid, &dest_uid);
+        if (r == MAILIMAP_ERROR_STREAM) {
+            mShouldDisconnect = true;
+            * pError = ErrorConnection;
+            goto release;
+        }
+        else if (r == MAILIMAP_ERROR_PARSE) {
+            * pError = ErrorParse;
+            goto release;
+        }
+        else if (hasError(r)) {
+            * pError = ErrorCopy;
+            goto release;
+        }
+
+        if ((src_uid != NULL) && (dest_uid != NULL)) {
+            if (uidMapping == NULL) {
+                uidMapping = HashMap::hashMap();
+            }
+            
+            Array * srcUidsArray = arrayFromSet(src_uid);
+            Array * destUidsArray = arrayFromSet(dest_uid);
+
+            for(int i = 0 ; i < srcUidsArray->count() && i < destUidsArray->count() ; i ++) {
+                uidMapping->setObjectForKey(srcUidsArray->objectAtIndex(i), destUidsArray->objectAtIndex(i));
+            }
+        }
+
+        if (src_uid != NULL) {
+            mailimap_set_free(src_uid);
+        }
+
+        if (dest_uid != NULL) {
+            mailimap_set_free(dest_uid);
+        }
+    }
+    if (pUidMapping != NULL) {
+        * pUidMapping = uidMapping;
+    }
+    * pError = ErrorNone;
+
+    release:
+
+    for(clistiter * iter = clist_begin(setList) ; iter != NULL ; iter = clist_next(iter)) {
+        struct mailimap_set * current_set;
+
+        current_set = (struct mailimap_set *) clist_content(iter);
+        mailimap_set_free(current_set);
+    }
+    clist_free(setList);
+    mailimap_set_free(set);
+}
+
 void IMAPSession::expunge(String * folder, ErrorCode * pError)
 {
     int r;
diff --git a/src/core/imap/MCIMAPSession.h b/src/core/imap/MCIMAPSession.h
index b3fdcb4e..c122e546 100755
--- a/src/core/imap/MCIMAPSession.h
+++ b/src/core/imap/MCIMAPSession.h
@@ -89,6 +89,9 @@ namespace mailcore {
         virtual void copyMessages(String * folder, IndexSet * uidSet, String * destFolder,
                                   HashMap ** pUidMapping, ErrorCode * pError);
         
+        virtual void moveMessages(String * folder, IndexSet * uidSet, String * destFolder,
+                                  HashMap ** pUidMapping, ErrorCode * pError);
+
         virtual void expunge(String * folder, ErrorCode * pError);
         
         virtual Array * /* IMAPMessage */ fetchMessagesByUID(String * folder, IMAPMessagesRequestKind requestKind,
diff --git a/src/objc/imap/MCOIMAP.h b/src/objc/imap/MCOIMAP.h
index 9483a36b..11cbc2ae 100755
--- a/src/objc/imap/MCOIMAP.h
+++ b/src/objc/imap/MCOIMAP.h
@@ -27,6 +27,7 @@
 #import <MailCore/MCOIMAPFolderStatus.h>
 #import <MailCore/MCOIMAPAppendMessageOperation.h>
 #import <MailCore/MCOIMAPCopyMessagesOperation.h>
+#import <MailCore/MCOIMAPMoveMessagesOperation.h>
 #import <MailCore/MCOIMAPFetchMessagesOperation.h>
 #import <MailCore/MCOIMAPFetchContentOperation.h>
 #import <MailCore/MCOIMAPFetchParsedContentOperation.h>
diff --git a/src/objc/imap/MCOIMAPMoveMessagesOperation.h b/src/objc/imap/MCOIMAPMoveMessagesOperation.h
new file mode 100644
index 00000000..77460878
--- /dev/null
+++ b/src/objc/imap/MCOIMAPMoveMessagesOperation.h
@@ -0,0 +1,39 @@
+//
+//  MCOIMAPMoveMessagesOperation.h
+//  mailcore2
+//
+//  Created by Nikolay Morev on 02/02/16.
+//  Copyright © 2016 MailCore. All rights reserved.
+//
+
+#import <MailCore/MCOIMAPBaseOperation.h>
+
+#ifndef MAILCORE_MCOMOVEMESSAGESOPERATION_H
+
+#define MAILCORE_MCOMOVEMESSAGESOPERATION_H
+
+/** Implements an operation for moving messages between folders */
+
+@class MCOIndexSet;
+
+NS_ASSUME_NONNULL_BEGIN
+@interface MCOIMAPMoveMessagesOperation : MCOIMAPBaseOperation
+
+/**
+ Starts the asynchronous move operation.
+
+ @param completionBlock Called when the operation is finished.
+
+ - On success `error` will be nil and `destUids` will contain the UIDs of the messages created
+ in the destination folder. If the server doesn't support UIDPLUS then `destUids` will be nil.
+
+ - On failure, `error` will be set with `MCOErrorDomain` as domain and an
+ error code available in `MCOConstants.h`, `destUids` will be nil
+ */
+
+- (void) start:(void (^)(NSError * __nullable error, NSDictionary * __nullable uidMapping))completionBlock;
+
+@end
+NS_ASSUME_NONNULL_END
+
+#endif
diff --git a/src/objc/imap/MCOIMAPMoveMessagesOperation.mm b/src/objc/imap/MCOIMAPMoveMessagesOperation.mm
new file mode 100644
index 00000000..b88109f4
--- /dev/null
+++ b/src/objc/imap/MCOIMAPMoveMessagesOperation.mm
@@ -0,0 +1,71 @@
+//
+//  MCOIMAPMoveMessagesOperation.m
+//  mailcore2
+//
+//  Created by Nikolay Morev on 02/02/16.
+//  Copyright © 2016 MailCore. All rights reserved.
+//
+
+#import "MCOIMAPMoveMessagesOperation.h"
+
+#include "MCAsyncIMAP.h"
+
+#import "MCOOperation+Private.h"
+#import "MCOUtils.h"
+#import "MCOIndexSet.h"
+
+typedef void (^CompletionType)(NSError *error, MCOIndexSet * destUids);
+
+@implementation MCOIMAPMoveMessagesOperation {
+    CompletionType _completionBlock;
+}
+
+#define nativeType mailcore::IMAPMoveMessagesOperation
+
++ (void) load
+{
+    MCORegisterClass(self, &typeid(nativeType));
+}
+
++ (NSObject *) mco_objectWithMCObject:(mailcore::Object *)object
+{
+    nativeType * op = (nativeType *) object;
+    return [[[self alloc] initWithMCOperation:op] autorelease];
+}
+
+- (void) dealloc
+{
+    [_completionBlock release];
+    [super dealloc];
+}
+
+- (void) start:(void (^)(NSError *error, NSDictionary * uidMapping))completionBlock
+{
+    _completionBlock = [completionBlock copy];
+    [self start];
+}
+
+- (void) cancel
+{
+    [_completionBlock release];
+    _completionBlock = nil;
+    [super cancel];
+}
+
+- (void) operationCompleted
+{
+    if (_completionBlock == NULL)
+        return;
+
+    nativeType *op = MCO_NATIVE_INSTANCE;
+    if (op->error() == mailcore::ErrorNone) {
+        _completionBlock(nil, MCO_TO_OBJC(op->uidMapping()));
+    }
+    else {
+        _completionBlock([NSError mco_errorWithErrorCode:op->error()], 0);
+    }
+    [_completionBlock release];
+    _completionBlock = nil;
+}
+
+@end
diff --git a/src/objc/imap/MCOIMAPSession.h b/src/objc/imap/MCOIMAPSession.h
index add9a428..bab3be7f 100755
--- a/src/objc/imap/MCOIMAPSession.h
+++ b/src/objc/imap/MCOIMAPSession.h
@@ -20,6 +20,7 @@
 @class MCOIMAPFolderStatusOperation;
 @class MCOIMAPAppendMessageOperation;
 @class MCOIMAPCopyMessagesOperation;
+@class MCOIMAPMoveMessagesOperation;
 @class MCOIndexSet;
 @class MCOIMAPFetchMessagesOperation;
 @class MCOIMAPFetchContentOperation;
@@ -318,6 +319,20 @@
                                                        destFolder:(NSString *)destFolder NS_RETURNS_NOT_RETAINED;
 
 /**
+ Returns an operation to move messages to a folder.
+
+     MCOIMAPMoveMessagesOperation * op = [session moveMessagesOperationWithFolder:@"INBOX"
+                                                                             uids:[MCIndexSet indexSetWithIndex:456]
+                                                                       destFolder:@"Cocoa"];
+     [op start:^(NSError * __nullable error, NSDictionary * uidMapping) {
+          NSLog(@"moved to folder with UID mapping %@", uidMapping);
+     }];
+*/
+- (MCOIMAPMoveMessagesOperation *)moveMessagesOperationWithFolder:(NSString *)folder
+                                                             uids:(MCOIndexSet *)uids
+                                                       destFolder:(NSString *)destFolder NS_RETURNS_NOT_RETAINED;
+
+/**
  Returns an operation to change flags of messages.
 
  For example: Adds the seen flag to the message with UID 456.
diff --git a/src/objc/imap/MCOIMAPSession.mm b/src/objc/imap/MCOIMAPSession.mm
index e978afac..32dd1119 100755
--- a/src/objc/imap/MCOIMAPSession.mm
+++ b/src/objc/imap/MCOIMAPSession.mm
@@ -274,6 +274,15 @@ MCO_OBJC_SYNTHESIZE_SCALAR(dispatch_queue_t, dispatch_queue_t, setDispatchQueue,
     return MCO_TO_OBJC_OP(coreOp);
 }
 
+- (MCOIMAPMoveMessagesOperation *)moveMessagesOperationWithFolder:(NSString *)folder
+                                                             uids:(MCOIndexSet *)uids
+                                                       destFolder:(NSString *)destFolder
+{
+    IMAPMoveMessagesOperation * coreOp = MCO_NATIVE_INSTANCE->moveMessagesOperation([folder mco_mcString],
+                                                                                    MCO_FROM_OBJC(IndexSet, uids),
+                                                                                    [destFolder mco_mcString]);
+    return MCO_TO_OBJC_OP(coreOp);
+}
 
 - (MCOIMAPOperation *) expungeOperation:(NSString *)folder
 {