Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions libraries/flutter_inapp_purchase/lib/flutter_inapp_purchase.dart
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,8 @@ class FlutterInappPurchase with RequestPurchaseBuilderApi {
subscriptionOffers;
final gentype.DeveloperBillingOptionParamsAndroid?
developerBillingOption;
final gentype.SubscriptionProductReplacementParamsAndroid?
subscriptionProductReplacementParams;

if (androidProps is gentype.RequestPurchaseAndroidProps) {
skus = androidProps.skus;
Expand All @@ -397,6 +399,7 @@ class FlutterInappPurchase with RequestPurchaseBuilderApi {
offerToken = androidProps.offerToken;
subscriptionOffers = null;
developerBillingOption = androidProps.developerBillingOption;
subscriptionProductReplacementParams = null;
} else if (androidProps
is gentype.RequestSubscriptionAndroidProps) {
skus = androidProps.skus;
Expand All @@ -408,6 +411,8 @@ class FlutterInappPurchase with RequestPurchaseBuilderApi {
offerToken = null; // Subscriptions don't use offerToken
subscriptionOffers = androidProps.subscriptionOffers;
developerBillingOption = androidProps.developerBillingOption;
subscriptionProductReplacementParams =
androidProps.subscriptionProductReplacementParams;
} else {
throw PurchaseError(
code: gentype.ErrorCode.DeveloperError,
Expand Down Expand Up @@ -468,6 +473,13 @@ class FlutterInappPurchase with RequestPurchaseBuilderApi {
developerBillingOption.toJson();
}

// Add subscriptionProductReplacementParams for item-level
// replacement (Billing Library 8.1.0+)
if (subscriptionProductReplacementParams != null) {
payload['subscriptionProductReplacementParams'] =
subscriptionProductReplacementParams.toJson();
}

await _channel.invokeMethod('requestPurchase', payload);
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,62 @@ void main() {
expect(payload.containsKey('subscriptionOffers'), isFalse);
});

test(
'forwards subscriptionProductReplacementParams on Android subscription',
() async {
final calls = <MethodCall>[];
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
.setMockMethodCallHandler(channel, (MethodCall call) async {
calls.add(call);
switch (call.method) {
case 'initConnection':
return true;
case 'requestPurchase':
return null;
}
return null;
});

final iap = FlutterInappPurchase.private(
FakePlatform(operatingSystem: 'android'),
);

await iap.initConnection();

const props = types.RequestPurchaseProps.subs((
apple: null,
google: types.RequestSubscriptionAndroidProps(
skus: <String>['sub.premium'],
subscriptionProductReplacementParams:
types.SubscriptionProductReplacementParamsAndroid(
oldProductId: 'sub.premium',
replacementMode:
types.SubscriptionReplacementModeAndroid.ChargeFullPrice,
),
),
useAlternativeBilling: null,
));

await iap.requestPurchase(props);

final requestCall = calls.singleWhere(
(MethodCall c) => c.method == 'requestPurchase',
);
final payload = Map<String, dynamic>.from(
requestCall.arguments as Map<dynamic, dynamic>,
);

expect(payload.containsKey('subscriptionProductReplacementParams'),
isTrue);
final replacement = Map<String, dynamic>.from(
payload['subscriptionProductReplacementParams']
as Map<dynamic, dynamic>,
);
expect(replacement['oldProductId'], 'sub.premium');
expect(replacement['replacementMode'], 'charge-full-price');
},
);

test(
'sends developerBillingOption for External Payments on Android',
() async {
Expand Down
Loading