Convert startProductRequest(), finishTransaction(), restoreTransactions(), presentCodeRedemptionSheet() to pigeon #6032
fix tests + formatting
- Loading branch information
commit 751b034c43d26e0aff06220a1960aa5952c594bb
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -136,8 +136,9 @@ - (nullable SKStorefrontMessage *)storefrontWithError:(FlutterError *_Nullable * | |
| return [FIAObjectTranslator convertStorefrontToPigeon:storefront]; | ||
| } | ||
|
|
||
| - (void)startProductRequestProductIdentifiers:(NSArray<NSString *> *)productIdentifiers | ||
| completion:(void (^)(SKProductsResponseMessage *_Nullable, | ||
| FlutterError *_Nullable))completion { | ||
| SKProductsRequest *request = | ||
| [self getProductRequestWithIdentifiers:[NSSet setWithArray:productIdentifiers]]; | ||
| FIAPRequestHandler *handler = [[FIAPRequestHandler alloc] initWithRequest:request]; | ||
|
|
@@ -149,14 +150,14 @@ - (void)startProductRequestProductIdentifiers:(NSArray<NSString *> *)productIden | |
| FlutterError *error = nil; | ||
| if (startProductRequestError != nil) { | ||
| error = [FlutterError errorWithCode:@"storekit_getproductrequest_platform_error" | ||
| message:startProductRequestError.localizedDescription | ||
| details:startProductRequestError.description]; | ||
| } | ||
| if (!response) { | ||
| error = [FlutterError errorWithCode:@"storekit_platform_no_response" | ||
| message:@"Failed to get SKProductResponse in startRequest " | ||
| @"call. Error occured on iOS platform" | ||
| details:productIdentifiers]; | ||
| } | ||
| for (SKProduct *product in response.products) { | ||
| [self.productsCache setObject:product forKey:product.productIdentifier]; | ||
|
|
@@ -224,7 +225,8 @@ - (void)addPaymentPaymentMap:(nonnull NSDictionary *)paymentMap | |
| } | ||
| } | ||
|
|
||
| - (void)finishTransactionFinishMap:(nonnull NSDictionary<NSString *, NSString *> *)finishMap | ||
| error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error { | ||
| NSString *transactionIdentifier = [finishMap objectForKey:@"transactionIdentifier"]; | ||
| NSString *productIdentifier = [finishMap objectForKey:@"productIdentifier"]; | ||
|
|
||
|
|
@@ -243,19 +245,22 @@ - (void)finishTransactionFinishMap:(nonnull NSDictionary<NSString *,NSString *> | |
| [self.paymentQueueHandler finishTransaction:transaction]; | ||
| } @catch (NSException *e) { | ||
| *error = [FlutterError errorWithCode:@"storekit_finish_transaction_exception" | ||
| message:e.name | ||
| details:e.description]; | ||
|
Contributor
There was a problem hiding this comment. where is this error used?
Contributor
Author
There was a problem hiding this comment. all generated pigeon functions have like an extra "error" param, I think it gets passed back to the dart side automatically |
||
| return; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| - (void)restoreTransactionsApplicationUserName:(nullable NSString *)applicationUserName | ||
| error:(FlutterError *_Nullable __autoreleasing *_Nonnull) | ||
| error { | ||
| [self.paymentQueueHandler restoreTransactions:applicationUserName]; | ||
| } | ||
|
|
||
| - (void)presentCodeRedemptionSheetWithError: | ||
| (FlutterError *_Nullable __autoreleasing *_Nonnull)error { | ||
| #if TARGET_OS_IOS | ||
| [self.paymentQueueHandler presentCodeRedemptionSheet]; | ||
| #endif | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: you know the size here. It's more efficient to create the array of the proper size.