SDK-3469 Remove deprecated purchase methods

api-tester/src/defaults/java/com/revenuecat/apitester/java/DeprecatedPurchasesAPI.java

@@ -10,7 +10,6 @@
 import com.revenuecat.purchases.Package;
 import com.revenuecat.purchases.Purchases;
 import com.revenuecat.purchases.PurchasesError;
-import com.revenuecat.purchases.UpgradeInfo;
 import com.revenuecat.purchases.interfaces.ProductChangeCallback;
 import com.revenuecat.purchases.interfaces.PurchaseCallback;
 import com.revenuecat.purchases.models.StoreProduct;
@@ -24,8 +23,7 @@ static void check(final Purchases purchases,
                       final SkuDetails skuDetails,
                       final StoreProduct storeProduct,
                       final Package packageToPurchase,
-                      final SubscriptionOption subscriptionOption,
-                      final UpgradeInfo upgradeInfo) {
+                      final SubscriptionOption subscriptionOption) {
         final ProductChangeCallback purchaseChangeListener = new ProductChangeCallback() {
             @Override
             public void onCompleted(@Nullable StoreTransaction storeTransaction, @NonNull CustomerInfo customerInfo) {
@@ -47,9 +45,7 @@ public void onError(@NonNull PurchasesError error, boolean userCancelled) {
 
         purchases.setAllowSharingPlayStoreAccount(true);
         Purchases.setDebugLogsEnabled(false);
-        purchases.purchaseProduct(activity, storeProduct, upgradeInfo, purchaseChangeListener);
         purchases.purchaseProduct(activity, storeProduct, makePurchaseListener);
-        purchases.purchasePackage(activity, packageToPurchase, upgradeInfo, purchaseChangeListener);
         purchases.purchasePackage(activity, packageToPurchase, makePurchaseListener);
     }
 

api-tester/src/defaults/kotlin/com/revenuecat/apitester/kotlin/DeprecatedPurchasesAPI.kt

@@ -5,10 +5,8 @@ import com.revenuecat.purchases.CustomerInfo
 import com.revenuecat.purchases.Package
 import com.revenuecat.purchases.Purchases
 import com.revenuecat.purchases.PurchasesError
-import com.revenuecat.purchases.UpgradeInfo
 import com.revenuecat.purchases.getNonSubscriptionSkusWith
 import com.revenuecat.purchases.getSubscriptionSkusWith
-import com.revenuecat.purchases.interfaces.ProductChangeCallback
 import com.revenuecat.purchases.interfaces.PurchaseCallback
 import com.revenuecat.purchases.models.StoreProduct
 import com.revenuecat.purchases.models.StoreTransaction
@@ -23,22 +21,15 @@ private class DeprecatedPurchasesAPI {
         purchases: Purchases,
         activity: Activity,
         storeProduct: StoreProduct,
-        upgradeInfo: UpgradeInfo,
         subscriptionOption: SubscriptionOption,
         packageToPurchase: Package,
     ) {
-        val purchaseChangeCallback = object : ProductChangeCallback {
-            override fun onCompleted(storeTransaction: StoreTransaction?, customerInfo: CustomerInfo) {}
-            override fun onError(error: PurchasesError, userCancelled: Boolean) {}
-        }
         val purchaseCallback = object : PurchaseCallback {
             override fun onCompleted(storeTransaction: StoreTransaction, customerInfo: CustomerInfo) {}
             override fun onError(error: PurchasesError, userCancelled: Boolean) {}
         }
 
-        purchases.purchaseProduct(activity, storeProduct, upgradeInfo, purchaseChangeCallback)
         purchases.purchaseProduct(activity, storeProduct, purchaseCallback)
-        purchases.purchasePackage(activity, packageToPurchase, upgradeInfo, purchaseChangeCallback)
         purchases.purchasePackage(activity, packageToPurchase, purchaseCallback)
 
         purchases.purchaseProductWith(
@@ -51,31 +42,6 @@ private class DeprecatedPurchasesAPI {
             activity,
             storeProduct,
         ) { _: StoreTransaction, _: CustomerInfo -> }
-        purchases.purchaseProductWith(
-            activity,
-            storeProduct,
-            upgradeInfo,
-            onError = { _: PurchasesError, _: Boolean -> },
-            onSuccess = { _: StoreTransaction?, _: CustomerInfo -> },
-        )
-        purchases.purchaseProductWith(
-            activity,
-            storeProduct,
-            upgradeInfo,
-        ) { _: StoreTransaction?, _: CustomerInfo -> }
-
-        purchases.purchasePackageWith(
-            activity,
-            packageToPurchase,
-            upgradeInfo,
-            onError = { _: PurchasesError, _: Boolean -> },
-            onSuccess = { _: StoreTransaction?, _: CustomerInfo -> },
-        )
-        purchases.purchasePackageWith(
-            activity,
-            packageToPurchase,
-            upgradeInfo,
-        ) { _: StoreTransaction?, _: CustomerInfo -> }
 
         purchases.purchasePackageWith(
             activity,

examples/purchase-tester/src/main/java/com/revenuecat/purchasetester/DeprecatedOfferingFragment.kt

@@ -10,17 +10,14 @@ import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.transition.MaterialContainerTransform
 import com.revenuecat.purchases.CustomerInfo
 import com.revenuecat.purchases.Offerings
 import com.revenuecat.purchases.Package
 import com.revenuecat.purchases.Purchases
 import com.revenuecat.purchases.PurchasesError
-import com.revenuecat.purchases.UpgradeInfo
 import com.revenuecat.purchases.getCustomerInfoWith
 import com.revenuecat.purchases.getOfferingsWith
-import com.revenuecat.purchases.models.GoogleReplacementMode
 import com.revenuecat.purchases.models.StoreProduct
 import com.revenuecat.purchases.models.StoreTransaction
 import com.revenuecat.purchases.purchasePackageWith
@@ -51,12 +48,6 @@ class DeprecatedOfferingFragment : Fragment(), DeprecatedPackageCardAdapter.Pack
             handleSuccessfulPurchase(storeTransaction.orderId)
         }
 
-    private val successfulUpgradeCallback: (purchase: StoreTransaction?, customerInfo: CustomerInfo) -> Unit =
-        { storeTransaction, _ ->
-            toggleLoadingIndicator(false)
-            handleSuccessfulPurchase(storeTransaction?.orderId)
-        }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         sharedElementEnterTransition = MaterialContainerTransform().apply {
@@ -96,74 +87,30 @@ class DeprecatedOfferingFragment : Fragment(), DeprecatedPackageCardAdapter.Pack
     override fun onPurchasePackageClicked(
         cardView: View,
         currentPackage: Package,
-        isUpgrade: Boolean,
     ) {
         toggleLoadingIndicator(true)
 
-        if (isUpgrade) {
-            promptForUpgradeInfo { upgradeInfo ->
-                upgradeInfo?.let {
-                    startPurchasePackage(currentPackage, upgradeInfo)
-                }
-            }
-        } else {
-            startPurchasePackage(currentPackage, null)
-        }
+        startPurchasePackage(currentPackage)
     }
 
     override fun onPurchaseProductClicked(
         cardView: View,
         currentProduct: StoreProduct,
-        isUpgrade: Boolean,
     ) {
         toggleLoadingIndicator(true)
 
-        if (isUpgrade) {
-            promptForUpgradeInfo { upgradeInfo ->
-                upgradeInfo?.let {
-                    startPurchaseProduct(currentProduct, upgradeInfo)
-                }
-            }
-        } else {
-            startPurchaseProduct(currentProduct, null)
-        }
-    }
-
-    private fun promptForUpgradeInfo(callback: (UpgradeInfo?) -> Unit) {
-        showOldSubIdPicker { subId ->
-            subId?.let {
-                showReplacementModePicker { replacementMode, error ->
-                    if (error == null) {
-                        replacementMode?.let {
-                            callback(UpgradeInfo(subId, replacementMode.playBillingClientMode))
-                        } ?: callback(UpgradeInfo(subId))
-                    } else {
-                        callback(null)
-                    }
-                }
-            } ?: callback(null)
-        }
+        startPurchaseProduct(currentProduct)
     }
 
     private fun startPurchaseProduct(
         currentProduct: StoreProduct,
-        upgradeInfo: UpgradeInfo?,
     ) {
-        when {
-            upgradeInfo == null -> Purchases.sharedInstance.purchaseProductWith(
-                requireActivity(),
-                currentProduct,
-                purchaseErrorCallback,
-                successfulPurchaseCallback,
-            )
-            upgradeInfo != null -> Purchases.sharedInstance.purchaseProductWith(
-                requireActivity(),
-                currentProduct,
-                upgradeInfo,
-                purchaseErrorCallback,
-                successfulUpgradeCallback,
-            )
-        }
+        Purchases.sharedInstance.purchaseProductWith(
+            requireActivity(),
+            currentProduct,
+            purchaseErrorCallback,
+            successfulPurchaseCallback,
+        )
     }
 
     private fun handleSuccessfulPurchase(orderId: String?) {
@@ -179,88 +126,16 @@ class DeprecatedOfferingFragment : Fragment(), DeprecatedPackageCardAdapter.Pack
 
     private fun startPurchasePackage(
         currentPackage: Package,
-        upgradeInfo: UpgradeInfo?,
     ) {
-        when {
-            upgradeInfo == null -> Purchases.sharedInstance.purchasePackageWith(
-                requireActivity(),
-                currentPackage,
-                purchaseErrorCallback,
-                successfulPurchaseCallback,
-            )
-            upgradeInfo != null -> Purchases.sharedInstance.purchasePackageWith(
-                requireActivity(),
-                currentPackage,
-                upgradeInfo,
-                purchaseErrorCallback,
-                successfulUpgradeCallback,
-            )
-        }
+        Purchases.sharedInstance.purchasePackageWith(
+            requireActivity(),
+            currentPackage,
+            purchaseErrorCallback,
+            successfulPurchaseCallback,
+        )
     }
 
     private fun toggleLoadingIndicator(isLoading: Boolean) {
         binding.purchaseProgress.visibility = if (isLoading) View.VISIBLE else View.GONE
     }
-
-    private fun showOldSubIdPicker(callback: (String?) -> Unit) {
-        // Removes base plan id to get the sub id
-        val activeSubIds = activeSubscriptions.map { it.split(":").first() }
-        if (activeSubIds.isEmpty()) {
-            Toast.makeText(
-                requireContext(),
-                "Cannot upgrade without an existing active subscription.",
-                Toast.LENGTH_LONG,
-            ).show()
-            toggleLoadingIndicator(false)
-            callback(null)
-            return
-        }
-
-        var selectedUpgradeSubId: String = activeSubIds[0]
-        MaterialAlertDialogBuilder(requireContext())
-            .setTitle("Choose which active sub to switch from")
-            .setSingleChoiceItems(activeSubIds.toTypedArray(), 0) { _, which ->
-                selectedUpgradeSubId = activeSubIds[which]
-            }
-            .setPositiveButton("Continue") { dialog, _ ->
-                dialog.dismiss()
-                callback(selectedUpgradeSubId)
-            }
-            .setNegativeButton("Cancel purchase") { dialog, _ ->
-                dialog.dismiss()
-                toggleLoadingIndicator(false)
-                callback(null)
-            }
-            .setOnDismissListener {
-                toggleLoadingIndicator(false)
-                callback(null)
-            }
-            .show()
-    }
-
-    private fun showReplacementModePicker(callback: (GoogleReplacementMode?, Error?) -> Unit) {
-        val replacementModeOptions = GoogleReplacementMode.values()
-        var selectedReplacementMode: GoogleReplacementMode? = null
-
-        val replacementModeNames = replacementModeOptions.map { it.name }.toTypedArray()
-        MaterialAlertDialogBuilder(requireContext())
-            .setTitle("Choose ReplacementMode")
-            .setSingleChoiceItems(replacementModeNames, -1) { _, selectedIndex ->
-                selectedReplacementMode = replacementModeOptions.elementAt(selectedIndex)
-            }
-            .setPositiveButton("Start purchase") { dialog, _ ->
-                dialog.dismiss()
-                callback(selectedReplacementMode, null)
-            }
-            .setNegativeButton("Cancel purchase") { dialog, _ ->
-                dialog.dismiss()
-                toggleLoadingIndicator(false)
-                callback(null, Error("Purchase cancelled"))
-            }
-            .setOnDismissListener {
-                toggleLoadingIndicator(false)
-                callback(null, Error("Selection dismissed"))
-            }
-            .show()
-    }
 }

examples/purchase-tester/src/main/java/com/revenuecat/purchasetester/DeprecatedPackageCardAdapter.kt

@@ -3,6 +3,7 @@ package com.revenuecat.purchasetester
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import com.revenuecat.purchases.Package
 import com.revenuecat.purchases.PackageType
@@ -38,12 +39,13 @@ class DeprecatedPackageCardAdapter(
             binding.currentPackage = currentPackage
             binding.isSubscription = product.type == ProductType.SUBS
             binding.isActive = activeSubscriptions.contains(product.id)
+            // Upgrades are no longer possible with deprecated methods.
+            binding.isUpgradeCheckbox.isVisible = false
 
             binding.packageBuyButton.setOnClickListener {
                 listener.onPurchasePackageClicked(
                     binding.root,
                     currentPackage,
-                    binding.isUpgradeCheckbox.isChecked,
                 )
             }
 
@@ -53,7 +55,6 @@ class DeprecatedPackageCardAdapter(
                 listener.onPurchaseProductClicked(
                     binding.root,
                     product,
-                    binding.isUpgradeCheckbox.isChecked,
                 )
             }
             binding.productBuyButton.text = "Buy product (deprecated)"
@@ -82,12 +83,10 @@ class DeprecatedPackageCardAdapter(
         fun onPurchasePackageClicked(
             cardView: View,
             currentPackage: Package,
-            isUpgrade: Boolean,
         )
         fun onPurchaseProductClicked(
             cardView: View,
             currentProduct: StoreProduct,
-            isUpgrade: Boolean,
         )
     }
 }