refactor: remove QDeferredTransaction, use QPurchaseResult directly per review

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: NickSxti

sdk/src/main/java/com/qonversion/android/sdk/QonversionConfig.kt

@@ -28,8 +28,6 @@ class QonversionConfig internal constructor(
     internal val application: Application,
     internal val primaryConfig: PrimaryConfig,
     internal val cacheConfig: CacheConfig,
-    // Review feedback (Task 6): removed entitlementsUpdateListener from config.
-    // The deprecated builder method now wraps it in an adapter stored as deferredPurchasesListener.
     internal val deferredPurchasesListener: QDeferredPurchasesListener? = null
 ) {
 

sdk/src/main/java/com/qonversion/android/sdk/dto/QDeferredTransaction.kt

@@ -1,6 +1,5 @@
 package com.qonversion.android.sdk.internal
 
-import com.qonversion.android.sdk.dto.QDeferredTransaction
 import com.qonversion.android.sdk.dto.QPurchaseResult
 import com.qonversion.android.sdk.listeners.QDeferredPurchasesListener
 import com.qonversion.android.sdk.listeners.QEntitlementsUpdateListener
@@ -19,10 +18,7 @@ internal class EntitlementsUpdateListenerAdapter(
     private val legacyListener: QEntitlementsUpdateListener
 ) : QDeferredPurchasesListener {
 
-    override fun deferredPurchaseCompleted(
-        transaction: QDeferredTransaction,
-        purchaseResult: QPurchaseResult
-    ) {
+    override fun deferredPurchaseCompleted(purchaseResult: QPurchaseResult) {
         legacyListener.onEntitlementsUpdated(purchaseResult.entitlements)
     }
 }

sdk/src/main/java/com/qonversion/android/sdk/internal/EntitlementsUpdateListenerAdapter.kt

@@ -11,11 +11,6 @@ import com.qonversion.android.sdk.internal.provider.PrimaryConfigProvider
 import com.qonversion.android.sdk.internal.provider.UidProvider
 import com.qonversion.android.sdk.listeners.QDeferredPurchasesListener
 
-// Review feedback (Task 6): removed entitlementsUpdateListener property.
-// InternalConfig now only holds deferredPurchasesListener. When the deprecated
-// setEntitlementsUpdateListener() is called, the legacy listener is wrapped in
-// EntitlementsUpdateListenerAdapter and stored as deferredPurchasesListener.
-// This eliminates duplicate listener storage and dual invocation logic.
 internal class InternalConfig(
     override var primaryConfig: PrimaryConfig,
     override val cacheConfig: CacheConfig,

sdk/src/main/java/com/qonversion/android/sdk/internal/InternalConfig.kt

@@ -47,8 +47,6 @@ import com.qonversion.android.sdk.internal.storage.LaunchResultCacheWrapper
 import com.qonversion.android.sdk.internal.storage.PurchasesCache
 import com.qonversion.android.sdk.listeners.QDeferredPurchasesListener
 import com.qonversion.android.sdk.listeners.QEntitlementsUpdateListener
-import com.qonversion.android.sdk.dto.QDeferredTransaction
-import com.qonversion.android.sdk.dto.QDeferredTransactionType
 import com.qonversion.android.sdk.listeners.QonversionUserCallback
 import com.qonversion.android.sdk.listeners.QonversionPurchaseCallback
 import com.qonversion.android.sdk.dto.QPurchaseResult
@@ -468,8 +466,6 @@ internal class QProductCenterManager internal constructor(
         callback.onSuccess(user)
     }
 
-    // Review feedback (Task 6): deprecated setter wraps legacy listener in adapter.
-    // QProductCenterManager only works with deferredPurchasesListener internally.
     fun setEntitlementsUpdateListener(entitlementsUpdateListener: QEntitlementsUpdateListener) {
         internalConfig.deferredPurchasesListener = EntitlementsUpdateListenerAdapter(entitlementsUpdateListener)
     }
@@ -576,17 +572,7 @@ internal class QProductCenterManager internal constructor(
         if (callback != null) {
             callback.onResult(purchaseResult)
         } else {
-            // Review feedback (Task 6): single listener invocation.
-            // The adapter handles forwarding entitlements to legacy listeners.
-            val deferredTransaction = QDeferredTransaction(
-                productId = purchase.productId ?: "",
-                transactionId = purchase.purchaseToken,
-                originalTransactionId = purchase.orderId,
-                type = QDeferredTransactionType.Unknown,
-                value = 0.0,
-                currency = null
-            )
-            internalConfig.deferredPurchasesListener?.deferredPurchaseCompleted(deferredTransaction, purchaseResult)
+            internalConfig.deferredPurchasesListener?.deferredPurchaseCompleted(purchaseResult)
         }
     }
 
@@ -1081,19 +1067,9 @@ internal class QProductCenterManager internal constructor(
 
                         removePurchaseOptions(product?.storeId)
 
-                        // Review feedback (Task 6): single listener invocation.
-                        // The adapter handles forwarding entitlements to legacy listeners.
                         if (purchaseCallback == null) {
-                            val deferredTransaction = QDeferredTransaction(
-                                productId = purchase.productId ?: "",
-                                transactionId = purchase.purchaseToken,
-                                originalTransactionId = purchase.orderId,
-                                type = QDeferredTransactionType.Unknown,
-                                value = 0.0,
-                                currency = null
-                            )
                             val purchaseResult = QPurchaseResult.success(entitlements, purchase)
-                            internalConfig.deferredPurchasesListener?.deferredPurchaseCompleted(deferredTransaction, purchaseResult)
+                            internalConfig.deferredPurchasesListener?.deferredPurchaseCompleted(purchaseResult)
                         } else {
                             purchaseCallback.onResult(QPurchaseResult.success(entitlements, purchase))
                         }

sdk/src/main/java/com/qonversion/android/sdk/internal/QProductCenterManager.kt

@@ -1,14 +1,13 @@
 package com.qonversion.android.sdk.listeners
 
-import com.qonversion.android.sdk.dto.QDeferredTransaction
 import com.qonversion.android.sdk.dto.QPurchaseResult
 
 /**
  * The listener for deferred purchase completions.
  *
  * Deferred purchases happen when transactions require additional steps to complete,
  * such as pending transactions on Google Play or purchases requiring additional access grants.
- * This listener provides full transaction details and the purchase result with entitlements.
+ * This listener provides the purchase result with entitlements.
  *
  * It can be provided to the [QonversionConfig](com.qonversion.android.sdk.QonversionConfig)
  * via [QonversionConfig.Builder.setDeferredPurchasesListener](com.qonversion.android.sdk.QonversionConfig.Builder.setDeferredPurchasesListener)
@@ -20,12 +19,9 @@ interface QDeferredPurchasesListener {
     /**
      * Called when a deferred purchase completes.
      *
-     * A deferred purchase is fundamentally a purchase, so the callback provides both
-     * the transaction details and the full purchase result containing entitlements.
-     *
-     * @param transaction the completed deferred transaction with full details
-     *                    including product ID, transaction ID, type, value, and currency.
      * @param purchaseResult the purchase result containing entitlements granted by this purchase.
+     *                       It also contains the underlying Google Play [Purchase] object with
+     *                       productId, purchaseToken, orderId, etc.
      */
-    fun deferredPurchaseCompleted(transaction: QDeferredTransaction, purchaseResult: QPurchaseResult)
+    fun deferredPurchaseCompleted(purchaseResult: QPurchaseResult)
 }

sdk/src/main/java/com/qonversion/android/sdk/listeners/QDeferredPurchasesListener.kt

@@ -1,8 +1,6 @@
 package com.qonversion.android.sdk.internal
 
 import android.os.Build
-import com.qonversion.android.sdk.dto.QDeferredTransaction
-import com.qonversion.android.sdk.dto.QDeferredTransactionType
 import com.qonversion.android.sdk.dto.QPurchaseResult
 import com.qonversion.android.sdk.dto.entitlements.QEntitlement
 import com.qonversion.android.sdk.listeners.QDeferredPurchasesListener
@@ -26,7 +24,7 @@ internal class DeferredPurchasesListenerTest {
         clearAllMocks()
     }
 
-    // -- Adapter pattern tests (review feedback: Task 6) --
+    // -- Adapter pattern tests --
 
     @Test
     fun `adapter forwards entitlements from purchaseResult to legacy listener`() {
@@ -41,16 +39,7 @@ internal class DeferredPurchasesListenerTest {
         val purchaseResult = mockk<QPurchaseResult>()
         every { purchaseResult.entitlements } returns entitlements
 
-        val transaction = QDeferredTransaction(
-            productId = "com.app.premium",
-            transactionId = "token_123",
-            originalTransactionId = "order_456",
-            type = QDeferredTransactionType.Subscription,
-            value = 9.99,
-            currency = "USD"
-        )
-
-        adapter.deferredPurchaseCompleted(transaction, purchaseResult)
+        adapter.deferredPurchaseCompleted(purchaseResult)
 
         verify(exactly = 1) { legacyListener.onEntitlementsUpdated(entitlements) }
     }
@@ -67,16 +56,7 @@ internal class DeferredPurchasesListenerTest {
         val purchaseResult = mockk<QPurchaseResult>()
         every { purchaseResult.entitlements } returns emptyMap()
 
-        val transaction = QDeferredTransaction(
-            productId = "com.app.coins",
-            transactionId = "token_456",
-            originalTransactionId = null,
-            type = QDeferredTransactionType.Consumable,
-            value = 0.0,
-            currency = null
-        )
-
-        adapter.deferredPurchaseCompleted(transaction, purchaseResult)
+        adapter.deferredPurchaseCompleted(purchaseResult)
 
         verify(exactly = 1) { legacyListener.onEntitlementsUpdated(emptyMap()) }
     }
@@ -114,44 +94,4 @@ internal class DeferredPurchasesListenerTest {
 
         assertNull(mockConfig.deferredPurchasesListener)
     }
-
-    // -- DeferredTransaction data class tests --
-
-    @Test
-    fun `DeferredTransaction data class holds correct values`() {
-        val transaction = QDeferredTransaction(
-            productId = "com.app.premium",
-            transactionId = "token_123",
-            originalTransactionId = "order_456",
-            type = QDeferredTransactionType.Subscription,
-            value = 9.99,
-            currency = "USD"
-        )
-
-        assertEquals("com.app.premium", transaction.productId)
-        assertEquals("token_123", transaction.transactionId)
-        assertEquals("order_456", transaction.originalTransactionId)
-        assertEquals(QDeferredTransactionType.Subscription, transaction.type)
-        assertEquals(9.99, transaction.value, 0.001)
-        assertEquals("USD", transaction.currency)
-    }
-
-    @Test
-    fun `DeferredTransaction with null optional fields`() {
-        val transaction = QDeferredTransaction(
-            productId = "com.app.consumable",
-            transactionId = null,
-            originalTransactionId = null,
-            type = QDeferredTransactionType.Consumable,
-            value = 0.0,
-            currency = null
-        )
-
-        assertEquals("com.app.consumable", transaction.productId)
-        assertNull(transaction.transactionId)
-        assertNull(transaction.originalTransactionId)
-        assertEquals(QDeferredTransactionType.Consumable, transaction.type)
-        assertEquals(0.0, transaction.value, 0.001)
-        assertNull(transaction.currency)
-    }
 }

sdk/src/test/java/com/qonversion/android/sdk/internal/DeferredPurchasesListenerTest.kt

@@ -13,8 +13,6 @@ import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 
-// Review feedback (Task 6): updated tests to reflect removal of entitlementsUpdateListener
-// from InternalConfig. Only deferredPurchasesListener remains.
 internal class InternalConfigTest {
     private lateinit var internalConfig: InternalConfig