清除 Google 内购代码

app/src/main/java/com/yizhuan/erban/ui/pay/BillingManager.java

@@ -21,9 +21,7 @@ import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 public class BillingManager implements PurchasesUpdatedListener {
 
@@ -47,9 +45,6 @@ public class BillingManager implements PurchasesUpdatedListener {
     /*商品列表*/
     private final List<Purchase> purchaseList = new ArrayList<>();
 
-    /*消耗令牌*/
-    private Set<String> mTokensToBeConsumed;
-
     /*监听接口*/
     public interface BillingUpdatesListener {
         void onBillingClientSetupFinished();
@@ -105,26 +100,15 @@ public class BillingManager implements PurchasesUpdatedListener {
                 billingClient.queryPurchasesAsync(
                         QueryPurchasesParams.newBuilder()
                                 .setProductType(BillingClient.ProductType.INAPP)
-                                .build(), this::onQueryPurchasesFinished);
+                                .build(), this::onPurchasesUpdated);
         executeServiceRequest(queryToExecute);
     }
 
-    /*请求商品信息完成*/
-    private void onQueryPurchasesFinished(BillingResult result, List<Purchase> list) {
-        if (billingClient == null || result.getResponseCode() != BillingResponseCode.OK) {
-            Log.w(TAG, "billingClient is null or result code (" + result.getResponseCode()
-                    + ") was bad - quitting");
-            return;
-        }
-        purchaseList.clear();
-        onPurchasesUpdated(result, list);
-    }
-
     /*更新商品*/
     @Override
     public void onPurchasesUpdated(BillingResult billingResult, List<Purchase> purchases) {
-        //Log.i(TAG, "billingResult.getResponseCode()==" + billingResult.getResponseCode() + ",purchases.size()==" + purchases.size());
-
+        Log.i(TAG, "billingResult.getResponseCode()==" + billingResult.getResponseCode() + ",purchases.size()==" + purchases.size());
+        purchaseList.clear();
         if (billingResult.getResponseCode() == BillingResponseCode.OK) {
             for (Purchase purchase : purchases) {
                 handlePurchase(purchase);
@@ -216,14 +200,6 @@ public class BillingManager implements PurchasesUpdatedListener {
     }
 
     public void consumeAsync(final String purchaseToken) {
-        if (mTokensToBeConsumed == null) {
-            mTokensToBeConsumed = new HashSet<>();
-        } else if (mTokensToBeConsumed.contains(purchaseToken)) {
-            Log.i(TAG, "Token was already scheduled to be consumed - skipping...");
-            return;
-        }
-        mTokensToBeConsumed.add(purchaseToken);
-
         final ConsumeParams consumeParams = ConsumeParams.newBuilder().setPurchaseToken(purchaseToken).build();
 
         executeServiceRequest(() -> billingClient.consumeAsync(consumeParams, (billingResult, s) ->