Use WordPressComRESTAPIInterfacing to run ObjC multipart POST

Author: mokagio

WordPressKit/MediaServiceRemoteREST.m

@@ -143,7 +143,7 @@ - (void)uploadMedia:(NSArray *)mediaItems
         [fileParts addObject:filePart];
     }
 
-    [self.wordPressComRestApi multipartPOST:requestUrl
+    [self.wordPressComRESTAPI multipartPOST:requestUrl
                                  parameters:parameters
                                   fileParts:fileParts
                             requestEnqueued:^(NSNumber *taskID) {
@@ -204,7 +204,7 @@ - (void)uploadMedia:(RemoteMedia *)media
         return;
     }
     FilePart *filePart = [[FilePart alloc] initWithParameterName:@"media[]" url:media.localURL fileName:filename mimeType:type];
-    __block NSProgress *localProgress = [self.wordPressComRestApi multipartPOST:requestUrl
+    __block NSProgress *localProgress = [self.wordPressComRESTAPI multipartPOST:requestUrl
                                                                      parameters:parameters
                                                                       fileParts:@[filePart]
                                                                 requestEnqueued:nil

WordPressKit/PostServiceRemoteREST.m

@@ -165,7 +165,7 @@ - (void)createPost:(RemotePost *)post
     parameters[@"title"] = post.title;
     parameters[@"status"] = post.status;
     FilePart *filePart = [[FilePart alloc] initWithParameterName:@"media[]" url:media.localURL fileName:filename mimeType:type];
-    [self.wordPressComRestApi multipartPOST:requestUrl
+    [self.wordPressComRESTAPI multipartPOST:requestUrl
                                  parameters:parameters
                                   fileParts:@[filePart]
                             requestEnqueued:^(NSNumber *taskID) {

WordPressKit/WordPressComRESTAPIInterfacing.h

@@ -19,7 +19,7 @@
 - (NSProgress * _Nullable)multipartPOST:(NSString * _Nonnull)URLString
                              parameters:(NSDictionary<NSString *, NSObject *> * _Nullable)parameters
                               fileParts:(NSArray<FilePart *> * _Nonnull)fileParts
-                        requestEnqueued:(void (^ _Nonnull)(NSNumber * _Nonnull))requestEnqueue
+                        requestEnqueued:(void (^ _Nullable)(NSNumber * _Nonnull))requestEnqueue
                                 success:(void (^ _Nonnull)(id _Nonnull, NSHTTPURLResponse * _Nullable))success
                                 failure:(void (^ _Nonnull)(NSError * _Nonnull, NSHTTPURLResponse * _Nullable))failure;
 

WordPressKit/WordPressComRestApi.swift

@@ -633,7 +633,13 @@ extension WordPressComRestApi: WordPressComRESTAPIInterfacing {
         _ URLString: String,
         parameters: [String: NSObject]?,
         fileParts: [FilePart],
-        requestEnqueued: @escaping (NSNumber) -> Void,
+        // Notice this does not require @escaping because it is Optional.
+        //
+        // Annotate with @escaping, and the compiler will fail with:
+        // > Closure is already escaping in optional type argument
+        //
+        // It is necessary to explicitly set this as Optional because of the _Nullable parameter requirement in the Objective-C protocol.
+        requestEnqueued: ((NSNumber) -> Void)?,
         success: @escaping (Any, HTTPURLResponse?) -> Void,
         failure: @escaping (any Error, HTTPURLResponse?) -> Void
     ) -> Progress? {