[in_app_purchase_android] Add UserChoiceBilling mode. #6162

reidbaker · 2024-02-19T18:24:24Z

Add UserChoiceBilling billing mode option.

Left in draft until:

connect, disconnect and set user mode test is added to java
dart tests for method channel
Callback api added to dart
Test for call back api
Example using callback api in example app

This does not have an End to end working example with play integration. I am currently stuck at the server side play integration part.

Pre-launch Checklist

If you need help, consider asking for advice on the #hackers-new channel on Discord.

…e billing info, define callbacks

…reopening a userChoiceBilling connection.

…pying

…intro

packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md

stuartmorgan · 2024-02-26T17:48:52Z

...android/android/src/main/java/io/flutter/plugins/inapppurchase/BillingClientFactoryImpl.java

+        // https://developer.android.com/google/play/billing/alternative/alternative-billing-without-user-choice-in-app
+        builder.enableAlternativeBillingOnly();
+        break;
+      case BillingChoiceMode.USER_CHOICE_BILLING:


Should this have a docs link too, like the above?

stuartmorgan · 2024-02-26T17:49:34Z

...android/android/src/main/java/io/flutter/plugins/inapppurchase/BillingClientFactoryImpl.java

+        // Do nothing
+        break;
+      default:
+        Log.w("BillingClientFactoryImpl", "Unknown BillingChoiceMode " + billingChoiceMode);


Shouldn't this be .e, and also mention that it's doing fallback to Play-only?

stuartmorgan · 2024-02-26T17:52:22Z

..._app_purchase_android/android/src/main/java/io/flutter/plugins/inapppurchase/Translator.java

+    HashMap<String, Object> info = new HashMap<>();
+    info.put("externalTransactionToken", userChoiceDetails.getExternalTransactionToken());
+    info.put("originalExternalTransactionId", userChoiceDetails.getOriginalExternalTransactionId());
+    info.put("productsList", fromProductsList(userChoiceDetails.getProducts()));


The Dart object's field is just called products; is List added automagically by JSON serialization, or is this a mismatch?

Confirmed mismatch and added test.

stuartmorgan · 2024-02-26T17:54:17Z

..._app_purchase_android/android/src/main/java/io/flutter/plugins/inapppurchase/Translator.java

+  static HashMap<String, Object> fromProduct(Product product) {
+    HashMap<String, Object> info = new HashMap<>();
+    info.put("productId", product.getId());
+    info.put("productOfferToken", product.getOfferToken());


Why do these two have an extra "product" prefix relative to Dart (but the type below matches directly)?

Mismatch, test added.

stuartmorgan · 2024-02-26T17:55:53Z

...purchase/in_app_purchase_android/lib/src/billing_client_wrappers/billing_client_wrapper.dart

@@ -507,6 +532,10 @@ enum BillingChoiceMode {
  /// Billing through app provided flow.
  @JsonValue(1)
  alternativeBillingOnly,
+
+  /// Users can choose play billing or alternative billing.


Done and fixed some other locations in this file.

…intro

… ensure compatibility

gmackall

partial (java side)

gmackall · 2024-03-08T18:52:15Z

packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md


+* Adds UserChoiceBilling API's to platform addition.


nit

Suggested change

* Adds UserChoiceBilling API's to platform addition.

* Adds UserChoiceBilling APIs to platform addition.

gmackall · 2024-03-08T19:28:09Z

...android/android/src/main/java/io/flutter/plugins/inapppurchase/BillingClientFactoryImpl.java

+        }
+        break;
+      case BillingChoiceMode.PLAY_BILLING_ONLY:
+        // Do nothing


nit: end comment with period

gmackall · 2024-03-08T19:36:51Z

...android/android/src/main/java/io/flutter/plugins/inapppurchase/BillingClientFactoryImpl.java

+          builder.enableUserChoiceBilling(userChoiceBillingListener);
+        } else {
+          Log.e(
+              "BillingClientFactoryImpl",


What do you think about enforcing this being an error case, instead of defaulting? I think I might be confusing for developers to default to PLAY_BILLING_ONLY, even if they have made a mistake in how they configured for USER_CHOICE_BILLING.

Not a strong preference, though, as long as the messaging is clear

After reading further, we should never reach this case right? We define the listener, and we basically do it as a pass through where we pass the UserChoiceDetails in a copied hashmap to the dart side?

And the only time that listener is null is when the BillingChoiceMode is not USER_CHOICE_BILLING?

Can't we instead move that logic where we construct the listener (lines 547-557 in MethodCallHandlerImpl) inside this class and only invoke it when we actually need to make the listener, so it is never null?

I agree that we should not every hit this case as the code is currently written but I added the additional fallaback logic to protect against future bugs and give us a way to know that we were in a bad state.

I didnt want to create the listener in this class because it needed to invoke methodChannel and I thought the methodchannelimpl class would be where you would look for that logic.

Part of why I suggested this is that we have existing code where we do something similar to construct a listener in this plugin, see

packages/packages/in_app_purchase/in_app_purchase_android/android/src/main/java/io/flutter/plugins/inapppurchase/PluginPurchaseListener.java

Line 39 in a10b360

channel.invokeMethod(ON_PURCHASES_UPDATED, callbackArgs);

.

I still lean towards moving the listener construction, so we can eliminate the bad case here, but if you have a strong preference to keep the structure as is I'm fine that way too

How about a compromise. I am worried about the march 13th deadline for apps to
migrate to this api. I have filed flutter/flutter#144851 and assigned it to myself along with some other cleanup bugs that I can do without impacting the public facing api.

..._app_purchase_android/android/src/main/java/io/flutter/plugins/inapppurchase/Translator.java

...purchase/in_app_purchase_android/lib/src/billing_client_wrappers/billing_client_wrapper.dart

gmackall · 2024-03-08T20:18:12Z

...android/android/src/main/java/io/flutter/plugins/inapppurchase/BillingClientFactoryImpl.java

+          builder.enableUserChoiceBilling(userChoiceBillingListener);
+        } else {
+          Log.e(
+              "BillingClientFactoryImpl",


Part of why I suggested this is that we have existing code where we do something similar to construct a listener in this plugin, see

packages/packages/in_app_purchase/in_app_purchase_android/android/src/main/java/io/flutter/plugins/inapppurchase/PluginPurchaseListener.java

Line 39 in a10b360

channel.invokeMethod(ON_PURCHASES_UPDATED, callbackArgs);

.

I still lean towards moving the listener construction, so we can eliminate the bad case here, but if you have a strong preference to keep the structure as is I'm fine that way too

…ng_client_wrappers/billing_client_wrapper.dart Co-authored-by: Gray Mackall <34871572+gmackall@users.noreply.github.com>

gmackall

LGTM with flutter/flutter#144851 as a follow up, considering deadline for developers to adopt these new apis is soon

…ter/packages#6162)

flutter/packages@0badb43...d489d84 2024-03-08 reidbaker@google.com [in_app_purchase_android] Add UserChoiceBilling mode. (flutter/packages#6162) 2024-03-08 engine-flutter-autoroll@skia.org Roll Flutter from 471a828 to 7c89ec8 (15 revisions) (flutter/packages#6288) 2024-03-08 engine-flutter-autoroll@skia.org Roll Flutter (stable) from 7482962 to ba39319 (2 revisions) (flutter/packages#6287) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages-flutter-autoroll Please CC flutter-ecosystem@google.com,rmistry@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

fareesh · 2024-03-18T12:26:57Z

LGTM

reidbaker added 3 commits February 15, 2024 12:02

Add generated code, create java and dart objects that hold user choic…

3427813

…e billing info, define callbacks

Analyzer warnings, test compile fix

b8dc1ed

do not remove disconnect call

8440a75

github-actions bot added p: in_app_purchase platform-android labels Feb 19, 2024

reidbaker added 5 commits February 19, 2024 14:23

return list of products update java test to use userchoicebilling

bfd7786

verify method channel is called in callback

939545d

Add test that mimics opening a connection, closing a connection then …

613f5f0

…reopening a userChoiceBilling connection.

formatting

4f2ab49

Changelog

8106192

reidbaker changed the title ~~[in_app_purchase_android]~~ [in_app_purchase_android] Add UserChoiceBilling mode. Feb 19, 2024

reidbaker added 11 commits February 20, 2024 17:35

Add product details list to test, add flags required for deep json co…

6f583d0

…pying

Add breadcrumb to documentation

4ca1aeb

java formatting

b2e00ce

Merge branch 'main' into i143004-in-app-purchase-user-choice-billing-…

d88603e

…intro

Add billing client manager test for stream

818e800

Add test for platform addition

e2d30da

Create api objects, add test for platform addition

02e7638

Add translator test with positive cases

024bbf5

Merge branch 'main' into i143004-in-app-purchase-user-choice-billing-…

818adf2

…intro

dart formatting

10ad143

Add example of details in main

3c0067a

reidbaker marked this pull request as ready for review February 22, 2024 20:50

reidbaker requested a review from gmackall as a code owner February 22, 2024 20:50

reidbaker requested a review from stuartmorgan February 22, 2024 20:50

formatting

dda2a57

stuartmorgan reviewed Feb 26, 2024

View reviewed changes

mariamhas requested a review from stuartmorgan February 26, 2024 19:20

reidbaker mentioned this pull request Mar 7, 2024

[in_app_purchase] Add alternative billing apis for android #6056

Merged

15 tasks

code review feedback

2e20b70

reidbaker added 3 commits March 8, 2024 12:37

Merge branch 'main' into i143004-in-app-purchase-user-choice-billing-…

0e8bc5b

…intro

formatting

7efca0f

Correct missmatch between java and dart and add over the wire test to…

6b282f8

… ensure compatibility

reidbaker requested a review from a team March 8, 2024 19:22

gmackall reviewed Mar 8, 2024

View reviewed changes

Formatting

43e00d7

gmackall reviewed Mar 8, 2024

View reviewed changes

Update packages/in_app_purchase/in_app_purchase_android/lib/src/billi…

3df9dd5

…ng_client_wrappers/billing_client_wrapper.dart Co-authored-by: Gray Mackall <34871572+gmackall@users.noreply.github.com>

reidbaker mentioned this pull request Mar 8, 2024

[in_app_purchase_android] Refactor listener to be created in implementation. flutter/flutter#144851

Closed

gmackall approved these changes Mar 8, 2024

View reviewed changes

reidbaker added the autosubmit Merge PR when tree becomes green via auto submit App label Mar 8, 2024

auto-submit bot merged commit d489d84 into flutter:main Mar 8, 2024
78 checks passed

engine-flutter-autoroll mentioned this pull request Mar 11, 2024

Roll Packages from 0badb4356021 to d489d84c359b (3 revisions) flutter/flutter#144931

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Mar 11, 2024

d489d84c3 [in_app_purchase_android] Add UserChoiceBilling mode. (flut…

2846f2b

…ter/packages#6162)

reidbaker mentioned this pull request Apr 1, 2024

[camera_android_camerax] Move integration_test dependency to tests reidbaker/packages#4

Closed

11 tasks

reidbaker deleted the i143004-in-app-purchase-user-choice-billing-intro branch April 19, 2024 15:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[in_app_purchase_android] Add UserChoiceBilling mode. #6162

[in_app_purchase_android] Add UserChoiceBilling mode. #6162

reidbaker commented Feb 19, 2024 •

edited

stuartmorgan Feb 26, 2024

reidbaker Mar 8, 2024

stuartmorgan Feb 26, 2024

reidbaker Mar 8, 2024

stuartmorgan Feb 26, 2024

reidbaker Mar 8, 2024

stuartmorgan Feb 26, 2024

reidbaker Mar 8, 2024

stuartmorgan Feb 26, 2024

reidbaker Mar 8, 2024

gmackall left a comment

gmackall Mar 8, 2024

reidbaker Mar 8, 2024

gmackall Mar 8, 2024

reidbaker Mar 8, 2024

gmackall Mar 8, 2024

gmackall Mar 8, 2024

reidbaker Mar 8, 2024

gmackall Mar 8, 2024

reidbaker Mar 8, 2024

gmackall Mar 8, 2024

gmackall left a comment

fareesh commented Mar 18, 2024

	* Adds UserChoiceBilling API's to platform addition.
	* Adds UserChoiceBilling APIs to platform addition.

[in_app_purchase_android] Add UserChoiceBilling mode. #6162

[in_app_purchase_android] Add UserChoiceBilling mode. #6162

Conversation

reidbaker commented Feb 19, 2024 • edited

Pre-launch Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gmackall left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gmackall left a comment

Choose a reason for hiding this comment

fareesh commented Mar 18, 2024

reidbaker commented Feb 19, 2024 •

edited