Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[in_app_purchase] Migrate to Billing to 5.0.0 #5405

Merged
GaryQian merged 22 commits into from
Jul 8, 2022
Merged

[in_app_purchase] Migrate to Billing to 5.0.0 #5405

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c6a5001
in_app_purchase: Upgrade build.gradle dependencies
GaryQian Apr 26, 2022
f0e9ceb
upgrade mockito
GaryQian Apr 26, 2022
6cb46b1
Support async queryPurchasesAsync()
GaryQian Apr 27, 2022
04fc57b
Add new API
GaryQian Apr 27, 2022
32ee0b1
Use setSubscriptionUpdateParams
GaryQian Apr 27, 2022
f84fdd4
Stuff
GaryQian May 3, 2022
cb8b0d3
Pass OK responseId to flutter
GaryQian May 12, 2022
6823a7d
COmpiling
GaryQian May 23, 2022
3af6514
Only build SubscriptionUpdateParams when oldsku is passed
GaryQian Jun 2, 2022
847b1dc
Docs and comments
GaryQian Jun 9, 2022
f679fcd
Adapt dart API
GaryQian Jun 9, 2022
eb5ccfb
Use annotations
GaryQian Jun 9, 2022
f394c10
Tests
GaryQian Jun 10, 2022
41e01ee
Compiling
GaryQian Jun 10, 2022
da9e0d6
Tests compiling
GaryQian Jun 10, 2022
5133ea9
Migrate tests
GaryQian Jul 7, 2022
40ba0fd
Dart-side handling of sku->skus
GaryQian Jul 7, 2022
ce91196
Move skus handling to dart, fix tests
GaryQian Jul 8, 2022
d711db3
Fix dart tests
GaryQian Jul 8, 2022
73cd064
formatting
GaryQian Jul 8, 2022
8c79e71
Formatting and test fixes
GaryQian Jul 8, 2022
a7f7714
Versioning
GaryQian Jul 8, 2022
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
Docs and comments
  • Loading branch information
@GaryQian
GaryQian committed Jul 7, 2022
commit 847b1dcd4a5350d5f69b6b22ca3a96aaed2ed365
3 changes: 2 additions & 1 deletion ...android/android/src/main/java/io/flutter/plugins/inapppurchase/MethodCallHandlerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,8 @@ private void queryPurchasesAsync(String skuType, MethodChannel.Result result) {
public void onQueryPurchasesResponse(
BillingResult billingResult, List<Purchase> purchasesList) {
final Map<String, Object> serialized = new HashMap<>();
// The response code is no longer passed, as part of billing 4.1.0, so we pass OK here.
// The response code is no longer passed, as part of billing 4.0, so we pass OK here
// as success is implied by calling this callback.
serialized.put("responseCode", BillingClient.BillingResponseCode.OK);
serialized.put("billingResult", Translator.fromBillingResult(billingResult));
serialized.put(
Expand Down
8 changes: 8 additions & 0 deletions ...p_purchase_android/android/src/main/java/io/flutter/plugins/inapppurchase/Translator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ static HashMap<String, Object> fromPurchase(Purchase purchase) {
info.put("purchaseTime", purchase.getPurchaseTime());
info.put("purchaseToken", purchase.getPurchaseToken());
info.put("signature", purchase.getSignature());
// TODO(garyq): Remove deprecated `sku`.
// `sku` was deprecated in billion 4.0, but we cannot directly remove it from our
// API instantly. Thus, for backwards compatibility, we pass the first sku here
// and include the rest of the list under `skus`.
if (!skus.isEmpty()) {
Copy link
Contributor

@cyanglaz cyanglaz Jul 6, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be easier to cleanup later if we put this logic to the dart side.
Then we don't have to cleanup the java code when we remove .sku.

Copy link
Contributor Author

@GaryQian GaryQian Jul 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, makes sense, I'll do that

info.put("sku", skus.get(0));
}
Expand All @@ -86,6 +90,10 @@ static HashMap<String, Object> fromPurchaseHistoryRecord(
info.put("purchaseTime", purchaseHistoryRecord.getPurchaseTime());
info.put("purchaseToken", purchaseHistoryRecord.getPurchaseToken());
info.put("signature", purchaseHistoryRecord.getSignature());
// TODO(garyq): Remove deprecated `sku`.
// `sku` was deprecated in billion 4.0, but we cannot directly remove it from our
// API instantly. Thus, for backwards compatibility, we pass the first sku here
// and include the rest of the list under `skus`.
if (!skus.isEmpty()) {
info.put("sku", skus.get(0));
}
Expand Down