[in_app_purchase] Mostly convert to Android Pigeon

packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.2+1
+
+* Converts internal platform communication to Pigeon.
+
 ## 0.3.2
 
 * Adds UserChoiceBilling APIs to platform addition.

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

@@ -9,7 +9,7 @@
 import androidx.annotation.Nullable;
 import com.android.billingclient.api.BillingClient;
 import com.android.billingclient.api.UserChoiceBillingListener;
-import io.flutter.plugin.common.MethodChannel;
+import io.flutter.plugins.inapppurchase.Messages.PlatformBillingChoiceMode;
 
 /** Responsible for creating a {@link BillingClient} object. */
 interface BillingClientFactory {
@@ -18,14 +18,14 @@ interface BillingClientFactory {
    * Creates and returns a {@link BillingClient}.
    *
    * @param context The context used to create the {@link BillingClient}.
-   * @param channel The method channel used to create the {@link BillingClient}.
+   * @param callbackApi The callback API to be used by the {@link BillingClient}.
    * @param billingChoiceMode Enables the ability to offer alternative billing or Google Play
    *     billing.
    * @return The {@link BillingClient} object that is created.
    */
   BillingClient createBillingClient(
       @NonNull Context context,
-      @NonNull MethodChannel channel,
-      int billingChoiceMode,
+      @NonNull Messages.InAppPurchaseCallbackApi callbackApi,
+      PlatformBillingChoiceMode billingChoiceMode,
       @Nullable UserChoiceBillingListener userChoiceBillingListener);
 }

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

@@ -10,25 +10,24 @@
 import com.android.billingclient.api.BillingClient;
 import com.android.billingclient.api.UserChoiceBillingListener;
 import io.flutter.Log;
-import io.flutter.plugin.common.MethodChannel;
-import io.flutter.plugins.inapppurchase.MethodCallHandlerImpl.BillingChoiceMode;
+import io.flutter.plugins.inapppurchase.Messages.PlatformBillingChoiceMode;
 
 /** The implementation for {@link BillingClientFactory} for the plugin. */
 final class BillingClientFactoryImpl implements BillingClientFactory {
 
   @Override
   public BillingClient createBillingClient(
       @NonNull Context context,
-      @NonNull MethodChannel channel,
-      int billingChoiceMode,
+      @NonNull Messages.InAppPurchaseCallbackApi callbackApi,
+      PlatformBillingChoiceMode billingChoiceMode,
       @Nullable UserChoiceBillingListener userChoiceBillingListener) {
     BillingClient.Builder builder = BillingClient.newBuilder(context).enablePendingPurchases();
     switch (billingChoiceMode) {
-      case BillingChoiceMode.ALTERNATIVE_BILLING_ONLY:
+      case ALTERNATIVE_BILLING_ONLY:
         // https://developer.android.com/google/play/billing/alternative/alternative-billing-without-user-choice-in-app
         builder.enableAlternativeBillingOnly();
         break;
-      case BillingChoiceMode.USER_CHOICE_BILLING:
+      case USER_CHOICE_BILLING:
         if (userChoiceBillingListener != null) {
           // https://developer.android.com/google/play/billing/alternative/alternative-billing-with-user-choice-in-app
           builder.enableUserChoiceBilling(userChoiceBillingListener);
@@ -38,7 +37,7 @@ public BillingClient createBillingClient(
               "userChoiceBillingListener null when USER_CHOICE_BILLING set. Defaulting to PLAY_BILLING_ONLY");
         }
         break;
-      case BillingChoiceMode.PLAY_BILLING_ONLY:
+      case PLAY_BILLING_ONLY:
         // Do nothing.
         break;
       default:
@@ -47,6 +46,6 @@ public BillingClient createBillingClient(
             "Unknown BillingChoiceMode " + billingChoiceMode + ", Defaulting to PLAY_BILLING_ONLY");
         break;
     }
-    return builder.setListener(new PluginPurchaseListener(channel)).build();
+    return builder.setListener(new PluginPurchaseListener(callbackApi)).build();
   }
 }

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

@@ -13,7 +13,6 @@
 import io.flutter.embedding.engine.plugins.activity.ActivityAware;
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
 import io.flutter.plugin.common.BinaryMessenger;
-import io.flutter.plugin.common.MethodChannel;
 
 /** Wraps a {@link BillingClient} instance and responds to Dart calls for it. */
 public class InAppPurchasePlugin implements FlutterPlugin, ActivityAware {
@@ -25,7 +24,6 @@ public class InAppPurchasePlugin implements FlutterPlugin, ActivityAware {
   // code owner of this package.
   static final String PROXY_VALUE = "io.flutter.plugins.inapppurchase";
 
-  private MethodChannel methodChannel;
   private MethodCallHandlerImpl methodCallHandler;
 
   /** Plugin registration. */
@@ -45,7 +43,7 @@ public void onAttachedToEngine(@NonNull FlutterPlugin.FlutterPluginBinding bindi
 
   @Override
   public void onDetachedFromEngine(@NonNull FlutterPlugin.FlutterPluginBinding binding) {
-    teardownMethodChannel();
+    teardownMethodChannel(binding.getBinaryMessenger());
   }
 
   @Override
@@ -71,16 +69,15 @@ public void onDetachedFromActivityForConfigChanges() {
   }
 
   private void setUpMethodChannel(BinaryMessenger messenger, Context context) {
-    methodChannel = new MethodChannel(messenger, "plugins.flutter.io/in_app_purchase");
+    Messages.InAppPurchaseCallbackApi handler = new Messages.InAppPurchaseCallbackApi(messenger);
     methodCallHandler =
         new MethodCallHandlerImpl(
-            /*activity=*/ null, context, methodChannel, new BillingClientFactoryImpl());
-    methodChannel.setMethodCallHandler(methodCallHandler);
+            /*activity=*/ null, context, handler, new BillingClientFactoryImpl());
+    Messages.InAppPurchaseApi.setUp(messenger, methodCallHandler);
   }
 
-  private void teardownMethodChannel() {
-    methodChannel.setMethodCallHandler(null);
-    methodChannel = null;
+  private void teardownMethodChannel(BinaryMessenger messenger) {
+    Messages.InAppPurchaseApi.setUp(messenger, null);
     methodCallHandler = null;
   }