Merge pull request #364 from superwall/develop

2.7.2

Author: ianrumac

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 The changelog for `Superwall`. Also see the [releases](https://github.com/superwall/Superwall-Android/releases) on GitHub.
 
+## 2.7.2.
+
+### Fixes
+- Fixes issue with `enableExperimentalDeviceVariables` option causing subscription status sync to fail
+
 ## 2.7.1
 
 ### Enhancements

superwall/src/main/java/com/superwall/sdk/network/device/DeviceHelper.kt

@@ -592,11 +592,13 @@ class DeviceHelper(
                 enriched
                     .plus(it)
                     .let {
-                        if (factory.makeSuperwallOptions().enableExperimentalDeviceVariables) {
-                            it.plus(latestExperimentalDeviceProperties())
-                        } else {
-                            it
-                        }
+                        withErrorTracking {
+                            if (factory.makeSuperwallOptions().enableExperimentalDeviceVariables) {
+                                it.plus(latestExperimentalDeviceProperties())
+                            } else {
+                                it
+                            }
+                        }.getSuccess() ?: it
                     }
             }.fold(
                 onSuccess = { deviceTemplate ->

superwall/src/main/java/com/superwall/sdk/store/abstractions/product/receipt/ReceiptManager.kt

@@ -298,7 +298,7 @@ class ReceiptManager(
         buildMap {
             determinePeriodType()?.let { put("latestSubscriptionPeriodType", it) }
             latestSubscriptionWillAutoRenew?.let { put("latestSubscriptionWillAutoRenew", it) }
-            put("latestSubscriptionState", latestSubscriptionState.value)
+            put("latestSubscriptionState", latestSubscriptionState.value.name)
         }
 
     /**

superwall/src/main/java/com/superwall/sdk/store/abstractions/transactions/GoogleBillingPurchaseTransaction.kt

@@ -49,20 +49,20 @@ data class GoogleBillingPurchaseTransaction(
 ) : StoreTransactionType {
     constructor(transaction: Purchase) : this(
         underlyingSK2Transaction = transaction,
-        transactionDate = Date(transaction.purchaseTime), // Replace with correct mapping
-        originalTransactionIdentifier = transaction.orderId, // Replace with correct mapping
-        state = StoreTransactionState.Purchased, // Replace with correct mapping
-        storeTransactionId = transaction.orderId, // Replace with correct mapping
-        originalTransactionDate = Date(transaction.purchaseTime), // Replace with correct mapping
-        webOrderLineItemID = null, // Replace with correct mapping
-        appBundleId = null, // Replace with correct mapping
-        subscriptionGroupId = null, // Replace with correct mapping
-        isUpgraded = null, // Replace with correct mapping
-        expirationDate = null, // Replace with correct mapping
-        offerId = null, // Replace with correct mapping
-        revocationDate = null, // Replace with correct mapping
-        appAccountToken = null, // Replace with correct mapping
-        payment = StorePayment(transaction), // Replace with correct mapping
+        transactionDate = Date(transaction.purchaseTime),
+        originalTransactionIdentifier = transaction.orderId,
+        state = StoreTransactionState.Purchased,
+        storeTransactionId = transaction.orderId,
+        originalTransactionDate = Date(transaction.purchaseTime),
+        webOrderLineItemID = null, // Not available in transaction, kept as iOS complement.
+        appBundleId = null, // Not available in transaction, kept as iOS complement.
+        subscriptionGroupId = null, // Not available in transaction, kept as iOS complement.
+        isUpgraded = null, // Not available in transaction, kept as iOS complement.
+        expirationDate = null, // Not available in transaction, kept as iOS complement. Available on `StoreProductType` object.
+        offerId = null, // Not available in transaction, kept as iOS complement. Available on `StoreProductType` object
+        revocationDate = null, // Not available in transaction, kept as iOS complement
+        appAccountToken = null, // iOS property only, kept as complement
+        payment = StorePayment(transaction),
         purchaseToken = transaction.purchaseToken,
         signature = transaction.signature,
     )

version.env

@@ -1 +1 @@
-SUPERWALL_VERSION=2.7.1
+SUPERWALL_VERSION=2.7.2