Merge pull request #408 from superwall/develop

2.7.14

Author: ianrumac

.github/badges/branches.svg

@@ -2,6 +2,14 @@
 
 The changelog for `Superwall`. Also see the [releases](https://github.com/superwall/Superwall-Android/releases) on GitHub.
 
+## 2.7.14
+
+## Fixes
+
+- Fixes test mode products not being loaded properly in PW
+- Improve exponential backoff retry for Play Service unavailable
+- Fix Custom Info date serialization issues
+
 ## 2.7.13
 
 ## Fixes

.github/badges/jacoco.svg

@@ -14,6 +14,8 @@ internal typealias ExecuteRequestOnUIThreadFunction = (delayInMillis: Long, onEr
 private const val MAX_RETRIES_DEFAULT = 3
 private const val RETRY_TIMER_START_MILLISECONDS = 878L // So it gets close to 15 minutes in last retry
 internal const val RETRY_TIMER_MAX_TIME_MILLISECONDS = 1000L * 60L * 15L // 15 minutes
+private const val FOREGROUND_BACKOFF_START_MILLISECONDS = 250L
+private const val FOREGROUND_BACKOFF_MAX_ATTEMPTS = 2
 
 internal interface UseCaseParams {
     val appInBackground: Boolean
@@ -33,6 +35,7 @@ internal abstract class BillingClientUseCase<T>(
     private val maxRetries: Int = MAX_RETRIES_DEFAULT
     private var retryAttempt: Int = 0
     private var retryBackoffMilliseconds = RETRY_TIMER_START_MILLISECONDS
+    private var foregroundBackoffAttempt: Int = 0
 
     fun run(delayMilliseconds: Long = 0) {
         executeRequestOnUIThread(delayMilliseconds) { connectionError ->
@@ -144,11 +147,28 @@ internal abstract class BillingClientUseCase<T>(
             } else {
                 onError(billingResult)
             }
+        } else if (retryAttempt < maxRetries) {
+            Logger.debug(
+                logLevel = LogLevel.warn,
+                scope = LogScope.productsManager,
+                message = "Billing unavailable in foreground. Retry ${retryAttempt + 1}/$maxRetries (immediate).",
+            )
+            retryAttempt++
+            executeAsync()
+        } else if (foregroundBackoffAttempt < FOREGROUND_BACKOFF_MAX_ATTEMPTS) {
+            val delay = FOREGROUND_BACKOFF_START_MILLISECONDS shl foregroundBackoffAttempt
+            Logger.debug(
+                logLevel = LogLevel.warn,
+                scope = LogScope.productsManager,
+                message = "Billing unavailable in foreground. Backoff retry ${foregroundBackoffAttempt + 1}/$FOREGROUND_BACKOFF_MAX_ATTEMPTS in ${delay}ms.",
+            )
+            foregroundBackoffAttempt++
+            run(delay)
         } else {
             Logger.debug(
                 logLevel = LogLevel.error,
                 scope = LogScope.productsManager,
-                message = "Billing is unavailable. App is in foreground. Won't retry.",
+                message = "Billing unavailable. Foreground retries exhausted.",
             )
             onError(billingResult)
         }

CHANGELOG.md

@@ -3,15 +3,14 @@ package com.superwall.sdk.models.customer
 import com.superwall.sdk.models.entitlements.Entitlement
 import com.superwall.sdk.models.entitlements.SubscriptionStatus
 import com.superwall.sdk.models.product.Store
+import com.superwall.sdk.network.JsonFactory
 import com.superwall.sdk.storage.LatestDeviceCustomerInfo
 import com.superwall.sdk.storage.LatestRedemptionResponse
 import com.superwall.sdk.storage.Storage
 import com.superwall.sdk.storage.core_data.convertFromJsonElement
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonNamingStrategy
 import kotlinx.serialization.json.jsonObject
 
 /**
@@ -58,7 +57,7 @@ data class CustomerInfo(
      */
     fun toParams(): Map<String, Any?> {
         if (isPlaceholder) return emptyMap()
-        val obj = paramsJson.encodeToJsonElement(serializer(), this).jsonObject
+        val obj = JsonFactory.JSON.encodeToJsonElement(serializer(), this).jsonObject
         return obj
             .mapValues { (_, value) -> value.convertFromJsonElement() }
     }
@@ -87,16 +86,6 @@ data class CustomerInfo(
         }
 
     companion object {
-        private val paramsJson = Json {
-            try {
-
-                namingStrategy = JsonNamingStrategy.SnakeCase
-            } catch (e: Throwable) {
-            }
-            encodeDefaults = true;
-            ignoreUnknownKeys = true
-        }
-
         /**
          * Creates a blank CustomerInfo instance for testing or default states.
          */

superwall/src/main/java/com/superwall/sdk/billing/BillingClientUseCase.kt

@@ -133,11 +133,21 @@ class StoreManager(
     }
 
     private suspend fun fetchOrAwaitProducts(fullProductIds: Set<String>): Map<String, StoreProduct> {
+        val testProducts = testMode?.takeIf { it.isTestMode }?.testProductsByFullId.orEmpty()
+        val testHits: Map<String, StoreProduct> =
+            if (testProducts.isEmpty()) {
+                emptyMap()
+            } else {
+                fullProductIds.mapNotNull { id -> testProducts[id]?.let { id to it } }.toMap()
+            }
+        val remainingIds = fullProductIds - testHits.keys
+        if (remainingIds.isEmpty()) return testHits
+
         val cached = mutableMapOf<String, StoreProduct>()
         val loading = mutableListOf<CompletableDeferred<StoreProduct>>()
         val newDeferreds = mutableMapOf<String, CompletableDeferred<StoreProduct>>()
 
-        for (id in fullProductIds) {
+        for (id in remainingIds) {
             val state =
                 productsByFullId.getOrPut(id) {
                     val deferred = CompletableDeferred<StoreProduct>()
@@ -181,7 +191,7 @@ class StoreManager(
 
         val fetched = fetchNewProducts(newDeferreds)
 
-        return cached + awaited + fetched
+        return testHits + cached + awaited + fetched
     }
 
     private suspend fun fetchNewProducts(deferreds: Map<String, CompletableDeferred<StoreProduct>>): Map<String, StoreProduct> {

superwall/src/main/java/com/superwall/sdk/models/customer/CustomerInfo.kt

@@ -1 +1 @@
-SUPERWALL_VERSION=2.7.13
+SUPERWALL_VERSION=2.7.14