[in_app_purchase] Enable -Werror for Android (#3403)

[in_app_purchase] Enable -Werror for Android
flutter · Mar 8, 2023 · 46c6333 · 46c6333
1 parent 95a8a76
commit 46c6333
Show file tree

Hide file tree

Showing 6 changed files with 109 additions and 61 deletions.
diff --git a/...android/android/src/main/java/io/flutter/plugins/inapppurchase/MethodCallHandlerImpl.java b/...android/android/src/main/java/io/flutter/plugins/inapppurchase/MethodCallHandlerImpl.java
@@ -24,16 +24,12 @@
 import com.android.billingclient.api.BillingResult;
 import com.android.billingclient.api.ConsumeParams;
 import com.android.billingclient.api.ConsumeResponseListener;
-import com.android.billingclient.api.PriceChangeFlowParams;
 import com.android.billingclient.api.Purchase;
 import com.android.billingclient.api.PurchaseHistoryRecord;
 import com.android.billingclient.api.PurchaseHistoryResponseListener;
 import com.android.billingclient.api.PurchasesResponseListener;
 import com.android.billingclient.api.QueryPurchaseHistoryParams;
 import com.android.billingclient.api.QueryPurchasesParams;
-import com.android.billingclient.api.SkuDetails;
-import com.android.billingclient.api.SkuDetailsParams;
-import com.android.billingclient.api.SkuDetailsResponseListener;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import java.util.HashMap;
@@ -55,7 +51,9 @@ class MethodCallHandlerImpl
   private final Context applicationContext;
   private final MethodChannel methodChannel;
 
-  private HashMap<String, SkuDetails> cachedSkus = new HashMap<>();
+  // TODO(stuartmorgan): Migrate this code. See TODO on querySkuDetailsAsync.
+  @SuppressWarnings("deprecation")
+  private HashMap<String, com.android.billingclient.api.SkuDetails> cachedSkus = new HashMap<>();
 
   /** Constructs the MethodCallHandlerImpl */
   MethodCallHandlerImpl(
@@ -185,21 +183,29 @@ private void isReady(MethodChannel.Result result) {
     result.success(billingClient.isReady());
   }
 
-  // TODO(garyq): Migrate to new subscriptions API: https://developer.android.com/google/play/billing/migrate-gpblv5
+  // TODO(stuartmorgan): Migrate to new subscriptions API. See:
+  // - https://developer.android.com/google/play/billing/migrate-gpblv5
+  // - https://github.com/flutter/flutter/issues/114265
+  // - https://github.com/flutter/flutter/issues/107370
+  @SuppressWarnings("deprecation")
   private void querySkuDetailsAsync(
       final String skuType, final List<String> skusList, final MethodChannel.Result result) {
     if (billingClientError(result)) {
       return;
     }
 
-    SkuDetailsParams params =
-        SkuDetailsParams.newBuilder().setType(skuType).setSkusList(skusList).build();
+    com.android.billingclient.api.SkuDetailsParams params =
+        com.android.billingclient.api.SkuDetailsParams.newBuilder()
+            .setType(skuType)
+            .setSkusList(skusList)
+            .build();
     billingClient.querySkuDetailsAsync(
         params,
-        new SkuDetailsResponseListener() {
+        new com.android.billingclient.api.SkuDetailsResponseListener() {
           @Override
           public void onSkuDetailsResponse(
-              BillingResult billingResult, List<SkuDetails> skuDetailsList) {
+              BillingResult billingResult,
+              List<com.android.billingclient.api.SkuDetails> skuDetailsList) {
             updateCachedSkus(skuDetailsList);
             final Map<String, Object> skuDetailsResponse = new HashMap<>();
             skuDetailsResponse.put("billingResult", Translator.fromBillingResult(billingResult));
@@ -220,7 +226,9 @@ private void launchBillingFlow(
     if (billingClientError(result)) {
       return;
     }
-    SkuDetails skuDetails = cachedSkus.get(sku);
+    // TODO(stuartmorgan): Migrate this code. See TODO on querySkuDetailsAsync.
+    @SuppressWarnings("deprecation")
+    com.android.billingclient.api.SkuDetails skuDetails = cachedSkus.get(sku);
     if (skuDetails == null) {
       result.error(
           "NOT_FOUND",
@@ -258,6 +266,8 @@ private void launchBillingFlow(
       return;
     }
 
+    // TODO(stuartmorgan): Migrate this code. See TODO on querySkuDetailsAsync.
+    @SuppressWarnings("deprecation")
     BillingFlowParams.Builder paramsBuilder =
         BillingFlowParams.newBuilder().setSkuDetails(skuDetails);
     if (accountId != null && !accountId.isEmpty()) {
@@ -401,16 +411,21 @@ public void onAcknowledgePurchaseResponse(BillingResult billingResult) {
         });
   }
 
-  private void updateCachedSkus(@Nullable List<SkuDetails> skuDetailsList) {
+  // TODO(stuartmorgan): Migrate this code. See TODO on querySkuDetailsAsync.
+  @SuppressWarnings("deprecation")
+  private void updateCachedSkus(
+      @Nullable List<com.android.billingclient.api.SkuDetails> skuDetailsList) {
     if (skuDetailsList == null) {
       return;
     }
 
-    for (SkuDetails skuDetails : skuDetailsList) {
+    for (com.android.billingclient.api.SkuDetails skuDetails : skuDetailsList) {
       cachedSkus.put(skuDetails.getSku(), skuDetails);
     }
   }
 
+  // TODO(stuartmorgan): Migrate this code. See TODO on querySkuDetailsAsync.
+  @SuppressWarnings("deprecation")
   private void launchPriceChangeConfirmationFlow(String sku, MethodChannel.Result result) {
     if (activity == null) {
       result.error(
@@ -428,7 +443,7 @@ private void launchPriceChangeConfirmationFlow(String sku, MethodChannel.Result
     // is handled by the `billingClientError()` call.
     assert billingClient != null;
 
-    SkuDetails skuDetails = cachedSkus.get(sku);
+    com.android.billingclient.api.SkuDetails skuDetails = cachedSkus.get(sku);
     if (skuDetails == null) {
       result.error(
           "NOT_FOUND",
@@ -439,8 +454,10 @@ private void launchPriceChangeConfirmationFlow(String sku, MethodChannel.Result
       return;
     }
 
-    PriceChangeFlowParams params =
-        new PriceChangeFlowParams.Builder().setSkuDetails(skuDetails).build();
+    com.android.billingclient.api.PriceChangeFlowParams params =
+        new com.android.billingclient.api.PriceChangeFlowParams.Builder()
+            .setSkuDetails(skuDetails)
+            .build();
     billingClient.launchPriceChangeConfirmationFlow(
         activity,
         params,

diff --git a/...p_purchase_android/android/src/main/java/io/flutter/plugins/inapppurchase/Translator.java b/...p_purchase_android/android/src/main/java/io/flutter/plugins/inapppurchase/Translator.java
@@ -9,7 +9,6 @@
 import com.android.billingclient.api.BillingResult;
 import com.android.billingclient.api.Purchase;
 import com.android.billingclient.api.PurchaseHistoryRecord;
-import com.android.billingclient.api.SkuDetails;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Currency;
@@ -19,7 +18,9 @@
 
 /** Handles serialization of {@link com.android.billingclient.api.BillingClient} related objects. */
 /*package*/ class Translator {
-  static HashMap<String, Object> fromSkuDetail(SkuDetails detail) {
+  // TODO(stuartmorgan): Migrate this code. See TODO on MethodCallHandlerImpl.querySkuDetailsAsync.
+  @SuppressWarnings("deprecation")
+  static HashMap<String, Object> fromSkuDetail(com.android.billingclient.api.SkuDetails detail) {
     HashMap<String, Object> info = new HashMap<>();
     info.put("title", detail.getTitle());
     info.put("description", detail.getDescription());
@@ -40,21 +41,25 @@ static HashMap<String, Object> fromSkuDetail(SkuDetails detail) {
     return info;
   }
 
+  // TODO(stuartmorgan): Migrate this code. See TODO on MethodCallHandlerImpl.querySkuDetailsAsync.
+  @SuppressWarnings("deprecation")
   static List<HashMap<String, Object>> fromSkuDetailsList(
-      @Nullable List<SkuDetails> skuDetailsList) {
+      @Nullable List<com.android.billingclient.api.SkuDetails> skuDetailsList) {
     if (skuDetailsList == null) {
       return Collections.emptyList();
     }
 
     ArrayList<HashMap<String, Object>> output = new ArrayList<>();
-    for (SkuDetails detail : skuDetailsList) {
+    for (com.android.billingclient.api.SkuDetails detail : skuDetailsList) {
       output.add(fromSkuDetail(detail));
     }
     return output;
   }
 
   static HashMap<String, Object> fromPurchase(Purchase purchase) {
     HashMap<String, Object> info = new HashMap<>();
+    // TODO(stuartmorgan): Migrate this code. See TODO on MethodCallHandlerImpl.querySkuDetailsAsync.
+    @SuppressWarnings("deprecation")
     List<String> skus = purchase.getSkus();
     info.put("orderId", purchase.getOrderId());
     info.put("packageName", purchase.getPackageName());
@@ -79,6 +84,8 @@ static HashMap<String, Object> fromPurchase(Purchase purchase) {
   static HashMap<String, Object> fromPurchaseHistoryRecord(
       PurchaseHistoryRecord purchaseHistoryRecord) {
     HashMap<String, Object> info = new HashMap<>();
+    // TODO(stuartmorgan): Migrate this code. See TODO on MethodCallHandlerImpl.querySkuDetailsAsync.
+    @SuppressWarnings("deprecation")
     List<String> skus = purchaseHistoryRecord.getSkus();
     info.put("purchaseTime", purchaseHistoryRecord.getPurchaseTime());
     info.put("purchaseToken", purchaseHistoryRecord.getPurchaseToken());

diff --git a/...droid/android/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java b/...droid/android/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
@@ -15,6 +15,7 @@
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.PluginRegistry;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -25,18 +26,23 @@ public class InAppPurchasePluginTest {
 
   static final String PROXY_PACKAGE_KEY = "PROXY_PACKAGE";
 
+  @SuppressWarnings("deprecation")
+  @Mock
+  PluginRegistry.Registrar mockRegistrar; // For v1 embedding
+
   @Mock Activity activity;
   @Mock Context context;
-  @Mock PluginRegistry.Registrar mockRegistrar; // For v1 embedding
   @Mock BinaryMessenger mockMessenger;
   @Mock Application mockApplication;
   @Mock Intent mockIntent;
   @Mock ActivityPluginBinding activityPluginBinding;
   @Mock FlutterPlugin.FlutterPluginBinding flutterPluginBinding;
 
+  AutoCloseable mockCloseable;
+
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
+    mockCloseable = MockitoAnnotations.openMocks(this);
     when(mockRegistrar.activity()).thenReturn(activity);
     when(mockRegistrar.messenger()).thenReturn(mockMessenger);
     when(mockRegistrar.context()).thenReturn(context);
@@ -46,6 +52,11 @@ public void setUp() {
     when(flutterPluginBinding.getApplicationContext()).thenReturn(context);
   }
 
+  @After
+  public void tearDown() throws Exception {
+    mockCloseable.close();
+  }
+
   @Test
   public void registerWith_doNotCrashWhenRegisterContextIsActivity_V1Embedding() {
     when(mockRegistrar.context()).thenReturn(activity);