CustomEntitlementComputation: Add restorePurchases

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

@@ -19,7 +19,6 @@ import com.revenuecat.purchases.interfaces.SyncPurchasesCallback
 import com.revenuecat.purchases.logInWith
 import com.revenuecat.purchases.logOutWith
 import com.revenuecat.purchases.models.BillingFeature
-import com.revenuecat.purchases.restorePurchasesWith
 import com.revenuecat.purchases.syncPurchasesWith
 
 @Suppress("unused", "UNUSED_VARIABLE", "EmptyFunctionBlock", "DEPRECATION")
@@ -48,7 +47,6 @@ private class PurchasesAPI {
         purchases.logOut()
         purchases.logOut(receiveCustomerInfoCallback)
 
-        purchases.restorePurchases(receiveCustomerInfoCallback)
         purchases.invalidateCustomerInfoCache()
 
         purchases.getCustomerInfo(receiveCustomerInfoCallback)
@@ -87,10 +85,6 @@ private class PurchasesAPI {
             onError = { _: PurchasesError -> },
             onSuccess = { _: CustomerInfo -> },
         )
-        purchases.restorePurchasesWith(
-            onError = { _: PurchasesError -> },
-            onSuccess = { _: CustomerInfo -> },
-        )
         purchases.syncPurchasesWith(
             onError = { _: PurchasesError -> },
             onSuccess = { _: CustomerInfo -> },

api-tester/src/main/java/com/revenuecat/apitester/kotlin/PurchasesCommonAPI.kt

@@ -22,6 +22,7 @@ import com.revenuecat.purchases.getOfferingsWith
 import com.revenuecat.purchases.getProductsWith
 import com.revenuecat.purchases.interfaces.GetStoreProductsCallback
 import com.revenuecat.purchases.interfaces.PurchaseCallback
+import com.revenuecat.purchases.interfaces.ReceiveCustomerInfoCallback
 import com.revenuecat.purchases.interfaces.ReceiveOfferingsCallback
 import com.revenuecat.purchases.interfaces.UpdatedCustomerInfoListener
 import com.revenuecat.purchases.models.BillingFeature
@@ -30,6 +31,7 @@ import com.revenuecat.purchases.models.StoreProduct
 import com.revenuecat.purchases.models.StoreTransaction
 import com.revenuecat.purchases.models.SubscriptionOption
 import com.revenuecat.purchases.purchaseWith
+import com.revenuecat.purchases.restorePurchasesWith
 import java.net.URL
 import java.util.concurrent.ExecutorService
 
@@ -40,6 +42,10 @@ private class PurchasesCommonAPI {
         purchases: Purchases,
     ) {
         val productIds = ArrayList<String>()
+        val receiveCustomerInfoCallback = object : ReceiveCustomerInfoCallback {
+            override fun onReceived(customerInfo: CustomerInfo) {}
+            override fun onError(error: PurchasesError) {}
+        }
         val receiveOfferingsCallback = object : ReceiveOfferingsCallback {
             override fun onReceived(offerings: Offerings) {}
             override fun onError(error: PurchasesError) {}
@@ -54,6 +60,8 @@ private class PurchasesCommonAPI {
         purchases.getProducts(productIds, productsResponseCallback)
         purchases.getProducts(productIds, ProductType.SUBS, productsResponseCallback)
 
+        purchases.restorePurchases(receiveCustomerInfoCallback)
+
         val appUserID: String = purchases.appUserID
 
         purchases.removeUpdatedCustomerInfoListener()
@@ -124,6 +132,10 @@ private class PurchasesCommonAPI {
         purchases.purchaseWith(
             purchaseParams,
         ) { _: StoreTransaction?, _: CustomerInfo -> }
+        purchases.restorePurchasesWith(
+            onError = { _: PurchasesError -> },
+            onSuccess = { _: CustomerInfo -> },
+        )
     }
 
     suspend fun checkCoroutines(

purchases/src/customEntitlementComputation/kotlin/com/revenuecat/purchases/Purchases.kt

@@ -11,6 +11,7 @@ import com.revenuecat.purchases.common.log
 import com.revenuecat.purchases.interfaces.Callback
 import com.revenuecat.purchases.interfaces.GetStoreProductsCallback
 import com.revenuecat.purchases.interfaces.PurchaseCallback
+import com.revenuecat.purchases.interfaces.ReceiveCustomerInfoCallback
 import com.revenuecat.purchases.interfaces.ReceiveOfferingsCallback
 import com.revenuecat.purchases.interfaces.UpdatedCustomerInfoListener
 import com.revenuecat.purchases.models.BillingFeature
@@ -129,6 +130,24 @@ class Purchases internal constructor(
         purchasesOrchestrator.removeUpdatedCustomerInfoListener()
     }
 
+    /**
+     * Restores purchases made with the current Play Store account for the current user.
+     * This method will post all purchases associated with the current Play Store account to
+     * RevenueCat and become associated with the current `appUserID`. If the receipt token is being
+     * used by an existing user, the current `appUserID` will be aliased together with the
+     * `appUserID` of the existing user. Going forward, either `appUserID` will be able to reference
+     * the same user.
+     *
+     * You shouldn't use this method if you have your own account system. In that case
+     * "restoration" is provided by your app passing the same `appUserId` used to purchase originally.
+     * @param [callback] The listener that will be called when purchase restore completes.
+     */
+    fun restorePurchases(
+        callback: ReceiveCustomerInfoCallback,
+    ) {
+        purchasesOrchestrator.restorePurchases(callback)
+    }
+
     /**
      * Updates the current appUserID to a new one, without associating the two.
      *

purchases/src/defaults/kotlin/com/revenuecat/purchases/listenerConversions.kt

@@ -195,26 +195,6 @@ fun Purchases.getCustomerInfoWith(
     getCustomerInfo(fetchPolicy, receiveCustomerInfoCallback(onSuccess, onError))
 }
 
-/**
- * Restores purchases made with the current Play Store account for the current user.
- * This method will post all purchases associated with the current Play Store account to
- * RevenueCat and become associated with the current `appUserID`. If the receipt token is being
- * used by an existing user, the current `appUserID` will be aliased together with the
- * `appUserID` of the existing user. Going forward, either `appUserID` will be able to reference
- * the same user.
- *
- * You shouldn't use this method if you have your own account system. In that case
- * "restoration" is provided by your app passing the same `appUserId` used to purchase originally.
- * @param [onSuccess] Will be called after the call has completed.
- * @param [onError] Will be called after the call has completed with an error.
- */
-fun Purchases.restorePurchasesWith(
-    onError: (error: PurchasesError) -> Unit = ON_ERROR_STUB,
-    onSuccess: (customerInfo: CustomerInfo) -> Unit,
-) {
-    restorePurchases(receiveCustomerInfoCallback(onSuccess, onError))
-}
-
 /**
  * This method will send all the purchases to the RevenueCat backend. Call this when using your own implementation
  * for subscriptions anytime a sync is needed, such as when migrating existing users to RevenueCat. The

purchases/src/main/kotlin/com/revenuecat/purchases/ListenerConversionsCommon.kt

@@ -121,3 +121,23 @@ fun Purchases.getProductsWith(
 ) {
     getProducts(productIds, type, getStoreProductsCallback(onGetStoreProducts, onError))
 }
+
+/**
+ * Restores purchases made with the current Play Store account for the current user.
+ * This method will post all purchases associated with the current Play Store account to
+ * RevenueCat and become associated with the current `appUserID`. If the receipt token is being
+ * used by an existing user, the current `appUserID` will be aliased together with the
+ * `appUserID` of the existing user. Going forward, either `appUserID` will be able to reference
+ * the same user.
+ *
+ * You shouldn't use this method if you have your own account system. In that case
+ * "restoration" is provided by your app passing the same `appUserId` used to purchase originally.
+ * @param [onSuccess] Will be called after the call has completed.
+ * @param [onError] Will be called after the call has completed with an error.
+ */
+fun Purchases.restorePurchasesWith(
+    onError: (error: PurchasesError) -> Unit = ON_ERROR_STUB,
+    onSuccess: (customerInfo: CustomerInfo) -> Unit,
+) {
+    restorePurchases(receiveCustomerInfoCallback(onSuccess, onError))
+}