download-progress-perf

Author: geof90

ios/CodePush/CodePush.h

@@ -54,13 +54,13 @@
 @property (strong) NSOutputStream *outputFileStream;
 @property long long expectedContentLength;
 @property long long receivedContentLength;
-@property dispatch_queue_t usingQueue;
+@property dispatch_queue_t operationQueue;
 @property (copy) void (^progressCallback)(long long, long long);
 @property (copy) void (^doneCallback)(BOOL);
 @property (copy) void (^failCallback)(NSError *err);
 
 - (id)init:(NSString *)downloadFilePath
-usingQueue:(dispatch_queue_t)usingQueue
+operationQueue:(dispatch_queue_t)operationQueue
 progressCallback:(void (^)(long long, long long))progressCallback
 doneCallback:(void (^)(BOOL))doneCallback
 failCallback:(void (^)(NSError *err))failCallback;
@@ -80,7 +80,7 @@ failCallback:(void (^)(NSError *err))failCallback;
 
 + (void)downloadPackage:(NSDictionary *)updatePackage
  expectedBundleFileName:(NSString *)expectedBundleFileName
-             usingQueue:(dispatch_queue_t)usingQueue
+         operationQueue:(dispatch_queue_t)operationQueue
        progressCallback:(void (^)(long long, long long))progressCallback
            doneCallback:(void (^)())doneCallback
            failCallback:(void (^)(NSError *err))failCallback;

ios/CodePush/CodePush.m

@@ -495,37 +495,33 @@ - (void)applicationWillResignActive
     [CodePushPackage
         downloadPackage:mutableUpdatePackage
         expectedBundleFileName:[bundleResourceName stringByAppendingPathExtension:bundleResourceExtension]
-        usingQueue:_methodQueue
+        operationQueue:_methodQueue
         // The download is progressing forward
         progressCallback:^(long long expectedContentLength, long long receivedContentLength) {
             // Notify the script-side about the progress
             if (notifyProgress) {
-                [self sendDownloadProgressDuringNextFrame:expectedContentLength
-                                    receivedContentLength:receivedContentLength];
+                [self updateDownloadProgressForNextFrame:expectedContentLength
+                                   receivedContentLength:receivedContentLength];
             }
         }
         // The download completed
         doneCallback:^{
-            dispatch_async(_methodQueue, ^{
-                NSError *err;
-                NSDictionary *newPackage = [CodePushPackage getPackage:mutableUpdatePackage[PackageHashKey] error:&err];
+            NSError *err;
+            NSDictionary *newPackage = [CodePushPackage getPackage:mutableUpdatePackage[PackageHashKey] error:&err];
 
-                if (err) {
-                    return reject([NSString stringWithFormat: @"%lu", (long)err.code], err.localizedDescription, err);
-                }
+            if (err) {
+                return reject([NSString stringWithFormat: @"%lu", (long)err.code], err.localizedDescription, err);
+            }
 
-                resolve(newPackage);
-            });
+            resolve(newPackage);
         }
         // The download failed
         failCallback:^(NSError *err) {
-            dispatch_async(_methodQueue, ^{
-                if ([CodePushErrorUtils isCodePushError:err]) {
-                    [self saveFailedUpdate:mutableUpdatePackage];
-                }
+            if ([CodePushErrorUtils isCodePushError:err]) {
+                [self saveFailedUpdate:mutableUpdatePackage];
+            }
 
-                reject([NSString stringWithFormat: @"%lu", (long)err.code], err.localizedDescription, err);
-            });
+            reject([NSString stringWithFormat: @"%lu", (long)err.code], err.localizedDescription, err);
         }];
 }
 
@@ -777,8 +773,8 @@ - (void)didUpdateFrame:(RCTFrameUpdate *)update
     _paused = YES;
 }
 
-- (void)sendDownloadProgressDuringNextFrame:(long long)expectedContentLength
-                      receivedContentLength:(long long)receivedContentLength
+- (void)updateDownloadProgressForNextFrame:(long long)expectedContentLength
+                     receivedContentLength:(long long)receivedContentLength
 {
     latestExpectedContentLength = expectedContentLength;
     latestReceivedConentLength = receivedContentLength;

ios/CodePush/CodePushDownloadHandler.m

@@ -6,14 +6,14 @@ @implementation CodePushDownloadHandler {
 }
 
 - (id)init:(NSString *)downloadFilePath
-usingQueue:(dispatch_queue_t)usingQueue
+operationQueue:(dispatch_queue_t)operationQueue
 progressCallback:(void (^)(long long, long long))progressCallback
 doneCallback:(void (^)(BOOL))doneCallback
 failCallback:(void (^)(NSError *err))failCallback {
     self.outputFileStream = [NSOutputStream outputStreamToFileAtPath:downloadFilePath
                                                               append:NO];
     self.receivedContentLength = 0;
-    self.usingQueue = usingQueue;
+    self.operationQueue = operationQueue;
     self.progressCallback = progressCallback;
     self.doneCallback = doneCallback;
     self.failCallback = failCallback;
@@ -25,7 +25,7 @@ -(void)download:(NSString*)url {
                                              cachePolicy:NSURLRequestUseProtocolCachePolicy
                                          timeoutInterval:60.0];
     NSOperationQueue *delegateQueue = [NSOperationQueue new];
-    delegateQueue.underlyingQueue = self.usingQueue;
+    delegateQueue.underlyingQueue = self.operationQueue;
     NSURLConnection *connection = [[NSURLConnection alloc] initWithRequest:request
                                                                   delegate:self
                                                           startImmediately:NO];

ios/CodePush/CodePushPackage.m

@@ -41,7 +41,7 @@ + (void)downloadAndReplaceCurrentBundle:(NSString *)remoteBundleUrl
 
 + (void)downloadPackage:(NSDictionary *)updatePackage
  expectedBundleFileName:(NSString *)expectedBundleFileName
-             usingQueue:(dispatch_queue_t)usingQueue
+         operationQueue:(dispatch_queue_t)operationQueue
        progressCallback:(void (^)(long long, long long))progressCallback
            doneCallback:(void (^)())doneCallback
            failCallback:(void (^)(NSError *err))failCallback
@@ -72,7 +72,7 @@ + (void)downloadPackage:(NSDictionary *)updatePackage
 
     CodePushDownloadHandler *downloadHandler = [[CodePushDownloadHandler alloc]
                                                 init:downloadFilePath
-                                                usingQueue:usingQueue
+                                                operationQueue:operationQueue
                                                 progressCallback:progressCallback
                                                 doneCallback:^(BOOL isZip) {
                                                     NSError *error = nil;