Skip to content

[in_app_purchase_storekit] disallow ios versions lower than supported from enabling storekit #8110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 19 commits into from
Nov 19, 2024
Merged

[in_app_purchase_storekit] disallow ios versions lower than supported from enabling storekit #8110

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9af7e22
.
LouiseHsu Nov 15, 2024
347be0a
.
LouiseHsu Nov 15, 2024
b40b70c
.
LouiseHsu Nov 16, 2024
2eb06a9
Merge branch 'main' into sk2-fallback
LouiseHsu Nov 16, 2024
78bf15e
.
LouiseHsu Nov 16, 2024
53ef0fa
.
LouiseHsu Nov 16, 2024
cc75f7b
format
LouiseHsu Nov 16, 2024
594d938
Merge branch 'main' into sk2-fallback
LouiseHsu Nov 16, 2024
b408602
Merge branch 'main' of github.com:flutter/packages into sk2-fallback
LouiseHsu Nov 16, 2024
a99f3b8
.
LouiseHsu Nov 16, 2024
c7ba104
Merge branch 'sk2-fallback' of github.com:LouiseHsu/packages into sk2…
LouiseHsu Nov 16, 2024
5427d18
.
LouiseHsu Nov 18, 2024
0e37d51
Merge branch 'main' of github.com:flutter/packages into sk2-fallback
LouiseHsu Nov 18, 2024
06194b0
.
LouiseHsu Nov 18, 2024
da953a2
.
LouiseHsu Nov 19, 2024
dad159c
ugh
LouiseHsu Nov 19, 2024
3569468
Merge branch 'main' into sk2-fallback
LouiseHsu Nov 19, 2024
9dfd629
add comment
LouiseHsu Nov 19, 2024
f262e5e
Merge branch 'sk2-fallback' of github.com:LouiseHsu/packages into sk2…
LouiseHsu Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
.
  • Loading branch information
@LouiseHsu
LouiseHsu committed Nov 16, 2024
commit a99f3b8ef9af0cc7ac391b9fd6ed3e41575cd3f7
263 changes: 157 additions & 106 deletions packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/messages.g.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ typedef NS_ENUM(NSUInteger, FIASKProductDiscountTypeMessage) {
typedef NS_ENUM(NSUInteger, FIASKProductDiscountPaymentModeMessage) {
/// Allows user to pay the discounted price at each payment period.
FIASKProductDiscountPaymentModeMessagePayAsYouGo = 0,
/// Allows user to pay the discounted price upfront and receive the product for the rest of time
/// Allows user to pay the discounted price upfront and receive the product
/// for the rest of time
/// that was paid for.
FIASKProductDiscountPaymentModeMessagePayUpFront = 1,
/// User pays nothing during the discounted period.
Expand Down Expand Up @@ -110,140 +111,162 @@ typedef NS_ENUM(NSUInteger, FIASKSubscriptionPeriodUnitMessage) {
/// `init` unavailable to enforce nonnull fields, see the `make` class method.
- (instancetype)init NS_UNAVAILABLE;
+ (instancetype)makeWithPayment:(FIASKPaymentMessage *)payment
transactionState:(FIASKPaymentTransactionStateMessage)transactionState
originalTransaction:(nullable FIASKPaymentTransactionMessage *)originalTransaction
transactionTimeStamp:(nullable NSNumber *)transactionTimeStamp
transactionIdentifier:(nullable NSString *)transactionIdentifier
error:(nullable FIASKErrorMessage *)error;
@property(nonatomic, strong) FIASKPaymentMessage * payment;
@property(nonatomic, assign) FIASKPaymentTransactionStateMessage transactionState;
@property(nonatomic, strong, nullable) FIASKPaymentTransactionMessage * originalTransaction;
@property(nonatomic, strong, nullable) NSNumber * transactionTimeStamp;
@property(nonatomic, copy, nullable) NSString * transactionIdentifier;
@property(nonatomic, strong, nullable) FIASKErrorMessage * error;
transactionState:
(FIASKPaymentTransactionStateMessage)transactionState
originalTransaction:
(nullable FIASKPaymentTransactionMessage *)originalTransaction
transactionTimeStamp:(nullable NSNumber *)transactionTimeStamp
transactionIdentifier:(nullable NSString *)transactionIdentifier
error:(nullable FIASKErrorMessage *)error;
@property(nonatomic, strong) FIASKPaymentMessage *payment;
@property(nonatomic, assign)
FIASKPaymentTransactionStateMessage transactionState;
@property(nonatomic, strong, nullable)
FIASKPaymentTransactionMessage *originalTransaction;
@property(nonatomic, strong, nullable) NSNumber *transactionTimeStamp;
@property(nonatomic, copy, nullable) NSString *transactionIdentifier;
@property(nonatomic, strong, nullable) FIASKErrorMessage *error;
@end

@interface FIASKPaymentMessage : NSObject
/// `init` unavailable to enforce nonnull fields, see the `make` class method.
- (instancetype)init NS_UNAVAILABLE;
+ (instancetype)makeWithProductIdentifier:(NSString *)productIdentifier
applicationUsername:(nullable NSString *)applicationUsername
requestData:(nullable NSString *)requestData
quantity:(NSInteger )quantity
simulatesAskToBuyInSandbox:(BOOL )simulatesAskToBuyInSandbox
paymentDiscount:(nullable FIASKPaymentDiscountMessage *)paymentDiscount;
@property(nonatomic, copy) NSString * productIdentifier;
@property(nonatomic, copy, nullable) NSString * applicationUsername;
@property(nonatomic, copy, nullable) NSString * requestData;
@property(nonatomic, assign) NSInteger quantity;
@property(nonatomic, assign) BOOL simulatesAskToBuyInSandbox;
@property(nonatomic, strong, nullable) FIASKPaymentDiscountMessage * paymentDiscount;
+ (instancetype)
makeWithProductIdentifier:(NSString *)productIdentifier
applicationUsername:(nullable NSString *)applicationUsername
requestData:(nullable NSString *)requestData
quantity:(NSInteger)quantity
simulatesAskToBuyInSandbox:(BOOL)simulatesAskToBuyInSandbox
paymentDiscount:
(nullable FIASKPaymentDiscountMessage *)paymentDiscount;
@property(nonatomic, copy) NSString *productIdentifier;
@property(nonatomic, copy, nullable) NSString *applicationUsername;
@property(nonatomic, copy, nullable) NSString *requestData;
@property(nonatomic, assign) NSInteger quantity;
@property(nonatomic, assign) BOOL simulatesAskToBuyInSandbox;
@property(nonatomic, strong, nullable)
FIASKPaymentDiscountMessage *paymentDiscount;
@end

@interface FIASKErrorMessage : NSObject
/// `init` unavailable to enforce nonnull fields, see the `make` class method.
- (instancetype)init NS_UNAVAILABLE;
+ (instancetype)makeWithCode:(NSInteger )code
domain:(NSString *)domain
userInfo:(nullable NSDictionary<NSString *, id> *)userInfo;
@property(nonatomic, assign) NSInteger code;
@property(nonatomic, copy) NSString * domain;
@property(nonatomic, copy, nullable) NSDictionary<NSString *, id> * userInfo;
+ (instancetype)makeWithCode:(NSInteger)code
domain:(NSString *)domain
userInfo:(nullable NSDictionary<NSString *, id> *)userInfo;
@property(nonatomic, assign) NSInteger code;
@property(nonatomic, copy) NSString *domain;
@property(nonatomic, copy, nullable) NSDictionary<NSString *, id> *userInfo;
@end

@interface FIASKPaymentDiscountMessage : NSObject
/// `init` unavailable to enforce nonnull fields, see the `make` class method.
- (instancetype)init NS_UNAVAILABLE;
+ (instancetype)makeWithIdentifier:(NSString *)identifier
keyIdentifier:(NSString *)keyIdentifier
nonce:(NSString *)nonce
signature:(NSString *)signature
timestamp:(NSInteger )timestamp;
@property(nonatomic, copy) NSString * identifier;
@property(nonatomic, copy) NSString * keyIdentifier;
@property(nonatomic, copy) NSString * nonce;
@property(nonatomic, copy) NSString * signature;
@property(nonatomic, assign) NSInteger timestamp;
keyIdentifier:(NSString *)keyIdentifier
nonce:(NSString *)nonce
signature:(NSString *)signature
timestamp:(NSInteger)timestamp;
@property(nonatomic, copy) NSString *identifier;
@property(nonatomic, copy) NSString *keyIdentifier;
@property(nonatomic, copy) NSString *nonce;
@property(nonatomic, copy) NSString *signature;
@property(nonatomic, assign) NSInteger timestamp;
@end

@interface FIASKStorefrontMessage : NSObject
/// `init` unavailable to enforce nonnull fields, see the `make` class method.
- (instancetype)init NS_UNAVAILABLE;
+ (instancetype)makeWithCountryCode:(NSString *)countryCode
identifier:(NSString *)identifier;
@property(nonatomic, copy) NSString * countryCode;
@property(nonatomic, copy) NSString * identifier;
identifier:(NSString *)identifier;
@property(nonatomic, copy) NSString *countryCode;
@property(nonatomic, copy) NSString *identifier;
@end

@interface FIASKProductsResponseMessage : NSObject
+ (instancetype)makeWithProducts:(nullable NSArray<FIASKProductMessage *> *)products
invalidProductIdentifiers:(nullable NSArray<NSString *> *)invalidProductIdentifiers;
@property(nonatomic, copy, nullable) NSArray<FIASKProductMessage *> * products;
@property(nonatomic, copy, nullable) NSArray<NSString *> * invalidProductIdentifiers;
+ (instancetype)makeWithProducts:
(nullable NSArray<FIASKProductMessage *> *)products
invalidProductIdentifiers:
(nullable NSArray<NSString *> *)invalidProductIdentifiers;
@property(nonatomic, copy, nullable) NSArray<FIASKProductMessage *> *products;
@property(nonatomic, copy, nullable)
NSArray<NSString *> *invalidProductIdentifiers;
@end

@interface FIASKProductMessage : NSObject
/// `init` unavailable to enforce nonnull fields, see the `make` class method.
- (instancetype)init NS_UNAVAILABLE;
+ (instancetype)makeWithProductIdentifier:(NSString *)productIdentifier
localizedTitle:(NSString *)localizedTitle
localizedDescription:(nullable NSString *)localizedDescription
priceLocale:(FIASKPriceLocaleMessage *)priceLocale
+ (instancetype)
makeWithProductIdentifier:(NSString *)productIdentifier
localizedTitle:(NSString *)localizedTitle
localizedDescription:(nullable NSString *)localizedDescription
priceLocale:(FIASKPriceLocaleMessage *)priceLocale
subscriptionGroupIdentifier:(nullable NSString *)subscriptionGroupIdentifier
price:(NSString *)price
subscriptionPeriod:(nullable FIASKProductSubscriptionPeriodMessage *)subscriptionPeriod
introductoryPrice:(nullable FIASKProductDiscountMessage *)introductoryPrice
discounts:(nullable NSArray<FIASKProductDiscountMessage *> *)discounts;
@property(nonatomic, copy) NSString * productIdentifier;
@property(nonatomic, copy) NSString * localizedTitle;
@property(nonatomic, copy, nullable) NSString * localizedDescription;
@property(nonatomic, strong) FIASKPriceLocaleMessage * priceLocale;
@property(nonatomic, copy, nullable) NSString * subscriptionGroupIdentifier;
@property(nonatomic, copy) NSString * price;
@property(nonatomic, strong, nullable) FIASKProductSubscriptionPeriodMessage * subscriptionPeriod;
@property(nonatomic, strong, nullable) FIASKProductDiscountMessage * introductoryPrice;
@property(nonatomic, copy, nullable) NSArray<FIASKProductDiscountMessage *> * discounts;
price:(NSString *)price
subscriptionPeriod:
(nullable FIASKProductSubscriptionPeriodMessage *)
subscriptionPeriod
introductoryPrice:
(nullable FIASKProductDiscountMessage *)introductoryPrice
discounts:
(nullable NSArray<FIASKProductDiscountMessage *> *)
discounts;
@property(nonatomic, copy) NSString *productIdentifier;
@property(nonatomic, copy) NSString *localizedTitle;
@property(nonatomic, copy, nullable) NSString *localizedDescription;
@property(nonatomic, strong) FIASKPriceLocaleMessage *priceLocale;
@property(nonatomic, copy, nullable) NSString *subscriptionGroupIdentifier;
@property(nonatomic, copy) NSString *price;
@property(nonatomic, strong, nullable)
FIASKProductSubscriptionPeriodMessage *subscriptionPeriod;
@property(nonatomic, strong, nullable)
FIASKProductDiscountMessage *introductoryPrice;
@property(nonatomic, copy, nullable)
NSArray<FIASKProductDiscountMessage *> *discounts;
@end

@interface FIASKPriceLocaleMessage : NSObject
/// `init` unavailable to enforce nonnull fields, see the `make` class method.
- (instancetype)init NS_UNAVAILABLE;
+ (instancetype)makeWithCurrencySymbol:(NSString *)currencySymbol
currencyCode:(NSString *)currencyCode
countryCode:(NSString *)countryCode;
///The currency symbol for the locale, e.g. $ for US locale.
@property(nonatomic, copy) NSString * currencySymbol;
///The currency code for the locale, e.g. USD for US locale.
@property(nonatomic, copy) NSString * currencyCode;
///The country code for the locale, e.g. US for US locale.
@property(nonatomic, copy) NSString * countryCode;
currencyCode:(NSString *)currencyCode
countryCode:(NSString *)countryCode;
/// The currency symbol for the locale, e.g. $ for US locale.
@property(nonatomic, copy) NSString *currencySymbol;
/// The currency code for the locale, e.g. USD for US locale.
@property(nonatomic, copy) NSString *currencyCode;
/// The country code for the locale, e.g. US for US locale.
@property(nonatomic, copy) NSString *countryCode;
@end

@interface FIASKProductDiscountMessage : NSObject
/// `init` unavailable to enforce nonnull fields, see the `make` class method.
- (instancetype)init NS_UNAVAILABLE;
+ (instancetype)makeWithPrice:(NSString *)price
priceLocale:(FIASKPriceLocaleMessage *)priceLocale
numberOfPeriods:(NSInteger )numberOfPeriods
paymentMode:(FIASKProductDiscountPaymentModeMessage)paymentMode
subscriptionPeriod:(FIASKProductSubscriptionPeriodMessage *)subscriptionPeriod
identifier:(nullable NSString *)identifier
type:(FIASKProductDiscountTypeMessage)type;
@property(nonatomic, copy) NSString * price;
@property(nonatomic, strong) FIASKPriceLocaleMessage * priceLocale;
@property(nonatomic, assign) NSInteger numberOfPeriods;
priceLocale:(FIASKPriceLocaleMessage *)priceLocale
numberOfPeriods:(NSInteger)numberOfPeriods
paymentMode:
(FIASKProductDiscountPaymentModeMessage)paymentMode
subscriptionPeriod:
(FIASKProductSubscriptionPeriodMessage *)subscriptionPeriod
identifier:(nullable NSString *)identifier
type:(FIASKProductDiscountTypeMessage)type;
@property(nonatomic, copy) NSString *price;
@property(nonatomic, strong) FIASKPriceLocaleMessage *priceLocale;
@property(nonatomic, assign) NSInteger numberOfPeriods;
@property(nonatomic, assign) FIASKProductDiscountPaymentModeMessage paymentMode;
@property(nonatomic, strong) FIASKProductSubscriptionPeriodMessage * subscriptionPeriod;
@property(nonatomic, copy, nullable) NSString * identifier;
@property(nonatomic, strong)
FIASKProductSubscriptionPeriodMessage *subscriptionPeriod;
@property(nonatomic, copy, nullable) NSString *identifier;
@property(nonatomic, assign) FIASKProductDiscountTypeMessage type;
@end

@interface FIASKProductSubscriptionPeriodMessage : NSObject
/// `init` unavailable to enforce nonnull fields, see the `make` class method.
- (instancetype)init NS_UNAVAILABLE;
+ (instancetype)makeWithNumberOfUnits:(NSInteger )numberOfUnits
unit:(FIASKSubscriptionPeriodUnitMessage)unit;
@property(nonatomic, assign) NSInteger numberOfUnits;
+ (instancetype)makeWithNumberOfUnits:(NSInteger)numberOfUnits
unit:(FIASKSubscriptionPeriodUnitMessage)unit;
@property(nonatomic, assign) NSInteger numberOfUnits;
@property(nonatomic, assign) FIASKSubscriptionPeriodUnitMessage unit;
@end

Expand All @@ -254,32 +277,60 @@ NSObject<FlutterMessageCodec> *FIAGetMessagesCodec(void);
/// Returns if the current device is able to make payments
///
/// @return `nil` only when `error != nil`.
- (nullable NSNumber *)canMakePaymentsWithError:(FlutterError *_Nullable *_Nonnull)error;
- (nullable NSNumber *)canMakePaymentsWithError:
(FlutterError *_Nullable *_Nonnull)error;
/// @return `nil` only when `error != nil`.
- (nullable NSArray<FIASKPaymentTransactionMessage *> *)transactionsWithError:(FlutterError *_Nullable *_Nonnull)error;
- (nullable NSArray<FIASKPaymentTransactionMessage *> *)transactionsWithError:
(FlutterError *_Nullable *_Nonnull)error;
/// @return `nil` only when `error != nil`.
- (nullable FIASKStorefrontMessage *)storefrontWithError:(FlutterError *_Nullable *_Nonnull)error;
- (void)addPaymentPaymentMap:(NSDictionary<NSString *, id> *)paymentMap error:(FlutterError *_Nullable *_Nonnull)error;
- (void)startProductRequestProductIdentifiers:(NSArray<NSString *> *)productIdentifiers completion:(void (^)(FIASKProductsResponseMessage *_Nullable, FlutterError *_Nullable))completion;
- (void)finishTransactionFinishMap:(NSDictionary<NSString *, id> *)finishMap error:(FlutterError *_Nullable *_Nonnull)error;
- (void)restoreTransactionsApplicationUserName:(nullable NSString *)applicationUserName error:(FlutterError *_Nullable *_Nonnull)error;
- (void)presentCodeRedemptionSheetWithError:(FlutterError *_Nullable *_Nonnull)error;
- (nullable NSString *)retrieveReceiptDataWithError:(FlutterError *_Nullable *_Nonnull)error;
- (void)refreshReceiptReceiptProperties:(nullable NSDictionary<NSString *, id> *)receiptProperties completion:(void (^)(FlutterError *_Nullable))completion;
- (void)startObservingPaymentQueueWithError:(FlutterError *_Nullable *_Nonnull)error;
- (void)stopObservingPaymentQueueWithError:(FlutterError *_Nullable *_Nonnull)error;
- (void)registerPaymentQueueDelegateWithError:(FlutterError *_Nullable *_Nonnull)error;
- (void)removePaymentQueueDelegateWithError:(FlutterError *_Nullable *_Nonnull)error;
- (void)showPriceConsentIfNeededWithError:(FlutterError *_Nullable *_Nonnull)error;
- (nullable FIASKStorefrontMessage *)storefrontWithError:
(FlutterError *_Nullable *_Nonnull)error;
- (void)addPaymentPaymentMap:(NSDictionary<NSString *, id> *)paymentMap
error:(FlutterError *_Nullable *_Nonnull)error;
- (void)
startProductRequestProductIdentifiers:
(NSArray<NSString *> *)productIdentifiers
completion:
(void (^)(
FIASKProductsResponseMessage *_Nullable,
FlutterError *_Nullable))completion;
- (void)finishTransactionFinishMap:(NSDictionary<NSString *, id> *)finishMap
error:(FlutterError *_Nullable *_Nonnull)error;
- (void)restoreTransactionsApplicationUserName:
(nullable NSString *)applicationUserName
error:
(FlutterError *_Nullable *_Nonnull)
error;
- (void)presentCodeRedemptionSheetWithError:
(FlutterError *_Nullable *_Nonnull)error;
- (nullable NSString *)retrieveReceiptDataWithError:
(FlutterError *_Nullable *_Nonnull)error;
- (void)refreshReceiptReceiptProperties:
(nullable NSDictionary<NSString *, id> *)receiptProperties
completion:
(void (^)(FlutterError *_Nullable))completion;
- (void)startObservingPaymentQueueWithError:
(FlutterError *_Nullable *_Nonnull)error;
- (void)stopObservingPaymentQueueWithError:
(FlutterError *_Nullable *_Nonnull)error;
- (void)registerPaymentQueueDelegateWithError:
(FlutterError *_Nullable *_Nonnull)error;
- (void)removePaymentQueueDelegateWithError:
(FlutterError *_Nullable *_Nonnull)error;
- (void)showPriceConsentIfNeededWithError:
(FlutterError *_Nullable *_Nonnull)error;
/// @return `nil` only when `error != nil`.
- (nullable NSNumber *)supportsStoreKit2WithError:(FlutterError *_Nullable *_Nonnull)error;
- (nullable NSNumber *)supportsStoreKit2WithError:
(FlutterError *_Nullable *_Nonnull)error;
@end

extern void SetUpFIAInAppPurchaseAPI(id<FlutterBinaryMessenger> binaryMessenger,
NSObject<FIAInAppPurchaseAPI> *_Nullable api);
extern void SetUpFIAInAppPurchaseAPI(
id<FlutterBinaryMessenger> binaryMessenger,
NSObject<FIAInAppPurchaseAPI> *_Nullable api);

extern void SetUpFIAInAppPurchaseAPIWithSuffix(id<FlutterBinaryMessenger> binaryMessenger,
NSObject<FIAInAppPurchaseAPI> *_Nullable api,
NSString *messageChannelSuffix);
extern void SetUpFIAInAppPurchaseAPIWithSuffix(
id<FlutterBinaryMessenger> binaryMessenger,
NSObject<FIAInAppPurchaseAPI> *_Nullable api,
NSString *messageChannelSuffix);

NS_ASSUME_NONNULL_END