Skip to content

Commit

Permalink
update syntax to Xcode 9.4
Browse files Browse the repository at this point in the history
  • Loading branch information
InjoyDeng committed Jul 16, 2018
1 parent 1fc883b commit e3b7313
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 38 deletions.
66 changes: 33 additions & 33 deletions ResignTool/Factory/IDAppPackageHandler.m
View file
Expand Up @@ -209,14 +209,14 @@ - (void)zipPackageToDirPath:(NSString *)zipDirPath
[manager createDirectoryAtPath:zipDirPath withIntermediateDirectories:TRUE attributes:nil error:nil];
[[IDFileHelper sharedInstance] zip:self.workPath toPath:zippedIpaPath complete:^(BOOL result) {
if (result) {
if (logLocalBlock)
logLocalBlock([NSString stringWithFormat:@"Zipping done. IPA file saved in the path: %@", zippedIpaPath]);
if (self->logLocalBlock)
self->logLocalBlock([NSString stringWithFormat:@"Zipping done. IPA file saved in the path: %@", zippedIpaPath]);

if (successLocalBlock)
successLocalBlock([NSString stringWithFormat:@"Resign result: %@", [[codesigningResult stringByAppendingString:@"\n\n"] stringByAppendingString:verificationResult]]);
if (self->successLocalBlock)
self->successLocalBlock([NSString stringWithFormat:@"Resign result: %@", [[self->codesigningResult stringByAppendingString:@"\n\n"] stringByAppendingString:self->verificationResult]]);
} else {
if (errorLocalBlock)
errorLocalBlock(@"Unable to unzip the file: the destination path is empty or the source IPA file was corrupted");
if (self->errorLocalBlock)
self->errorLocalBlock(@"Unable to unzip the file: the destination path is empty or the source IPA file was corrupted");
}
}];
}
Expand Down Expand Up @@ -265,8 +265,8 @@ - (void)createEntitlementsWithProvisioning:(IDProvisioningProfile *)provisioning
if (terminationStatus == 0) {
[self doEntitlements:provisioningprofile];
} else {
if (errorLocalBlock != nil)
errorLocalBlock(@"Entitlements generation failed. Please try again");
if (self->errorLocalBlock != nil)
self->errorLocalBlock(@"Entitlements generation failed. Please try again");
}
}];
}
Expand Down Expand Up @@ -381,7 +381,7 @@ - (void)doCodesign:(NSString *)certificateName log:(LogBlock)logBlock error:(Err
[codesignTask launch];
[NSThread detachNewThreadSelector:@selector(watchCodesigning:) toTarget:self withObject:handle];

if (logLocalBlock) logLocalBlock([NSString stringWithFormat:@"start codesigning with %@...", [signPath lastPathComponent]]);
if (self->logLocalBlock) self->logLocalBlock([NSString stringWithFormat:@"start codesigning with %@...", [signPath lastPathComponent]]);

IDRunLoop *verifyCodesigning = [IDRunLoop new];
[verifyCodesigning run:^{
Expand All @@ -390,14 +390,14 @@ - (void)doCodesign:(NSString *)certificateName log:(LogBlock)logBlock error:(Err
[verifyCodesigning stop:^{
[self verifySignature:signPath complete:^(NSString *error) {
if (error) {
if (errorLocalBlock) {
if (self->errorLocalBlock) {
failurePath = signPath;
errorLocalBlock([NSString stringWithFormat:@"Signing failed with error: %@", error]);
self->errorLocalBlock([NSString stringWithFormat:@"Signing failed with error: %@", error]);
[queue cancelAll];
}
} else {
if (logLocalBlock) {
logLocalBlock([NSString stringWithFormat:@"%@ codesigning done", [signPath lastPathComponent]]);
if (self->logLocalBlock) {
self->logLocalBlock([NSString stringWithFormat:@"%@ codesigning done", [signPath lastPathComponent]]);
[queue next];
}
}
Expand All @@ -412,8 +412,8 @@ - (void)doCodesign:(NSString *)certificateName log:(LogBlock)logBlock error:(Err

[queue next];
queue.noOperationPerform = ^{
if (successLocalBlock && failurePath == nil)
successLocalBlock(@"Verification Codesigning dones");
if (self->successLocalBlock && failurePath == nil)
self->successLocalBlock(@"Verification Codesigning dones");
};

} else {
Expand Down Expand Up @@ -451,10 +451,10 @@ - (void)verifySignature:(NSString *)filePath complete:(void(^)(NSString *error))
if ([verifyTask isRunning] == 0) {

[checkVerification stop:^{
if ([verificationResult length] == 0) {
if ([self->verificationResult length] == 0) {
if (complete) complete(nil);
} else {
NSString *error = [[codesigningResult stringByAppendingString:@"\n\n"] stringByAppendingString:verificationResult];
NSString *error = [[self->codesigningResult stringByAppendingString:@"\n\n"] stringByAppendingString:self->verificationResult];
if (complete) complete(error);
}
}];
Expand Down Expand Up @@ -486,44 +486,44 @@ - (void)resignWithProvisioningProfile:(IDProvisioningProfile *)provisioningprofi

// create Entitlements
[self createEntitlementsWithProvisioning:provisioningprofile log:^(NSString *logString) {
if (logResignBlock) logResignBlock(logString);
if (self->logResignBlock) self->logResignBlock(logString);
} error:^(NSString *errorString) {
if (errorResignBlock) errorResignBlock(errorString);
if (self->errorResignBlock) self->errorResignBlock(errorString);
} success:^(id message) {
if (logResignBlock) logResignBlock(message);
if (self->logResignBlock) self->logResignBlock(message);

// edit info.plist
[self editInfoPlistWithIdentifier:bundleIdentifier displayName:displayName log:^(NSString *logString) {
if (logResignBlock) logResignBlock(logString);
if (self->logResignBlock) self->logResignBlock(logString);
} error:^(NSString *errorString) {
if (errorResignBlock) errorResignBlock(errorString);
if (self->errorResignBlock) self->errorResignBlock(errorString);
} success:^(id message) {
if (logResignBlock) logResignBlock(message);
if (self->logResignBlock) self->logResignBlock(message);

// edit Embedded Provision
[self editEmbeddedProvision:provisioningprofile log:^(NSString *logString) {
if (logResignBlock) logResignBlock(logString);
if (self->logResignBlock) self->logResignBlock(logString);
} error:^(NSString *errorString) {
if (errorResignBlock) errorResignBlock(errorString);
if (self->errorResignBlock) self->errorResignBlock(errorString);
} success:^(id message) {
if (logResignBlock) logResignBlock(message);
if (self->logResignBlock) self->logResignBlock(message);

// Do the codesign
[self doCodesign:certificateName log:^(NSString *logString) {
if (logResignBlock) logResignBlock(logString);
if (self->logResignBlock) self->logResignBlock(logString);
} error:^(NSString *errorString) {
if (errorResignBlock) errorResignBlock(errorString);
if (self->errorResignBlock) self->errorResignBlock(errorString);
} success:^(id message) {
if (logResignBlock) logResignBlock(message);
if (self->logResignBlock) self->logResignBlock(message);

// zip
[self zipPackageToDirPath:destinationPath log:^(NSString *logString) {
if (logResignBlock) logResignBlock(logString);
if (self->logResignBlock) self->logResignBlock(logString);
} error:^(NSString *errorString) {
if (errorResignBlock) errorResignBlock(errorString);
if (self->errorResignBlock) self->errorResignBlock(errorString);
} success:^(id message) {
if (successResignBlock)
successResignBlock(message);
if (self->successResignBlock)
self->successResignBlock(message);
}];
}];
}];
Expand Down
6 changes: 3 additions & 3 deletions ResignTool/Util/IDFileHelper.m
View file
Expand Up @@ -104,7 +104,7 @@ - (NSArray *)getProvisioningProfiles
[provisioningProfiles enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
NSString *path = (NSString*)obj;
BOOL isDirectory;
if ([manager fileExistsAtPath:[NSString stringWithFormat:@"%@/%@/%@", NSHomeDirectory(), kMobileprovisionDirName, path] isDirectory:&isDirectory]) {
if ([self->manager fileExistsAtPath:[NSString stringWithFormat:@"%@/%@/%@", NSHomeDirectory(), kMobileprovisionDirName, path] isDirectory:&isDirectory]) {
IDProvisioningProfile *profile = [[IDProvisioningProfile alloc] initWithPath:[NSString stringWithFormat:@"%@/%@/%@", NSHomeDirectory(), kMobileprovisionDirName, path]];

[provisioningArray addObject:profile];
Expand Down Expand Up @@ -133,7 +133,7 @@ - (void)unzip:(NSString *)filePath toPath:(NSString *)dstPath complete:(void (^)
[runloop stop:^{
int terminationStatus = unzipTask.terminationStatus;
if (terminationStatus == 0) {
if ([manager fileExistsAtPath:dstPath]) {
if ([self->manager fileExistsAtPath:dstPath]) {
completeBlock(YES);
}
} else {
Expand All @@ -158,7 +158,7 @@ - (void)zip:(NSString *)srcPath toPath:(NSString *)dstFilePath complete:(void (^
[runloop stop:^{
int terminationStatus = zipTask.terminationStatus;
if (terminationStatus == 0) {
if ([manager fileExistsAtPath:dstFilePath]) {
if ([self->manager fileExistsAtPath:dstFilePath]) {
completeBlock(YES);
} else {
completeBlock(NO);
Expand Down
2 changes: 1 addition & 1 deletion ResignTool/Util/IDManualQueue.m
View file
Expand Up @@ -27,7 +27,7 @@ - (void)next {
if (operations.count > 0) {
NSOperation *operation = [operations objectAtIndex:0];
operation.completionBlock = ^{
[operations removeObjectAtIndex:0];
[self->operations removeObjectAtIndex:0];
};

[operation start];
Expand Down
2 changes: 1 addition & 1 deletion ResignTool/ViewController.m
View file
Expand Up @@ -216,7 +216,7 @@ - (void)addLog:(NSString *)log withColor:(NSColor *)color {
#pragma mark - Certificate Methods
- (void)getCertificates {
[[IDFileHelper sharedInstance] getCertificatesSuccess:^(NSArray *certificateNames) {
certificatesArray = certificateNames;
self->certificatesArray = certificateNames;
[self.certificateComboBox reloadData];
} error:^(NSString *errString) {
[self addLog:errString withColor:[NSColor redColor]];
Expand Down

0 comments on commit e3b7313

Please sign in to comment.