From fefd45626138f9705cca84df2fd1b9c7ff2fe4cc Mon Sep 17 00:00:00 2001 From: Elad Gil Date: Mon, 4 Sep 2017 16:02:47 +0300 Subject: [PATCH] completeHandlerIOS now return a promise so you can await for it --- FS.common.js | 2 +- RNFSManager.m | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/FS.common.js b/FS.common.js index d9cdd4a..2da7c55 100755 --- a/FS.common.js +++ b/FS.common.js @@ -225,7 +225,7 @@ var RNFS = { }, completeHandlerIOS(jobId: number): void { - RNFSManager.completeHandlerIOS(jobId); + return RNFSManager.completeHandlerIOS(jobId); }, readDir(dirpath: string): Promise { diff --git a/RNFSManager.m b/RNFSManager.m index d5193c4..b76b583 100755 --- a/RNFSManager.m +++ b/RNFSManager.m @@ -508,17 +508,19 @@ RCT_EXPORT_METHOD(isResumable:(nonnull NSNumber *)jobId } } -RCT_EXPORT_METHOD(completeHandlerIOS:(nonnull NSNumber *)jobId) +RCT_EXPORT_METHOD(completeHandlerIOS:(nonnull NSNumber *)jobId + resolver:(RCTPromiseResolveBlock)resolve + rejecter:(RCTPromiseRejectBlock)reject) { if (self.uuids) { NSString *uuid = [self.uuids objectForKey:[jobId stringValue]]; CompletionHandler completionHandler = [completionHandlers objectForKey:uuid]; if (completionHandler) { - NSLog(@"Calling completion handler on: %@", uuid); completionHandler(); [completionHandlers removeObjectForKey:uuid]; } } + resolve(nil); } RCT_EXPORT_METHOD(uploadFiles:(NSDictionary *)options