From 41a4a11daa91dc176f3b8f758543040a96f20b6f Mon Sep 17 00:00:00 2001 From: Dima Bart <dima.bart01@gmail.com> Date: Wed, 8 Jun 2016 14:52:41 -0400 Subject: [PATCH] Make private polling method return status. --- Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient+Checkout.m | 6 ++---- Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient+Internal.h | 2 +- Mobile Buy SDK/Mobile Buy SDK/Operations/BUYCheckoutOperation.m | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient+Checkout.m b/Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient+Checkout.m index acef9f8..de356d0 100644 --- a/Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient+Checkout.m +++ b/Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient+Checkout.m @@ -153,11 +153,9 @@ }]; } -- (NSOperation *)pollCompletionStatusAndGetCheckoutWithToken:(NSString *)token start:(BOOL)start completion:(BUYDataCheckoutBlock)block +- (NSOperation *)pollCompletionStatusAndGetCheckoutWithToken:(NSString *)token start:(BOOL)start completion:(BUYCheckoutStatusOperationCompletion)block { - BUYStatusOperation *operation = [BUYStatusOperation operationWithClient:self checkoutToken:token completion:^(BUYStatus status, BUYCheckout *checkout, NSError *error) { - block(checkout, error); - }]; + BUYStatusOperation *operation = [BUYStatusOperation operationWithClient:self checkoutToken:token completion:block]; if (start) { [self startOperation:operation]; } diff --git a/Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient+Internal.h b/Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient+Internal.h index 9eb397c..29a97b4 100644 --- a/Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient+Internal.h +++ b/Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient+Internal.h @@ -37,7 +37,7 @@ typedef void (^BUYClientRequestJSONCompletion)(NSDictionary *json, NSHTTPURLResp @property (nonatomic, strong) NSOperationQueue *requestQueue; -- (NSOperation *)pollCompletionStatusAndGetCheckoutWithToken:(NSString *)token start:(BOOL)start completion:(BUYDataCheckoutBlock)block; +- (NSOperation *)pollCompletionStatusAndGetCheckoutWithToken:(NSString *)token start:(BOOL)start completion:(BUYCheckoutStatusOperationCompletion)block; - (NSOperation *)getRequestForURL:(NSURL *)url completionHandler:(BUYClientRequestJSONCompletion)completionHandler; - (NSOperation *)deleteRequestForURL:(NSURL *)url completionHandler:(BUYClientRequestJSONCompletion)completionHandler; diff --git a/Mobile Buy SDK/Mobile Buy SDK/Operations/BUYCheckoutOperation.m b/Mobile Buy SDK/Mobile Buy SDK/Operations/BUYCheckoutOperation.m index 507e890..142c86b 100644 --- a/Mobile Buy SDK/Mobile Buy SDK/Operations/BUYCheckoutOperation.m +++ b/Mobile Buy SDK/Mobile Buy SDK/Operations/BUYCheckoutOperation.m @@ -112,7 +112,7 @@ - (NSOperation *)createStatusOperation { - return [self.client pollCompletionStatusAndGetCheckoutWithToken:self.checkoutToken start:NO completion:^(BUYCheckout *checkout, NSError *error) { + return [self.client pollCompletionStatusAndGetCheckoutWithToken:self.checkoutToken start:NO completion:^(BUYStatus status, BUYCheckout *checkout, NSError *error) { if (checkout) { [self finishWithObject:checkout]; } else { -- libgit2 0.26.0