[in_app_purchase] Add countryCode implementation to android and storekit

packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.4
+
+* Adds `countryCode` API.
+* Moves alternative billing listener creation to BillingClientFactoryImpl.
+
 ## 0.3.3
 
 * Converts data objects in internal platform communication to Pigeon.

packages/in_app_purchase/in_app_purchase_android/android/build.gradle

@@ -66,6 +66,8 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.json:json:20240303'
     testImplementation 'org.mockito:mockito-core:5.4.0'
+    testImplementation 'androidx.test:core:1.5.0'
+    testImplementation 'org.robolectric:robolectric:4.10.3'
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }

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

@@ -6,9 +6,7 @@
 
 import android.content.Context;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import com.android.billingclient.api.BillingClient;
-import com.android.billingclient.api.UserChoiceBillingListener;
 import io.flutter.plugins.inapppurchase.Messages.PlatformBillingChoiceMode;
 
 /** Responsible for creating a {@link BillingClient} object. */
@@ -26,6 +24,5 @@ interface BillingClientFactory {
   BillingClient createBillingClient(
       @NonNull Context context,
       @NonNull Messages.InAppPurchaseCallbackApi callbackApi,
-      PlatformBillingChoiceMode billingChoiceMode,
-      @Nullable UserChoiceBillingListener userChoiceBillingListener);
+      PlatformBillingChoiceMode billingChoiceMode);
 }

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

@@ -4,9 +4,11 @@
 
 package io.flutter.plugins.inapppurchase;
 
+import static io.flutter.plugins.inapppurchase.Translator.fromUserChoiceDetails;
+
 import android.content.Context;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import com.android.billingclient.api.BillingClient;
 import com.android.billingclient.api.UserChoiceBillingListener;
 import io.flutter.Log;
@@ -19,23 +21,15 @@ final class BillingClientFactoryImpl implements BillingClientFactory {
   public BillingClient createBillingClient(
       @NonNull Context context,
       @NonNull Messages.InAppPurchaseCallbackApi callbackApi,
-      PlatformBillingChoiceMode billingChoiceMode,
-      @Nullable UserChoiceBillingListener userChoiceBillingListener) {
+      PlatformBillingChoiceMode billingChoiceMode) {
     BillingClient.Builder builder = BillingClient.newBuilder(context).enablePendingPurchases();
     switch (billingChoiceMode) {
       case ALTERNATIVE_BILLING_ONLY:
         // https://developer.android.com/google/play/billing/alternative/alternative-billing-without-user-choice-in-app
         builder.enableAlternativeBillingOnly();
         break;
       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);
-        } else {
-          Log.e(
-              "BillingClientFactoryImpl",
-              "userChoiceBillingListener null when USER_CHOICE_BILLING set. Defaulting to PLAY_BILLING_ONLY");
-        }
+        builder.enableUserChoiceBilling(createUserChoiceBillingListener(callbackApi));
         break;
       case PLAY_BILLING_ONLY:
         // Do nothing.
@@ -48,4 +42,22 @@ public BillingClient createBillingClient(
     }
     return builder.setListener(new PluginPurchaseListener(callbackApi)).build();
   }
+
+  @VisibleForTesting
+  /* package */ UserChoiceBillingListener createUserChoiceBillingListener(
+      @NonNull Messages.InAppPurchaseCallbackApi callbackApi) {
+    return userChoiceDetails ->
+        callbackApi.userSelectedalternativeBilling(
+            fromUserChoiceDetails(userChoiceDetails),
+            new Messages.VoidResult() {
+              @Override
+              public void success() {}
+
+              @Override
+              public void error(@NonNull Throwable error) {
+                io.flutter.Log.e(
+                    "IN_APP_PURCHASE", "userSelectedalternativeBilling handler error: " + error);
+              }
+            });
+  }
 }

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

@@ -10,7 +10,6 @@
 import static io.flutter.plugins.inapppurchase.Translator.fromProductDetailsList;
 import static io.flutter.plugins.inapppurchase.Translator.fromPurchaseHistoryRecordList;
 import static io.flutter.plugins.inapppurchase.Translator.fromPurchasesList;
-import static io.flutter.plugins.inapppurchase.Translator.fromUserChoiceDetails;
 import static io.flutter.plugins.inapppurchase.Translator.toProductList;
 import static io.flutter.plugins.inapppurchase.Translator.toProductTypeString;
 
@@ -34,7 +33,6 @@
 import com.android.billingclient.api.QueryProductDetailsParams;
 import com.android.billingclient.api.QueryPurchaseHistoryParams;
 import com.android.billingclient.api.QueryPurchasesParams;
-import com.android.billingclient.api.UserChoiceBillingListener;
 import io.flutter.plugins.inapppurchase.Messages.FlutterError;
 import io.flutter.plugins.inapppurchase.Messages.InAppPurchaseApi;
 import io.flutter.plugins.inapppurchase.Messages.InAppPurchaseCallbackApi;
@@ -437,10 +435,8 @@ public void startConnection(
       @NonNull PlatformBillingChoiceMode billingMode,
       @NonNull Result<PlatformBillingResult> result) {
     if (billingClient == null) {
-      UserChoiceBillingListener listener = getUserChoiceBillingListener(billingMode);
       billingClient =
-          billingClientFactory.createBillingClient(
-              applicationContext, callbackApi, billingMode, listener);
+          billingClientFactory.createBillingClient(applicationContext, callbackApi, billingMode);
     }
 
     try {
@@ -482,30 +478,6 @@ public void error(@NonNull Throwable error) {
     }
   }
 
-  @Nullable
-  private UserChoiceBillingListener getUserChoiceBillingListener(
-      PlatformBillingChoiceMode billingChoiceMode) {
-    UserChoiceBillingListener listener = null;
-    if (billingChoiceMode == PlatformBillingChoiceMode.USER_CHOICE_BILLING) {
-      listener =
-          userChoiceDetails ->
-              callbackApi.userSelectedalternativeBilling(
-                  fromUserChoiceDetails(userChoiceDetails),
-                  new Messages.VoidResult() {
-                    @Override
-                    public void success() {}
-
-                    @Override
-                    public void error(@NonNull Throwable error) {
-                      io.flutter.Log.e(
-                          "IN_APP_PURCHASE",
-                          "userSelectedalternativeBilling handler error: " + error);
-                    }
-                  });
-    }
-    return listener;
-  }
-
   @Override
   public void acknowledgePurchase(
       @NonNull String purchaseToken, @NonNull Result<PlatformBillingResult> result) {

packages/in_app_purchase/in_app_purchase_android/android/src/test/java/io/flutter/plugins/inapppurchase/BillingClientFactoryImplTest.java

@@ -0,0 +1,105 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugins.inapppurchase;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import androidx.test.core.app.ApplicationProvider;
+import com.android.billingclient.api.BillingClient;
+import com.android.billingclient.api.UserChoiceBillingListener;
+import com.android.billingclient.api.UserChoiceDetails;
+import io.flutter.plugins.inapppurchase.Messages.InAppPurchaseCallbackApi;
+import io.flutter.plugins.inapppurchase.Messages.PlatformBillingChoiceMode;
+import io.flutter.plugins.inapppurchase.Messages.PlatformUserChoiceDetails;
+import java.util.Collections;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class BillingClientFactoryImplTest {
+
+  private AutoCloseable openMocks;
+  BillingClientFactoryImpl factory;
+  @Mock InAppPurchaseCallbackApi mockCallbackApi;
+  Context context;
+
+  @Before
+  public void setUp() {
+    openMocks = MockitoAnnotations.openMocks(this);
+    // Context must be a "real/robolectric" context since the implementation of billing client
+    // calls methods on context.
+    context = ApplicationProvider.getApplicationContext();
+    factory = spy(new BillingClientFactoryImpl());
+  }
+
+  @Test
+  public void playBillingOnly() {
+    // No logic to verify just ensure creation works.
+    BillingClient client =
+        factory.createBillingClient(
+            context, mockCallbackApi, PlatformBillingChoiceMode.PLAY_BILLING_ONLY);
+    assertNotNull(client);
+  }
+
+  @Test
+  public void alternativeBillingOnly() {
+    // No logic to verify just ensure creation works.
+    BillingClient client =
+        factory.createBillingClient(
+            context, mockCallbackApi, PlatformBillingChoiceMode.ALTERNATIVE_BILLING_ONLY);
+    assertNotNull(client);
+  }
+
+  @Test
+  public void userChoiceBilling() {
+    final UserChoiceBillingListener listener =
+        factory.createUserChoiceBillingListener(mockCallbackApi);
+    doReturn(listener)
+        .when(factory)
+        .createUserChoiceBillingListener(any(InAppPurchaseCallbackApi.class));
+
+    final BillingClient billingClient =
+        factory.createBillingClient(
+            context, mockCallbackApi, PlatformBillingChoiceMode.USER_CHOICE_BILLING);
+
+    UserChoiceDetails details = mock(UserChoiceDetails.class);
+    final String externalTransactionToken = "someLongTokenId1234";
+    final String originalTransactionId = "originalTransactionId123456";
+    when(details.getExternalTransactionToken()).thenReturn(externalTransactionToken);
+    when(details.getOriginalExternalTransactionId()).thenReturn(originalTransactionId);
+    when(details.getProducts()).thenReturn(Collections.emptyList());
+    listener.userSelectedAlternativeBilling(details);
+
+    ArgumentCaptor<PlatformUserChoiceDetails> callbackCaptor =
+        ArgumentCaptor.forClass(PlatformUserChoiceDetails.class);
+    verify(mockCallbackApi, times(1))
+        .userSelectedalternativeBilling(callbackCaptor.capture(), any());
+    assertEquals(callbackCaptor.getValue().getExternalTransactionToken(), externalTransactionToken);
+    assertEquals(
+        callbackCaptor.getValue().getOriginalExternalTransactionId(), originalTransactionId);
+    assertTrue(callbackCaptor.getValue().getProducts().isEmpty());
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    openMocks.close();
+  }
+}