@appzung/react-native-code-push 8.3.2 → 10.0.0-rc1

package/ios/CodePush/CodePushPackage.m

@@ -31,7 +31,7 @@ static NSString *const UnzippedFolderName = @"unzipped";
     NSString *downloadedBundle = [NSString stringWithContentsOfURL:urlRequest
                                                           encoding:NSUTF8StringEncoding
                                                              error:&error];
-    
+
     if (error) {
         CPLog(@"Error downloading from URL %@", remoteBundleUrl);
     } else {
@@ -55,7 +55,7 @@ static NSString *const UnzippedFolderName = @"unzipped";
     NSString *newUpdateFolderPath = [self getPackageFolderPath:newUpdateHash];
     NSString *newUpdateMetadataPath = [newUpdateFolderPath stringByAppendingPathComponent:UpdateMetadataFileName];
     NSError *error;
-    
+
     if ([[NSFileManager defaultManager] fileExistsAtPath:newUpdateFolderPath]) {
         // This removes any stale data in newUpdateFolderPath that could have been left
         // uncleared due to a crash or error during the download or install process.
@@ -66,20 +66,20 @@ static NSString *const UnzippedFolderName = @"unzipped";
                                   withIntermediateDirectories:YES
                                                    attributes:nil
                                                         error:&error];
-                                                        
+
         // Ensure that none of the CodePush updates we store on disk are
         // ever included in the end users iTunes and/or iCloud backups
         NSURL *codePushURL = [NSURL fileURLWithPath:[self getCodePushPath]];
         [codePushURL setResourceValue:@YES forKey:NSURLIsExcludedFromBackupKey error:nil];
     }
-    
+
     if (error) {
         return failCallback(error);
     }
-    
+
     NSString *downloadFilePath = [self getDownloadFilePath];
     NSString *bundleFilePath = [newUpdateFolderPath stringByAppendingPathComponent:UpdateBundleFileName];
-    
+
     CodePushDownloadHandler *downloadHandler = [[CodePushDownloadHandler alloc]
                                                 init:downloadFilePath
                                                 operationQueue:operationQueue
@@ -99,7 +99,7 @@ static NSString *const UnzippedFolderName = @"unzipped";
                                                                 return;
                                                             }
                                                         }
-                                                        
+
                                                         NSError *nonFailingError = nil;
                                                         [SSZipArchive unzipFileAtPath:downloadFilePath
                                                                         toDestination:unzippedFolderPath];
@@ -109,10 +109,10 @@ static NSString *const UnzippedFolderName = @"unzipped";
                                                             CPLog(@"Error deleting downloaded file: %@", nonFailingError);
                                                             nonFailingError = nil;
                                                         }
-                                                        
+
                                                         NSString *diffManifestFilePath = [unzippedFolderPath stringByAppendingPathComponent:DiffManifestFileName];
                                                         BOOL isDiffUpdate = [[NSFileManager defaultManager] fileExistsAtPath:diffManifestFilePath];
-                                                        
+
                                                         if (isDiffUpdate) {
                                                             // Copy the current package to the new package.
                                                             NSString *currentPackageFolderPath = [self getCurrentPackageFolderPath:&error];
@@ -120,7 +120,7 @@ static NSString *const UnzippedFolderName = @"unzipped";
                                                                 failCallback(error);
                                                                 return;
                                                             }
-                                                            
+
                                                             if (currentPackageFolderPath == nil) {
                                                                 // Currently running the binary version, copy files from the bundled resources
                                                                 NSString *newUpdateCodePushPath = [newUpdateFolderPath stringByAppendingPathComponent:[CodePushUpdateUtils manifestFolderPrefix]];
@@ -132,7 +132,7 @@ static NSString *const UnzippedFolderName = @"unzipped";
                                                                     failCallback(error);
                                                                     return;
                                                                 }
-                                                                
+
                                                                 [[NSFileManager defaultManager] copyItemAtPath:[CodePush bundleAssetsPath]
                                                                                                         toPath:[newUpdateCodePushPath stringByAppendingPathComponent:[CodePushUpdateUtils assetsFolderName]]
                                                                                                          error:&error];
@@ -140,7 +140,7 @@ static NSString *const UnzippedFolderName = @"unzipped";
                                                                     failCallback(error);
                                                                     return;
                                                                 }
-                                                                
+
                                                                 [[NSFileManager defaultManager] copyItemAtPath:[[CodePush binaryBundleURL] path]
                                                                                                         toPath:[newUpdateCodePushPath stringByAppendingPathComponent:[[CodePush binaryBundleURL] lastPathComponent]]
                                                                                                          error:&error];
@@ -157,7 +157,7 @@ static NSString *const UnzippedFolderName = @"unzipped";
                                                                     return;
                                                                 }
                                                             }
-                                                            
+
                                                             // Delete files mentioned in the manifest.
                                                             NSString *manifestContent = [NSString stringWithContentsOfFile:diffManifestFilePath
                                                                                                                   encoding:NSUTF8StringEncoding
@@ -166,7 +166,7 @@ static NSString *const UnzippedFolderName = @"unzipped";
                                                                 failCallback(error);
                                                                 return;
                                                             }
-                                                            
+
                                                             NSData *data = [manifestContent dataUsingEncoding:NSUTF8StringEncoding];
                                                             NSDictionary *manifestJSON = [NSJSONSerialization JSONObjectWithData:data
                                                                                                                          options:kNilOptions
@@ -183,7 +183,7 @@ static NSString *const UnzippedFolderName = @"unzipped";
                                                                     }
                                                                 }
                                                             }
-                                                            
+
                                                             [[NSFileManager defaultManager] removeItemAtPath:diffManifestFilePath
                                                                                                        error:&error];
                                                             if (error) {
@@ -191,7 +191,7 @@ static NSString *const UnzippedFolderName = @"unzipped";
                                                                 return;
                                                             }
                                                         }
-                                                        
+
                                                         [CodePushUpdateUtils copyEntriesInFolder:unzippedFolderPath
                                                                                       destFolder:newUpdateFolderPath
                                                                                            error:&error];
@@ -199,34 +199,34 @@ static NSString *const UnzippedFolderName = @"unzipped";
                                                             failCallback(error);
                                                             return;
                                                         }
-                                                        
+
                                                         [[NSFileManager defaultManager] removeItemAtPath:unzippedFolderPath
                                                                                                    error:&nonFailingError];
                                                         if (nonFailingError) {
                                                             CPLog(@"Error deleting downloaded file: %@", nonFailingError);
                                                             nonFailingError = nil;
                                                         }
-                                                        
+
                                                         NSString *relativeBundlePath = [CodePushUpdateUtils findMainBundleInFolder:newUpdateFolderPath
                                                                                                                   expectedFileName:expectedBundleFileName
                                                                                                                              error:&error];
-                                                        
+
                                                         if (error) {
                                                             failCallback(error);
                                                             return;
                                                         }
-                                                        
+
                                                         if (relativeBundlePath) {
                                                             [mutableUpdatePackage setValue:relativeBundlePath forKey:RelativeBundlePathKey];
                                                         } else {
-                                                            NSString *errorMessage = [NSString stringWithFormat:@"Update is invalid - A JS bundle file named \"%@\" could not be found within the downloaded contents. Please ensure that your app is syncing with the correct deployment and that you are releasing your CodePush updates using the exact same JS bundle file name that was shipped with your app's binary.", expectedBundleFileName];
-                                                            
+                                                            NSString *errorMessage = [NSString stringWithFormat:@"Update is invalid - A JS bundle file named \"%@\" could not be found within the downloaded contents. Please ensure that your app is syncing with the correct release channel and that you are releasing your CodePush updates using the exact same JS bundle file name that was shipped with your app's binary.", expectedBundleFileName];
+
                                                             error = [CodePushErrorUtils errorWithMessage:errorMessage];
-                                                            
+
                                                             failCallback(error);
                                                             return;
                                                         }
-                                                        
+
                                                         if ([[NSFileManager defaultManager] fileExistsAtPath:newUpdateMetadataPath]) {
                                                             [[NSFileManager defaultManager] removeItemAtPath:newUpdateMetadataPath
                                                                                                        error:&error];
@@ -237,12 +237,12 @@ static NSString *const UnzippedFolderName = @"unzipped";
                                                         }
 
                                                         CPLog((isDiffUpdate) ? @"Applying diff update." : @"Applying full update.");
-                                                        
+
                                                         BOOL isSignatureVerificationEnabled = (publicKey != nil);
-                                                        
+
                                                         NSString *signatureFilePath = [CodePushUpdateUtils getSignatureFilePath:newUpdateFolderPath];
                                                         BOOL isSignatureAppearedInBundle = [[NSFileManager defaultManager] fileExistsAtPath:signatureFilePath];
-                                                        
+
                                                         if (isSignatureVerificationEnabled) {
                                                             if (isSignatureAppearedInBundle) {
                                                                 if (![CodePushUpdateUtils verifyFolderHash:newUpdateFolderPath
@@ -252,7 +252,7 @@ static NSString *const UnzippedFolderName = @"unzipped";
                                                                     if (!error) {
                                                                         error = [CodePushErrorUtils errorWithMessage:@"The update contents failed the data integrity check."];
                                                                     }
-                                                                    
+
                                                                     failCallback(error);
                                                                     return;
                                                                 } else {
@@ -281,7 +281,7 @@ static NSString *const UnzippedFolderName = @"unzipped";
                                                                 failCallback(error);
                                                                 return;
                                                             }
-                                                            
+
                                                         } else {
                                                             BOOL needToVerifyHash;
                                                             if (isSignatureAppearedInBundle) {
@@ -300,7 +300,7 @@ static NSString *const UnzippedFolderName = @"unzipped";
                                                                     if (!error) {
                                                                         error = [CodePushErrorUtils errorWithMessage:@"The update contents failed the data integrity check."];
                                                                     }
-                                                                    
+
                                                                     failCallback(error);
                                                                     return;
                                                                 } else {
@@ -321,13 +321,13 @@ static NSString *const UnzippedFolderName = @"unzipped";
                                                             return;
                                                         }
                                                     }
-                                                    
+
                                                     NSData *updateSerializedData = [NSJSONSerialization dataWithJSONObject:mutableUpdatePackage
                                                                                                                    options:0
                                                                                                                      error:&error];
                                                     NSString *packageJsonString = [[NSString alloc] initWithData:updateSerializedData
                                                                                                         encoding:NSUTF8StringEncoding];
-                                                    
+
                                                     [packageJsonString writeToFile:newUpdateMetadataPath
                                                                         atomically:YES
                                                                           encoding:NSUTF8StringEncoding
@@ -338,9 +338,9 @@ static NSString *const UnzippedFolderName = @"unzipped";
                                                         doneCallback();
                                                     }
                                                 }
-                                                
+
                                                 failCallback:failCallback];
-    
+
     [downloadHandler download:updatePackage[@"downloadUrl"]];
 }
 
@@ -350,7 +350,7 @@ static NSString *const UnzippedFolderName = @"unzipped";
     if ([CodePush isUsingTestConfiguration]) {
         codePushPath = [codePushPath stringByAppendingPathComponent:@"TestPackages"];
     }
-    
+
     return codePushPath;
 }
 
@@ -367,17 +367,17 @@ static NSString *const UnzippedFolderName = @"unzipped";
 + (NSString *)getCurrentPackageBundlePath:(NSError **)error
 {
     NSString *packageFolder = [self getCurrentPackageFolderPath:error];
-    
+
     if (!packageFolder) {
         return nil;
     }
-    
+
     NSDictionary *currentPackage = [self getCurrentPackage:error];
-    
+
     if (!currentPackage) {
         return nil;
     }
-    
+
     NSString *relativeBundlePath = [currentPackage objectForKey:RelativeBundlePathKey];
     if (relativeBundlePath) {
         return [packageFolder stringByAppendingPathComponent:relativeBundlePath];
@@ -392,24 +392,24 @@ static NSString *const UnzippedFolderName = @"unzipped";
     if (!info) {
         return nil;
     }
-    
+
     return info[@"currentPackage"];
 }
 
 + (NSString *)getCurrentPackageFolderPath:(NSError **)error
 {
     NSDictionary *info = [self getCurrentPackageInfo:error];
-    
+
     if (!info) {
         return nil;
     }
-    
+
     NSString *packageHash = info[@"currentPackage"];
-    
+
     if (!packageHash) {
         return nil;
     }
-    
+
     return [self getPackageFolderPath:packageHash];
 }
 
@@ -419,14 +419,14 @@ static NSString *const UnzippedFolderName = @"unzipped";
     if (![[NSFileManager defaultManager] fileExistsAtPath:statusFilePath]) {
         return [NSMutableDictionary dictionary];
     }
-    
+
     NSString *content = [NSString stringWithContentsOfFile:statusFilePath
                                                   encoding:NSUTF8StringEncoding
                                                      error:error];
     if (!content) {
         return nil;
     }
-    
+
     NSData *data = [content dataUsingEncoding:NSUTF8StringEncoding];
     NSDictionary* json = [NSJSONSerialization JSONObjectWithData:data
                                                          options:kNilOptions
@@ -434,7 +434,7 @@ static NSString *const UnzippedFolderName = @"unzipped";
     if (!json) {
         return nil;
     }
-    
+
     return [json mutableCopy];
 }
 
@@ -448,18 +448,18 @@ static NSString *const UnzippedFolderName = @"unzipped";
 {
     NSString *updateDirectoryPath = [self getPackageFolderPath:packageHash];
     NSString *updateMetadataFilePath = [updateDirectoryPath stringByAppendingPathComponent:UpdateMetadataFileName];
-    
+
     if (![[NSFileManager defaultManager] fileExistsAtPath:updateMetadataFilePath]) {
         return nil;
     }
-    
+
     NSString *updateMetadataString = [NSString stringWithContentsOfFile:updateMetadataFilePath
                                                                encoding:NSUTF8StringEncoding
                                                                   error:error];
     if (!updateMetadataString) {
         return nil;
     }
-    
+
     NSData *updateMetadata = [updateMetadataString dataUsingEncoding:NSUTF8StringEncoding];
     return [NSJSONSerialization JSONObjectWithData:updateMetadata
                                            options:kNilOptions
@@ -477,7 +477,7 @@ static NSString *const UnzippedFolderName = @"unzipped";
     if (!packageHash) {
         return nil;
     }
-    
+
     return [CodePushPackage getPackage:packageHash error:error];
 }
 
@@ -487,7 +487,7 @@ static NSString *const UnzippedFolderName = @"unzipped";
     if (!info) {
         return nil;
     }
-    
+
     return info[@"previousPackage"];
 }
 
@@ -507,11 +507,11 @@ static NSString *const UnzippedFolderName = @"unzipped";
 {
     NSString *packageHash = updatePackage[@"packageHash"];
     NSMutableDictionary *info = [self getCurrentPackageInfo:error];
-    
+
     if (!info) {
         return NO;
     }
-    
+
     if (packageHash && [packageHash isEqualToString:info[@"currentPackage"]]) {
         // The current package is already the one being installed, so we should no-op.
         return YES;
@@ -542,7 +542,7 @@ static NSString *const UnzippedFolderName = @"unzipped";
         }
         [info setValue:info[@"currentPackage"] forKey:@"previousPackage"];
     }
-    
+
     [info setValue:packageHash forKey:@"currentPackage"];
     return [self updateCurrentPackageInfo:info
                                     error:error];
@@ -556,23 +556,23 @@ static NSString *const UnzippedFolderName = @"unzipped";
         CPLog(@"Error getting current package info: %@", error);
         return;
     }
-    
-    NSString *currentPackageFolderPath = [self getCurrentPackageFolderPath:&error];        
+
+    NSString *currentPackageFolderPath = [self getCurrentPackageFolderPath:&error];
     if (!currentPackageFolderPath) {
         CPLog(@"Error getting current package folder path: %@", error);
         return;
     }
-    
+
     NSError *deleteError;
     BOOL result = [[NSFileManager defaultManager] removeItemAtPath:currentPackageFolderPath
                                                error:&deleteError];
     if (!result) {
         CPLog(@"Error deleting current package contents at %@ error %@", currentPackageFolderPath, deleteError);
     }
-    
+
     [info setValue:info[@"previousPackage"] forKey:@"currentPackage"];
     [info removeObjectForKey:@"previousPackage"];
-    
+
     [self updateCurrentPackageInfo:info error:&error];
 }
 

package/ios/CodePush/CodePushTelemetryManager.m

@@ -2,12 +2,12 @@
 
 static NSString *const AppVersionKey = @"appVersion";
 static NSString *const DeploymentFailed = @"DeploymentFailed";
-static NSString *const DeploymentKeyKey = @"deploymentKey";
+static NSString *const ReleaseChannelPublicIDKey = @"releaseChannelPublicId";
 static NSString *const DeploymentSucceeded = @"DeploymentSucceeded";
 static NSString *const LabelKey = @"label";
 static NSString *const LastDeploymentReportKey = @"CODE_PUSH_LAST_DEPLOYMENT_REPORT";
 static NSString *const PackageKey = @"package";
-static NSString *const PreviousDeploymentKeyKey = @"previousDeploymentKey";
+static NSString *const PreviousReleaseChannelPublicIDKey = @"previousReleaseChannelPublicId";
 static NSString *const PreviousLabelOrAppVersionKey = @"previousLabelOrAppVersion";
 static NSString *const RetryDeploymentReportKey = @"CODE_PUSH_RETRY_DEPLOYMENT_REPORT";
 static NSString *const StatusKey = @"status";
@@ -22,12 +22,12 @@ static NSString *const StatusKey = @"status";
         return @{ AppVersionKey: appVersion };
     } else if (![previousStatusReportIdentifier isEqualToString:appVersion]) {
         if ([self isStatusReportIdentifierCodePushLabel:previousStatusReportIdentifier]) {
-            NSString *previousDeploymentKey = [self getDeploymentKeyFromStatusReportIdentifier:previousStatusReportIdentifier];
+            NSString *previousReleaseChannelPublicId = [self getReleaseChannelPublicIdFromStatusReportIdentifier:previousStatusReportIdentifier];
             NSString *previousLabel = [self getVersionLabelFromStatusReportIdentifier:previousStatusReportIdentifier];
             [self clearRetryStatusReport];
             return @{
                       AppVersionKey: appVersion,
-                      PreviousDeploymentKeyKey: previousDeploymentKey,
+                      PreviousReleaseChannelPublicIDKey: previousReleaseChannelPublicId,
                       PreviousLabelOrAppVersionKey: previousLabel
                     };
         } else {
@@ -77,12 +77,12 @@ static NSString *const StatusKey = @"status";
         } else if (![previousStatusReportIdentifier isEqualToString:currentPackageIdentifier]) {
             [self clearRetryStatusReport];
             if ([self isStatusReportIdentifierCodePushLabel:previousStatusReportIdentifier]) {
-                NSString *previousDeploymentKey = [self getDeploymentKeyFromStatusReportIdentifier:previousStatusReportIdentifier];
+                NSString *previousReleaseChannelPublicId = [self getReleaseChannelPublicIdFromStatusReportIdentifier:previousStatusReportIdentifier];
                 NSString *previousLabel = [self getVersionLabelFromStatusReportIdentifier:previousStatusReportIdentifier];
                 return @{
                           PackageKey: currentPackage,
                           StatusKey: DeploymentSucceeded,
-                          PreviousDeploymentKeyKey: previousDeploymentKey,
+                          PreviousReleaseChannelPublicIDKey: previousReleaseChannelPublicId,
                           PreviousLabelOrAppVersionKey: previousLabel
                         };
             } else {
@@ -105,7 +105,7 @@ static NSString *const StatusKey = @"status";
     if ([DeploymentFailed isEqualToString:statusReport[StatusKey]]) {
         return;
     }
-    
+
     if (statusReport[AppVersionKey]) {
         [self saveStatusReportedForIdentifier:statusReport[AppVersionKey]];
     } else if (statusReport[PackageKey]) {
@@ -130,19 +130,19 @@ static NSString *const StatusKey = @"status";
     [preferences synchronize];
 }
 
-+ (NSString *)getDeploymentKeyFromStatusReportIdentifier:(NSString *)statusReportIdentifier
++ (NSString *)getReleaseChannelPublicIdFromStatusReportIdentifier:(NSString *)statusReportIdentifier
 {
     return [[statusReportIdentifier componentsSeparatedByString:@":"] firstObject];
 }
 
 + (NSString *)getPackageStatusReportIdentifier:(NSDictionary *)package
 {
-    // Because deploymentKeys can be dynamically switched, we use a
-    // combination of the deploymentKey and label as the packageIdentifier.
-    NSString *deploymentKey = [package objectForKey:DeploymentKeyKey];
+    // Because release channels can be dynamically switched, we use a
+    // combination of the release channel and label as the packageIdentifier.
+    NSString *releaseChannelPublicId = [package objectForKey:ReleaseChannelPublicIDKey];
     NSString *label = [package objectForKey:LabelKey];
-    if (deploymentKey && label) {
-        return [[deploymentKey stringByAppendingString:@":"] stringByAppendingString:label];
+    if (releaseChannelPublicId && label) {
+        return [[releaseChannelPublicId stringByAppendingString:@":"] stringByAppendingString:label];
     } else {
         return nil;
     }