Remove presentCodeRedemptionSheet from PaymentQueueWrapper & Use SK2 APIs #4378
There are no files selected for viewing
This file contains 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 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 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 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 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 |
|---|---|---|
|
|
@@ -679,6 +679,28 @@ public protocol PurchasesType: AnyObject { | |
|
|
||
| #if os(iOS) || VISION_OS | ||
|
There was a problem hiding this comment. Was the |
||
|
|
||
| /** | ||
| * Displays a sheet that enables users to redeem subscription offer codes that you generated in App Store Connect. | ||
| * | ||
| * - Important: Even though the docs in `SKPaymentQueue.presentCodeRedemptionSheet` | ||
| * say that it's available on Catalyst 14.0, there is a note: | ||
| * "`This function doesn’t affect Mac apps built with Mac Catalyst.`" | ||
| * when, in fact, it crashes when called both from Catalyst and also when running as "Designed for iPad". | ||
| * This is why RevenueCat's SDK makes it unavailable in mac catalyst. | ||
| */ | ||
|
There was a problem hiding this comment. Does this mean calling this function of the SDK has been crashing on Catalyst and iOS apps running on macOS? There was a problem hiding this comment. For Catalyst, nope! Luckily the old version of For "Designed for iPad" on macOS, I haven't tested it myself, but I wouldn't be surprised if the existing SDK function is crashing, since this PR introduces the |
||
| @available( | ||
| iOS, | ||
| introduced: 14.0, | ||
| deprecated, | ||
| renamed: "presentCodeRedemptionSheet(_:)", | ||
| message: "Use async/throwing version instead" | ||
| ) | ||
| @available(watchOS, unavailable) | ||
| @available(tvOS, unavailable) | ||
| @available(macOS, unavailable) | ||
| @available(macCatalyst, unavailable) | ||
| func presentCodeRedemptionSheet() | ||
|
|
||
| /** | ||
| * Presents a refund request sheet in the current window scene for | ||
| * the latest transaction associated with the `productID` | ||
|
|
@@ -736,22 +758,6 @@ public protocol PurchasesType: AnyObject { | |
|
|
||
| #endif | ||
|
|
||
| #if os(iOS) || targetEnvironment(macCatalyst) || VISION_OS | ||
| /** | ||
| * Displays price consent sheet if needed. You only need to call this manually if you implement | ||
|
|
@@ -771,6 +777,24 @@ public protocol PurchasesType: AnyObject { | |
| */ | ||
| @available(iOS 13.4, macCatalyst 13.4, *) | ||
| @objc func showPriceConsentIfNeeded() | ||
|
|
||
| /** | ||
| * Displays a sheet that enables users to redeem subscription offer codes that you generated in App Store Connect. | ||
| * | ||
| * - Important: Even though the docs in `AppStore.presentOfferCodeRedeemSheet(in:)` | ||
| * say that it's available on Catalyst 16.0+, there is a note: | ||
| * "`In Mac apps built with Mac Catalyst, this method throws a StoreKitError.unknown error.`". | ||
| * The function also throws a StoreKitError.unknown error when running as "Designed for iPad" on macOS. | ||
| * | ||
| * For these reasons, RevenueCat's SDK makes this function unavailable on Mac Catalyst, and it no-ops | ||
| * for iOS apps running as a "Designed for iPad" app on macOS. | ||
| */ | ||
| @available(iOS 14.0, *) | ||
| @available(macCatalyst, unavailable) | ||
| @available(watchOS, unavailable) | ||
| @available(tvOS, unavailable) | ||
| @available(macOS, unavailable) | ||
| func presentCodeRedemptionSheet(uiWindowScene: UIWindowScene?) async throws | ||
| #endif | ||
|
|
||
| #if os(iOS) || os(macOS) || VISION_OS | ||
|
|
||
This file contains 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
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.
It might be a little awkward that this is possible, but I thought it was important to keep the provided window scene optional for two reasons:
Purchases.presentCodeRedemptionSheetAPI as similar as possible to the deprecated one