From 8a349b00d26e1381a66303fcb5c45a523fbddf79 Mon Sep 17 00:00:00 2001 From: Mahendra Date: Thu, 16 Jan 2020 14:02:43 +0530 Subject: [PATCH 1/2] no message --- MASFoundation/Classes/MAS.h | 2 +- MASFoundation/Classes/MAS.m | 11 +++++++---- .../services/network/MASNetworkingService.h | 2 +- .../services/network/MASNetworkingService.m | 14 +++++++++++--- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/MASFoundation/Classes/MAS.h b/MASFoundation/Classes/MAS.h index 4222d40..410e630 100644 --- a/MASFoundation/Classes/MAS.h +++ b/MASFoundation/Classes/MAS.h @@ -1158,7 +1158,7 @@ withParameters:(NSDictionary *_Nullable)parameterInfo * @param task MASDataTask object that was obtained as a result of invoking a request using the API invoke:taksBlock:completion: */ -+ (void)cancelRequest:(nonnull MASDataTask*)task error:(NSError*_Nullable*_Nullable)error; ++ (BOOL)cancelRequest:(nonnull MASDataTask*)task error:(NSError*_Nullable*_Nullable)error; /** diff --git a/MASFoundation/Classes/MAS.m b/MASFoundation/Classes/MAS.m index 586be88..0affb4a 100644 --- a/MASFoundation/Classes/MAS.m +++ b/MASFoundation/Classes/MAS.m @@ -1222,19 +1222,22 @@ + (void)postMultiPartForm:(nonnull MASRequest *)request constructingBodyWithBloc } -+ (void)cancelRequest:(nonnull MASDataTask*)task error:(NSError**)error ++ (BOOL)cancelRequest:(nonnull MASDataTask*)task error:(NSError**)error { // // Check if MAS has been started. // if ([MAS MASState] != MASStateDidStart) { - *error = [NSError errorMASIsNotStarted]; - return; + if(error != NULL){ + *error = [NSError errorMASIsNotStarted]; + } + + return NO; } - [[MASNetworkingService sharedService] cancelRequest:task error:error]; + return [[MASNetworkingService sharedService] cancelRequest:task error:error]; } + (void)cancelAllRequests diff --git a/MASFoundation/Classes/_private_/services/network/MASNetworkingService.h b/MASFoundation/Classes/_private_/services/network/MASNetworkingService.h index bc70d5c..9729695 100644 --- a/MASFoundation/Classes/_private_/services/network/MASNetworkingService.h +++ b/MASFoundation/Classes/_private_/services/network/MASNetworkingService.h @@ -849,7 +849,7 @@ timeoutInterval:(NSTimeInterval)timeoutInterval - (void)httpRequestWithCancel:(MASRequest*)request taskBlock:(MASDataTaskBlock)taskBlock completion:(MASResponseInfoErrorBlock)completion; -- (void)cancelRequest:(MASDataTask*)task error:(NSError**)error; +- (BOOL)cancelRequest:(MASDataTask*)task error:(NSError**)error; - (void)cancelAllRequests; diff --git a/MASFoundation/Classes/_private_/services/network/MASNetworkingService.m b/MASFoundation/Classes/_private_/services/network/MASNetworkingService.m index 15bc8ee..c213098 100644 --- a/MASFoundation/Classes/_private_/services/network/MASNetworkingService.m +++ b/MASFoundation/Classes/_private_/services/network/MASNetworkingService.m @@ -1858,7 +1858,7 @@ - (void)cleanUpFinishedTasks NSLog(@"cleanUpFinishedTasks : finished cleaning up"); } -- (void)cancelRequest:(MASDataTask*)task error:(NSError**)error; +- (BOOL)cancelRequest:(MASDataTask*)task error:(NSError**)error; { NSString* taskID = task.taskID; if(self.tasks && [self.tasks objectForKey:taskID]){ @@ -1867,14 +1867,22 @@ - (void)cancelRequest:(MASDataTask*)task error:(NSError**)error; [self.tasks removeObjectForKey:taskToBeCancelled.taskID]; if (!isTaskCancelled){ - *error = [NSError errorDataTaskNotFound]; + if (error != NULL){ + *error = [NSError errorDataTaskNotFound]; + } + return NO; } } else { //task not found error - *error = [NSError errorDataTaskNotFound]; + if (error != NULL){ + *error = [NSError errorDataTaskNotFound]; + } + return NO; } + return YES; + } From 2a04ea06801a341ae7857cd1d5b8d62aa140c926 Mon Sep 17 00:00:00 2001 From: Mahendra Date: Thu, 16 Jan 2020 14:06:20 +0530 Subject: [PATCH 2/2] Version changes for a pre-release --- MASFoundation.xcodeproj/project.pbxproj | 6 ++++-- MASFoundation/Info.plist | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/MASFoundation.xcodeproj/project.pbxproj b/MASFoundation.xcodeproj/project.pbxproj index dce8e98..8304e6f 100644 --- a/MASFoundation.xcodeproj/project.pbxproj +++ b/MASFoundation.xcodeproj/project.pbxproj @@ -2163,7 +2163,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2.0.00; + CURRENT_PROJECT_VERSION = 2.0.10; DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; @@ -2195,6 +2195,7 @@ "$(PROJECT_DIR)/MASFoundation/Vendor/OpenSSL/include/lib", ); MACH_O_TYPE = mh_dylib; + MARKETING_VERSION = 2.0.10; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.ca.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2211,7 +2212,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2.0.00; + CURRENT_PROJECT_VERSION = 2.0.10; DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; @@ -2243,6 +2244,7 @@ "$(PROJECT_DIR)/MASFoundation/Vendor/OpenSSL/include/lib", ); MACH_O_TYPE = mh_dylib; + MARKETING_VERSION = 2.0.10; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.ca.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/MASFoundation/Info.plist b/MASFoundation/Info.plist index b6725b1..ca23c84 100644 --- a/MASFoundation/Info.plist +++ b/MASFoundation/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.0.00 + $(MARKETING_VERSION) CFBundleSignature ???? CFBundleVersion