Adds imap response string to custom command operation

2 files changed, 8 insertions, 5 deletions

diff --git a/src/objc/imap/MCOIMAPCustomCommandOperation.h b/src/objc/imap/MCOIMAPCustomCommandOperation.h
index 87124533..e23d29e7 100644
--- a/src/objc/imap/MCOIMAPCustomCommandOperation.h
+++ b/src/objc/imap/MCOIMAPCustomCommandOperation.h
@@ -16,7 +16,7 @@
 NS_ASSUME_NONNULL_BEGIN
 @interface MCOIMAPCustomCommandOperation : MCOIMAPBaseOperation
 
-- (void)start:(void(^)(NSError * __nullable error))completionBlock;
+- (void)start:(void(^)(NSString * __nullable response, NSError * __nullable error))completionBlock;
 
 @end
 NS_ASSUME_NONNULL_END
diff --git a/src/objc/imap/MCOIMAPCustomCommandOperation.mm b/src/objc/imap/MCOIMAPCustomCommandOperation.mm
index a9193477..b4fb15a6 100644
--- a/src/objc/imap/MCOIMAPCustomCommandOperation.mm
+++ b/src/objc/imap/MCOIMAPCustomCommandOperation.mm
@@ -9,11 +9,12 @@
 #import "MCOIMAPCustomCommandOperation.h"
 
 #include "MCAsyncIMAP.h"
+#include "MCIMAPCustomCommandOperation.h"
 
 #import "MCOOperation+Private.h"
 #import "MCOUtils.h"
 
-typedef void (^CompletionType)(NSError *error);
+typedef void (^CompletionType)(NSString * __nullable response, NSError * __nullable error);
 
 @implementation MCOIMAPCustomCommandOperation {
     CompletionType _completionBlock;
@@ -38,7 +39,7 @@ typedef void (^CompletionType)(NSError *error);
     [super dealloc];
 }
 
-- (void)start:(void(^)(NSError * __nullable error))completionBlock
+- (void)start:(void(^)(NSString * __nullable response, NSError * __nullable error))completionBlock
 {
     _completionBlock = [completionBlock copy];
     [self start];
@@ -58,9 +59,11 @@ typedef void (^CompletionType)(NSError *error);
     
     nativeType *op = MCO_NATIVE_INSTANCE;
     if (op->error() == mailcore::ErrorNone) {
-        _completionBlock(nil);
+        NSString *response = [NSString mco_stringWithMCString:op->response()];
+        _completionBlock(response, nil);
     } else {
-        _completionBlock([NSError mco_errorWithErrorCode:op->error()]);
+        NSError *error = [NSError mco_errorWithErrorCode:op->error()];
+        _completionBlock(nil, error);
     }
     [_completionBlock release];
     _completionBlock = nil;