Fix billing API usage

app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/support/SupportActivity.java

@@ -10,7 +10,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.ViewModelProvider;
 
-import com.android.billingclient.api.SkuDetails;
+import com.android.billingclient.api.ProductDetails;
 import com.d4rk.androidtutorials.java.databinding.ActivitySupportBinding;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 
@@ -43,33 +43,33 @@ protected void onCreate(Bundle savedInstanceState) {
         binding.buttonWebAd.setOnClickListener(v ->
                 startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://bit.ly/3p8bpjj"))));
 
-        supportViewModel.initBillingClient(this::querySkuDetails);
+        supportViewModel.initBillingClient(this::queryProductDetails);
 
         binding.buttonLowDonation.setOnClickListener(v -> initiatePurchase("low_donation"));
         binding.buttonNormalDonation.setOnClickListener(v -> initiatePurchase("normal_donation"));
         binding.buttonHighDonation.setOnClickListener(v -> initiatePurchase("high_donation"));
         binding.buttonExtremeDonation.setOnClickListener(v -> initiatePurchase("extreme_donation"));
     }
 
-    private void querySkuDetails() {
-        List<String> skuList = List.of("low_donation", "normal_donation", "high_donation", "extreme_donation");
-        supportViewModel.querySkuDetails(skuList, skuDetailsList -> {
-            for (SkuDetails skuDetails : skuDetailsList) {
-                switch (skuDetails.getSku()) {
-                    case "low_donation" -> binding.buttonLowDonation.setText(skuDetails.getPrice());
-                    case "normal_donation" ->
-                            binding.buttonNormalDonation.setText(skuDetails.getPrice());
-                    case "high_donation" ->
-                            binding.buttonHighDonation.setText(skuDetails.getPrice());
-                    case "extreme_donation" ->
-                            binding.buttonExtremeDonation.setText(skuDetails.getPrice());
+    private void queryProductDetails() {
+        List<String> productIds = List.of("low_donation", "normal_donation", "high_donation", "extreme_donation");
+        supportViewModel.queryProductDetails(productIds, productDetailsList -> {
+            for (ProductDetails productDetails : productDetailsList) {
+                String price = productDetails.getOneTimePurchaseOfferDetails() != null
+                        ? productDetails.getOneTimePurchaseOfferDetails().getFormattedPrice()
+                        : "";
+                switch (productDetails.getProductId()) {
+                    case "low_donation" -> binding.buttonLowDonation.setText(price);
+                    case "normal_donation" -> binding.buttonNormalDonation.setText(price);
+                    case "high_donation" -> binding.buttonHighDonation.setText(price);
+                    case "extreme_donation" -> binding.buttonExtremeDonation.setText(price);
                 }
             }
         });
     }
 
-    private void initiatePurchase(String sku) {
-        supportViewModel.initiatePurchase(this, sku);
+    private void initiatePurchase(String productId) {
+        supportViewModel.initiatePurchase(this, productId);
     }
 
     @Override

app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/support/SupportViewModel.java

@@ -24,13 +24,13 @@ public void initBillingClient(Runnable onConnected) {
         repository.initBillingClient(onConnected);
     }
 
-    public void querySkuDetails(List<String> skuList,
-                                SupportRepository.OnSkuDetailsListener listener) {
-        repository.querySkuDetails(skuList, listener);
+    public void queryProductDetails(List<String> productIds,
+                                   SupportRepository.OnProductDetailsListener listener) {
+        repository.queryProductDetails(productIds, listener);
     }
 
-    public void initiatePurchase(Activity activity, String sku) {
-        repository.initiatePurchase(activity, sku);
+    public void initiatePurchase(Activity activity, String productId) {
+        repository.initiatePurchase(activity, productId);
     }
 
     public void initMobileAds(ActivitySupportBinding binding) {

app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/support/repository/SupportRepository.java

@@ -9,12 +9,14 @@
 import com.android.billingclient.api.BillingClientStateListener;
 import com.android.billingclient.api.BillingFlowParams;
 import com.android.billingclient.api.BillingResult;
-import com.android.billingclient.api.SkuDetails;
-import com.android.billingclient.api.SkuDetailsParams;
+import com.android.billingclient.api.PendingPurchasesParams;
+import com.android.billingclient.api.ProductDetails;
+import com.android.billingclient.api.QueryProductDetailsParams;
 import com.d4rk.androidtutorials.java.databinding.ActivitySupportBinding;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.MobileAds;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -25,7 +27,7 @@
 public class SupportRepository {
 
     private final Context context;
-    private final Map<String, SkuDetails> skuDetailsMap = new HashMap<>();
+    private final Map<String, ProductDetails> productDetailsMap = new HashMap<>();
     private BillingClient billingClient;
 
     public SupportRepository(Context context) {
@@ -41,7 +43,10 @@ public void initBillingClient(Runnable onConnected) {
         billingClient = BillingClient.newBuilder(context)
                 .setListener((billingResult, purchases) -> {
                 })
-                .enablePendingPurchases()
+                .enablePendingPurchases(
+                        PendingPurchasesParams.newBuilder()
+                                .enableOneTimeProducts()
+                                .build())
                 .build();
 
         billingClient.startConnection(new BillingClientStateListener() {
@@ -63,40 +68,52 @@ public void onBillingServiceDisconnected() {
     }
 
     /**
-     * Query your SKU details for in-app items.
+     * Query your product details for in-app items.
      * Typically called after billing client is connected.
      */
-    public void querySkuDetails(List<String> skuList, OnSkuDetailsListener listener) {
+    public void queryProductDetails(List<String> productIds, OnProductDetailsListener listener) {
         if (billingClient == null || !billingClient.isReady()) {
             return;
         }
-        SkuDetailsParams params = SkuDetailsParams.newBuilder()
-                .setSkusList(skuList)
-                .setType(BillingClient.SkuType.INAPP)
+
+        List<QueryProductDetailsParams.Product> products = new ArrayList<>();
+        for (String id : productIds) {
+            products.add(QueryProductDetailsParams.Product.newBuilder()
+                    .setProductId(id)
+                    .setProductType(BillingClient.ProductType.INAPP)
+                    .build());
+        }
+
+        QueryProductDetailsParams params = QueryProductDetailsParams.newBuilder()
+                .setProductList(products)
                 .build();
 
-        billingClient.querySkuDetailsAsync(params, (billingResult, skuDetailsList) -> {
+        billingClient.queryProductDetailsAsync(params, (billingResult, productDetailsList) -> {
             if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.OK
-                    && skuDetailsList != null) {
-                for (SkuDetails skuDetails : skuDetailsList) {
-                    skuDetailsMap.put(skuDetails.getSku(), skuDetails);
+                    && productDetailsList != null) {
+                for (ProductDetails productDetails : productDetailsList) {
+                    productDetailsMap.put(productDetails.getProductId(), productDetails);
                 }
                 if (listener != null) {
-                    listener.onSkuDetailsRetrieved(skuDetailsList);
+                    listener.onProductDetailsRetrieved(productDetailsList);
                 }
             }
         });
     }
 
     /**
-     * Launch the billing flow for a particular SKU.
+     * Launch the billing flow for a particular product.
      */
-    public void initiatePurchase(Activity activity, String sku) {
-        if (skuDetailsMap.containsKey(sku)) {
-            SkuDetails skuDetails = skuDetailsMap.get(sku);
-            if (skuDetails != null) {
+    public void initiatePurchase(Activity activity, String productId) {
+        if (productDetailsMap.containsKey(productId)) {
+            ProductDetails details = productDetailsMap.get(productId);
+            if (details != null) {
+                BillingFlowParams.ProductDetailsParams productParams =
+                        BillingFlowParams.ProductDetailsParams.newBuilder()
+                                .setProductDetails(details)
+                                .build();
                 BillingFlowParams flowParams = BillingFlowParams.newBuilder()
-                        .setSkuDetails(skuDetails)
+                        .setProductDetailsParamsList(List.of(productParams))
                         .build();
                 billingClient.launchBillingFlow(activity, flowParams);
             }
@@ -113,10 +130,10 @@ public void initMobileAds(ActivitySupportBinding binding) {
     }
 
     /**
-     * Callback interface for when SKU details are fetched.
+     * Callback interface for when product details are fetched.
      */
-    public interface OnSkuDetailsListener {
-        void onSkuDetailsRetrieved(List<SkuDetails> skuDetailsList);
+    public interface OnProductDetailsListener {
+        void onProductDetailsRetrieved(List<ProductDetails> productDetailsList);
     }
 
 }